diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rwxr-xr-x | unix/configure | 28 | ||||
| -rw-r--r-- | unix/tcl.m4 | 28 |
3 files changed, 33 insertions, 28 deletions
@@ -1,3 +1,8 @@ +2001-09-12 Mo DeJong <mdejong@users.sourceforge.net> + + * unix/configure: + * unix/tcl.m4: Update from Tcl. + 2001-09-12 D. Richard Hipp <drh@hwaci.com> * Fix a bug in library/tkxbox.tcl diff --git a/unix/configure b/unix/configure index 7cda6e0..03dbfa1 100755 --- a/unix/configure +++ b/unix/configure @@ -1548,7 +1548,7 @@ fi STLIB_LD='${AR} cr' case $system in AIX-5.*) - if test "${TCL_THREADS}" = "1" -a "$GCC" = "no" ; then + if test "${TCL_THREADS}" = "1" -a "$GCC" != "yes" ; then # AIX requires the _r compiler when gcc isn't being used if test "${CC}" != "cc_r" ; then CC=${CC}_r @@ -1575,17 +1575,17 @@ fi fi if test "$do64bit" = "yes" ; then - if test "$GCC" = "no" ; then + if test "$GCC" = "yes" ; then + echo "configure: warning: "64bit mode not supported with GCC on $system"" 1>&2 + else do64bit_ok=yes EXTRA_CFLAGS="-q64" LDFLAGS="-q64" - else - echo "configure: warning: "64bit mode not supported with GCC on $system"" 1>&2 fi fi ;; AIX-*) - if test "${TCL_THREADS}" = "1" -a "$GCC" = "no" ; then + if test "${TCL_THREADS}" = "1" -a "$GCC" != "yes" ; then # AIX requires the _r compiler when gcc isn't being used if test "${CC}" != "cc_r" ; then CC=${CC}_r @@ -2098,18 +2098,18 @@ EOF DL_LIBS="" LDFLAGS="" LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}' - if test "$GCC" = "no" ; then + if test "$GCC" != "yes" ; then EXTRA_CFLAGS="-DHAVE_TZSET -std1" fi # see pthread_intro(3) for pthread support on osf1, k.furukawa if test "${TCL_THREADS}" = "1" ; then EXTRA_CFLAGS="${EXTRA_CFLAGS} -DTCL_THREAD_STACK_MIN=PTHREAD_STACK_MIN*64" - if test "$GCC" = "no" ; then - EXTRA_CFLAGS="${EXTRA_CFLAGS} -pthread" - LDFLAGS="-pthread" - else + if test "$GCC" = "yes" ; then LIBS=`echo $LIBS | sed s/-lpthreads//` LIBS="$LIBS -lpthread -lmach -lexc" + else + EXTRA_CFLAGS="${EXTRA_CFLAGS} -pthread" + LDFLAGS="-pthread" fi fi @@ -2224,7 +2224,9 @@ EOF if test "$do64bit" = "yes" ; then arch=`isainfo` if test "$arch" = "sparcv9 sparc" ; then - if test "$GCC" = "no" ; then + if test "$GCC" = "yes" ; then + echo "configure: warning: "64bit mode not supported with GCC on $system"" 1>&2 + else do64bit_ok=yes if test "$do64bitVIS" = "yes" ; then EXTRA_CFLAGS="-xarch=v9a" @@ -2233,8 +2235,6 @@ EOF EXTRA_CFLAGS="-xarch=v9" LDFLAGS="-xarch=v9" fi - else - echo "configure: warning: "64bit mode not supported with GCC on $system"" 1>&2 fi else echo "configure: warning: "64bit mode only supported sparcv9 system"" 1>&2 @@ -2263,7 +2263,7 @@ EOF DL_LIBS="" LDFLAGS="-Wl,-D,08000000" LD_SEARCH_FLAGS='-L${LIB_RUNTIME_DIR}' - if test "$GCC" = "no" ; then + if test "$GCC" != "yes" ; then EXTRA_CFLAGS="-DHAVE_TZSET -std1" fi ;; diff --git a/unix/tcl.m4 b/unix/tcl.m4 index 61d01f5..da67764 100644 --- a/unix/tcl.m4 +++ b/unix/tcl.m4 @@ -591,7 +591,7 @@ dnl AC_CHECK_TOOL(AR, ar, :) STLIB_LD='${AR} cr' case $system in AIX-5.*) - if test "${TCL_THREADS}" = "1" -a "$GCC" = "no" ; then + if test "${TCL_THREADS}" = "1" -a "$GCC" != "yes" ; then # AIX requires the _r compiler when gcc isn't being used if test "${CC}" != "cc_r" ; then CC=${CC}_r @@ -618,17 +618,17 @@ dnl AC_CHECK_TOOL(AR, ar, :) fi if test "$do64bit" = "yes" ; then - if test "$GCC" = "no" ; then + if test "$GCC" = "yes" ; then + AC_MSG_WARN("64bit mode not supported with GCC on $system") + else do64bit_ok=yes EXTRA_CFLAGS="-q64" LDFLAGS="-q64" - else - AC_MSG_WARN("64bit mode not supported with GCC on $system") fi fi ;; AIX-*) - if test "${TCL_THREADS}" = "1" -a "$GCC" = "no" ; then + if test "${TCL_THREADS}" = "1" -a "$GCC" != "yes" ; then # AIX requires the _r compiler when gcc isn't being used if test "${CC}" != "cc_r" ; then CC=${CC}_r @@ -945,18 +945,18 @@ dnl AC_CHECK_TOOL(AR, ar, :) DL_LIBS="" LDFLAGS="" LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}' - if test "$GCC" = "no" ; then + if test "$GCC" != "yes" ; then EXTRA_CFLAGS="-DHAVE_TZSET -std1" fi # see pthread_intro(3) for pthread support on osf1, k.furukawa if test "${TCL_THREADS}" = "1" ; then EXTRA_CFLAGS="${EXTRA_CFLAGS} -DTCL_THREAD_STACK_MIN=PTHREAD_STACK_MIN*64" - if test "$GCC" = "no" ; then - EXTRA_CFLAGS="${EXTRA_CFLAGS} -pthread" - LDFLAGS="-pthread" - else + if test "$GCC" = "yes" ; then LIBS=`echo $LIBS | sed s/-lpthreads//` LIBS="$LIBS -lpthread -lmach -lexc" + else + EXTRA_CFLAGS="${EXTRA_CFLAGS} -pthread" + LDFLAGS="-pthread" fi fi @@ -1065,7 +1065,9 @@ dnl AC_CHECK_TOOL(AR, ar, :) if test "$do64bit" = "yes" ; then arch=`isainfo` if test "$arch" = "sparcv9 sparc" ; then - if test "$GCC" = "no" ; then + if test "$GCC" = "yes" ; then + AC_MSG_WARN("64bit mode not supported with GCC on $system") + else do64bit_ok=yes if test "$do64bitVIS" = "yes" ; then EXTRA_CFLAGS="-xarch=v9a" @@ -1074,8 +1076,6 @@ dnl AC_CHECK_TOOL(AR, ar, :) EXTRA_CFLAGS="-xarch=v9" LDFLAGS="-xarch=v9" fi - else - AC_MSG_WARN("64bit mode not supported with GCC on $system") fi else AC_MSG_WARN("64bit mode only supported sparcv9 system") @@ -1104,7 +1104,7 @@ dnl AC_CHECK_TOOL(AR, ar, :) DL_LIBS="" LDFLAGS="-Wl,-D,08000000" LD_SEARCH_FLAGS='-L${LIB_RUNTIME_DIR}' - if test "$GCC" = "no" ; then + if test "$GCC" != "yes" ; then EXTRA_CFLAGS="-DHAVE_TZSET -std1" fi ;; |