From 8fb82585043253ad71e5623478fda7d8a67b1c23 Mon Sep 17 00:00:00 2001
From: mdejong <mdejong>
Date: Wed, 12 Sep 2001 21:00:18 +0000
Subject: * unix/configure: Regen. * unix/tcl.m4: Invert the
logic that checks for $GCC. Instead of checking for "$GCC" = "no" we check
for "$GCC" != "yes" or simply swap the true and false blocks of code
in an if statement. That way if GCC is set to "" everything will still
work. [Bug 460991]
---
ChangeLog | 9 +++++++++
unix/configure | 28 ++++++++++++++--------------
unix/tcl.m4 | 28 ++++++++++++++--------------
3 files changed, 37 insertions(+), 28 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index d020f47..40053d0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2001-09-12 Mo DeJong <mdejong@users.sourceforge.net>
+
+ * unix/configure: Regen.
+ * unix/tcl.m4: Invert the logic that checks for $GCC.
+ Instead of checking for "$GCC" = "no" we check for
+ "$GCC" != "yes" or simply swap the true and false
+ blocks of code in an if statement. That way if
+ GCC is set to "" everything will still work. [Bug 460991]
+
2001-09-12 Don Porter <msofer@users.sourceforge.net>
* tests/appendComp.test:
diff --git a/unix/configure b/unix/configure
index ccdb0d7..3d7e3e5 100755
--- a/unix/configure
+++ b/unix/configure
@@ -4804,7 +4804,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
@@ -4831,17 +4831,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
@@ -5354,18 +5354,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
@@ -5480,7 +5480,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"
@@ -5489,8 +5491,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
@@ -5519,7 +5519,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
;;
--
cgit v0.12