X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=configure.ac;h=dad55e2cb032ad1b0e7ef5f57504eadfb72f2672;hb=e18dc0608fac0bf723bbdbd60389a602e9638cd8;hp=d147a97f9f802673d951f346da29c668a4ff4450;hpb=e59bf0b7b753079089d6bc4b13798216b2cb6809;p=pspp-builds.git

diff --git a/configure.ac b/configure.ac
index d147a97f..dad55e2c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -16,6 +16,7 @@ AC_LIBTOOL_DLOPEN
 AC_PROG_LIBTOOL
 PKG_PROG_PKG_CONFIG
 m4_pattern_forbid([PKG_CHECK_MODULES])
+PSPP_CHECK_CLICKSEQUENCE
 
 AC_ARG_ENABLE(
   anachronistic-dependencies, 
@@ -31,15 +32,15 @@ PSPP_PERL
 
 dnl Internationalization macros.
 AC_ARG_ENABLE(nls, [AS_HELP_STRING([--disable-nls], [do not use Native Language Support])])
-if test x"$enable_nls" != x"no"  ; then
-   AM_GNU_GETTEXT_VERSION([0.17])
-   AC_DEFINE(ENABLE_NLS, 1, [Define to 1 if translation of program messages to the user's native language is requested.])
+if  test x"$enable_nls" != x"no"  ; then
+ AC_DEFINE(ENABLE_NLS, 1, [Define to 1 if translation of program messages to the user's native language is requested.])
 fi
 
 
 dnl Checks for libraries.
 AC_SYS_LARGEFILE
 AC_SEARCH_LIBS([sin], [m])
+AC_SEARCH_LIBS([dcgettext], [intl])
 PSPP_LIBPLOT
 PSPP_LC_PAPER
 AM_CONDITIONAL(WITHCHARTS, test x"$with_libplot" != x"no")
@@ -58,6 +59,8 @@ required_gtk_version=2.12
 if test x"$with_gui" != x"no" ; then 
   PKG_CHECK_MODULES(GTK, gtk+-2.0 >= $required_gtk_version,,
     [PSPP_REQUIRED_PREREQ([gtk+ 2.0 v$required_gtk_version or later (or use --without-gui)])])
+  AC_PATH_PROG([XMLLINT], [xmllint], [echo], [$PATH])
+  AC_SUBST(XMLLINT)
 fi
 AM_CONDITIONAL(WITHGUI, test x"$with_gui" != x"no")
 
@@ -206,6 +209,11 @@ if test "$am_cv_func_iconv" != "yes"; then
    PSPP_REQUIRED_PREREQ([iconv (see http://www.gnu.org/software/libiconv/)])
 fi
 
+dnl Required by the gnulib 'relocatable-prog' module.
+dnl See doc/relocatable-maint.texi in the gnulib tree for details.
+RELOCATABLE_LIBRARY_PATH='$(libdir)'
+RELOCATABLE_STRIP=:
+
 PSPP_CHECK_PREREQS
 
 AC_CONFIG_FILES([Makefile gl/Makefile])