X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=configure.ac;h=d574b892090f051707a9595046e67e400609f447;hb=449346bb0204b7193666295242d751ba3ce0dd4f;hp=e50a4983ea43e58029019ba73f01ebee417ae2f1;hpb=e04c680aae366f5af85cd50776875fcdf3c8927a;p=pspp

diff --git a/configure.ac b/configure.ac
index e50a4983ea..d574b89209 100644
--- a/configure.ac
+++ b/configure.ac
@@ -18,7 +18,7 @@ dnl Process this file with autoconf to produce a configure script.
 
 dnl Initialize.
 AC_PREREQ(2.63)
-AC_INIT([GNU PSPP], [1.0.0], [bug-gnu-pspp@gnu.org], [pspp])
+AC_INIT([GNU PSPP], [1.1.0], [bug-gnu-pspp@gnu.org], [pspp])
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_TESTDIR([tests])
@@ -106,14 +106,17 @@ if test "$with_cairo" != no && test "$with_gui" != "no"; then
   PKG_CHECK_MODULES([GTHREAD], [gthread-2.0], [],
     [PSPP_REQUIRED_PREREQ([gthread 2.0 (or use --without-gui)])])
 
-  PKG_CHECK_MODULES([GTK], [gtk+-3.0 >= 3.14.5], [],
-    [PSPP_REQUIRED_PREREQ([gtk+ 3.0 version 3.14.5 or later (or use --without-gui)])])
+  PKG_CHECK_MODULES([GTK], [gtk+-3.0 >= 3.18.0], [],
+    [PSPP_REQUIRED_PREREQ([gtk+ 3.0 version 3.18.0 or later (or use --without-gui)])])
 
   PKG_CHECK_MODULES([GTKSOURCEVIEW], [gtksourceview-3.0 >= 3.4.2], [],
     [PSPP_REQUIRED_PREREQ([gtksourceview 3.0 version 3.4.2 or later (or use --without-gui)])])
 
-  PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.32], [],
-    [PSPP_REQUIRED_PREREQ([glib 2.0 version 2.32 or later (or use --without-gui)])])
+  PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.44], [],
+    [PSPP_REQUIRED_PREREQ([glib 2.0 version 2.44 or later (or use --without-gui)])])
+
+  PKG_CHECK_MODULES([SPREAD_SHEET_WIDGET], [spread-sheet-widget >= 0.3], [],
+    [PSPP_REQUIRED_PREREQ([spread-sheet-widget 0.3 (or use --without-gui)])])
 
   AC_ARG_VAR([GLIB_GENMARSHAL])
   AC_CHECK_PROGS([GLIB_GENMARSHAL], [glib-genmarshal])
@@ -213,10 +216,7 @@ AC_SUBST([PSQL_SUPPORT])
 
 dnl Check for libxml2
 PKG_CHECK_MODULES(
-  [LIBXML2], [libxml-2.0], 
-  [HAVE_LIBXML2=yes],
-  [HAVE_LIBXML2=no
-   PSPP_OPTIONAL_PREREQ([libxml2])])
+  [LIBXML2], [libxml-2.0], [], [PSPP_REQUIRED_PREREQ([libxml2])])
 
 dnl Check for zlib.
 AC_SEARCH_LIBS([gzopen], [z], [], [PSPP_REQUIRED_PREREQ([zlib])])
@@ -234,31 +234,6 @@ AC_DEFINE(
   [crc32], [gl_crc32],
   [Avoid making zlib call gnulib's crc32() instead of its own.])
 
-dnl Gnumeric and OpenDocument (read) support requires libxml2 and zlib.
-if test $HAVE_LIBXML2 = yes; then
-  GNM_READ_SUPPORT=yes
-  ODF_READ_SUPPORT=yes
-  AC_DEFINE(
-    [GNM_READ_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_READ_SUPPORT=no
-  ODF_READ_SUPPORT=no
-fi
-AC_SUBST([GNM_READ_SUPPORT])
-AC_SUBST([ODF_READ_SUPPORT])
-
-dnl ODF support requires libxml2 (zlib is optional).
-if test $HAVE_LIBXML2 = yes; then
-  AC_DEFINE(
-    [ODF_WRITE_SUPPORT], [1],
-    [Define to 1 if building in support for writing OpenDocument files.])
-fi
-AM_CONDITIONAL([ODF_WRITE_SUPPORT], [test $HAVE_LIBXML2 = yes])
-
 AC_ARG_WITH(
   gui_tools,
   [AS_HELP_STRING([--with-gui-tools], [build the gui developer tools.  For DEVELOPERS only! There is no reason why users will need this flag.])])