summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <jan.nijtmans@noemail.net>2013-06-27 19:01:50 (GMT)
committerjan.nijtmans <jan.nijtmans@noemail.net>2013-06-27 19:01:50 (GMT)
commit7cc18aa23f4cebdc711c675468866b483f7822e0 (patch)
tree3bc5537557d0e95006d0258c4e65ff24756bcaef
parent36d234f63579afb864f65affb0f945bb8dc1fb3d (diff)
downloadtk-7cc18aa23f4cebdc711c675468866b483f7822e0.zip
tk-7cc18aa23f4cebdc711c675468866b483f7822e0.tar.gz
tk-7cc18aa23f4cebdc711c675468866b483f7822e0.tar.bz2
manually revert changes caused by different autoconf versions.
FossilOrigin-Name: 3dfb5d7cdfb18b249b1b7bcca876c638f811960a
-rwxr-xr-xunix/configure12
1 files changed, 6 insertions, 6 deletions
diff --git a/unix/configure b/unix/configure
index 3049b3c..7a19259 100755
--- a/unix/configure
+++ b/unix/configure
@@ -10034,7 +10034,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. */
@@ -10042,7 +10042,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
@@ -10069,7 +10069,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
@@ -10083,18 +10083,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;
}