X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=configure.ac;h=1b501232275238a8afdaa8f4b6a315ecc203b520;hb=d4ff0e074d703dbeb8af5aa3ac470ddda5ebe301;hp=c5b14901b2e74336bd11841f2611db0b38a31715;hpb=e8a13862f469de50fd2a6499b5eb4c94f34a5975;p=pspp

diff --git a/configure.ac b/configure.ac
index c5b14901b2..1b50123227 100644
--- a/configure.ac
+++ b/configure.ac
@@ -16,6 +16,7 @@ AM_PROG_CC_C_O
 AC_LIBTOOL_WIN32_DLL
 AC_LIBTOOL_DLOPEN
 AC_PROG_LIBTOOL
+AC_HEADER_TIOCGWINSZ
 PKG_PROG_PKG_CONFIG
 m4_pattern_forbid([PKG_CHECK_MODULES])
 PSPP_CHECK_CLICKSEQUENCE
@@ -32,6 +33,11 @@ dnl Disable automatic po/ support, because PSPP provides its own po/ support.
 AC_PROVIDE([AM_PO_SUBDIRS])
 AM_GNU_GETTEXT([external], [need-ngettext])
 LIBS="$LIBINTL $LIBS"
+AC_CHECK_PROGS([MSGFMT], [msgfmt])
+if test "x$MSGFMT" = x; then
+  PSPP_REQUIRED_PREREQ([msgfmt (is usually provided with gettext)])
+fi
+
 
 dnl Checks for libraries.
 AC_SYS_LARGEFILE
@@ -90,8 +96,8 @@ if test "$with_cairo" != no && test "$with_gui" != "no"; then
   PKG_CHECK_MODULES([GTKSOURCEVIEW], [gtksourceview-3.0 >= 3.4.2], [],
     [PSPP_REQUIRED_PREREQ([gtksourceview 3.0 version 3.4.2 or later (or use --without-gui)])])
 
-  PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.32], [],
-    [PSPP_REQUIRED_PREREQ([glib 2.0 version 2.32 or later (or use --without-gui)])])
+  PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.44], [],
+    [PSPP_REQUIRED_PREREQ([glib 2.0 version 2.44 or later (or use --without-gui)])])
 
   AC_ARG_VAR([GLIB_GENMARSHAL])
   AC_CHECK_PROGS([GLIB_GENMARSHAL], [glib-genmarshal])
@@ -268,44 +274,6 @@ PKG_CHECK_MODULES([GSL], [gsl >= 1.13], [],
 
 PSPP_GSL_NEEDS_FGNU89_INLINE
 
-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 !!!
-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
-          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.])
-  fi
-  AC_CHECK_HEADERS([termcap.h])
-fi
-
 PSPP_READLINE
 
 dnl Checks for header files.