summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2013-03-13 15:46:32 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2013-03-13 15:46:32 (GMT)
commit1e43f52d3f5a853bf95be27798ace31ea8ee2884 (patch)
treea1e05e64b1041bd6a172690d3d22874625a63557
parent80d43beb6caae9ce728cd5054194124706038073 (diff)
parente4a806f57cf76fe3fc789dafd98b46ac11d7e68d (diff)
downloadtk-1e43f52d3f5a853bf95be27798ace31ea8ee2884.zip
tk-1e43f52d3f5a853bf95be27798ace31ea8ee2884.tar.gz
tk-1e43f52d3f5a853bf95be27798ace31ea8ee2884.tar.bz2
Patch by Andrew Shadura, providing better support for three architectures they have in Debian.
-rw-r--r--ChangeLog5
-rwxr-xr-xunix/configure17
-rw-r--r--unix/tcl.m414
3 files changed, 7 insertions, 29 deletions
diff --git a/ChangeLog b/ChangeLog
index 19a5bac..98c86ff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-03-13 Jan Nijtmans <nijtmans@users.sf.net>
+
+ * unix/tcl.m4: Patch by Andrew Shadura, providing better support for
+ three architectures they have in Debian.
+
2013-03-11 Don Porter <dgp@users.sourceforge.net>
* generic/tkListbox.c: [Bug 3607326] Stop segfault from
diff --git a/unix/configure b/unix/configure
index c99f25e..535b5f5 100755
--- a/unix/configure
+++ b/unix/configure
@@ -5623,7 +5623,7 @@ fi
fi
;;
- Linux*)
+ Linux*|GNU*|NetBSD-Debian)
SHLIB_CFLAGS="-fPIC"
SHLIB_SUFFIX=".so"
@@ -5729,21 +5729,6 @@ fi
fi
;;
- GNU*)
- SHLIB_CFLAGS="-fPIC"
- SHLIB_SUFFIX=".so"
-
- SHLIB_LD='${CC} -shared'
- DL_OBJS=""
- DL_LIBS="-ldl"
- LDFLAGS="$LDFLAGS -Wl,--export-dynamic"
- CC_SEARCH_FLAGS=""
- LD_SEARCH_FLAGS=""
- if test "`uname -m`" = "alpha"; then
- CFLAGS="$CFLAGS -mieee"
-fi
-
- ;;
Lynx*)
SHLIB_CFLAGS="-fPIC"
SHLIB_SUFFIX=".so"
diff --git a/unix/tcl.m4 b/unix/tcl.m4
index 3974753..668fa2f 100644
--- a/unix/tcl.m4
+++ b/unix/tcl.m4
@@ -1410,7 +1410,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
])
])
;;
- Linux*)
+ Linux*|GNU*|NetBSD-Debian)
SHLIB_CFLAGS="-fPIC"
SHLIB_SUFFIX=".so"
@@ -1448,18 +1448,6 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
AS_IF([test x"${USE_COMPAT}" != x],[CFLAGS="$CFLAGS -fno-inline"])
;;
- GNU*)
- SHLIB_CFLAGS="-fPIC"
- SHLIB_SUFFIX=".so"
-
- SHLIB_LD='${CC} -shared'
- DL_OBJS=""
- DL_LIBS="-ldl"
- LDFLAGS="$LDFLAGS -Wl,--export-dynamic"
- CC_SEARCH_FLAGS=""
- LD_SEARCH_FLAGS=""
- AS_IF([test "`uname -m`" = "alpha"], [CFLAGS="$CFLAGS -mieee"])
- ;;
Lynx*)
SHLIB_CFLAGS="-fPIC"
SHLIB_SUFFIX=".so"