X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=configure.ac;h=eb10e560a2d2a4362a6f17ab269855b9ade0ecee;hb=e87acf42e694cfae68040f62342becc7be3909a7;hp=ac57a2a9633f62167d05dcd7af2960391c10e24a;hpb=f7a8c2b2c3c581786146159f9022c017fee76a18;p=pspp-builds.git diff --git a/configure.ac b/configure.ac index ac57a2a9..eb10e560 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.7], [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="$LIBINTL $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="$LIBICONV $LIBS" dnl Required by the gnulib 'relocatable-prog' module. dnl See doc/relocatable-maint.texi in the gnulib tree for details.