TDBC

Check-in [2a9a688c5b]
Login
Bounty program for improvements to Tcl and certain Tcl packages.
Tcl 2019 Conference, Houston/TX, US, Nov 4-8
Send your abstracts to [email protected]
or submit via the online form by Sep 9.

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Re-generate configure script with latest TEA
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | trunk
Files: files | file ages | folders
SHA3-256: 2a9a688c5b927aea5940ee0244dc428f7ae509175316ae5a7bb18084df16670d
User & Date: jan.nijtmans 2019-02-10 16:57:19
Context
2019-02-10
16:57
Re-generate configure script with latest TEA Leaf check-in: 2a9a688c5b user: jan.nijtmans tags: trunk
2018-11-01
16:02
TEA update check-in: f8d10aed99 user: dgp tags: trunk, tdbc-1-1-0
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to configure.

   649    649   SHLIB_LD_LIBS
   650    650   SHLIB_LD
   651    651   STLIB_LD
   652    652   CFLAGS_WARNING
   653    653   CFLAGS_OPTIMIZE
   654    654   CFLAGS_DEBUG
   655    655   RC
   656         -CELIB_DIR
   657    656   AR
   658    657   STUBS_BUILD
   659    658   SHARED_BUILD
   660    659   TCL_THREADS
   661    660   TCL_INCLUDES
   662    661   PKG_OBJECTS
   663    662   PKG_SOURCES
................................................................................
   762    761   with_tclinclude
   763    762   enable_threads
   764    763   enable_shared
   765    764   enable_stubs
   766    765   enable_64bit
   767    766   enable_64bit_vis
   768    767   enable_rpath
   769         -enable_wince
   770         -with_celib
   771    768   enable_symbols
   772    769   '
   773    770         ac_precious_vars='build_alias
   774    771   host_alias
   775    772   target_alias
   776    773   CC
   777    774   CFLAGS
................................................................................
  1391   1388     --enable-threads        build with threads (default: on)
  1392   1389     --enable-shared         build and link with shared libraries (default: on)
  1393   1390     --enable-stubs          build and link with stub libraries. Always true for
  1394   1391                             shared builds (default: on)
  1395   1392     --enable-64bit          enable 64bit support (default: off)
  1396   1393     --enable-64bit-vis      enable 64bit Sparc VIS support (default: off)
  1397   1394     --disable-rpath         disable rpath support (default: on)
  1398         -  --enable-wince          enable Win/CE support (where applicable)
  1399   1395     --enable-symbols        build with debugging symbols (default: off)
  1400   1396   
  1401   1397   Optional Packages:
  1402   1398     --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
  1403   1399     --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
  1404   1400     --with-tcl              directory containing tcl configuration
  1405   1401                             (tclConfig.sh)
  1406   1402     --with-tcloo              directory containing tcloo configuration (tclooConfig.sh)
  1407   1403     --with-tclinclude       directory containing the public Tcl header files
  1408         -  --with-celib=DIR        use Windows/CE support library from DIR
  1409   1404   
  1410   1405   Some influential environment variables:
  1411   1406     CC          C compiler command
  1412   1407     CFLAGS      C compiler flags
  1413   1408     LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
  1414   1409                 nonstandard directory <lib dir>
  1415   1410     LIBS        libraries to pass to the linker, e.g. -l<library>
................................................................................
  3341   3336   
  3342   3337     ;
  3343   3338     return 0;
  3344   3339   }
  3345   3340   _ACEOF
  3346   3341   if ac_fn_c_try_compile "$LINENO"; then :
  3347   3342   
  3348         -	    TEA_PLATFORM="unix"
         3343  +	    # first test we've already retrieved platform (cross-compile), fallback to unix otherwise:
         3344  +	    TEA_PLATFORM="${TEA_PLATFORM-unix}"
  3349   3345   	    CYGPATH=echo
  3350   3346   
  3351   3347   else
  3352   3348   
  3353   3349   	    TEA_PLATFORM="windows"
  3354   3350   	    # Extract the first word of "cygpath", so it can be a program name with args.
  3355   3351   set dummy cygpath; ac_word=$2
................................................................................
  5686   5682       Building ${PACKAGE_NAME} without threads enabled, but building against Tcl
  5687   5683       that IS thread-enabled.  It is recommended to use --enable-threads." >&5
  5688   5684   $as_echo "$as_me: WARNING:
  5689   5685       Building ${PACKAGE_NAME} without threads enabled, but building against Tcl
  5690   5686       that IS thread-enabled.  It is recommended to use --enable-threads." >&2;}
  5691   5687   	    fi
  5692   5688   	    ;;
  5693         -	*)
  5694         -	    if test "${TCL_THREADS}" = "1"; then
  5695         -		{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:
  5696         -    --enable-threads requested, but building against a Tcl that is NOT
  5697         -    thread-enabled.  This is an OK configuration that will also run in
  5698         -    a thread-enabled core." >&5
  5699         -$as_echo "$as_me: WARNING:
  5700         -    --enable-threads requested, but building against a Tcl that is NOT
  5701         -    thread-enabled.  This is an OK configuration that will also run in
  5702         -    a thread-enabled core." >&2;}
  5703         -	    fi
  5704         -	    ;;
  5705   5689       esac
  5706   5690   
  5707   5691   
  5708   5692   
  5709   5693   #--------------------------------------------------------------------
  5710   5694   # The statement below defines a collection of symbols related to
  5711   5695   # building as a shared library instead of a static library.
................................................................................
  5969   5953   else
  5970   5954     doRpath=yes
  5971   5955   fi
  5972   5956   
  5973   5957       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $doRpath" >&5
  5974   5958   $as_echo "$doRpath" >&6; }
  5975   5959   
  5976         -    # TEA specific: Cross-compiling options for Windows/CE builds?
  5977         -
  5978         -    if test "${TEA_PLATFORM}" = windows; then :
  5979         -
  5980         -	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if Windows/CE build is requested" >&5
  5981         -$as_echo_n "checking if Windows/CE build is requested... " >&6; }
  5982         -	# Check whether --enable-wince was given.
  5983         -if test "${enable_wince+set}" = set; then :
  5984         -  enableval=$enable_wince; doWince=$enableval
  5985         -else
  5986         -  doWince=no
  5987         -fi
  5988         -
  5989         -	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $doWince" >&5
  5990         -$as_echo "$doWince" >&6; }
  5991         -
  5992         -fi
  5993         -
  5994   5960       # Set the variable "system" to hold the name and version number
  5995   5961       # for the system.
  5996   5962   
  5997   5963   
  5998   5964       { $as_echo "$as_me:${as_lineno-$LINENO}: checking system version" >&5
  5999   5965   $as_echo_n "checking system version... " >&6; }
  6000   5966   if ${tcl_cv_sys_version+:} false; then :
................................................................................
  6188   6154   		else
  6189   6155   		    { $as_echo "$as_me:${as_lineno-$LINENO}: result:    Using 64-bit $MACHINE mode" >&5
  6190   6156   $as_echo "   Using 64-bit $MACHINE mode" >&6; }
  6191   6157   		    do64bit_ok="yes"
  6192   6158   		fi
  6193   6159   	    fi
  6194   6160   
  6195         -	    if test "$doWince" != "no" ; then
  6196         -		if test "$do64bit" != "no" ; then
  6197         -		    as_fn_error $? "Windows/CE and 64-bit builds incompatible" "$LINENO" 5
  6198         -		fi
  6199         -		if test "$GCC" = "yes" ; then
  6200         -		    as_fn_error $? "Windows/CE and GCC builds incompatible" "$LINENO" 5
  6201         -		fi
  6202         -
  6203         -    # First, look for one uninstalled.
  6204         -    # the alternative search directory is invoked by --with-celib
  6205         -
  6206         -    if test x"${no_celib}" = x ; then
  6207         -	# we reset no_celib in case something fails here
  6208         -	no_celib=true
  6209         -
  6210         -# Check whether --with-celib was given.
  6211         -if test "${with_celib+set}" = set; then :
  6212         -  withval=$with_celib; with_celibconfig=${withval}
  6213         -fi
  6214         -
  6215         -	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Windows/CE celib directory" >&5
  6216         -$as_echo_n "checking for Windows/CE celib directory... " >&6; }
  6217         -	if ${ac_cv_c_celibconfig+:} false; then :
  6218         -  $as_echo_n "(cached) " >&6
  6219         -else
  6220         -
  6221         -	    # First check to see if --with-celibconfig was specified.
  6222         -	    if test x"${with_celibconfig}" != x ; then
  6223         -		if test -d "${with_celibconfig}/inc" ; then
  6224         -		    ac_cv_c_celibconfig=`(cd ${with_celibconfig}; pwd)`
  6225         -		else
  6226         -		    as_fn_error $? "${with_celibconfig} directory doesn't contain inc directory" "$LINENO" 5
  6227         -		fi
  6228         -	    fi
  6229         -
  6230         -	    # then check for a celib library
  6231         -	    if test x"${ac_cv_c_celibconfig}" = x ; then
  6232         -		for i in \
  6233         -			../celib-palm-3.0 \
  6234         -			../celib \
  6235         -			../../celib-palm-3.0 \
  6236         -			../../celib \
  6237         -			`ls -dr ../celib-*3.[0-9]* 2>/dev/null` \
  6238         -			${srcdir}/../celib-palm-3.0 \
  6239         -			${srcdir}/../celib \
  6240         -			`ls -dr ${srcdir}/../celib-*3.[0-9]* 2>/dev/null` \
  6241         -			; do
  6242         -		    if test -d "$i/inc" ; then
  6243         -			ac_cv_c_celibconfig=`(cd $i; pwd)`
  6244         -			break
  6245         -		    fi
  6246         -		done
  6247         -	    fi
  6248         -
  6249         -fi
  6250         -
  6251         -	if test x"${ac_cv_c_celibconfig}" = x ; then
  6252         -	    as_fn_error $? "Cannot find celib support library directory" "$LINENO" 5
  6253         -	else
  6254         -	    no_celib=
  6255         -	    CELIB_DIR=${ac_cv_c_celibconfig}
  6256         -	    CELIB_DIR=`echo "$CELIB_DIR" | sed -e 's!\\\!/!g'`
  6257         -	    { $as_echo "$as_me:${as_lineno-$LINENO}: result: found $CELIB_DIR" >&5
  6258         -$as_echo "found $CELIB_DIR" >&6; }
  6259         -	fi
  6260         -    fi
  6261         -
  6262         -		# Set defaults for common evc4/PPC2003 setup
  6263         -		# Currently Tcl requires 300+, possibly 420+ for sockets
  6264         -		CEVERSION=420; 		# could be 211 300 301 400 420 ...
  6265         -		TARGETCPU=ARMV4;	# could be ARMV4 ARM MIPS SH3 X86 ...
  6266         -		ARCH=ARM;		# could be ARM MIPS X86EM ...
  6267         -		PLATFORM="Pocket PC 2003"; # or "Pocket PC 2002"
  6268         -		if test "$doWince" != "yes"; then
  6269         -		    # If !yes then the user specified something
  6270         -		    # Reset ARCH to allow user to skip specifying it
  6271         -		    ARCH=
  6272         -		    eval `echo $doWince | awk -F, '{ \
  6273         -	    if (length($1)) { printf "CEVERSION=\"%s\"\n", $1; \
  6274         -	    if ($1 < 400)   { printf "PLATFORM=\"Pocket PC 2002\"\n" } }; \
  6275         -	    if (length($2)) { printf "TARGETCPU=\"%s\"\n", toupper($2) }; \
  6276         -	    if (length($3)) { printf "ARCH=\"%s\"\n", toupper($3) }; \
  6277         -	    if (length($4)) { printf "PLATFORM=\"%s\"\n", $4 }; \
  6278         -		    }'`
  6279         -		    if test "x${ARCH}" = "x" ; then
  6280         -			ARCH=$TARGETCPU;
  6281         -		    fi
  6282         -		fi
  6283         -		OSVERSION=WCE$CEVERSION;
  6284         -	    	if test "x${WCEROOT}" = "x" ; then
  6285         -			WCEROOT="C:/Program Files/Microsoft eMbedded C++ 4.0"
  6286         -		    if test ! -d "${WCEROOT}" ; then
  6287         -			WCEROOT="C:/Program Files/Microsoft eMbedded Tools"
  6288         -		    fi
  6289         -		fi
  6290         -		if test "x${SDKROOT}" = "x" ; then
  6291         -		    SDKROOT="C:/Program Files/Windows CE Tools"
  6292         -		    if test ! -d "${SDKROOT}" ; then
  6293         -			SDKROOT="C:/Windows CE Tools"
  6294         -		    fi
  6295         -		fi
  6296         -		WCEROOT=`echo "$WCEROOT" | sed -e 's!\\\!/!g'`
  6297         -		SDKROOT=`echo "$SDKROOT" | sed -e 's!\\\!/!g'`
  6298         -		if test ! -d "${SDKROOT}/${OSVERSION}/${PLATFORM}/Lib/${TARGETCPU}" \
  6299         -		    -o ! -d "${WCEROOT}/EVC/${OSVERSION}/bin"; then
  6300         -		    as_fn_error $? "could not find PocketPC SDK or target compiler to enable WinCE mode $CEVERSION,$TARGETCPU,$ARCH,$PLATFORM" "$LINENO" 5
  6301         -		    doWince="no"
  6302         -		else
  6303         -		    # We could PATH_NOSPACE these, but that's not important,
  6304         -		    # as long as we quote them when used.
  6305         -		    CEINCLUDE="${SDKROOT}/${OSVERSION}/${PLATFORM}/include"
  6306         -		    if test -d "${CEINCLUDE}/${TARGETCPU}" ; then
  6307         -			CEINCLUDE="${CEINCLUDE}/${TARGETCPU}"
  6308         -		    fi
  6309         -		    CELIBPATH="${SDKROOT}/${OSVERSION}/${PLATFORM}/Lib/${TARGETCPU}"
  6310         -    		fi
  6311         -	    fi
  6312         -
  6313   6161   	    if test "$GCC" != "yes" ; then
  6314   6162   	        if test "${SHARED_BUILD}" = "0" ; then
  6315   6163   		    runtime=-MT
  6316   6164   	        else
  6317   6165   		    runtime=-MD
  6318   6166   	        fi
  6319   6167   	        case "x`echo \${VisualStudioVersion}`" in
................................................................................
  6353   6201   	    # Convert foo.lib to -lfoo for GCC.  No-op if not *.lib
  6354   6202   	    i=`echo "$i" | sed -e 's/^\([^-].*\)\.lib$/-l\1/i'`
  6355   6203   	fi
  6356   6204   	PKG_LIBS="$PKG_LIBS $i"
  6357   6205       done
  6358   6206   
  6359   6207   
  6360         -		elif test "$doWince" != "no" ; then
  6361         -		    CEBINROOT="${WCEROOT}/EVC/${OSVERSION}/bin"
  6362         -		    if test "${TARGETCPU}" = "X86"; then
  6363         -			CC="\"${CEBINROOT}/cl.exe\""
  6364         -		    else
  6365         -			CC="\"${CEBINROOT}/cl${ARCH}.exe\""
  6366         -		    fi
  6367         -		    CFLAGS="$CFLAGS -I\"${CELIB_DIR}/inc\" -I\"${CEINCLUDE}\""
  6368         -		    RC="\"${WCEROOT}/Common/EVC/bin/rc.exe\""
  6369         -		    arch=`echo ${ARCH} | awk '{print tolower($0)}'`
  6370         -		    defs="${ARCH} _${ARCH}_ ${arch} PALM_SIZE _MT _WINDOWS"
  6371         -		    if test "${SHARED_BUILD}" = "1" ; then
  6372         -			# Static CE builds require static celib as well
  6373         -		    	defs="${defs} _DLL"
  6374         -		    fi
  6375         -		    for i in $defs ; do
  6376         -
  6377         -cat >>confdefs.h <<_ACEOF
  6378         -#define $i 1
  6379         -_ACEOF
  6380         -
  6381         -		    done
  6382         -
  6383         -cat >>confdefs.h <<_ACEOF
  6384         -#define _WIN32_WCE $CEVERSION
  6385         -_ACEOF
  6386         -
  6387         -
  6388         -cat >>confdefs.h <<_ACEOF
  6389         -#define UNDER_CE $CEVERSION
  6390         -_ACEOF
  6391         -
  6392         -		    CFLAGS_DEBUG="-nologo -Zi -Od"
  6393         -		    CFLAGS_OPTIMIZE="-nologo -Ox"
  6394         -		    lversion=`echo ${CEVERSION} | sed -e 's/\(.\)\(..\)/\1\.\2/'`
  6395         -		    lflags="${lflags} -MACHINE:${ARCH} -LIBPATH:\"${CELIBPATH}\" -subsystem:windowsce,${lversion} -nologo"
  6396         -		    LINKBIN="\"${CEBINROOT}/link.exe\""
  6397         -
  6398   6208   		else
  6399   6209   		    RC="rc"
  6400   6210   		    lflags="${lflags} -nologo"
  6401   6211   		    LINKBIN="link"
  6402   6212   		    CFLAGS_DEBUG="-nologo -Z7 -Od -W3 -WX ${runtime}d"
  6403   6213   		    CFLAGS_OPTIMIZE="-nologo -O2 -W2 ${runtime}"
  6404   6214   		fi
................................................................................
  6563   6373   		# For information on what debugtype is most useful, see:
  6564   6374   		# http://msdn.microsoft.com/library/en-us/dnvc60/html/gendepdebug.asp
  6565   6375   		# and also
  6566   6376   		# http://msdn2.microsoft.com/en-us/library/y0zzbyt4%28VS.80%29.aspx
  6567   6377   		# This essentially turns it all on.
  6568   6378   		LDFLAGS_DEBUG="-debug -debugtype:cv"
  6569   6379   		LDFLAGS_OPTIMIZE="-release"
  6570         -		if test "$doWince" != "no" ; then
  6571         -		    LDFLAGS_CONSOLE="-link ${lflags}"
  6572         -		    LDFLAGS_WINDOW=${LDFLAGS_CONSOLE}
  6573         -		else
  6574         -		    LDFLAGS_CONSOLE="-link -subsystem:console ${lflags}"
  6575         -		    LDFLAGS_WINDOW="-link -subsystem:windows ${lflags}"
  6576         -		fi
         6380  +		LDFLAGS_CONSOLE="-link -subsystem:console ${lflags}"
         6381  +		LDFLAGS_WINDOW="-link -subsystem:windows ${lflags}"
  6577   6382   	    fi
  6578   6383   
  6579   6384   	    SHLIB_SUFFIX=".dll"
  6580   6385   	    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.dll'
  6581   6386   
  6582   6387   	    TCL_LIB_VERSIONS_OK=nodots
  6583   6388       	    ;;
................................................................................
  7253   7058   		SHLIB_LD="${SHLIB_LD} -Wl,-single_module"
  7254   7059   
  7255   7060   fi
  7256   7061   	    # TEA specific: link shlib with current and compatibility version flags
  7257   7062   	    vers=`echo ${PACKAGE_VERSION} | sed -e 's/^\([0-9]\{1,5\}\)\(\(\.[0-9]\{1,3\}\)\{0,2\}\).*$/\1\2/p' -e d`
  7258   7063   	    SHLIB_LD="${SHLIB_LD} -current_version ${vers:-0} -compatibility_version ${vers:-0}"
  7259   7064   	    SHLIB_SUFFIX=".dylib"
  7260         -	    # Don't use -prebind when building for Mac OS X 10.4 or later only:
  7261         -	    if test "`echo "${MACOSX_DEPLOYMENT_TARGET}" | awk -F '10\\.' '{print int($2)}'`" -lt 4 -a \
  7262         -		"`echo "${CPPFLAGS}" | awk -F '-mmacosx-version-min=10\\.' '{print int($2)}'`" -lt 4; then :
  7263         -
  7264         -		LDFLAGS="$LDFLAGS -prebind"
  7265         -fi
  7266   7065   	    LDFLAGS="$LDFLAGS -headerpad_max_install_names"
  7267   7066   	    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if ld accepts -search_paths_first flag" >&5
  7268   7067   $as_echo_n "checking if ld accepts -search_paths_first flag... " >&6; }
  7269   7068   if ${tcl_cv_ld_search_paths_first+:} false; then :
  7270   7069     $as_echo_n "(cached) " >&6
  7271   7070   else
  7272   7071