output: Make building without libplot possible again.

[pspp] / configure.ac

diff --git a/configure.ac b/configure.ac
index fc4b9828e9a4d2fa286eb5db9a8f4d77836d7b07..3405c0390d00270f2999063a2fc7001b6be7e2d1 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -38,7 +38,6 @@ AC_SYS_LARGEFILE
 AC_SEARCH_LIBS([sin], [m])
 PSPP_LIBPLOT
 PSPP_LC_PAPER
-AM_CONDITIONAL(WITHCHARTS, test x"$with_libplot" != x"no")
 
 
 AC_ARG_VAR([PSPP_LDFLAGS], [linker flags to be used for linking the pspp binary only])
@@ -54,12 +53,20 @@ required_gtk_version=2.12
 if test x"$with_gui" != x"no" ; then 
   PKG_CHECK_MODULES(GTK, gtk+-2.0 >= $required_gtk_version,,
     [PSPP_REQUIRED_PREREQ([gtk+ 2.0 v$required_gtk_version or later (or use --without-gui)])])
-  PKG_CHECK_MODULES(GLADE, libglade-2.0 >= 2.6.0,,
-    [PSPP_REQUIRED_PREREQ([libglade 2.0 v2.6.0 or later (or use --without-gui)])])
 fi
 AM_CONDITIONAL(WITHGUI, test x"$with_gui" != x"no")
 
 
+PKG_CHECK_MODULES([CAIRO], [cairo >= 1.5 pango pangocairo], 
+   [HAVE_CAIRO=yes
+    CPPFLAGS="$CPPFLAGS $CAIRO_CFLAGS"
+    LIBS="$LIBPLOT_LIBS $LIBS"
+    AC_DEFINE([HAVE_CAIRO], 1,
+              [Define to 1 if Cairo and Pango are available.])],
+   [HAVE_CAIRO=no
+    PSPP_OPTIONAL_PREREQ([cairo 1.5 or later])])
+AM_CONDITIONAL([HAVE_CAIRO], [test $HAVE_CAIRO = yes])
+
 dnl Checks needed for psql reader
 
 dnl The 8.x series postgres tarballs installs with a default prefix of