Changeset 4025

Timestamp:

05/10/07 11:52:37 (6 years ago)

Author:

piers

Message:

Updated configure so one can disable aquatcl/tk and use ucltk:i e.g.
./configure --disable-aquatcl --disable-aquatk --with-ucltk --with-ucltcl

Location:

vic/branches/mpeg4

Files:

• configure (modified) (5 diffs)
• configure.in (modified) (1 diff)
• configure.in.head (modified) (1 diff)
• configure.in.tk (modified) (2 diffs)

vic/branches/mpeg4/configure

@@ -1299 +1299 @@
 --enable-debug          build with debugging enabled
 --enable-ipv6           build with ipv6 enabled
+--disable-aquatcl       build with aquatcl enabled
+--disable-aquatk        build with aquatk enabled
 --enable-gpl    Enable or disable  use of gpl functionality - H264 MPEG4 Swscale
 --disable-ffmpeg-co     Enable or disable ffmpeg svn checkout
@@ -4298 +4300 @@
 esac
 
+# Check whether --enable-aquatcl was given.
+if test "${enable_aquatcl+set}" = set; then
+  enableval=$enable_aquatcl; aquatcl=no
+fi
+
+# Check whether --enable-aquatk was given.
+if test "${enable_aquatk+set}" = set; then
+  enableval=$enable_aquatk; aquatk=no
+fi
+
+
 if test "$aquatk" != "yes" -a "$mingw" != "yes"; then
 
@@ -4581 +4594 @@
 
 if test "$aquatcl" == yes; then
-        echo "On MACOSX - Using Aqua TCL/Tk"
+        echo "Using AquaTCL"
         V_LIB_TCL="-framework Tcl"
+        V_DEFINE="$V_DEFINE -DMAC_OSX_TCL"
         V_LIBRARY_TCL=/Library/Frameworks/Tcl.framework/Versions/8.4/Resources/Scripts
         V_INCLUDE_TCL="-I/Library/Frameworks/Tcl.framework/Headers -I/Library/Frameworks/Tcl.framework/PrivateHeaders"
 
 elif test "$ucltcl" == yes; then
-        if test -z "$ucltcl"; then
+        if test -z "$tcl"; then
                 # UCL defaults
                 ucltcl=../tcl-8.0
         fi
         if test ! -d "$ucltcl" ; then
-                echo "'$d' is not a directory"
+                echo "UCL tcl path: '$ucltcl' is not a directory"
                 exit 1
         fi
@@ -4854 +4868 @@
 
 if test "$aquatk" == yes; then
+        echo "Using AquaTk"
         V_LIB_TK="-framework Tk"
+        V_DEFINE="$V_DEFINE -DMAC_OSX_TK"
         V_LIBRARY_TK=/Library/Frameworks/Tk.framework/Versions/8.4/Resources/Scripts
         V_INCLUDE_TK="-I/Library/Frameworks/Tk.framework/Headers -I/Library/Frameworks/Tk.framework/PrivateHeaders"
 
 elif test "$ucltk" == yes; then
-        if test -z "$ucltk"; then
+        if test -z "$tk"; then
                 # UCL defaults
                 ucltk=../tk-8.0
         fi
         if test ! -d "$ucltk" ; then
-                echo "'$d' is not a directory"
+                echo "UCL TK dir: '$ucltk' is not a directory"
                 exit 1
         fi
@@ -6950 +6966 @@
         V_STATIC=""
         V_BROKEN_OBJ=
-        V_DEFINE="$V_DEFINE -DHAVE_IPV6 -DMAC_OSX_TCL -DMAC_OSX_TK -DHAVE_FAST_INT"
+        V_DEFINE="$V_DEFINE -DHAVE_IPV6 -DHAVE_FAST_INT"
         V_LIB="$V_LIB -framework Carbon -framework QuickTime -lssl -lcrypto"
         if test "$target_cpu" = powerpc; then

vic/branches/mpeg4/configure.in

@@ -578 +578 @@
         V_STATIC=""
         V_BROKEN_OBJ=
-        V_DEFINE="$V_DEFINE -DHAVE_IPV6 -DMAC_OSX_TCL -DMAC_OSX_TK -DHAVE_FAST_INT"
+        V_DEFINE="$V_DEFINE -DHAVE_IPV6 -DHAVE_FAST_INT"
         V_LIB="$V_LIB -framework Carbon -framework QuickTime -lssl -lcrypto"
         if test "$target_cpu" = powerpc; then

vic/branches/mpeg4/configure.in.head

@@ -90 +90 @@
 esac   
 
+AC_ARG_ENABLE(aquatcl,  --disable-aquatcl       build with aquatcl enabled, aquatcl=no, )
+AC_ARG_ENABLE(aquatk,   --disable-aquatk        build with aquatk enabled, aquatk=no, )
+
 if test "$aquatk" != "yes" -a "$mingw" != "yes"; then
 builtin(include, configure.in.x11)

vic/branches/mpeg4/configure.in.tk

@@ -7 +7 @@
 
 if test "$aquatcl" == yes; then
-        echo "On MACOSX - Using Aqua TCL/Tk"
+        echo "Using AquaTCL"
         V_LIB_TCL="-framework Tcl"
+        V_DEFINE="$V_DEFINE -DMAC_OSX_TCL"
         V_LIBRARY_TCL=/Library/Frameworks/Tcl.framework/Versions/8.4/Resources/Scripts
         V_INCLUDE_TCL="-I/Library/Frameworks/Tcl.framework/Headers -I/Library/Frameworks/Tcl.framework/PrivateHeaders"
 
 elif test "$ucltcl" == yes; then
-        if test -z "$ucltcl"; then 
+        if test -z "$tcl"; then 
                 # UCL defaults
                 ucltcl=../tcl-8.0
         fi
         if test ! -d "$ucltcl" ; then
-                echo "'$d' is not a directory"
+                echo "UCL tcl path: '$ucltcl' is not a directory"
                 exit 1
         fi
@@ -174 +175 @@
 
 if test "$aquatk" == yes; then
+        echo "Using AquaTk"
         V_LIB_TK="-framework Tk"
+        V_DEFINE="$V_DEFINE -DMAC_OSX_TK"
         V_LIBRARY_TK=/Library/Frameworks/Tk.framework/Versions/8.4/Resources/Scripts
         V_INCLUDE_TK="-I/Library/Frameworks/Tk.framework/Headers -I/Library/Frameworks/Tk.framework/PrivateHeaders"
 
 elif test "$ucltk" == yes; then
-        if test -z "$ucltk"; then 
+        if test -z "$tk"; then 
                 # UCL defaults
                 ucltk=../tk-8.0
         fi
         if test ! -d "$ucltk" ; then
-                echo "'$d' is not a directory"
+                echo "UCL TK dir: '$ucltk' is not a directory"
                 exit 1
         fi