Protected some tests which don't work when cross-compiling.

[pspp-builds.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index c5939e26350932c720b84fca2d177712b7a97b53..8f86a643b52ae579834a7c3de2e50d41a43ce264 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -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")
 
@@ -65,7 +65,9 @@ dnl only set PG_LDFLAGS if it's not found.
 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 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,
@@ -111,8 +113,32 @@ AM_CONDITIONAL(WITH_GUI_TOOLS, test x"$with_gui_tools" = x"yes")
 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)
+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 !!!
+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])
 
 PSPP_READLINE