Fix up build following dropping ulc-width-linebreaks module.

[pspp-builds.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 09a2e3e42b4b623efe46b9c049ca1480d67a1056..bcad1e011d92733a58f495b1f2f51e376acf3077 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -32,10 +32,9 @@ AM_CONDITIONAL(cc_is_gcc, test x"$GCC" = x"yes" )
 PSPP_CC_FOR_BUILD
 PSPP_PERL
 
-dnl Internationalization macros.
-AC_PROVIDE([AM_PO_SUBDIRS])    # PSPP provides its own po/ support.
-AM_GNU_GETTEXT([external], [need-ngettext])
-AM_GNU_GETTEXT_VERSION([0.17])
+dnl Disable automatic po/ support, because PSPP provides its own po/ support.
+AC_PROVIDE([AM_PO_SUBDIRS])
+AM_GNU_GETTEXT_NEED([need-ngettext])
 
 dnl Checks for libraries.
 AC_SYS_LARGEFILE
@@ -303,7 +302,9 @@ gl_INIT
 
 AC_C_INLINE
 
-AC_CHECK_SIZEOF(double)
+AC_CHECK_SIZEOF([size_t])
+SIZEOF_SIZE_T=$ac_cv_sizeof_size_t
+AC_SUBST([SIZEOF_SIZE_T])
 
 AC_C_BIGENDIAN
 
@@ -320,6 +321,7 @@ if test x"$enable_debug" = x"yes"  ; then
 fi
 
 # iconv is required
+AM_ICONV
 if test "$am_cv_func_iconv" != "yes"; then
    PSPP_REQUIRED_PREREQ([iconv (see http://www.gnu.org/software/libiconv/)])
 fi