Changeset 4117 for branches

Timestamp:

Jan 14, 2014 3:00:10 PM (10 years ago)

Author:

dkearney

Message:

updating the rappture 1.3 branch to allow users to build just the Rappture
C/C++/Fortran bindings, including the new configure flag --enable-lang flag.
This command also brings in a fix for what looks like a typo in the configure
script when dealing with the --with-ffmpeg=yes flag. this fix was made in the
trunk, along with the inclusion of libavutil/mathematics.h header which was
left out of the commit for now. I'm not sure if this new header is relevant to
the 1.3 branch.

Location:

branches/1.3

Files:

• Makefile.in (modified) (1 diff)
• configure (modified) (3 diffs)
• configure.in (modified) (2 diffs)

branches/1.3/Makefile.in

@@ -33 +33 @@
 ENABLE_GUI      = @ENABLE_GUI@
 HAVE_FFMPEG     = @HAVE_FFMPEG_LIBS@
-TARGETS         = src lang lib
+TARGETS         = src lib
 
+ifneq ($(ENABLE_LANG),)
+  TARGETS += lang
+endif
 ifneq ($(ENABLE_GUI),)
   TARGETS += gui builder tester examples 

branches/1.3/configure

@@ -685 +685 @@
 HAVE_FFMPEG_LIBS
 ENABLE_GUI
+ENABLE_LANG
 FFMPEG
 LDFLAGS_DEFAULT
@@ -9493 +9494 @@
 #--------------------------------------------------------------------
 if test "${with_ffmpeg}" != "no" ; then
-  if test "${with_tclsh}" = "yes" ; then
+  if test "${with_ffmpeg}" = "yes" ; then
     # Extract the first word of "ffmpeg", so it can be a program name with args.
 set dummy ffmpeg; ac_word=$2
@@ -10066 +10067 @@
   fi
 fi
+
 
 

branches/1.3/configure.in

@@ -261 +261 @@
 #--------------------------------------------------------------------
 if test "${with_ffmpeg}" != "no" ; then
-  if test "${with_tclsh}" = "yes" ; then 
+  if test "${with_ffmpeg}" = "yes" ; then 
     AC_PATH_PROG(FFMPEG, ffmpeg, [], $PATH)
   else 
@@ -341 +341 @@
 AC_SUBST(CFLAGS_DEBUG)
 AC_SUBST(CFLAGS_OPTIMIZE)
+AC_SUBST(ENABLE_LANG)
 AC_SUBST(ENABLE_GUI)
 AC_SUBST(FFMPEG)