diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2014-03-20 10:14:32 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2014-03-20 10:14:32 (GMT) |
| commit | 9d05820f021850520e283025476da9c5e5a7fd12 (patch) | |
| tree | 8a6b10280af34ba3fec693c07947f1de618a0269 | |
| parent | 001ceafb231f23c8d6f9ae1530eba59284640b3d (diff) | |
| parent | cb2a1e4c132a705181bab3d1b864cb97fdfbe7eb (diff) | |
| download | tcl-9d05820f021850520e283025476da9c5e5a7fd12.zip tcl-9d05820f021850520e283025476da9c5e5a7fd12.tar.gz tcl-9d05820f021850520e283025476da9c5e5a7fd12.tar.bz2 | |
merge trunk
| -rwxr-xr-x | unix/configure | 14 | ||||
| -rw-r--r-- | unix/tcl.m4 | 14 |
2 files changed, 18 insertions, 10 deletions
diff --git a/unix/configure b/unix/configure index 5fd9dea..47a1a30 100755 --- a/unix/configure +++ b/unix/configure @@ -7761,11 +7761,15 @@ fi 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 + case $system in + FreeBSD-3.*) + # 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}.so' + TCL_LIB_VERSIONS_OK=nodots + ;; + esac ;; Darwin-*) CFLAGS_OPTIMIZE="-Os" diff --git a/unix/tcl.m4 b/unix/tcl.m4 index 72094bb..3f00e5b 100644 --- a/unix/tcl.m4 +++ b/unix/tcl.m4 @@ -1545,11 +1545,15 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ LIBS=`echo $LIBS | sed s/-pthread//` CFLAGS="$CFLAGS $PTHREAD_CFLAGS" LDFLAGS="$LDFLAGS $PTHREAD_LIBS"]) - # 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 + case $system in + FreeBSD-3.*) + # 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}.so' + TCL_LIB_VERSIONS_OK=nodots + ;; + esac ;; Darwin-*) CFLAGS_OPTIMIZE="-Os" |