new build system: update for texk/xdvik/

git-svn-id: svn://tug.org/texlive/trunk@12895 c570f23f-e606-0410-a88d-b1316a301751

3 files changed, 210 insertions, 168 deletions

diff --git a/Build/source/texk/xdvik/m4/xdvi-check-xaw.m4 b/Build/source/texk/xdvik/m4/xdvi-check-xaw.m4
index a1421cd3141..6f7301c6340 100644
--- a/Build/source/texk/xdvik/m4/xdvi-check-xaw.m4
+++ b/Build/source/texk/xdvik/m4/xdvi-check-xaw.m4
@@ -12,8 +12,9 @@
 AC_DEFUN([XDVI_CHECK_XAW_HEADERS],
 [save_CPPFLAGS=$CPPFLAGS
 CPPFLAGS="$CPPFLAGS $X_CFLAGS"
-AC_MSG_CHECKING([for Xaw headers])
-AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+AC_CACHE_CHECK([for Xaw headers],
+               [xdvi_cv_xaw_headers],
+               [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
 #include <X11/X.h>
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
@@ -21,9 +22,9 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
 #include <X11/Xfuncs.h>
 #include <X11/Intrinsic.h>
 #include <X11/Xaw/Form.h>]])],
-                  [xdvi_have_xaw=yes],
-                  [xdvi_have_xaw=no])
-AC_MSG_RESULT([$xdvi_have_xaw])
+                                  [xdvi_cv_xaw_headers=yes],
+                                  [xdvi_cv_xaw_headers=no])])
+xdvi_have_xaw=$xdvi_cv_xaw_headers
 #
 if test "x$xdvi_have_xaw" = xyes; then
  _XDVI_CHECK_XAW_VERSION
@@ -55,11 +56,23 @@ m4_define([_XDVI_CHECK_XAW_VERSION],
 AC_DEFUN([XDVI_CHECK_XAW_LIBRARY],
 [AC_REQUIRE([XDVI_CHECK_XAW_HEADERS])
 if test "x$xdvi_have_xaw" = xyes; then
-  :
+  # First try without libXp
+  AC_CHECK_LIB([Xaw], [XawInitializeWidgetSet],
+      [x_tool_libs="-lXaw"],
+      [# libXaw without libXp failed
+       if test "x$x_xp_lib" = x; then
+         xdvi_have_xaw=no
+       else
+         # Now try with libXp
+         AC_CHECK_LIB([Xaw], [XawTextReplace],
+             [x_tool_libs="-lXaw $x_xp_lib"],
+             [xdvi_have_xaw=no],
+             [$x_xp_lib $x_xmu_lib -lXt $X_PRE_LIBS $x_ext_lib $x_xpm_libs -lX11 $X_EXTRA_LIBS $XLFLAG])
+       fi],
+      [$x_xmu_lib -lXt $X_PRE_LIBS $x_ext_lib $x_xpm_libs -lX11 $X_EXTRA_LIBS $XLFLAG])
 fi 
 if test "x$xdvi_have_xaw" = xyes; then
   prog_extension="xaw"
-  x_tool_libs="-lXaw"
   AC_DEFINE([XAW], 1, [Define to use the Xaw toolkit.])
 else
   AC_MSG_ERROR([Sorry, you will need at least the Xaw header/library files to compile xdvik.])
diff --git a/Build/source/texk/xdvik/m4/xdvi-find-motif.m4 b/Build/source/texk/xdvik/m4/xdvi-find-motif.m4
index 160f43e18d7..09f8091ce4b 100644
--- a/Build/source/texk/xdvik/m4/xdvi-find-motif.m4
+++ b/Build/source/texk/xdvik/m4/xdvi-find-motif.m4
@@ -15,78 +15,91 @@
 # If default_toolkit is not `none', use Xaw as toolkit if Motif isn't found.
 AC_DEFUN([XDVI_FIND_MOTIF],
 [AC_REQUIRE([AC_PATH_XTRA])
-motif_include=
-motif_libdir=
 AC_ARG_WITH([motif-include],
             AS_HELP_STRING([--with-motif-include=DIR],
-                           [Specify the location of Motif include files])
-            [motif_include=$withval])
+                           [Specify the location of Motif include files]),
+            [motif_include=$withval], [motif_include=])[]dnl
 AC_ARG_WITH([motif-libdir],
             AS_HELP_STRING([--with-motif-libdir=DIR],
-                           [Specify the location of Motif libraries])
-            [motif_libdir=$withval])
+                           [Specify the location of Motif libraries]),
+            [motif_libdir=$withval], [motif_libdir=])[]dnl
 AC_MSG_CHECKING([for Motif])
 #
 # Search the include files.
 #
-if test "$motif_include" = ""; then
+if test "x$motif_include" = x; then
   _XDVI_FIND_MOTIF_INCLUDES
 fi
 #
+# Add Motif definition to X_CFLAGS (and remember previous value)
+#
+xdvi_motif_save_X_CFLAGS=$X_CFLAGS
+if test "x$motif_include" != xdefault \
+    && test "x$motif_include" != "x$x_includes" && test "x$motif_include" != xno
+then
+  X_CFLAGS="-I$motif_include $X_CFLAGS"
+fi
+#
 # Now for the libraries.
 #
-if test "$motif_libdir" = ""; then
+if test "x$motif_libdir" = x; then
   _XDVI_FIND_MOTIF_LIBRARIES
 fi
-# Add Motif definitions to X flags
 #
-if test "$motif_include" != "" && test "$motif_include" != "$x_includes" && test "$motif_include" != "no"
-then
-X_CFLAGS="-I$motif_include $X_CFLAGS"
-fi
-if test "$motif_libdir" != "" && test "$motif_libdir" != "$x_libraries" && test "$motif_libdir" != "no"
-then
-case "$X_LIBS" in
-  *-R\ *) X_LIBS="-L$motif_libdir -R $motif_libdir $X_LIBS";;
-  *-R*)   X_LIBS="-L$motif_libdir -R$motif_libdir $X_LIBS";;
-  *)      X_LIBS="-L$motif_libdir $X_LIBS";;
-esac
-fi
+# Report the results of headers and libraries.
 #
+xdvi_have_motif=yes
 #
-motif_libdir_result="$motif_libdir"
-motif_include_result="$motif_include"
-test "$motif_libdir_result" = "" && 
-  motif_libdir_result="in default path" && AC_DEFINE([MOTIF], 1, [Define to use the Motif toolkit.])
-test "$motif_include_result" = "" && 
-  motif_include_result="in default path" && AC_DEFINE([MOTIF], 1)
-if test "$motif_libdir_result" = "no"; then
-    if test "$default_toolkit" = "none"; then
-        motif_libdir_result="(none)"
-    else
-	motif_libdir_result=""
-    fi
+motif_libdir_result=$motif_libdir
+if test "x$motif_libdir_result" = xdefault; then
+  motif_libdir_result="in default path"
+elif test "x$motif_libdir_result" = xno; then
+  motif_libdir_result="(none)"
+  xdvi_have_motif=no
 fi
-if test "$motif_include_result" = "no"; then
-    if test "$default_toolkit" = "none"; then
-        motif_include_result="(none)"
-    else
-	motif_include_result=""
-    fi
+#
+motif_include_result=$motif_include
+if test "x$motif_include_result" = xdefault; then
+  motif_include_result="in default path"
+elif test "x$motif_include_result" = xno; then
+  motif_include_result="(none)"
+  xdvi_have_motif=no
 fi
-
-if test "$motif_include_result" != "" && test "$motif_libdir_result" != ""; then
-  AC_MSG_RESULT([libraries $motif_libdir_result, headers $motif_include_result])
+#
+AC_MSG_RESULT([libraries $motif_libdir_result, headers $motif_include_result])
+#
+if test "x$xdvi_have_motif" = xyes; then
+  #
+  # Add Motif definition to X_LIBS
+  #
+  if test "x$motif_libdir" != xdefault \
+      && test "x$motif_libdir" != "x$x_libraries" && test "x$motif_libdir" != no
+  then
+    case "$X_LIBS" in
+      *-R\ *) X_LIBS="-L$motif_libdir -R $motif_libdir $X_LIBS";;
+      *-R*)   X_LIBS="-L$motif_libdir -R$motif_libdir $X_LIBS";;
+      *)      X_LIBS="-L$motif_libdir $X_LIBS";;
+    esac
+  fi
+  #
   prog_extension="motif"
-  AC_DEFINE([MOTIF], 1)
+  AC_DEFINE([MOTIF], 1, [Define to use the Motif toolkit.])
   x_tool_libs="-lXm"
+  if test "x$x_xp_lib" != x; then
+    # check if libXm requires libXp
+    _XDVI_CHECK_MOTIF_XP
+  fi
   # now warn if we're using LessTif (see LESSTIF-BUGS for why ...)
   _XDVI_CHECK_LESSTIF
   # Check whether to compile for Motif with Xaw Panner.
   _XDVI_CHECK_PANNER
+elif test "x$default_toolkit" = xnone; then
+  AC_MSG_ERROR([No Motif.])
 else
-    AC_MSG_RESULT([not found, using Xaw])
-    with_xdvi_x_toolkit="xaw"
+  # Restore previous X_CFLAGS
+  X_CFLAGS=$xdvi_motif_save_X_CFLAGS
+  AC_MSG_NOTICE([No Motif, using Xaw.])
+  with_xdvi_x_toolkit="xaw"
 fi
 
 ]) # XDVI_FIND_MOTIF
@@ -96,24 +109,18 @@ fi
 # Search the Xm include files.
 m4_define([_XDVI_FIND_MOTIF_INCLUDES],
 [AC_CACHE_VAL([xdvi_cv_motif_include],
-[
-xdvi_motif_save_LIBS="$LIBS"
-xdvi_motif_save_CFLAGS="$CFLAGS"
-xdvi_motif_save_CPPFLAGS="$CPPFLAGS"
-xdvi_motif_save_LDFLAGS="$LDFLAGS"
+[xdvi_motif_save_CFLAGS=$CFLAGS
+xdvi_motif_save_CPPFLAGS=$CPPFLAGS
 #
-LIBS="$X_PRE_LIBS -lXm -lXt -lX11 $X_EXTRA_LIBS $LIBS"
 CFLAGS="$X_CFLAGS $CFLAGS"
 CPPFLAGS="$X_CFLAGS $CPPFLAGS"
-LDFLAGS="$X_LIBS $LDFLAGS"
 #
-AC_TRY_COMPILE([#include <Xm/Xm.h>],[int a;],
-[
-# Xm/Xm.h is in the standard search path.
-xdvi_cv_motif_include=
-],
-[
-# Xm/Xm.h is not in the standard search path.
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <Xm/Xm.h>]],
+                                   [[int a;]])],
+                  [# Xm/Xm.h is in the standard search path.
+                   xdvi_cv_motif_include=default],
+                  [# Xm/Xm.h is not in the standard search path.
+                   xdvi_cv_motif_include=no
 # Locate it and put its directory in `motif_include'
 #
 # /usr/include/Motif* are used on HP-UX (Motif).
@@ -129,21 +136,14 @@ for dir in "$x_includes" "${prefix}/include" /usr/include /usr/local/include \
 	   "${prefix}"/*/include /usr/*/include /usr/local/*/include \
 	   "${prefix}"/include/* /usr/include/* /usr/local/include/*; do
     if test -f "$dir/Xm/Xm.h"; then
-        xdvi_cv_motif_include="$dir"
+        xdvi_cv_motif_include=$dir
         break
     fi
-done
-if test "$xdvi_cv_motif_include" = ""; then
-xdvi_cv_motif_include=no
-fi
-])
+done])
 #
-LIBS="$xdvi_motif_save_LIBS"
-CFLAGS="$xdvi_motif_save_CFLAGS"
-CPPFLAGS="$xdvi_motif_save_CPPFLAGS"
-LDFLAGS="$xdvi_motif_save_LDFLAGS"
-])
-motif_include="$xdvi_cv_motif_include"
+CFLAGS=$xdvi_motif_save_CFLAGS
+CPPFLAGS=$xdvi_motif_save_CPPFLAGS])
+motif_include=$xdvi_cv_motif_include
 ]) # _XDVI_FIND_MOTIF_INCLUDES
 
 # _XDVI_FIND_MOTIF_LIBRARIES
@@ -151,29 +151,25 @@ motif_include="$xdvi_cv_motif_include"
 # Search the Xm library.
 m4_define([_XDVI_FIND_MOTIF_LIBRARIES],
 [AC_CACHE_VAL([xdvi_cv_motif_libdir],
-[
-xdvi_motif_save_LIBS="$LIBS"
-xdvi_motif_save_CFLAGS="$CFLAGS"
-xdvi_motif_save_CPPFLAGS="$CPPFLAGS"
-xdvi_motif_save_LDFLAGS="$LDFLAGS"
+[xdvi_motif_save_LIBS=$LIBS
+xdvi_motif_save_CFLAGS=$CFLAGS
+xdvi_motif_save_CPPFLAGS=$CPPFLAGS
+xdvi_motif_save_LDFLAGS=$LDFLAGS
 #
-LIBS="$X_PRE_LIBS -lXm -lXt -lX11 $X_EXTRA_LIBS $LIBS"
+LIBS="$X_PRE_LIBS -lXm $x_xp_lib -lXt -lX11 $X_EXTRA_LIBS $LIBS"
 CFLAGS="$X_CFLAGS $CFLAGS"
 CPPFLAGS="$X_CFLAGS $CPPFLAGS"
 LDFLAGS="$X_LIBS $LDFLAGS"
 #
 # We use XtToolkitInitialize() here since it takes no arguments
 # and thus also works with a C++ compiler.
-AC_TRY_LINK(
-[#include <X11/Intrinsic.h>
-#include <Xm/Xm.h>
-],[XtToolkitInitialize();],
-[
-# libXm.a is in the standard search path.
-xdvi_cv_motif_libdir=
-],
-[
-# libXm.a is not in the standard search path.
+AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <X11/Intrinsic.h>
+#include <Xm/Xm.h>]],
+                                [[XtToolkitInitialize();]])],
+               [# libXm.a is in the standard search path.
+                xdvi_cv_motif_libdir=default],
+               [# libXm.a is not in the standard search path.
+                xdvi_cv_motif_libdir=no
 # Locate it and put its directory in `motif_libdir'
 #
 # /usr/lib/Motif* are used on HP-UX (Motif).
@@ -191,42 +187,72 @@ for dir in "$x_libraries" "${prefix}/lib" /usr/lib /usr/local/lib \
 	   "${prefix}"/*/lib /usr/*/lib /usr/local/*/lib \
 	   "${prefix}"/lib/* /usr/lib/* /usr/local/lib/*; do
     if test -d "$dir" && test "`ls $dir/libXm.* 2> /dev/null`" != ""; then
-        xdvi_cv_motif_libdir="$dir"
+        xdvi_cv_motif_libdir=$dir
         break
     fi
-done
-if test "$xdvi_cv_motif_libdir" = ""; then
-xdvi_cv_motif_libdir=no
-fi
-])
+done])
 #
-LIBS="$xdvi_motif_save_LIBS"
-CFLAGS="$xdvi_motif_save_CFLAGS"
-CPPFLAGS="$xdvi_motif_save_CPPFLAGS"
-LDFLAGS="$xdvi_motif_save_LDFLAGS"
-])
+LIBS=$xdvi_motif_save_LIBS
+CFLAGS=$xdvi_motif_save_CFLAGS
+CPPFLAGS=$xdvi_motif_save_CPPFLAGS
+LDFLAGS=$xdvi_motif_save_LDFLAGS])
 #
 motif_libdir="$xdvi_cv_motif_libdir"
 ]) # _XDVI_FIND_MOTIF_LIBRARIES
 
+# _XDVI_CHECK_MOTIF_XP
+# --------------------
+# Check if libXm (explicitly) requires libXp
+m4_define([_XDVI_CHECK_MOTIF_XP],
+[AC_CACHE_CHECK([if libXm requires libXp],
+                [xdvi_cv_motif_xp],
+[xdvi_motif_save_LIBS=$LIBS
+xdvi_motif_save_CFLAGS=$CFLAGS
+xdvi_motif_save_CPPFLAGS=$CPPFLAGS
+xdvi_motif_save_LDFLAGS=$LDFLAGS
+#
+LIBS="$X_PRE_LIBS -lXm -lXt -lX11 $X_EXTRA_LIBS $LIBS"
+CFLAGS="$X_CFLAGS $CFLAGS"
+CPPFLAGS="$X_CFLAGS $CPPFLAGS"
+LDFLAGS="$X_LIBS $LDFLAGS"
+#
+# We use XtToolkitInitialize() here since it takes no arguments
+# and thus also works with a C++ compiler.
+AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <X11/Intrinsic.h>
+#include <Xm/Xm.h>]],
+                                [[XtToolkitInitialize();]])],
+               [xdvi_cv_motif_xp=no],
+               [xdvi_cv_motif_xp=yes])
+#
+LIBS=$xdvi_motif_save_LIBS
+CFLAGS=$xdvi_motif_save_CFLAGS
+CPPFLAGS=$xdvi_motif_save_CPPFLAGS
+LDFLAGS=$xdvi_motif_save_LDFLAGS])
+if test "x$xdvi_cv_motif_xp" = xyes; then
+  x_tool_libs="$x_tool_libs $x_xp_lib"
+fi
+]) # _XDVI_CHECK_MOTIF_XP
+
 # _XDVI_CHECK_LESSTIF
 # -------------------
 # Check if using LessTif and warn if so.
 m4_define([_XDVI_CHECK_LESSTIF],
-[AC_MSG_CHECKING([for LessTif])
-save_CPPFLAGS="$CPPFLAGS"
+[AC_CACHE_CHECK([for LessTif],
+                [xdvi_cv_using_lesstif],
+[save_CPPFLAGS=$CPPFLAGS
 CPPFLAGS="$CPPFLAGS $X_CFLAGS"
-AC_TRY_COMPILE([
-#include <X11/X.h>
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <X11/X.h>
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 #include <X11/Xos.h>
 #include <X11/Intrinsic.h>
-#include <Xm/Xm.h>],[const char *p = LesstifVERSION_STRING;
-],[
-# yes, we're running LessTif
-AC_MSG_RESULT([yes])
-AC_MSG_WARN([LessTif header detected.
+#include <Xm/Xm.h>]],
+                                   [[const char *p = LesstifVERSION_STRING;]])],
+                  [xdvi_cv_using_lesstif=yes],
+                  [xdvi_cv_using_lesstif=no])
+CPPFLAGS=$save_CPPFLAGS])
+if test "x$xdvi_cv_using_lesstif" = xyes; then
+  AC_MSG_WARN([LessTif header detected.
   *****************************************************************
   * Warning: You are using LessTif instead of OpenMotif.          *
   * Some GUI elements might be broken; please see the file        *
@@ -235,33 +261,28 @@ AC_MSG_WARN([LessTif header detected.
   *                                                               *
   * for more information.                                         *
   *****************************************************************])
-],[
-# no, not running LessTif
-AC_MSG_RESULT([no])
-])
-CPPFLAGS=$save_CPPFLAGS
+fi
 ]) # _XDVI_CHECK_LESSTIF
 
 # _XDVI_CHECK_PANNER
 # ------------------
 # Check whether to compile for Motif with Xaw Panner.
 m4_define([_XDVI_CHECK_PANNER],
-[AC_MSG_CHECKING([whether to compile in panner (requires Xaw)])
-save_CPPFLAGS=$CPPFLAGS
+[AC_CACHE_CHECK([whether to compile in panner (requires Xaw)],
+                [xdvi_cv_use_xaw_panner],
+[save_CPPFLAGS=$CPPFLAGS
 CPPFLAGS="$CPPFLAGS $X_CFLAGS"
-AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
-#include <X11/X.h>
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <X11/X.h>
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 #include <X11/Xos.h>
 #include <X11/Xfuncs.h>
 #include <X11/Intrinsic.h>
 #include <X11/Xaw/Reports.h>]])],
-                 [xdvi_use_xaw_panner=yes],
-                 [xdvi_use_xaw_panner=no])
-CPPFLAGS=$save_CPPFLAGS
-AC_MSG_RESULT([$xdvi_use_xaw_panner])
-if test "x$xdvi_use_xaw_panner" = xyes; then
+                  [xdvi_cv_use_xaw_panner=yes],
+                  [xdvi_cv_use_xaw_panner=no])
+CPPFLAGS=$save_CPPFLAGS])
+if test "x$xdvi_cv_use_xaw_panner" = xyes; then
   AC_DEFINE([USE_XAW_PANNER], 1, [Define to use Xaw panner.])
 fi
 ]) # _XDVI_CHECK_PANNER
diff --git a/Build/source/texk/xdvik/m4/xdvi-find-xpm.m4 b/Build/source/texk/xdvik/m4/xdvi-find-xpm.m4
index 4a12e0c2e20..6b89c0c89f2 100644
--- a/Build/source/texk/xdvik/m4/xdvi-find-xpm.m4
+++ b/Build/source/texk/xdvik/m4/xdvi-find-xpm.m4
@@ -14,19 +14,17 @@
 # and add appropriate flags to X_CFLAGS and X_LIBS.
 AC_DEFUN([XDVI_FIND_XPM],
 [AC_REQUIRE([AC_PATH_XTRA])
-xpm_includes=
-xpm_libraries=
 AC_ARG_WITH([xpm],
             AS_HELP_STRING([--without-xpm],
                            [Do not use the Xpm library (will disable the toolbar)]))[]dnl
 AC_ARG_WITH([xpm-includes],
             AS_HELP_STRING([--with-xpm-include=DIR],
                            [Specify the location of Xpm include files]),
-            [xpm_includes=$withval])
+            [xpm_includes=$withval], [xpm_includes=])[]dnl
 AC_ARG_WITH([xpm-libraries],
             AS_HELP_STRING([--with-xpm-libdir=DIR],
                            [Specify the location of Xpm libraries]),
-            [xpm_libraries=$withval])
+            [xpm_libraries=$withval], [xpm_libraries=])[]dnl
 dnl Treat --without-xpm like
 dnl --without-xpm-includes --without-xpm-libraries.
 if test "x$with_xpm" = xno; then
@@ -40,66 +38,76 @@ AC_MSG_CHECKING([for Xpm])
 if test "x$xpm_includes" = x; then
   _XDVI_FIND_XPM_INCLUDES
 fi
-if test "x$xpm_includes" != x; then
-    if test "x$xpm_includes" = xdefault; then
-	AC_DEFINE([HAVE_X11_XPM_H], 1, [Define if you have the <X11/xpm.h> header file.])
-    elif test -f "$xpm_includes/X11/xpm.h"; then
-	AC_DEFINE([HAVE_X11_XPM_H], 1)
-    elif test -f "$xpm_includes/xpm.h"; then
-	AC_DEFINE([HAVE_XPM_H], 1,
-	          [Define if you have the <xpm.h> header file (not in X11, e.g. Solaris 5.8).])
-    fi
-fi
-#
-# Check the libraries.
-#
-if test "x$xpm_libraries" = x; then
-  _XDVI_FIND_XPM_LIBRARIES
+if test "x$xpm_includes" = xdefault; then
+  AC_DEFINE([HAVE_X11_XPM_H], 1, [Define if you have the <X11/xpm.h> header file.])
+elif test -f "$xpm_includes/X11/xpm.h"; then
+  AC_DEFINE([HAVE_X11_XPM_H], 1)
+elif test -f "$xpm_includes/xpm.h"; then
+  AC_DEFINE([HAVE_XPM_H], 1,
+            [Define if you have the <xpm.h> header file (not in X11, e.g. Solaris 5.8).])
 fi
 #
-# Add Xpm definitions to X flags
+# Add Xpm definition to X_CFLAGS (and remember previous value)
 #
-if test "x$xpm_includes" != xdefault && test "x$xpm_includes" != x \
+xdvi_xpm_save_X_CFLAGS=$X_CFLAGS
+if test "x$xpm_includes" != xdefault \
     && test "x$xpm_includes" != "x$x_includes" && test "x$xpm_includes" != xno
 then
   X_CFLAGS="-I$xpm_includes $X_CFLAGS"
 fi
 #
-if test "x$xpm_libraries" != xdefault && test "x$xpm_libraries" != x \
-    && test "x$xpm_libraries" != "x$x_libraries" && test "x$xpm_libraries" != xno
-then
-  case "$X_LIBS" in
-    *-R\ *) X_LIBS="-L$xpm_libraries -R $xpm_libraries $X_LIBS";;
-    *-R*)   X_LIBS="-L$xpm_libraries -R$xpm_libraries $X_LIBS";;
-    *)      X_LIBS="-L$xpm_libraries $X_LIBS";;
-  esac
+# Check the libraries.
+#
+if test "x$xpm_libraries" = x; then
+  _XDVI_FIND_XPM_LIBRARIES
 fi
 #
-# Now check the results of headers and libraries and set USE_XPM to 0
-# if one of them hadn't been found.
+# Report the results of headers and libraries.
+#
+xdvi_use_xpm=yes
 #
-AC_DEFINE([USE_XPM], 1, [Define if you want to use the Xpm library])
-x_xpm_libs="-lXpm"
 #
 xpm_libraries_result=$xpm_libraries
-if test "x$xpm_libraries_result" = xdefault ; then
+if test "x$xpm_libraries_result" = xdefault; then
   xpm_libraries_result="in default path"
-elif test "x$xpm_libraries_result" = xno || test "x$xpm_libraries_result" = x; then
+elif test "x$xpm_libraries_result" = xno; then
   xpm_libraries_result="(none)"
-  AC_DEFINE([USE_XPM], 0)
-  x_xpm_libs=""
+  xdvi_use_xpm=no
 fi
-AC_SUBST([x_xpm_libs])
 #
 xpm_includes_result=$xpm_includes
 if test "x$xpm_includes_result" = xdefault; then
   xpm_includes_result="in default path"
-elif test "x$xpm_includes_result" = xno || test "x$xpm_includes_result" = x; then
-  AC_DEFINE([USE_XPM], 0)
+elif test "x$xpm_includes_result" = xno; then
   xpm_includes_result="(none)"
+  xdvi_use_xpm=no
 fi
 #
 AC_MSG_RESULT([libraries $xpm_libraries_result, headers $xpm_includes_result])
+#
+if test "x$xdvi_use_xpm" = xyes; then
+  #
+  # Add Xpm definition to X_LIBS
+  #
+  if test "x$xpm_libraries" != xdefault \
+      && test "x$xpm_libraries" != "x$x_libraries" && test "x$xpm_libraries" != xno
+  then
+    case "$X_LIBS" in
+      *-R\ *) X_LIBS="-L$xpm_libraries -R $xpm_libraries $X_LIBS";;
+      *-R*)   X_LIBS="-L$xpm_libraries -R$xpm_libraries $X_LIBS";;
+      *)      X_LIBS="-L$xpm_libraries $X_LIBS";;
+    esac
+  fi
+  #
+  AC_DEFINE([USE_XPM], 1, [Define if you want to use the Xpm library])
+  x_xpm_libs="-lXpm"
+else
+  # Restore previous X_CFLAGS
+  X_CFLAGS=$xdvi_xpm_save_X_CFLAGS
+  AC_DEFINE([USE_XPM], 0)
+  x_xpm_libs=
+fi
+AC_SUBST([x_xpm_libs])
 ]) # XDVI_FIND_XPM
 
 # _XDVI_FIND_XPM_INCLUDES