summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornijtmans <nijtmans>2008-10-08 21:36:47 (GMT)
committernijtmans <nijtmans>2008-10-08 21:36:47 (GMT)
commit61a9c44c70087f9eb7e1d3f0284c4cea2a21840d (patch)
treecef4a36c8192cfb54bb6ce8340addb809f806ee9
parentfc8311ca1ea7910975b3ecc853f51c687fe1aec7 (diff)
downloadtk-61a9c44c70087f9eb7e1d3f0284c4cea2a21840d.zip
tk-61a9c44c70087f9eb7e1d3f0284c4cea2a21840d.tar.gz
tk-61a9c44c70087f9eb7e1d3f0284c4cea2a21840d.tar.bz2
* unix/tcl.m4: fix for bug [2073255]
* unix/configure: regenerated
-rw-r--r--ChangeLog5
-rwxr-xr-xunix/configure29
-rw-r--r--unix/tcl.m415
3 files changed, 27 insertions, 22 deletions
diff --git a/ChangeLog b/ChangeLog
index cc19365..0f2499e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-10-08 Jan Nijtmans <nijtmans@users.sf.net>
+
+ * unix/tcl.m4: fix for bug [2073255]
+ * unix/configure: regenerated
+
2008-10-08 Don Porter <dgp@users.sourceforge.net>
* tests/textDisp.test (textDisp-16.34): Update test that tested
diff --git a/unix/configure b/unix/configure
index 36efcfc..7e26c83 100755
--- a/unix/configure
+++ b/unix/configure
@@ -4916,14 +4916,12 @@ fi
if test "$tcl_ok" = yes; then
- SHLIB_CFLAGS="+z"
- SHLIB_LD="ld -b"
SHLIB_LD_LIBS='${LIBS}'
DL_OBJS="tclLoadShl.o"
DL_LIBS="-ldld"
LDFLAGS="$LDFLAGS -Wl,-E"
CC_SEARCH_FLAGS='-Wl,+s,+b,${LIB_RUNTIME_DIR}:.'
- LD_SEARCH_FLAGS='+s +b ${LIB_RUNTIME_DIR}:.'
+ LD_SEARCH_FLAGS='-Wl,+s +b ${LIB_RUNTIME_DIR}:.'
LD_LIBRARY_PATH_VAR="SHLIB_PATH"
fi
@@ -4931,14 +4929,17 @@ fi
if test "$GCC" = yes; then
SHLIB_LD='${CC} -shared'
- SHLIB_LD_LIBS='${LIBS}'
- LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
-fi
+else
+ CFLAGS="$CFLAGS -z"
+ # Users may want PA-RISC 1.1/2.0 portable code - needs HP cc
+ #CFLAGS="$CFLAGS +DAportable"
+ SHLIB_CFLAGS="+z"
+ SHLIB_LD="${CC} -Wl,-b"
+
+fi
- # Users may want PA-RISC 1.1/2.0 portable code - needs HP cc
- #CFLAGS="$CFLAGS +DAportable"
# Check to enable 64-bit flags for compiler/linker
if test "$do64bit" = "yes"; then
@@ -9206,7 +9207,7 @@ ac_x_header_dirs='
/usr/openwin/share/include'
if test "$ac_x_includes" = no; then
- # Guess where to find include files, by looking for Xlib.h.
+ # Guess where to find include files, by looking for Intrinsic.h.
# First, try using that file with no special directory specified.
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -9214,7 +9215,7 @@ _ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-#include <X11/Xlib.h>
+#include <X11/Intrinsic.h>
_ACEOF
if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
@@ -9241,7 +9242,7 @@ else
sed 's/^/| /' conftest.$ac_ext >&5
for ac_dir in $ac_x_header_dirs; do
- if test -r "$ac_dir/X11/Xlib.h"; then
+ if test -r "$ac_dir/X11/Intrinsic.h"; then
ac_x_includes=$ac_dir
break
fi
@@ -9255,18 +9256,18 @@ if test "$ac_x_libraries" = no; then
# See if we find them without any special options.
# Don't add to $LIBS permanently.
ac_save_LIBS=$LIBS
- LIBS="-lX11 $LIBS"
+ LIBS="-lXt $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-#include <X11/Xlib.h>
+#include <X11/Intrinsic.h>
int
main ()
{
-XrmInitialize ()
+XtMalloc (0)
;
return 0;
}
diff --git a/unix/tcl.m4 b/unix/tcl.m4
index c5be8f0..3e4979a 100644
--- a/unix/tcl.m4
+++ b/unix/tcl.m4
@@ -1262,25 +1262,24 @@ dnl AC_CHECK_TOOL(AR, ar)
])
AC_CHECK_LIB(dld, shl_load, tcl_ok=yes, tcl_ok=no)
AS_IF([test "$tcl_ok" = yes], [
- SHLIB_CFLAGS="+z"
- SHLIB_LD="ld -b"
SHLIB_LD_LIBS='${LIBS}'
DL_OBJS="tclLoadShl.o"
DL_LIBS="-ldld"
LDFLAGS="$LDFLAGS -Wl,-E"
CC_SEARCH_FLAGS='-Wl,+s,+b,${LIB_RUNTIME_DIR}:.'
- LD_SEARCH_FLAGS='+s +b ${LIB_RUNTIME_DIR}:.'
+ LD_SEARCH_FLAGS='-Wl,+s +b ${LIB_RUNTIME_DIR}:.'
LD_LIBRARY_PATH_VAR="SHLIB_PATH"
])
AS_IF([test "$GCC" = yes], [
SHLIB_LD='${CC} -shared'
- SHLIB_LD_LIBS='${LIBS}'
- LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
+ ], [
+ CFLAGS="$CFLAGS -z"
+ # Users may want PA-RISC 1.1/2.0 portable code - needs HP cc
+ #CFLAGS="$CFLAGS +DAportable"
+ SHLIB_CFLAGS="+z"
+ SHLIB_LD="${CC} -Wl,-b"
])
- # Users may want PA-RISC 1.1/2.0 portable code - needs HP cc
- #CFLAGS="$CFLAGS +DAportable"
-
# Check to enable 64-bit flags for compiler/linker
AS_IF([test "$do64bit" = "yes"], [
AS_IF([test "$GCC" = yes], [