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

diff --git a/INSTALL b/INSTALL
index 4997fd52b8c57f817c4f2ceb16d01ef30ec7e191..303f507055612ae2d238e917ea721e6992c78f86 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -78,6 +78,9 @@ The following packages are optional.
       later.  Installing Texinfo will allow you to build PSPP
       documentation in PostScript or PDF format.
 
       later.  Installing Texinfo will allow you to build PSPP
       documentation in PostScript or PDF format.
 

+    * libpq, from Postgresql (http://postgresql.org). This enables PSPP 
+      to read Postgresql databases.
+

 Basic Installation
 ==================
 
 Basic Installation
 ==================
 


@@ -199,6 +202,12 @@ Optional Features
     Build the gui developer tools.  There is no reason to use this
     option unless you're involved with the development of PSPP
 
     Build the gui developer tools.  There is no reason to use this
     option unless you're involved with the development of PSPP
 

+`--without-lib{xx}'
+    Optional libraries should normally be detected and the relevant
+    functionality will be built they exist.  However, on some poorly
+    configured systems a library may exist, but be totally broken.
+    In these cases you can use --without-lib{xx} to force configure
+    to disregard it.

 
 Defining Variables
 ==================
 
 Defining Variables
 ==================

diff --git a/configure.ac b/configure.ac
index 8f86a643b52ae579834a7c3de2e50d41a43ce264..fc9524b7d9deb730b6527ee49b0f4136f11e4ef5 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -24,7 +24,7 @@ PSPP_PERL
 
 dnl Internationalization macros.
 AM_GNU_GETTEXT([external], [need-ngettext])
 
 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
 
 dnl Checks for libraries.
 AC_SYS_LARGEFILE


@@ -62,13 +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.
 
 
 dnl only set PG_LDFLAGS if it's not found.
 
 

-AC_SEARCH_LIBS([PQexec], [pq], [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])
-if test x"$cross_compiling" != x"yes" ; 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])
    AC_PATH_PROG([PG_CONFIG], [pg_config], [], [$PATH:/usr/local/pgsql/bin:/usr/pgsql/bin])

-fi 
-if test -n "$PG_CONFIG" ; then 
+ 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.])
    AC_SUBST(PG_CONFIG)
    AC_DEFINE([PSQL_SUPPORT], 1,
    [Define to 1 if building in support for reading from postgres databases.])


@@ -86,6 +91,7 @@ if test -n "$PG_CONFIG" ; then
          AC_DEFINE([USE_SSL],1,
                    [Define to 1 if the openssl library is present.])
            ,)
          AC_DEFINE([USE_SSL],1,
                    [Define to 1 if the openssl library is present.])
            ,)

+ fi

 fi
 AM_CONDITIONAL(PSQL_SUPPORT, test -n "$PG_CONFIG")
 
 fi
 AM_CONDITIONAL(PSQL_SUPPORT, test -n "$PG_CONFIG")
 


@@ -121,24 +127,30 @@ 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 !!!
 dnl try to discover it ourselves.
 dnl To confound things further, Cygwin has decided to rename ncurses5-config
 dnl to ncurses8-config !!!

-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.])
+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
 fi

-AC_CHECK_HEADERS([termcap.h])

 
 PSPP_READLINE
 
 
 PSPP_READLINE