[Sumover-dev] [svn commit] r4025 - vic/branches/mpeg4
sumover-dev at cs.ucl.ac.uk
sumover-dev at cs.ucl.ac.uk
Thu May 10 11:52:48 BST 2007
Author: piers
Date: Thu May 10 11:52:37 2007
New Revision: 4025
Modified:
vic/branches/mpeg4/configure
vic/branches/mpeg4/configure.in
vic/branches/mpeg4/configure.in.head
vic/branches/mpeg4/configure.in.tk
Log:
Updated configure so one can disable aquatcl/tk and use ucltk:i e.g.
./configure --disable-aquatcl --disable-aquatk --with-ucltk --with-ucltcl
Modified: vic/branches/mpeg4/configure
==============================================================================
--- vic/branches/mpeg4/configure (original)
+++ vic/branches/mpeg4/configure Thu May 10 11:52:37 2007
@@ -1298,6 +1298,8 @@
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
--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
--disable-x264-co Enable or disable x264 svn checkout
@@ -4297,6 +4299,17 @@
;;
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
xlibdirs="\
@@ -4580,18 +4593,19 @@
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
V_INCLUDE_TCL="-I$ucltcl/generic"
@@ -4853,17 +4867,19 @@
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
V_INCLUDE_TK="-I$ucltk/generic"
@@ -6949,7 +6965,7 @@
V_SHM=""
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
V_CCOPT="-O2 -mcpu=G3 -mtune=G4"
Modified: vic/branches/mpeg4/configure.in
==============================================================================
--- vic/branches/mpeg4/configure.in (original)
+++ vic/branches/mpeg4/configure.in Thu May 10 11:52:37 2007
@@ -577,7 +577,7 @@
V_SHM=""
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
V_CCOPT="-O2 -mcpu=G3 -mtune=G4"
Modified: vic/branches/mpeg4/configure.in.head
==============================================================================
--- vic/branches/mpeg4/configure.in.head (original)
+++ vic/branches/mpeg4/configure.in.head Thu May 10 11:52:37 2007
@@ -89,6 +89,9 @@
;;
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)
fi
Modified: vic/branches/mpeg4/configure.in.tk
==============================================================================
--- vic/branches/mpeg4/configure.in.tk (original)
+++ vic/branches/mpeg4/configure.in.tk Thu May 10 11:52:37 2007
@@ -6,18 +6,19 @@
AC_ARG_WITH(tcl, --with-tcl=path specify a pathname for tcl, d=$withval, d="")
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
V_INCLUDE_TCL="-I$ucltcl/generic"
@@ -173,17 +174,19 @@
AC_ARG_WITH(tk, --with-tk=path specify a pathname for tk, d=$withval, d="")
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
V_INCLUDE_TK="-I$ucltk/generic"
More information about the Sumover-dev
mailing list