[Pspp-cvs] pspp ChangeLog acinclude.m4

[Ben Pfaff]

CVSROOT:        /cvsroot/pspp
Module name:    pspp
Changes by:     Ben Pfaff <blp> 07/08/05 22:16:16

Modified files:
        .              : ChangeLog acinclude.m4 

Log message:
        Fix bug #16189.  Reviewed by Jason Stover.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/pspp/ChangeLog?cvsroot=pspp&r1=1.80&r2=1.81
http://cvs.savannah.gnu.org/viewcvs/pspp/acinclude.m4?cvsroot=pspp&r1=1.11&r2=1.12

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/pspp/pspp/ChangeLog,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -b -r1.80 -r1.81
--- ChangeLog   27 Jul 2007 21:38:12 -0000      1.80
+++ ChangeLog   5 Aug 2007 22:16:16 -0000       1.81
@@ -1,3 +1,9 @@
+2007-08-05  Ben Pfaff  <address@hidden>
+
+       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  <address@hidden>
 
        Bug #19069.

Index: acinclude.m4
===================================================================
RCS file: /cvsroot/pspp/pspp/acinclude.m4,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- acinclude.m4        26 Feb 2007 04:52:23 -0000      1.11
+++ acinclude.m4        5 Aug 2007 22:16:16 -0000       1.12
@@ -40,8 +40,28 @@
   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
 ])