[Pspp-cvs] pspp INSTALL configure.ac

[John Darrington]

CVSROOT:        /sources/pspp
Module name:    pspp
Changes by:     John Darrington <jmd>   08/04/28 02:06:01

Modified files:
        .              : INSTALL configure.ac 

Log message:
        Add --without-libpq and --without-libncurses options

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/pspp/INSTALL?cvsroot=pspp&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/pspp/configure.ac?cvsroot=pspp&r1=1.81&r2=1.82

Patches:
Index: INSTALL
===================================================================
RCS file: /sources/pspp/pspp/INSTALL,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- INSTALL     19 Feb 2008 00:35:20 -0000      1.20
+++ INSTALL     28 Apr 2008 02:06:01 -0000      1.21
@@ -78,6 +78,9 @@
       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
 ==================
 
@@ -199,6 +202,12 @@
     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
 ==================

Index: configure.ac
===================================================================
RCS file: /sources/pspp/pspp/configure.ac,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -b -r1.81 -r1.82
--- configure.ac        21 Apr 2008 02:35:31 -0000      1.81
+++ configure.ac        28 Apr 2008 02:06:01 -0000      1.82
@@ -24,7 +24,7 @@
 
 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
@@ -62,13 +62,18 @@
 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])
-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.])
@@ -86,6 +91,7 @@
          AC_DEFINE([USE_SSL],1,
                    [Define to 1 if the openssl library is present.])
            ,)
+ fi
 fi
 AM_CONDITIONAL(PSQL_SUPPORT, test -n "$PG_CONFIG")
 
@@ -121,24 +127,30 @@
 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_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
+  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
+  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
+  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
-AC_CHECK_HEADERS([termcap.h])
 
 PSPP_READLINE