summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormdejong <mdejong>2001-12-20 21:32:05 (GMT)
committermdejong <mdejong>2001-12-20 21:32:05 (GMT)
commitd0ae1ed47c64f16387530060881d2504f8c530a9 (patch)
tree72b431dba1a68ef91cd61a7d0eee815eca7ede46
parenta307ef5b1e57756cadfe4f8f8af6eaf362ed0345 (diff)
downloadtk-d0ae1ed47c64f16387530060881d2504f8c530a9.zip
tk-d0ae1ed47c64f16387530060881d2504f8c530a9.tar.gz
tk-d0ae1ed47c64f16387530060881d2504f8c530a9.tar.bz2
* unix/configure: Regen.
* unix/tcl.m4: Update from Tcl.
-rw-r--r--ChangeLog5
-rwxr-xr-xunix/configure4
-rw-r--r--unix/tcl.m46
3 files changed, 10 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index af88143..8a7b132 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+001-12-20 Mo DeJong <mdejong@users.sourceforge.net>
+
+ * unix/configure: Regen.
+ * unix/tcl.m4: Update from Tcl.
+
2001-12-19 Mo DeJong <mdejong@users.sourceforge.net>
* unix/configure: Regen.
diff --git a/unix/configure b/unix/configure
index 60ab97b..bdc3c35 100755
--- a/unix/configure
+++ b/unix/configure
@@ -1363,7 +1363,7 @@ else
# check in a few common install locations
if test x"${ac_cv_c_tclconfig}" = x ; then
- for i in `ls -d ${prefix}/lib 2>/dev/null` \
+ for i in `ls -d ${exec_prefix}/lib 2>/dev/null` \
`ls -d /usr/local/lib 2>/dev/null` \
`ls -d /usr/contrib/lib 2>/dev/null` \
`ls -d /usr/lib 2>/dev/null` \
@@ -2176,7 +2176,7 @@ fi
SHLIB_CFLAGS="-fno-common"
SHLIB_LD="cc -dynamiclib \${LDFLAGS}"
TCL_SHLIB_LD_EXTRAS="-compatibility_version ${TCL_MAJOR_VERSION} -current_version \${VERSION} -install_name \${LIB_RUNTIME_DIR}/\${TCL_LIB_FILE} -prebind -seg1addr a000000"
- SHLIB_LD_LIBS="${LIBS}"
+ SHLIB_LD_LIBS='${LIBS}'
SHLIB_SUFFIX=".dylib"
DL_OBJS="tclLoadDyld.o"
DL_LIBS=""
diff --git a/unix/tcl.m4 b/unix/tcl.m4
index 08d84b1..2b146e7 100644
--- a/unix/tcl.m4
+++ b/unix/tcl.m4
@@ -58,7 +58,7 @@ AC_DEFUN(SC_PATH_TCLCONFIG, [
# check in a few common install locations
if test x"${ac_cv_c_tclconfig}" = x ; then
- for i in `ls -d ${prefix}/lib 2>/dev/null` \
+ for i in `ls -d ${exec_prefix}/lib 2>/dev/null` \
`ls -d /usr/local/lib 2>/dev/null` \
`ls -d /usr/contrib/lib 2>/dev/null` \
`ls -d /usr/lib 2>/dev/null` \
@@ -153,7 +153,7 @@ AC_DEFUN(SC_PATH_TKCONFIG, [
fi
# check in a few common install locations
if test x"${ac_cv_c_tkconfig}" = x ; then
- for i in `ls -d ${prefix}/lib 2>/dev/null` \
+ for i in `ls -d ${exec_prefix}/lib 2>/dev/null` \
`ls -d /usr/local/lib 2>/dev/null` \
`ls -d /usr/contrib/lib 2>/dev/null` \
`ls -d /usr/lib 2>/dev/null` \
@@ -988,7 +988,7 @@ dnl AC_CHECK_TOOL(AR, ar, :)
SHLIB_CFLAGS="-fno-common"
SHLIB_LD="cc -dynamiclib \${LDFLAGS}"
TCL_SHLIB_LD_EXTRAS="-compatibility_version ${TCL_MAJOR_VERSION} -current_version \${VERSION} -install_name \${LIB_RUNTIME_DIR}/\${TCL_LIB_FILE} -prebind -seg1addr a000000"
- SHLIB_LD_LIBS="${LIBS}"
+ SHLIB_LD_LIBS='${LIBS}'
SHLIB_SUFFIX=".dylib"
DL_OBJS="tclLoadDyld.o"
DL_LIBS=""