Changeset 4025

Show
Ignore:
Timestamp:
05/10/07 11:52:37 (7 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:
4 modified

Legend:

Unmodified
Added
Removed
  • vic/branches/mpeg4/configure

    r4007 r4025  
    12991299--enable-debug          build with debugging enabled 
    13001300--enable-ipv6           build with ipv6 enabled 
     1301--disable-aquatcl       build with aquatcl enabled 
     1302--disable-aquatk        build with aquatk enabled 
    13011303--enable-gpl    Enable or disable  use of gpl functionality - H264 MPEG4 Swscale 
    13021304--disable-ffmpeg-co     Enable or disable ffmpeg svn checkout 
     
    42984300esac 
    42994301 
     4302# Check whether --enable-aquatcl was given. 
     4303if test "${enable_aquatcl+set}" = set; then 
     4304  enableval=$enable_aquatcl; aquatcl=no 
     4305fi 
     4306 
     4307# Check whether --enable-aquatk was given. 
     4308if test "${enable_aquatk+set}" = set; then 
     4309  enableval=$enable_aquatk; aquatk=no 
     4310fi 
     4311 
     4312 
    43004313if test "$aquatk" != "yes" -a "$mingw" != "yes"; then 
    43014314 
     
    45814594 
    45824595if test "$aquatcl" == yes; then 
    4583         echo "On MACOSX - Using Aqua TCL/Tk" 
     4596        echo "Using AquaTCL" 
    45844597        V_LIB_TCL="-framework Tcl" 
     4598        V_DEFINE="$V_DEFINE -DMAC_OSX_TCL" 
    45854599        V_LIBRARY_TCL=/Library/Frameworks/Tcl.framework/Versions/8.4/Resources/Scripts 
    45864600        V_INCLUDE_TCL="-I/Library/Frameworks/Tcl.framework/Headers -I/Library/Frameworks/Tcl.framework/PrivateHeaders" 
    45874601 
    45884602elif test "$ucltcl" == yes; then 
    4589         if test -z "$ucltcl"; then 
     4603        if test -z "$tcl"; then 
    45904604                # UCL defaults 
    45914605                ucltcl=../tcl-8.0 
    45924606        fi 
    45934607        if test ! -d "$ucltcl" ; then 
    4594                 echo "'$d' is not a directory" 
     4608                echo "UCL tcl path: '$ucltcl' is not a directory" 
    45954609                exit 1 
    45964610        fi 
     
    48544868 
    48554869if test "$aquatk" == yes; then 
     4870        echo "Using AquaTk" 
    48564871        V_LIB_TK="-framework Tk" 
     4872        V_DEFINE="$V_DEFINE -DMAC_OSX_TK" 
    48574873        V_LIBRARY_TK=/Library/Frameworks/Tk.framework/Versions/8.4/Resources/Scripts 
    48584874        V_INCLUDE_TK="-I/Library/Frameworks/Tk.framework/Headers -I/Library/Frameworks/Tk.framework/PrivateHeaders" 
    48594875 
    48604876elif test "$ucltk" == yes; then 
    4861         if test -z "$ucltk"; then 
     4877        if test -z "$tk"; then 
    48624878                # UCL defaults 
    48634879                ucltk=../tk-8.0 
    48644880        fi 
    48654881        if test ! -d "$ucltk" ; then 
    4866                 echo "'$d' is not a directory" 
     4882                echo "UCL TK dir: '$ucltk' is not a directory" 
    48674883                exit 1 
    48684884        fi 
     
    69506966        V_STATIC="" 
    69516967        V_BROKEN_OBJ= 
    6952         V_DEFINE="$V_DEFINE -DHAVE_IPV6 -DMAC_OSX_TCL -DMAC_OSX_TK -DHAVE_FAST_INT" 
     6968        V_DEFINE="$V_DEFINE -DHAVE_IPV6 -DHAVE_FAST_INT" 
    69536969        V_LIB="$V_LIB -framework Carbon -framework QuickTime -lssl -lcrypto" 
    69546970        if test "$target_cpu" = powerpc; then 
  • vic/branches/mpeg4/configure.in

    r4008 r4025  
    578578        V_STATIC="" 
    579579        V_BROKEN_OBJ= 
    580         V_DEFINE="$V_DEFINE -DHAVE_IPV6 -DMAC_OSX_TCL -DMAC_OSX_TK -DHAVE_FAST_INT" 
     580        V_DEFINE="$V_DEFINE -DHAVE_IPV6 -DHAVE_FAST_INT" 
    581581        V_LIB="$V_LIB -framework Carbon -framework QuickTime -lssl -lcrypto" 
    582582        if test "$target_cpu" = powerpc; then 
  • vic/branches/mpeg4/configure.in.head

    r3937 r4025  
    9090esac    
    9191 
     92AC_ARG_ENABLE(aquatcl,  --disable-aquatcl       build with aquatcl enabled, aquatcl=no, ) 
     93AC_ARG_ENABLE(aquatk,   --disable-aquatk        build with aquatk enabled, aquatk=no, ) 
     94 
    9295if test "$aquatk" != "yes" -a "$mingw" != "yes"; then 
    9396builtin(include, configure.in.x11) 
  • vic/branches/mpeg4/configure.in.tk

    r4003 r4025  
    77 
    88if test "$aquatcl" == yes; then 
    9         echo "On MACOSX - Using Aqua TCL/Tk" 
     9        echo "Using AquaTCL" 
    1010        V_LIB_TCL="-framework Tcl" 
     11        V_DEFINE="$V_DEFINE -DMAC_OSX_TCL" 
    1112        V_LIBRARY_TCL=/Library/Frameworks/Tcl.framework/Versions/8.4/Resources/Scripts 
    1213        V_INCLUDE_TCL="-I/Library/Frameworks/Tcl.framework/Headers -I/Library/Frameworks/Tcl.framework/PrivateHeaders" 
    1314 
    1415elif test "$ucltcl" == yes; then 
    15         if test -z "$ucltcl"; then  
     16        if test -z "$tcl"; then  
    1617                # UCL defaults 
    1718                ucltcl=../tcl-8.0 
    1819        fi 
    1920        if test ! -d "$ucltcl" ; then 
    20                 echo "'$d' is not a directory" 
     21                echo "UCL tcl path: '$ucltcl' is not a directory" 
    2122                exit 1 
    2223        fi 
     
    174175 
    175176if test "$aquatk" == yes; then 
     177        echo "Using AquaTk" 
    176178        V_LIB_TK="-framework Tk" 
     179        V_DEFINE="$V_DEFINE -DMAC_OSX_TK" 
    177180        V_LIBRARY_TK=/Library/Frameworks/Tk.framework/Versions/8.4/Resources/Scripts 
    178181        V_INCLUDE_TK="-I/Library/Frameworks/Tk.framework/Headers -I/Library/Frameworks/Tk.framework/PrivateHeaders" 
    179182 
    180183elif test "$ucltk" == yes; then 
    181         if test -z "$ucltk"; then  
     184        if test -z "$tk"; then  
    182185                # UCL defaults 
    183186                ucltk=../tk-8.0 
    184187        fi 
    185188        if test ! -d "$ucltk" ; then 
    186                 echo "'$d' is not a directory" 
     189                echo "UCL TK dir: '$ucltk' is not a directory" 
    187190                exit 1 
    188191        fi