X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?p=pspp-builds.git;a=blobdiff_plain;f=configure.ac;h=7d33ca25daf29827ced92b991aa0e05179380989;hp=eb10e560a2d2a4362a6f17ab269855b9ade0ecee;hb=5cdb1f83c37674ee6d588bb0104729d564012ecb;hpb=f3dc389d453a81ffd3957662e287c96b3a73c4bb

diff --git a/configure.ac b/configure.ac
index eb10e560..7d33ca25 100644
--- 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.63)
-AC_INIT([GNU PSPP], [0.7.8], [bug-gnu-pspp@gnu.org], [pspp])
+AC_INIT([GNU PSPP], [0.7.9], [bug-gnu-pspp@gnu.org], [pspp])
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_TESTDIR([tests])
@@ -26,6 +26,7 @@ AC_ARG_ENABLE(
                   [Attempt to allow building against older versions of dependent libraries])])
 
 PSPP_ENABLE_OPTION(-Wdeclaration-after-statement)
+PSPP_ENABLE_WERROR
 
 AM_CONDITIONAL(cc_is_gcc, test x"$GCC" = x"yes" )
 
@@ -75,15 +76,19 @@ if test "$with_cairo" != no && test "$with_gui" != "no"; then
   PKG_CHECK_MODULES([GTK], [gtk+-2.0 >= 2.16], [],
     [PSPP_REQUIRED_PREREQ([gtk+ 2.0 version 2.16 or later (or use --without-gui)])])
 
+  PKG_CHECK_MODULES([GTKSOURCEVIEW], [gtksourceview-2.0 >= 2.2], [],
+    [PSPP_REQUIRED_PREREQ([gtksourceview 2.0 version 2.2 or later (or use --without-gui)])])
+
   AC_ARG_VAR([GLIB_GENMARSHAL])
   AC_CHECK_PROGS([GLIB_GENMARSHAL], [glib-genmarshal])
   if test "x$GLIB_GENMARSHAL" = x; then
     PSPP_REQUIRED_PREREQ([glib-genmarshal (or use --without-gui)])
   fi
 
-  gl_NEXT_HEADERS([gtk/gtk.h])
 fi
 
+gl_NEXT_HEADERS([gtk/gtk.h])
+
 dnl Checks needed for psql reader
 
 dnl The 8.x series postgres tarballs installs with a default prefix of
@@ -196,24 +201,30 @@ AC_DEFINE(
   [crc32], [gl_crc32],
   [Avoid making zlib call gnulib's crc32() instead of its own.])
 
-dnl Gnumeric support requires libxml2 and zlib.
+dnl Gnumeric and OpenDocument (read) support requires libxml2 and zlib.
 if test $HAVE_LIBXML2 = yes && test $HAVE_ZLIB = yes; then
   GNM_SUPPORT=yes
+  ODF_READ_SUPPORT=yes
   AC_DEFINE(
     [GNM_SUPPORT], [1],
     [Define to 1 if building in support for reading Gnumeric files.])
+  AC_DEFINE(
+    [ODF_READ_SUPPORT], [1],
+    [Define to 1 if building in support for reading OpenDocument files.])
 else
   GNM_SUPPORT=no
+  ODF_READ_SUPPORT=no
 fi
 AC_SUBST([GNM_SUPPORT])
+AC_SUBST([ODF_READ_SUPPORT])
 
-dnl ODT support requires libxml2.
+dnl ODF support requires libxml2 (zlib is optional).
 if test $HAVE_LIBXML2 = yes; then
   AC_DEFINE(
-    [ODT_SUPPORT], [1],
-    [Define to 1 if building in support for writing ODT files.])
+    [ODF_WRITE_SUPPORT], [1],
+    [Define to 1 if building in support for writing OpenDocument files.])
 fi
-AM_CONDITIONAL([ODT_SUPPORT], [test $HAVE_LIBXML2 = yes])
+AM_CONDITIONAL([ODF_WRITE_SUPPORT], [test $HAVE_LIBXML2 = yes])
 
 AC_ARG_WITH(
   gui_tools,
@@ -331,7 +342,7 @@ LIBS="$LIBICONV $LIBS"
 
 dnl Required by the gnulib 'relocatable-prog' module.
 dnl See doc/relocatable-maint.texi in the gnulib tree for details.
-RELOCATABLE_LIBRARY_PATH='$(libdir)'
+RELOCATABLE_LIBRARY_PATH='$(pkglibdir)'
 RELOCATABLE_STRIP=:
 
 PSPP_CHECK_PREREQS