summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornijtmans <nijtmans@noemail.net>2010-01-10 21:03:20 (GMT)
committernijtmans <nijtmans@noemail.net>2010-01-10 21:03:20 (GMT)
commitf863ad6258afdab21d799dfb8e1f34b4a4a30721 (patch)
treeff908fc99f85d195c1e2702f068332e22e660d2e
parent6977b9f507709d26497c667c5e31bd761ccd0457 (diff)
downloadtk-f863ad6258afdab21d799dfb8e1f34b4a4a30721.zip
tk-f863ad6258afdab21d799dfb8e1f34b4a4a30721.tar.gz
tk-f863ad6258afdab21d799dfb8e1f34b4a4a30721.tar.bz2
Sync tcl.m4 and configure with Tcl version
Regenerate configure script with autoconf-2.59 FossilOrigin-Name: 4b8d286511c99878d99038882638ac5a7f6a1f56
-rw-r--r--ChangeLog2
-rwxr-xr-xunix/configure32
-rw-r--r--unix/tcl.m42
3 files changed, 34 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index a0794f2..a895b63 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,8 @@
* generic/tkInt.h
* generic/tkWindow.c
* generic/tkDecls.h: (regenerated)
+ * unix/tcl.m4 Sync with Tcl version
+ * unix/configure (regenerated)
2010-01-09 Pat Thoyts <patthoyts@users.sourceforge.net>
diff --git a/unix/configure b/unix/configure
index de0ff4a..b4a15ed 100755
--- a/unix/configure
+++ b/unix/configure
@@ -5620,7 +5620,7 @@ fi
UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
TCL_LIB_VERSIONS_OK=nodots
;;
- NetBSD-*|FreeBSD-*)
+ NetBSD-*|FreeBSD-[3-4].*)
# FreeBSD 3.* and greater have ELF.
# NetBSD 2.* has ELF and can use 'cc -shared' to build shared libs
SHLIB_CFLAGS="-fPIC"
@@ -5654,6 +5654,36 @@ fi
;;
esac
;;
+ FreeBSD-*)
+ # This configuration from FreeBSD Ports.
+ SHLIB_CFLAGS="-fPIC"
+ SHLIB_LD="${CC} -shared"
+ TCL_SHLIB_LD_EXTRAS="-soname \$@"
+ SHLIB_LD_LIBS='${LIBS}'
+ SHLIB_SUFFIX=".so"
+ DL_OBJS="tclLoadDl.o"
+ DL_LIBS=""
+ LDFLAGS=""
+ if test $doRpath = yes; then
+
+ CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
+ LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'
+fi
+
+ if test "${TCL_THREADS}" = "1"; then
+
+ # The -pthread needs to go in the LDFLAGS, not LIBS
+ LIBS=`echo $LIBS | sed s/-pthread//`
+ CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+ LDFLAGS="$LDFLAGS $PTHREAD_LIBS"
+fi
+
+ # Version numbers are dot-stripped by system policy.
+ TCL_TRIM_DOTS=`echo ${VERSION} | tr -d .`
+ UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1'
+ TCL_LIB_VERSIONS_OK=nodots
+ ;;
Darwin-*)
CFLAGS_OPTIMIZE="-Os"
SHLIB_CFLAGS="-fno-common"
diff --git a/unix/tcl.m4 b/unix/tcl.m4
index b799665..b7cb2ac 100644
--- a/unix/tcl.m4
+++ b/unix/tcl.m4
@@ -1552,7 +1552,7 @@ dnl AC_CHECK_TOOL(AR, ar)
UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
TCL_LIB_VERSIONS_OK=nodots
;;
- NetBSD-*|FreeBSD-[[3.4]].*)
+ NetBSD-*|FreeBSD-[[3-4]].*)
# FreeBSD 3.* and greater have ELF.
# NetBSD 2.* has ELF and can use 'cc -shared' to build shared libs
SHLIB_CFLAGS="-fPIC"