Add --without-libpq and --without-libncurses options

[pspp-builds.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 33201c795d7b5be19cfdb73caaf01cd8042194c0..fc9524b7d9deb730b6527ee49b0f4136f11e4ef5 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -24,11 +24,11 @@ PSPP_PERL
 
 dnl Internationalization macros.
 AM_GNU_GETTEXT([external], [need-ngettext])
-AM_GNU_GETTEXT_VERSION([0.16.1])
+AM_GNU_GETTEXT_VERSION([0.17])
 
 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")
@@ -42,7 +42,7 @@ if test x"$with_gui" != x"no" ; then
   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,11 +62,18 @@ 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_ARG_WITH(
+  libpq, 
+  [AS_HELP_STRING([--without-libpq], [don't compile in Postgres capability])])
+
+if test x"$with_libpq" != x"no" ; then
+ 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])
-if test -n "$PG_CONFIG" ; then 
+ AC_ARG_VAR([PG_CONFIG], [Full pathname of the pg_config program shipped with Postgresql])
+ if test x"$cross_compiling" != x"yes" ; then
+   AC_PATH_PROG([PG_CONFIG], [pg_config], [], [$PATH:/usr/local/pgsql/bin:/usr/pgsql/bin])
+ fi 
+ if test -n "$PG_CONFIG" ; then 
    AC_SUBST(PG_CONFIG)
    AC_DEFINE([PSQL_SUPPORT], 1,
    [Define to 1 if building in support for reading from postgres databases.])
@@ -84,6 +91,7 @@ if test -n "$PG_CONFIG" ; then
          AC_DEFINE([USE_SSL],1,
                    [Define to 1 if the openssl library is present.])
            ,)
+ fi
 fi
 AM_CONDITIONAL(PSQL_SUPPORT, test -n "$PG_CONFIG")
 
@@ -108,11 +116,41 @@ 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_CHECK_LIB(ncurses, tgetent)
-AC_CHECK_HEADERS(termcap.h)
+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)])])
+
+dnl Recent versions of GNU ncurses install the curses header files into
+dnl /usr/include/ncurses, and provide a 'ncurses5-config' program which
+dnl enables us to discover where they are. Earlier versions don't have
+dnl this, so we can't rely on it.  So if ncurses5-config is present,
+dnl we'll trust it to find the right information.  Otherwise, we'll
+dnl try to discover it ourselves.
+dnl To confound things further, Cygwin has decided to rename ncurses5-config
+dnl to ncurses8-config !!!
+AC_ARG_WITH(
+  libncurses, 
+  [AS_HELP_STRING([--without-libncurses], [don't compile in ncurses functions])])
+
+if test x"$with_libncurses" != x"no" ; then
+  if test x"$cross_compiling" != x"yes" ; then
+         AC_CHECK_PROGS([NCURSES_CONFIG], [ncurses5-config ncurses8-config])
+  fi
+  if test x"$NCURSES_CONFIG" = x ; then
+         AC_SEARCH_LIBS([tgetent], [ncurses],
+             [curses_available=yes; AC_CHECK_HEADERS([term.h curses.h],,[curses_available=no])])
+  else
+         curses_available=yes
+         NCURSES_CFLAGS=`$NCURSES_CONFIG --cflags`
+         NCURSES_LIBS=`$NCURSES_CONFIG --libs`
+         AC_SUBST(NCURSES_CFLAGS)
+         AC_SUBST(NCURSES_LIBS)
+  fi
+  if test x"$curses_available" = x"yes" ; then
+         AC_DEFINE([LIBNCURSES_USABLE], 1,
+             [Define to 1 if the libncurses is both present and usable.])
+  fi
+  AC_CHECK_HEADERS([termcap.h])
+fi
 
 PSPP_READLINE