Update libglade version dependency

[pspp-builds.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index fec518d4f70da80657395c5883cd9381944a0dfb..f0895ce20564d883311855baedbf47069e2b662a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,10 +1,10 @@
 dnl Process this file with autoconf to produce a configure script.
 
 dnl Initialize.
-AX_PREREQ(2.57)
-AC_INIT(pspp, 0.4.2,bug-gnu-pspp@gnu.org)
+AX_PREREQ(2.60)
+AC_INIT(pspp, 0.4.3,bug-gnu-pspp@gnu.org)
 AC_CONFIG_HEADERS([config.h])
-AM_INIT_AUTOMAKE(1.9)
+AM_INIT_AUTOMAKE
 
 dnl Checks for programs.
 AC_GNU_SOURCE
@@ -15,7 +15,6 @@ AC_LIBTOOL_DLOPEN
 AC_PROG_LIBTOOL
 
 PSPP_ENABLE_OPTION(-Wdeclaration-after-statement)
-PSPP_ENABLE_OPTION(-mieee)
 
 AM_CONDITIONAL(cc_is_gcc, test x"$GCC" = x"yes" )
 
@@ -23,28 +22,31 @@ PSPP_CC_FOR_BUILD
 PSPP_PERL
 
 dnl Internationalization macros.
-AM_GNU_GETTEXT
-AM_GNU_GETTEXT_VERSION([0.14.5])
+AM_GNU_GETTEXT([external], [need-ngettext])
+AM_GNU_GETTEXT_VERSION([0.16.1])
 
 dnl Checks for libraries.
 AC_SYS_LARGEFILE
 AC_FUNC_FSEEKO
 AC_CHECK_LIB(m, sin)
 PSPP_LIBPLOT
+PSPP_LC_PAPER
 AM_CONDITIONAL(WITHCHARTS, test x"$with_libplot" != x"no")
 
 
 AC_ARG_WITH(gui, [  --without-gui         don't build the PSPPIRE gui])
 
 if test x"$with_gui" != x"no" ; then 
-       PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.6.0)
-       PKG_CHECK_MODULES(GLADE, libglade-2.0)
+  PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.8.0,,
+    [PSPP_REQUIRED_PREREQ([gtk+ 2.0 v2.8.0 or later (or use --without-gui)])])
+  PKG_CHECK_MODULES(GLADE, libglade-2.0 >= 2.6.0,,
+    [PSPP_REQUIRED_PREREQ([libglade 2.0 (or use --without-gui)])])
 fi
 AM_CONDITIONAL(WITHGUI, test x"$with_gui" != x"no")
 
 AC_ARG_WITH(gui_tools, [  --with-gui-tools          build the gui developer tools])
 if test x"$with_gui_tools" = x"yes" ; then 
-       PKG_CHECK_MODULES(GLADE_UI, libgladeui-1.0)
+       PKG_CHECK_MODULES(GLADE_UI, gladeui-1.0)
 fi
 AM_CONDITIONAL(WITH_GUI_TOOLS, test x"$with_gui_tools" = x"yes")
 
@@ -100,8 +102,9 @@ fi
 
 PSPP_CHECK_PREREQS
 
-AC_CONFIG_FILES([Makefile gl/Makefile intl/Makefile po/Makefile.in])
+AC_CONFIG_FILES([Makefile gl/Makefile po/Makefile.in])
 
 AC_OUTPUT
+echo "PSPP configured successfully."
 
 dnl configure.ac ends here