output: Make outp_parse_options slightly more general-purpose.

[pspp-builds.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index aa1cb6f5fdc10965fec6892bd454462abcc4ebcc..00e7e9f0a0a9e280fadbeb6dc466c82cad05ba3f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script.
 
 dnl Initialize.
 AC_PREREQ(2.60)
-AC_INIT([pspp],[0.7.1],[bug-gnu-pspp@gnu.org])
+AC_INIT([pspp],[0.7.2],[bug-gnu-pspp@gnu.org])
 AC_CONFIG_HEADERS([config.h])
 AM_INIT_AUTOMAKE
 
@@ -54,12 +54,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.8 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.8 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