[Pspp-cvs] pspp configure.ac

[John Darrington]

CVSROOT:        /sources/pspp
Module name:    pspp
Changes by:     John Darrington <jmd>   08/04/21 02:35:31

Modified files:
        .              : configure.ac 

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

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

Patches:
Index: configure.ac
===================================================================
RCS file: /sources/pspp/pspp/configure.ac,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -b -r1.80 -r1.81
--- configure.ac        18 Apr 2008 23:44:42 -0000      1.80
+++ configure.ac        21 Apr 2008 02:35:31 -0000      1.81
@@ -65,7 +65,9 @@
 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,
@@ -119,7 +121,9 @@
 dnl try to discover it ourselves.
 dnl To confound things further, Cygwin has decided to rename ncurses5-config
 dnl to ncurses8-config !!!
-AC_CHECK_PROGS([NCURSES_CONFIG], [ncurses5-config 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])])