summaryrefslogtreecommitdiffstats
path: root/unix
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2014-03-20 11:06:17 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2014-03-20 11:06:17 (GMT)
commita9d547c16cd9f33fd2c54a28ff71950ee248d450 (patch)
treeaabc83a6d01ff7bde3963335f88b62ca49ff2c30 /unix
parent23bde948c21ad09fc7b4883d2c4ed67f647e6414 (diff)
parentd4b7f036fda7b1585e1a11297d394cf43e3bd380 (diff)
downloadtk-a9d547c16cd9f33fd2c54a28ff71950ee248d450.zip
tk-a9d547c16cd9f33fd2c54a28ff71950ee248d450.tar.gz
tk-a9d547c16cd9f33fd2c54a28ff71950ee248d450.tar.bz2
Fix [http://core.tcl.tk/tcl/info/2f7cbd01c3|2f7cbd01c3]: tcl8.6.1 fails to build on FreeBSD 10.0
Diffstat (limited to 'unix')
-rwxr-xr-xunix/configure14
-rw-r--r--unix/tcl.m414
2 files changed, 18 insertions, 10 deletions
diff --git a/unix/configure b/unix/configure
index ad9b051..f6544c3 100755
--- a/unix/configure
+++ b/unix/configure
@@ -5606,11 +5606,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 25137d0..a0f448b 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"