Properly report required version of libglade.

[pspp-builds.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 708911ed6cbf00d9536fecff27b6a25726035c04..03a4b399c7aeba1ac578b15502c1b706bde84d90 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.
 AX_PREREQ(2.60)
-AC_INIT(pspp, 0.4.3,bug-gnu-pspp@gnu.org)
+AC_INIT([pspp],[0.4.3],[bug-gnu-pspp@gnu.org])
 AC_CONFIG_HEADERS([config.h])
 AM_INIT_AUTOMAKE
 
@@ -28,7 +28,7 @@ AM_GNU_GETTEXT_VERSION([0.16.1])
 
 dnl Checks for libraries.
 AC_SYS_LARGEFILE
-AC_CHECK_LIB(m, sin)
+AC_SEARCH_LIBS([sin], [m])
 PSPP_LIBPLOT
 PSPP_LC_PAPER
 AM_CONDITIONAL(WITHCHARTS, test x"$with_libplot" != x"no")
@@ -39,10 +39,10 @@ AC_ARG_WITH(
   [AS_HELP_STRING([--without-gui], [don't build the PSPPIRE gui])])
 
 if test x"$with_gui" != x"no" ; then 
-  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(GTK, gtk+-2.0 >= 2.12.0,,
+    [PSPP_REQUIRED_PREREQ([gtk+ 2.0 v2.12.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)])])
+    [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")
 
@@ -62,7 +62,7 @@ dnl To overcome this, we first check for libpq in the standard places, and
 dnl only set PG_LDFLAGS if it's not found.
 
 
-AC_CHECK_LIB([pq], [PQexec], [libpq_in_std_lib_path=yes])
+AC_SEARCH_LIBS([PQexec], [pq], [libpq_in_std_lib_path=yes])
 
 AC_ARG_VAR([PG_CONFIG], [Full pathname of the pg_config program shipped with Postgresql])
 AC_PATH_PROG([PG_CONFIG], [pg_config], [], [$PATH:/usr/local/pgsql/bin:/usr/pgsql/bin])
@@ -80,7 +80,7 @@ if test -n "$PG_CONFIG" ; then
 
    PG_LIBS=-lpq
    AC_SUBST(PG_LIBS)
-   PKG_CHECK_MODULES(OPENSSL,libssl,
+   PKG_CHECK_EXISTS(libssl,
          AC_DEFINE([USE_SSL],1,
                    [Define to 1 if the openssl library is present.])
            ,)
@@ -108,8 +108,8 @@ if test x"$with_gui_tools" = x"yes" ; then
 fi
 AM_CONDITIONAL(WITH_GUI_TOOLS, test x"$with_gui_tools" = x"yes")
 
-AC_CHECK_LIB(gslcblas,main,,[PSPP_REQUIRED_PREREQ([libgslcblas])])
-AC_CHECK_LIB(gsl, gsl_cdf_chisq_Q,,[PSPP_REQUIRED_PREREQ([libgsl (version 1.4 or later)])])
+AC_SEARCH_LIBS([cblas_dsdot], [gslcblas],,[PSPP_REQUIRED_PREREQ([libgslcblas])])
+AC_SEARCH_LIBS([gsl_cdf_chisq_Q], [gsl],,[PSPP_REQUIRED_PREREQ([libgsl (version 1.4 or later)])])
 
 AC_CHECK_LIB(ncurses, tgetent)
 AC_CHECK_HEADERS(termcap.h)