summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2017-03-20 14:19:19 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2017-03-20 14:19:19 (GMT)
commitaca8f6e571da1e5aeb078efae38cb33c3e5f3228 (patch)
tree96c47109df7c967cd6d68ce2697b200e353220d0
parentcea691ec5d066d8dafa8e4d2eb0e4e5fe8faa993 (diff)
downloadtk-aca8f6e571da1e5aeb078efae38cb33c3e5f3228.zip
tk-aca8f6e571da1e5aeb078efae38cb33c3e5f3228.tar.gz
tk-aca8f6e571da1e5aeb078efae38cb33c3e5f3228.tar.bz2
Check for Xlib.h in stead of Intrinsic.h in configure script. Reason: see [1610236]: beware FC autoconf fork. This autoconf bug is fixed in later autoconf versions, but as we are stuck with autoconf-2.59 ...
-rwxr-xr-xunix/configure12
1 files changed, 6 insertions, 6 deletions
diff --git a/unix/configure b/unix/configure
index 8bd1c0b..be81f66 100755
--- a/unix/configure
+++ b/unix/configure
@@ -9598,7 +9598,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 Intrinsic.h.
+ # Guess where to find include files, by looking for Xlib.h.
# First, try using that file with no special directory specified.
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -9606,7 +9606,7 @@ _ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-#include <X11/Intrinsic.h>
+#include <X11/Xlib.h>
_ACEOF
if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
@@ -9633,7 +9633,7 @@ else
sed 's/^/| /' conftest.$ac_ext >&5
for ac_dir in $ac_x_header_dirs; do
- if test -r "$ac_dir/X11/Intrinsic.h"; then
+ if test -r "$ac_dir/X11/Xlib.h"; then
ac_x_includes=$ac_dir
break
fi
@@ -9647,18 +9647,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="-lXt $LIBS"
+ LIBS="-lX11 $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/Intrinsic.h>
+#include <X11/Xlib.h>
int
main ()
{
-XtMalloc (0)
+XrmInitialize ()
;
return 0;
}