From: Ben Pfaff <blp@gnu.org>
Date: Sun, 5 Aug 2007 22:16:16 +0000 (+0000)
Subject: Fix bug #16189.  Reviewed by Jason Stover.
X-Git-Tag: v0.6.0~328
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=587a0e3e681e25fdf8fd635f7944f5707f9b1868;p=pspp-builds.git

Fix bug #16189.  Reviewed by Jason Stover.
---

diff --git a/ChangeLog b/ChangeLog
index dce0df29..c4788611 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-08-05  Ben Pfaff  <blp@gnu.org>
+
+	Bug #16189.  Reviewed by Jason Stover.
+	* acinclude.m4: If -lplot doesn't work by itself, also test with
+	typical X11 libraries.X
+
 2007-07-27  Ben Pfaff  <blp@gnu.org>
 
 	Bug #19069.
diff --git a/acinclude.m4 b/acinclude.m4
index 5f358087..4201e22b 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -40,8 +40,28 @@ AC_DEFUN([PSPP_LIBPLOT],
   AC_ARG_WITH(libplot, [  --without-libplot         don't compile in support of charts (using libplot)])
 
   if test x"$with_libplot" != x"no" ; then 
-    AC_CHECK_LIB(plot, pl_newpl_r,,
-	         [PSPP_REQUIRED_PREREQ([libplot (or use --without-libplot)])])
+    # Check whether we can link against libplot without any extra libraries.
+    AC_CHECK_LIB(plot, pl_newpl_r, [LIBPLOT_LIBS="-lplot"])
+
+    # Check whether we can link against libplot if we also link X.
+    if test x"$LIBPLOT_LIBS" = x""; then
+      AC_PATH_XTRA
+      extra_libs="-lXaw -lXmu -lXt $X_PRE_LIBS -lXext -lX11 $X_EXTRA_LIBS -lm"
+      AC_CHECK_LIB(plot, pl_newpl_r,
+      		   [LIBPLOT_LIBS="-lplot $extra_libs"
+                    LDFLAGS="$LDFLAGS $X_LIBS"],,
+      		   [$extra_libs])
+    fi
+
+    # Still can't link?
+    if test x"$LIBPLOT_LIBS" = x""; then
+      PSPP_REQUIRED_PREREQ([libplot (or use --without-libplot)])
+    fi
+
+    # Set up to make everything work.
+    LIBS="$LIBPLOT_LIBS $LIBS"
+    AC_DEFINE(HAVE_LIBPLOT, 1,
+              [Define to 1 if you have the `libplot' library (-lplot).])
   fi
 ])