(AC_PATH_X_XMKMF): Check for libX11.{so,sl} as well as .a when

seeing whether LIBDIR or USRLIBDIR is right.

diff --git a/acspecific.m4 b/acspecific.m4
index 21d44f0c7c597e02fd1de1ada1961280b4f75508..e48e42f462ff3f81658069c5f92f1e66ddcdb4c1 100644 (file)
--- a/acspecific.m4
+++ b/acspecific.m4
@@ -1768,10 +1768,12 @@ EOF
     # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
     eval `make acfindx 2>/dev/null | grep -v make`
     # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR.
-    if test ! -f $ac_im_usrlibdir/libX11.a && test -f $ac_im_libdir/libX11.a
-    then
-      ac_im_usrlibdir=$ac_im_libdir
-    fi
+    for ac_extension in a so sl; do
+      if test ! -f $ac_im_usrlibdir/libX11.$ac_extension &&
+        test -f $ac_im_libdir/libX11.$ac_extension; then
+        ac_im_usrlibdir=$ac_im_libdir; break
+      fi
+    done
     # Screen out bogus values from the imake configuration.
     case "$ac_im_incroot" in
        /usr/include) ;;

diff --git a/lib/autoconf/specific.m4 b/lib/autoconf/specific.m4
index 21d44f0c7c597e02fd1de1ada1961280b4f75508..e48e42f462ff3f81658069c5f92f1e66ddcdb4c1 100644 (file)
--- a/lib/autoconf/specific.m4
+++ b/lib/autoconf/specific.m4
@@ -1768,10 +1768,12 @@ EOF
     # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
     eval `make acfindx 2>/dev/null | grep -v make`
     # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR.
-    if test ! -f $ac_im_usrlibdir/libX11.a && test -f $ac_im_libdir/libX11.a
-    then
-      ac_im_usrlibdir=$ac_im_libdir
-    fi
+    for ac_extension in a so sl; do
+      if test ! -f $ac_im_usrlibdir/libX11.$ac_extension &&
+        test -f $ac_im_libdir/libX11.$ac_extension; then
+        ac_im_usrlibdir=$ac_im_libdir; break
+      fi
+    done
     # Screen out bogus values from the imake configuration.
     case "$ac_im_incroot" in
        /usr/include) ;;