[Pspp-cvs] pspp configure.ac

[John Darrington]

CVSROOT:        /sources/pspp
Module name:    pspp
Changes by:     John Darrington <jmd>   08/05/09 11:54:55

Modified files:
        .              : configure.ac 

Log message:
        Debian ships a package which provides ncurses5-config but no header 
files.
        Work around this (buggy) situation.

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

Patches:
Index: configure.ac
===================================================================
RCS file: /sources/pspp/pspp/configure.ac,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -b -r1.82 -r1.83
--- configure.ac        28 Apr 2008 02:06:01 -0000      1.82
+++ configure.ac        9 May 2008 11:54:55 -0000       1.83
@@ -139,12 +139,17 @@
          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`
+          old_cflags=$CFLAGS
+          CFLAGS=$CFLAGS `$NCURSES_CONFIG --cflags`
+         AC_CHECK_HEADERS([term.h curses.h],[curses_available=yes])
+         CFLAGS=$old_cflags
+         if test x"$curses_available" = x"yes" ; then
          NCURSES_LIBS=`$NCURSES_CONFIG --libs`
+          NCURSES_CFLAGS=`$NCURSES_CONFIG --cflags`
          AC_SUBST(NCURSES_CFLAGS)
          AC_SUBST(NCURSES_LIBS)
   fi
+  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.])