Formerly acspecific.m4.~185~

diff --git a/acspecific.m4 b/acspecific.m4
index ccbb945c40782626baf5daf1d818cf54f9fb8818..d2d2ea1a150668b3fb29fd42a3b520c7fb9ea1eb 100644 (file)
--- a/acspecific.m4
+++ b/acspecific.m4
@@ -997,9 +997,12 @@ dnl Internal subroutine of AC_FIND_X.
 define(AC_FIND_X_DIRECT,
 [echo checking for X include and library files directly
 if test ".$x_direct_test_library" = . ; then
-   x_direct_test_library=Xt
+   x_direct_test_library='Xt'
 fi
-AC_TEST_CPP([#include <X11/Intrinsic.h>], no_x=,
+if test ".$x_direct_test_include" = . ; then
+   x_direct_test_include='X11/Intrinsic.h'
+fi
+AC_TEST_CPP([#include <$x_direct_test_include>], no_x=,
   for dir in \
     /usr/local/include \
     /usr/unsupported/include \
@@ -1017,7 +1020,7 @@ AC_TEST_CPP([#include <X11/Intrinsic.h>], no_x=,
     /usr/athena/include \
     ; \
   do
-    if test -r $dir/X11/Intrinsic.h; then
+    if test -r "$dir/$x_direct_test_include"; then
       x_includes=$dir; no_x=
       break
     fi
@@ -1042,10 +1045,11 @@ for dir in `echo "$x_includes" | sed s/include/lib/` \
   /usr/openwin/lib \
   /usr/lpp/Xamples/lib \
   /usr/athena/lib \
+  /usr/lib \
   ; \
 do
   for extension in a so sl; do
-    if test -r $dir/libXt.$extension; then
+    if test -r $dir/lib${x_direct_test_library}.$extension; then
       x_libraries=$dir; no_x=
       break 2
     fi

diff --git a/lib/autoconf/specific.m4 b/lib/autoconf/specific.m4
index ccbb945c40782626baf5daf1d818cf54f9fb8818..d2d2ea1a150668b3fb29fd42a3b520c7fb9ea1eb 100644 (file)
--- a/lib/autoconf/specific.m4
+++ b/lib/autoconf/specific.m4
@@ -997,9 +997,12 @@ dnl Internal subroutine of AC_FIND_X.
 define(AC_FIND_X_DIRECT,
 [echo checking for X include and library files directly
 if test ".$x_direct_test_library" = . ; then
-   x_direct_test_library=Xt
+   x_direct_test_library='Xt'
 fi
-AC_TEST_CPP([#include <X11/Intrinsic.h>], no_x=,
+if test ".$x_direct_test_include" = . ; then
+   x_direct_test_include='X11/Intrinsic.h'
+fi
+AC_TEST_CPP([#include <$x_direct_test_include>], no_x=,
   for dir in \
     /usr/local/include \
     /usr/unsupported/include \
@@ -1017,7 +1020,7 @@ AC_TEST_CPP([#include <X11/Intrinsic.h>], no_x=,
     /usr/athena/include \
     ; \
   do
-    if test -r $dir/X11/Intrinsic.h; then
+    if test -r "$dir/$x_direct_test_include"; then
       x_includes=$dir; no_x=
       break
     fi
@@ -1042,10 +1045,11 @@ for dir in `echo "$x_includes" | sed s/include/lib/` \
   /usr/openwin/lib \
   /usr/lpp/Xamples/lib \
   /usr/athena/lib \
+  /usr/lib \
   ; \
 do
   for extension in a so sl; do
-    if test -r $dir/libXt.$extension; then
+    if test -r $dir/lib${x_direct_test_library}.$extension; then
       x_libraries=$dir; no_x=
       break 2
     fi