From d28dcbeb1eafcb1a59fb940457faf7de223b2dfd Mon Sep 17 00:00:00 2001 From: mdejong Date: Tue, 26 Jun 2001 00:56:44 +0000 Subject: * win/configure: Regen. * win/configure.in: Use RC_DEFINE flag from tcl.m4. * win/tcl.m4: Update from Tcl. --- ChangeLog | 6 ++++++ win/configure | 44 +++++++++++++++++++++----------------------- win/configure.in | 15 +++++---------- win/tcl.m4 | 2 ++ 4 files changed, 34 insertions(+), 33 deletions(-) diff --git a/ChangeLog b/ChangeLog index e13b2b1..33cbb58 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,12 @@ 2001-06-22 Mo DeJong * win/configure: Regen. + * win/configure.in: Use RC_DEFINE flag from tcl.m4. + * win/tcl.m4: Update from Tcl. + +2001-06-22 Mo DeJong + + * win/configure: Regen. * win/tcl.m4: Update from Tcl. 2001-06-22 Mo DeJong diff --git a/win/configure b/win/configure index b8cf97d..ce1d31a 100755 --- a/win/configure +++ b/win/configure @@ -1149,6 +1149,7 @@ echo "configure:1131: checking compiler flags" >&5 RC_OUT=-o RC_TYPE= RC_INCLUDE=--include + RC_DEFINE=--define RES=res.o MAKE_LIB="\${AR} crv \$@" POST_MAKE_LIB="\${RANLIB} \$@" @@ -1232,6 +1233,7 @@ echo "configure:1131: checking compiler flags" >&5 RC_OUT=-fo RC_TYPE=-r RC_INCLUDE=-i + RC_DEFINE=-d RES=res MAKE_LIB="\${AR} -out:\$@" POST_MAKE_LIB= @@ -1287,7 +1289,7 @@ echo "configure:1131: checking compiler flags" >&5 #-------------------------------------------------------------------- echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1291: checking how to run the C preprocessor" >&5 +echo "configure:1293: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1302,13 +1304,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1312: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1314: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1319,13 +1321,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1329: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1331: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1336,13 +1338,13 @@ else rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1346: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1348: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1368,17 +1370,17 @@ echo "$ac_t""$CPP" 1>&6 ac_safe=`echo "errno.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for errno.h""... $ac_c" 1>&6 -echo "configure:1372: checking for errno.h" >&5 +echo "configure:1374: checking for errno.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1382: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1384: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1410,7 +1412,7 @@ fi echo $ac_n "checking for build with symbols""... $ac_c" 1>&6 -echo "configure:1414: checking for build with symbols" >&5 +echo "configure:1416: checking for build with symbols" >&5 # Check whether --enable-symbols or --disable-symbols was given. if test "${enable_symbols+set}" = set; then enableval="$enable_symbols" @@ -1441,7 +1443,7 @@ TK_DBGX=${DBGX} echo $ac_n "checking the location of tclConfig.sh""... $ac_c" 1>&6 -echo "configure:1445: checking the location of tclConfig.sh" >&5 +echo "configure:1447: checking the location of tclConfig.sh" >&5 if test -d ../../tcl8.4$TK_PATCH_LEVEL/win; then TCL_BIN_DIR_DEFAULT=../../tcl8.4$TK_PATCH_LEVEL/win @@ -1467,7 +1469,7 @@ fi echo $ac_n "checking for existence of $TCL_BIN_DIR/tclConfig.sh""... $ac_c" 1>&6 -echo "configure:1471: checking for existence of $TCL_BIN_DIR/tclConfig.sh" >&5 +echo "configure:1473: checking for existence of $TCL_BIN_DIR/tclConfig.sh" >&5 if test -f "$TCL_BIN_DIR/tclConfig.sh" ; then echo "$ac_t""loading" 1>&6 @@ -1489,7 +1491,7 @@ echo "configure:1471: checking for existence of $TCL_BIN_DIR/tclConfig.sh" >&5 echo $ac_n "checking for tclsh""... $ac_c" 1>&6 -echo "configure:1493: checking for tclsh" >&5 +echo "configure:1495: checking for tclsh" >&5 if eval "test \"`echo '$''{'ac_cv_path_tclsh'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1568,22 +1570,16 @@ CFG_TK_EXPORT_FILE_SUFFIX=${TK_EXPORT_FILE_SUFFIX} # on symbols and static vs. shared. #-------------------------------------------------------------------- -if test "${GCC}" = "yes" ; then - RC_DEFINE_FLAG=--define -else - RC_DEFINE_FLAG=-d -fi - if test "$SHARED_BUILD" = 0 -o $TCL_NEEDS_EXP_FILE = 0; then if test "${DBGX}" = "d"; then - RC_DEFINES="${RC_DEFINE_FLAG} STATIC_BUILD ${RC_DEFINE_FLAG} DEBUG" + RC_DEFINES="${RC_DEFINE} STATIC_BUILD ${RC_DEFINE} DEBUG" else - RC_DEFINES="${RC_DEFINE_FLAG} STATIC_BUILD" + RC_DEFINES="${RC_DEFINE} STATIC_BUILD" fi TK_RES="" else if test "${DBGX}" = "d"; then - RC_DEFINES="${RC_DEFINE_FLAG} DEBUG" + RC_DEFINES="${RC_DEFINE} DEBUG" else RC_DEFINES="" fi @@ -1663,6 +1659,7 @@ fi + trap '' 1 2 15 cat > confcache <<\EOF # This file is a shell script that caches the results of configure @@ -1869,6 +1866,7 @@ s%@LDFLAGS_WINDOW@%$LDFLAGS_WINDOW%g s%@RC_OUT@%$RC_OUT%g s%@RC_TYPE@%$RC_TYPE%g s%@RC_INCLUDE@%$RC_INCLUDE%g +s%@RC_DEFINE@%$RC_DEFINE%g s%@RC_DEFINES@%$RC_DEFINES%g s%@TK_RES@%$TK_RES%g s%@RES@%$RES%g diff --git a/win/configure.in b/win/configure.in index 1dc0d76..ae8398f 100644 --- a/win/configure.in +++ b/win/configure.in @@ -2,7 +2,7 @@ # generate the file "configure", which is run during Tk installation # to configure the system for the local environment. # -# RCS: @(#) $Id: configure.in,v 1.28 2001/06/23 02:10:28 mdejong Exp $ +# RCS: @(#) $Id: configure.in,v 1.29 2001/06/26 00:56:44 mdejong Exp $ AC_INIT(../generic/tk.h) @@ -159,22 +159,16 @@ CFG_TK_EXPORT_FILE_SUFFIX=${TK_EXPORT_FILE_SUFFIX} # on symbols and static vs. shared. #-------------------------------------------------------------------- -if test "${GCC}" = "yes" ; then - RC_DEFINE_FLAG=--define -else - RC_DEFINE_FLAG=-d -fi - if test "$SHARED_BUILD" = 0 -o $TCL_NEEDS_EXP_FILE = 0; then if test "${DBGX}" = "d"; then - RC_DEFINES="${RC_DEFINE_FLAG} STATIC_BUILD ${RC_DEFINE_FLAG} DEBUG" + RC_DEFINES="${RC_DEFINE} STATIC_BUILD ${RC_DEFINE} DEBUG" else - RC_DEFINES="${RC_DEFINE_FLAG} STATIC_BUILD" + RC_DEFINES="${RC_DEFINE} STATIC_BUILD" fi TK_RES="" else if test "${DBGX}" = "d"; then - RC_DEFINES="${RC_DEFINE_FLAG} DEBUG" + RC_DEFINES="${RC_DEFINE} DEBUG" else RC_DEFINES="" fi @@ -237,6 +231,7 @@ AC_SUBST(RC) AC_SUBST(RC_OUT) AC_SUBST(RC_TYPE) AC_SUBST(RC_INCLUDE) +AC_SUBST(RC_DEFINE) AC_SUBST(RC_DEFINES) AC_SUBST(TK_RES) AC_SUBST(RES) diff --git a/win/tcl.m4 b/win/tcl.m4 index 943e3f3..9083f60 100644 --- a/win/tcl.m4 +++ b/win/tcl.m4 @@ -349,6 +349,7 @@ AC_DEFUN(SC_CONFIG_CFLAGS, [ RC_OUT=-o RC_TYPE= RC_INCLUDE=--include + RC_DEFINE=--define RES=res.o MAKE_LIB="\${AR} crv \[$]@" POST_MAKE_LIB="\${RANLIB} \[$]@" @@ -432,6 +433,7 @@ AC_DEFUN(SC_CONFIG_CFLAGS, [ RC_OUT=-fo RC_TYPE=-r RC_INCLUDE=-i + RC_DEFINE=-d RES=res MAKE_LIB="\${AR} -out:\[$]@" POST_MAKE_LIB= -- cgit v0.12