diff options
| author | wart <wart> | 1999-06-16 02:20:41 (GMT) |
|---|---|---|
| committer | wart <wart> | 1999-06-16 02:20:41 (GMT) |
| commit | 5ec56455226b1df586b2a72d90635ed4913bb186 (patch) | |
| tree | 1c71c3b5c5e42c2b65bb0233035f2b75c7faecac /unix/aclocal.m4 | |
| parent | 26bf1f75c9b6c7835946da2f24342d4d49abd542 (diff) | |
| download | tcl-5ec56455226b1df586b2a72d90635ed4913bb186.zip tcl-5ec56455226b1df586b2a72d90635ed4913bb186.tar.gz tcl-5ec56455226b1df586b2a72d90635ed4913bb186.tar.bz2 | |
More TEA changes. Should play well with TclX now.
Diffstat (limited to 'unix/aclocal.m4')
| -rw-r--r-- | unix/aclocal.m4 | 31 |
1 files changed, 20 insertions, 11 deletions
diff --git a/unix/aclocal.m4 b/unix/aclocal.m4 index a1d0335..828dfd7 100644 --- a/unix/aclocal.m4 +++ b/unix/aclocal.m4 @@ -397,6 +397,8 @@ AC_DEFUN(SC_ENABLE_THREADS, [ # Requires the following vars to be set: # CFLAGS_DEBUG # CFLAGS_OPTIMIZE +# LDFLAGS_DEBUG +# LDFLAGS_OPTIMIZE # # Results: # @@ -416,13 +418,13 @@ AC_DEFUN(SC_ENABLE_SYMBOLS, [ AC_MSG_CHECKING([for build with symbols]) AC_ARG_ENABLE(symbols, [ --enable-symbols build with debugging symbols [--disable-symbols]], [tcl_ok=$enableval], [tcl_ok=no]) if test "$tcl_ok" = "yes"; then - CFLAGS_DEFAULT='$(CFLAGS_DEBUG)' - LD_FLAGS_DEFAULT='$(LDFLAGS_DEBUG)' + CFLAGS_DEFAULT="${CFLAGS_DEBUG}" + LD_FLAGS_DEFAULT="${LDFLAGS_DEBUG}" DBGX=g AC_MSG_RESULT([yes]) else - CFLAGS_DEFAULT='$(CFLAGS_OPTIMIZE)' - LD_FLAGS_DEFAULT='$(LDFLAGS_OPTIMIZE)' + CFLAGS_DEFAULT="${CFLAGS_OPTIMIZE}" + LD_FLAGS_DEFAULT="${LDFLAGS_OPTIMIZE}" DBGX="" AC_MSG_RESULT([no]) fi @@ -1168,7 +1170,7 @@ AC_DEFUN(SC_CONFIG_CFLAGS, [ fullSrcDir=`cd $srcdir; pwd` EXTRA_CFLAGS="" TCL_EXPORT_FILE_SUFFIX="" - TCL_UNSHARED_LIB_SUFFIX="" + UNSHARED_LIB_SUFFIX="" TCL_TRIM_DOTS='`echo ${VERSION} | tr -d .`' ECHO_VERSION='`echo ${VERSION}`' TCL_LIB_VERSIONS_OK=ok @@ -1255,7 +1257,7 @@ AC_DEFUN(SC_CONFIG_CFLAGS, [ DL_LIBS="" LD_FLAGS="-Wl,-D,08000000" LD_SEARCH_FLAGS='-L${LIB_RUNTIME_DIR}' - TCL_SHARED_LIB_SUFFIX='${VERSION}\$\{DBGX\}.a' + SHARED_LIB_SUFFIX='${VERSION}\$\{DBGX\}.a' ;; IRIX-5.*|IRIX-6.*|IRIX64-6.5*) SHLIB_CFLAGS="" @@ -1341,7 +1343,7 @@ AC_DEFUN(SC_CONFIG_CFLAGS, [ DL_LIBS="" LD_FLAGS="" LD_SEARCH_FLAGS="" - TCL_SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1.0' + SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1.0' ], [ SHLIB_CFLAGS="" SHLIB_LD="echo tclLdAout $CC \{$SHLIB_CFLAGS\} | `pwd`/tclsh -r" @@ -1351,12 +1353,12 @@ AC_DEFUN(SC_CONFIG_CFLAGS, [ DL_LIBS="" LD_FLAGS="" LD_SEARCH_FLAGS='-L${LIB_RUNTIME_DIR}' - TCL_SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a' + SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a' ]) # FreeBSD doesn't handle version numbers with dots. - TCL_UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a' + UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a' TCL_LIB_VERSIONS_OK=nodots ;; FreeBSD-*) @@ -1466,8 +1468,8 @@ AC_DEFUN(SC_CONFIG_CFLAGS, [ # requires an extra version number at the end of .so file names. # So, the library has to have a name like libtcl75.so.1.0 - TCL_SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1.0' - TCL_UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a' + SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1.0' + UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a' TCL_LIB_VERSIONS_OK=nodots ;; SunOS-5.[[0-6]]*) @@ -1682,6 +1684,13 @@ AC_DEFUN(SC_CONFIG_CFLAGS, [ fi fi + if test "$SHARED_LIB_SUFFIX" = "" ; then + SHARED_LIB_SUFFIX='${VERSION}\$\{DBGX\}${SHLIB_SUFFIX}' + fi + if test "$UNSHARED_LIB_SUFFIX" = "" ; then + UNSHARED_LIB_SUFFIX='${VERSION}\$\{DBGX\}.a' + fi + AC_SUBST(DL_LIBS) AC_SUBST(CFLAGS_DEBUG) AC_SUBST(CFLAGS_OPTIMIZE) |