summaryrefslogtreecommitdiffstats
path: root/unix/tcl.m4
diff options
context:
space:
mode:
Diffstat (limited to 'unix/tcl.m4')
-rw-r--r--unix/tcl.m476
1 files changed, 20 insertions, 56 deletions
diff --git a/unix/tcl.m4 b/unix/tcl.m4
index 3346500..a58e9f3 100644
--- a/unix/tcl.m4
+++ b/unix/tcl.m4
@@ -251,6 +251,7 @@ AC_DEFUN(SC_LOAD_TCLCONFIG, [
#
# eval is required to do the TCL_DBGX substitution
+ # (@@@ Is this still the case?)
#
eval "TCL_LIB_FILE=\"${TCL_LIB_FILE}\""
@@ -514,43 +515,6 @@ AC_DEFUN(SC_ENABLE_THREADS, [
fi
fi
LIBS=$ac_saved_libs
- AC_CHECK_FUNCS(readdir_r)
- if test "x$ac_cv_func_readdir_r" = "xyes"; then
- AC_MSG_CHECKING([how many args readdir_r takes])
- # IRIX 5.3 has a 2 arg version of readdir_r
- # while other systems have a 3 arg version.
- AC_CACHE_VAL(tcl_cv_two_arg_readdir_r,
- AC_TRY_COMPILE([#include <stdlib.h>
-#include <sys/types.h>
-#ifdef NO_DIRENT_H
-# include <sys/dir.h> /* logic from tcl/compat/dirent.h *
-# define dirent direct * */
-#else
-# include <dirent.h>
-#endif
-], [readdir_r(NULL, NULL);],
- tcl_cv_two_arg_readdir_r=yes, tcl_cv_two_arg_readdir_r=no))
- AC_CACHE_VAL(tcl_cv_three_arg_readdir_r,
- AC_TRY_COMPILE([#include <stdlib.h>
-#include <sys/types.h>
-#ifdef NO_DIRENT_H
-# include <sys/dir.h> /* logic from tcl/compat/dirent.h *
-# define dirent direct * */
-#else
-# include <dirent.h>
-#endif
-], [readdir_r(NULL, NULL, NULL);],
- tcl_cv_three_arg_readdir_r=yes, tcl_cv_three_arg_readdir_r=no))
- if test "x$tcl_cv_two_arg_readdir_r" = "xyes" ; then
- AC_MSG_RESULT([2])
- AC_DEFINE(HAVE_TWO_ARG_READDIR_R)
- elif test "x$tcl_cv_three_arg_readdir_r" = "xyes" ; then
- AC_MSG_RESULT([3])
- AC_DEFINE(HAVE_THREE_ARG_READDIR_R)
- else
- AC_MSG_ERROR([unknown number of args for readdir_r])
- fi
- fi
else
TCL_THREADS=0
AC_MSG_RESULT([no (default)])
@@ -584,7 +548,8 @@ AC_DEFUN(SC_ENABLE_THREADS, [
# Sets to $(CFLAGS_OPTIMIZE) if false
# LDFLAGS_DEFAULT Sets to $(LDFLAGS_DEBUG) if true
# Sets to $(LDFLAGS_OPTIMIZE) if false
-# DBGX Debug library extension
+# DBGX Formerly used as debug library extension;
+# always blank now.
#
#------------------------------------------------------------------------
@@ -592,16 +557,15 @@ 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])
# FIXME: Currently, LDFLAGS_DEFAULT is not used, it should work like CFLAGS_DEFAULT.
+ DBGX=""
if test "$tcl_ok" = "no"; then
CFLAGS_DEFAULT='$(CFLAGS_OPTIMIZE)'
LDFLAGS_DEFAULT='$(LDFLAGS_OPTIMIZE)'
- DBGX=""
AC_MSG_RESULT([no])
AC_DEFINE(TCL_CFG_OPTIMIZED, 1, [Is this an optimized build?])
else
CFLAGS_DEFAULT='$(CFLAGS_DEBUG)'
LDFLAGS_DEFAULT='$(LDFLAGS_DEBUG)'
- DBGX=g
if test "$tcl_ok" = "yes"; then
AC_MSG_RESULT([yes (standard debugging)])
fi
@@ -985,7 +949,7 @@ dnl AC_CHECK_TOOL(AR, ar)
CC_SEARCH_FLAGS='-L${LIB_RUNTIME_DIR}'
LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
TCL_NEEDS_EXP_FILE=1
- TCL_EXPORT_FILE_SUFFIX='${VERSION}\$\{DBGX\}.exp'
+ TCL_EXPORT_FILE_SUFFIX='${VERSION}.exp'
fi
;;
AIX-*)
@@ -1006,7 +970,7 @@ dnl AC_CHECK_TOOL(AR, ar)
LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
LD_LIBRARY_PATH_VAR="LIBPATH"
TCL_NEEDS_EXP_FILE=1
- TCL_EXPORT_FILE_SUFFIX='${VERSION}\$\{DBGX\}.exp'
+ TCL_EXPORT_FILE_SUFFIX='${VERSION}.exp'
# AIX v<=4.1 has some different flags than 4.2+
if test "$system" = "AIX-4.1" -o "`uname -v`" -lt "4" ; then
@@ -1171,7 +1135,7 @@ dnl AC_CHECK_TOOL(AR, ar)
LDFLAGS="$LDFLAGS -Wl,-D,08000000"
CC_SEARCH_FLAGS='-L${LIB_RUNTIME_DIR}'
LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
- SHARED_LIB_SUFFIX='${VERSION}\$\{DBGX\}.a'
+ SHARED_LIB_SUFFIX='${VERSION}.a'
;;
IRIX-5.*)
SHLIB_CFLAGS=""
@@ -1340,9 +1304,9 @@ dnl AC_CHECK_TOOL(AR, ar)
#endif
],
AC_MSG_RESULT(yes)
- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so',
+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so',
AC_MSG_RESULT(no)
- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1.0'
+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.1.0'
)
], [
SHLIB_CFLAGS=""
@@ -1353,12 +1317,12 @@ dnl AC_CHECK_TOOL(AR, ar)
DL_LIBS=""
CC_SEARCH_FLAGS='-L${LIB_RUNTIME_DIR}'
LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
])
# FreeBSD doesn't handle version numbers with dots.
- UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
+ UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
TCL_LIB_VERSIONS_OK=nodots
;;
OpenBSD-*)
@@ -1376,13 +1340,13 @@ dnl AC_CHECK_TOOL(AR, ar)
#endif
],
[AC_MSG_RESULT(yes)
- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1.0'],
+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.1.0'],
[AC_MSG_RESULT(no)
- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1.0']
+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.1.0']
)
# OpenBSD doesn't do version numbers with dots.
- UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
+ UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
TCL_LIB_VERSIONS_OK=nodots
;;
FreeBSD-*)
@@ -1405,8 +1369,8 @@ dnl AC_CHECK_TOOL(AR, ar)
case $system in
FreeBSD-3.*)
# FreeBSD-3 doesn't handle version numbers with dots.
- UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
+ UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so'
TCL_LIB_VERSIONS_OK=nodots
;;
esac
@@ -1576,8 +1540,8 @@ dnl AC_CHECK_TOOL(AR, ar)
# 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
- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1.0'
- UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.1.0'
+ UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
TCL_LIB_VERSIONS_OK=nodots
;;
SunOS-5.[[0-6]]*)
@@ -1835,10 +1799,10 @@ dnl AC_CHECK_TOOL(AR, ar)
fi
if test "$SHARED_LIB_SUFFIX" = "" ; then
- SHARED_LIB_SUFFIX='${VERSION}\$\{DBGX\}${SHLIB_SUFFIX}'
+ SHARED_LIB_SUFFIX='${VERSION}${SHLIB_SUFFIX}'
fi
if test "$UNSHARED_LIB_SUFFIX" = "" ; then
- UNSHARED_LIB_SUFFIX='${VERSION}\$\{DBGX\}.a'
+ UNSHARED_LIB_SUFFIX='${VERSION}.a'
fi
if test "${SHARED_BUILD}" = "1" && test "${SHLIB_SUFFIX}" != "" ; then