X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=configure.ac;h=35337d6cbb4cfc1a124e4ecf54863970f85e00d2;hb=refs%2Fbuilds%2F20110511030502%2Fpspp;hp=bcad1e011d92733a58f495b1f2f51e376acf3077;hpb=b54a5702b6200871c8278a55d37a87e924f04eb1;p=pspp

diff --git a/configure.ac b/configure.ac
index bcad1e011d..35337d6cbb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script.
 
 dnl Initialize.
 AC_PREREQ(2.63)
-AC_INIT([GNU PSPP], [0.7.6], [bug-gnu-pspp@gnu.org], [pspp])
+AC_INIT([GNU PSPP], [0.7.8], [bug-gnu-pspp@gnu.org], [pspp])
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_TESTDIR([tests])
@@ -34,12 +34,12 @@ PSPP_PERL
 
 dnl Disable automatic po/ support, because PSPP provides its own po/ support.
 AC_PROVIDE([AM_PO_SUBDIRS])
-AM_GNU_GETTEXT_NEED([need-ngettext])
+AM_GNU_GETTEXT([external], [need-ngettext])
+LIBS="$LTLIBINTL $LIBS"
 
 dnl Checks for libraries.
 AC_SYS_LARGEFILE
 AC_SEARCH_LIBS([sin], [m])
-AC_SEARCH_LIBS([dcgettext], [intl])
 PSPP_LC_PAPER
 
 
@@ -80,6 +80,8 @@ if test "$with_cairo" != no && test "$with_gui" != "no"; then
   if test "x$GLIB_GENMARSHAL" = x; then
     PSPP_REQUIRED_PREREQ([glib-genmarshal (or use --without-gui)])
   fi
+
+  gl_NEXT_HEADERS([gtk/gtk.h])
 fi
 
 dnl Checks needed for psql reader
@@ -325,6 +327,7 @@ AM_ICONV
 if test "$am_cv_func_iconv" != "yes"; then
    PSPP_REQUIRED_PREREQ([iconv (see http://www.gnu.org/software/libiconv/)])
 fi
+LIBS="$LTLIBICONV $LIBS"
 
 dnl Required by the gnulib 'relocatable-prog' module.
 dnl See doc/relocatable-maint.texi in the gnulib tree for details.