docs

[pspp] / configure.ac

diff --git a/configure.ac b/configure.ac
index d6415d0fc43c25b858b09e17604f3112c5e08588..6b8ef74edb490385992445928f7343eaa3b29ba8 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,50 +1,103 @@
+dnl PSPP - a program for statistical analysis.
+dnl Copyright (C) 2017, 2021 Free Software Foundation, Inc.
+dnl
+dnl This program is free software: you can redistribute it and/or modify
+dnl it under the terms of the GNU General Public License as published by
+dnl the Free Software Foundation, either version 3 of the License, or
+dnl (at your option) any later version.
+dnl
+dnl This program is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+dnl GNU General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU General Public License
+dnl along with this program.  If not, see <http://www.gnu.org/licenses/>.
+dnl

 dnl Process this file with autoconf to produce a configure script.
 
 dnl Initialize.
 dnl Process this file with autoconf to produce a configure script.
 
 dnl Initialize.

-AC_PREREQ(2.63)
-AC_INIT([GNU PSPP], [0.7.5], [bug-gnu-pspp@gnu.org], [pspp])
+AC_PREREQ(2.64)
+AC_INIT([GNU PSPP], [1.6.0], [bug-gnu-pspp@gnu.org], [pspp])

 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_TESTDIR([tests])
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_TESTDIR([tests])

-AM_INIT_AUTOMAKE
+AM_INIT_AUTOMAKE([tar-ustar info-in-builddir])

 
 dnl Checks for programs.
 AC_GNU_SOURCE
 AC_PROG_CC
 gl_EARLY
 
 dnl Checks for programs.
 AC_GNU_SOURCE
 AC_PROG_CC
 gl_EARLY

+if test x"$cross_compiling" = x"yes"; then
+   if test x"$srcdir" = x"."; then
+      AC_ERROR([Cross compiling must be done out of source.])
+   fi
+fi
+

 AM_PROG_CC_C_O
 AC_LIBTOOL_WIN32_DLL
 AC_LIBTOOL_DLOPEN
 AC_PROG_LIBTOOL
 AM_PROG_CC_C_O
 AC_LIBTOOL_WIN32_DLL
 AC_LIBTOOL_DLOPEN
 AC_PROG_LIBTOOL

+AC_HEADER_TIOCGWINSZ
+
+AC_CHECK_SIZEOF([ptrdiff_t])
+binary_width=`expr 8 '*' $ac_cv_sizeof_ptrdiff_t`
+AC_SUBST([binary_width])
+
+

 PKG_PROG_PKG_CONFIG
 m4_pattern_forbid([PKG_CHECK_MODULES])
 PSPP_CHECK_CLICKSEQUENCE
 PKG_PROG_PKG_CONFIG
 m4_pattern_forbid([PKG_CHECK_MODULES])
 PSPP_CHECK_CLICKSEQUENCE

-
-AC_ARG_ENABLE(
-  anachronistic-dependencies, 
-  [AS_HELP_STRING([--enable-anachronistic-dependencies], 
-                  [Attempt to allow building against older versions of dependent libraries])])
-
-PSPP_ENABLE_OPTION(-Wdeclaration-after-statement)
+PSPP_CHECK_MAKEINFO_DOCBOOK_XML
+PSPP_CHECK_DOT
+
+PSPP_ENABLE_WERROR
+PSPP_ENABLE_OPTION([-Wall])
+PSPP_ENABLE_OPTION([-Wextra])
+PSPP_ENABLE_OPTION([-Wwrite-strings])
+PSPP_ENABLE_OPTION([-Wstrict-prototypes])
+PSPP_ENABLE_OPTION([-Wpointer-arith])
+PSPP_ENABLE_OPTION([-Wno-sign-compare])
+PSPP_ENABLE_OPTION([-Wmissing-prototypes])

 
 AM_CONDITIONAL(cc_is_gcc, test x"$GCC" = x"yes" )
 
 AM_CONDITIONAL(cc_is_gcc, test x"$GCC" = x"yes" )

+AM_CONDITIONAL(host_is_w32, [case $host_os in mingw*) true;; *) false;; esac] )

 
 

-PSPP_CC_FOR_BUILD

 PSPP_PERL
 PSPP_PERL

-
-dnl Internationalization macros.
-AC_PROVIDE([AM_PO_SUBDIRS])    # PSPP provides its own po/ support.
+PSPP_PYTHON3
+AC_CHECK_PROGS([TEX], [tex], [no])
+AC_SUBST([TEX])
+
+# This suppresses an error in gl/careadlinkat.c that otherwise can't be
+# avoided in GCC 10.x:
+#   ../../gl/careadlinkat.c: In function ‘careadlinkat’:
+#   cc1: error: function may return address of local variable
+CFLAGS="$CFLAGS -DGCC_LINT"
+
+dnl Disable automatic po/ support, because PSPP provides its own po/ support.
+AC_PROVIDE([AM_PO_SUBDIRS])

 AM_GNU_GETTEXT([external], [need-ngettext])
 AM_GNU_GETTEXT([external], [need-ngettext])

-AM_GNU_GETTEXT_VERSION([0.17])
-if test -n "$LIBINTL"; then
-  AC_DEFINE([DEPENDS_ON_LIBINTL], [1], 
-    [Define to 1 if libintl is a separate library, not integrated into libc])
+
+LIBS="$LIBINTL $LIBS"
+AC_CHECK_PROGS([MSGFMT], [msgfmt])
+if test "x$MSGFMT" = x; then
+  PSPP_REQUIRED_PREREQ([msgfmt (is usually provided with gettext)])
+fi
+
+AC_CHECK_PROGS([XGETTEXT], [xgettext])
+if test "x$XGETTEXT" = x; then
+  PSPP_REQUIRED_PREREQ([xgettext (is usually provided with gettext)])
+fi
+
+PSPP_CHECK_XGETTEXT
+
+if test "$pspp_cv_progrecent_xgettext"  != "yes"; then
+   PSPP_REQUIRED_PREREQ([xgettext version 0.20 or greater])

 fi
 
 dnl Checks for libraries.
 AC_SYS_LARGEFILE
 AC_SEARCH_LIBS([sin], [m])
 fi
 
 dnl Checks for libraries.
 AC_SYS_LARGEFILE
 AC_SEARCH_LIBS([sin], [m])

-AC_SEARCH_LIBS([dcgettext], [intl])

 PSPP_LC_PAPER
 
 
 PSPP_LC_PAPER
 
 


@@ -52,41 +105,59 @@ AC_ARG_VAR([PSPP_LDFLAGS], [linker flags to be used for linking the pspp binary
 AC_ARG_VAR([PSPPIRE_LDFLAGS], [linker flags to be used for linking the psppire binary only])
 
 # Support for Cairo and Pango.
 AC_ARG_VAR([PSPPIRE_LDFLAGS], [linker flags to be used for linking the psppire binary only])
 
 # Support for Cairo and Pango.

-AC_ARG_WITH([cairo],
-  [AS_HELP_STRING(
-    [--without-cairo], 
-    [Don't build support for charts (using Cairo and Pango);
-     implies --without-gui])],
-  [], [with_cairo=yes])
-AM_CONDITIONAL([HAVE_CAIRO], [test "$with_cairo" != no])
-if test "$with_cairo" != no; then
-  PKG_CHECK_MODULES([CAIRO], [cairo >= 1.5 pango >= 1.20 pangocairo], 
-    [CPPFLAGS="$CPPFLAGS $CAIRO_CFLAGS"
-     AC_DEFINE([HAVE_CAIRO], 1, 
-       [Define to 1 if Cairo and Pango are available.])],
-    [PSPP_REQUIRED_PREREQ([cairo 1.5 or later and pango 1.20 or later (or use --without-cairo)])])
-  AC_PATH_PROG([XMLLINT], [xmllint], [echo], [$PATH])
-  AC_SUBST(XMLLINT)
-fi
+PKG_CHECK_MODULES([CAIRO], [cairo >= 1.5 pango >= 1.22 pangocairo],
+  [CPPFLAGS="$CPPFLAGS $CAIRO_CFLAGS"],
+  [PSPP_REQUIRED_PREREQ([cairo 1.5 or later and pango 1.22 or later])])
+
+dnl One of the tests uses xmllint.
+AC_CACHE_CHECK([for an xmllint program which fits our needs],[ac_cv_path_XMLLINT],
+[AC_PATH_PROGS_FEATURE_CHECK([XMLLINT], [xmllint],
+  [[$ac_path_XMLLINT --version 2>&1 | $GREP XPath > /dev/null &&
+    test `$ac_path_XMLLINT --version 2>&1 | $SED 's/^.* \([0-9]*\).*/\1/'` -gt 20900 &&
+    ac_cv_path_XMLLINT=$ac_path_XMLLINT]],
+   [AC_MSG_WARN([no appropriate xmllint program found. Using a dummy (echo)]); ac_cv_path_XMLLINT=$ECHO])])
+
+AC_SUBST([XMLLINT],[$ac_cv_path_XMLLINT])

 
 # Support for GUI.
 
 # Support for GUI.

-AC_ARG_WITH([gui], 
-  [AS_HELP_STRING([--without-gui], 
+AC_ARG_WITH([gui],
+  [AS_HELP_STRING([--without-gui],

                   [Don't build the PSPPIRE GUI (using GTK+)])],
   [], [with_gui=yes])
                   [Don't build the PSPPIRE GUI (using GTK+)])],
   [], [with_gui=yes])

-AM_CONDITIONAL([HAVE_GUI], 
-               [test "$with_cairo" != no && test "$with_gui" != "no"])
-if test "$with_cairo" != no && test "$with_gui" != "no"; then
-  PKG_CHECK_MODULES([GTK], [gtk+-2.0 >= 2.16], [],
-    [PSPP_REQUIRED_PREREQ([gtk+ 2.0 version 2.16 or later (or use --without-gui)])])
+AM_CONDITIONAL([building_gui], [test "$with_gui" != "no"])
+if test "$with_gui" != "no"; then
+  PKG_CHECK_MODULES([GTHREAD], [gthread-2.0], [],
+    [PSPP_REQUIRED_PREREQ([gthread 2.0 (or use --without-gui)])])
+
+  PKG_CHECK_MODULES([GTK], [gtk+-3.0 >= 3.22.0], [],
+    [PSPP_REQUIRED_PREREQ([gtk+ 3.0 version 3.22.0 or later (or use --without-gui)])])
+
+  PKG_CHECK_MODULES([GTKSOURCEVIEW], [gtksourceview-4 >= 4.0], [],
+    [PKG_CHECK_MODULES([GTKSOURCEVIEW], [gtksourceview-3.0 >= 3.4.2], [],
+      [PSPP_REQUIRED_PREREQ([gtksourceview 4.x or gtksourceview 3.x version 3.4.2 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)])])
+
+  PKG_CHECK_MODULES([SPREAD_SHEET_WIDGET], [spread-sheet-widget >= 0.7], [],
+    [PSPP_REQUIRED_PREREQ([spread-sheet-widget 0.7 (or use --without-gui)])])
+  PKG_CHECK_VAR([SPREAD_SHEET_WIDGET_LIBDIR], [spread-sheet-widget], [libdir])

 
   AC_ARG_VAR([GLIB_GENMARSHAL])
   AC_CHECK_PROGS([GLIB_GENMARSHAL], [glib-genmarshal])
   if test "x$GLIB_GENMARSHAL" = x; then
     PSPP_REQUIRED_PREREQ([glib-genmarshal (or use --without-gui)])
   fi
 
   AC_ARG_VAR([GLIB_GENMARSHAL])
   AC_CHECK_PROGS([GLIB_GENMARSHAL], [glib-genmarshal])
   if test "x$GLIB_GENMARSHAL" = x; then
     PSPP_REQUIRED_PREREQ([glib-genmarshal (or use --without-gui)])
   fi

+
+  AC_CHECK_PROGS([GLIB_COMPILE_RESOURCES], [glib-compile-resources])
+  if test "x$GLIB_COMPILE_RESOURCES" = x; then
+    PSPP_REQUIRED_PREREQ([glib-compile-resources (or use --without-gui)])
+  fi
+

 fi
 
 fi
 

+gl_NEXT_HEADERS([gtk/gtk.h])
+

 dnl Checks needed for psql reader
 
 dnl The 8.x series postgres tarballs installs with a default prefix of
 dnl Checks needed for psql reader
 
 dnl The 8.x series postgres tarballs installs with a default prefix of


@@ -96,27 +167,27 @@ dnl If the libpq.so file is in a non standard path, (one which the linker
 dnl doesn't search) then we must set the PG_LDFLAGS to -R/usr/wherever/
 dnl However, if the system happens to have more than one version of other
 dnl dependent libraries (eg. libgtk) in different standard paths. (eg:
 dnl doesn't search) then we must set the PG_LDFLAGS to -R/usr/wherever/
 dnl However, if the system happens to have more than one version of other
 dnl dependent libraries (eg. libgtk) in different standard paths. (eg:

-dnl /usr and /usr/local) then the wrong one may get linked. 
+dnl /usr and /usr/local) then the wrong one may get linked.

 
 dnl To overcome this, we first check for libpq in the standard places, and
 dnl only set PG_LDFLAGS if it's not found.
 
 
 AC_ARG_WITH(
 
 dnl To overcome this, we first check for libpq in the standard places, and
 dnl only set PG_LDFLAGS if it's not found.
 
 
 AC_ARG_WITH(

-  libpq, 
+  libpq,

   [AS_HELP_STRING([--without-libpq], [don't compile in Postgres capability])])
   [AS_HELP_STRING([--without-libpq], [don't compile in Postgres capability])])

-AC_ARG_VAR([PG_CONFIG], 
+AC_ARG_VAR([PG_CONFIG],

            [Full pathname of the pg_config program shipped with Postgresql])
            [Full pathname of the pg_config program shipped with Postgresql])

-AC_PATH_PROG([PG_CONFIG], [pg_config], [], 
+AC_PATH_PROG([PG_CONFIG], [pg_config], [],

              [$PATH:/usr/local/pgsql/bin:/usr/pgsql/bin])
 
              [$PATH:/usr/local/pgsql/bin:/usr/pgsql/bin])
 

-if test x"$with_libpq" != x"no" && test -n "$PG_CONFIG" ; then 
+if test x"$with_libpq" != x"no" && test -n "$PG_CONFIG" ; then

   AC_SUBST(PG_CONFIG)
   AC_SUBST(PG_CONFIG)

-  PG_CFLAGS=-I`$PG_CONFIG --includedir` 
+  PG_CFLAGS=-I`$PG_CONFIG --includedir`

   AC_SUBST(PG_CFLAGS)
 
   AC_CHECK_LIB([pq], [PQexec],
   AC_SUBST(PG_CFLAGS)
 
   AC_CHECK_LIB([pq], [PQexec],

-     [:], 
+     [:],

      [PG_LDFLAGS="-L`$PG_CONFIG --libdir` -R`$PG_CONFIG --libdir`"])
   AC_SUBST(PG_LDFLAGS)
 
      [PG_LDFLAGS="-L`$PG_CONFIG --libdir` -R`$PG_CONFIG --libdir`"])
   AC_SUBST(PG_LDFLAGS)
 


@@ -151,38 +222,30 @@ if test x"$with_libpq" != x"no" && test -n "$PG_CONFIG" ; then
      LDFLAGS=$save_LDFLAGS])
 
   if test $pspp_cv_have_libpq = yes; then
      LDFLAGS=$save_LDFLAGS])
 
   if test $pspp_cv_have_libpq = yes; then

+    PSQL_SUPPORT=yes

     AC_DEFINE([PSQL_SUPPORT], [1],
       [Define to 1 if building in support for reading from postgres
        databases.])
   else
     AC_DEFINE([PSQL_SUPPORT], [1],
       [Define to 1 if building in support for reading from postgres
        databases.])
   else

+    PSQL_SUPPORT=no

     PG_CONFIG=
     PG_CFLAGS=
     PG_LDFLAGS=
     PG_LIBS=
   fi
 else
     PG_CONFIG=
     PG_CFLAGS=
     PG_LDFLAGS=
     PG_LIBS=
   fi
 else

+  PSQL_SUPPORT=no

   pspp_cv_have_libpq=no
 fi
   pspp_cv_have_libpq=no
 fi

-AM_CONDITIONAL(PSQL_SUPPORT, test $pspp_cv_have_libpq = yes)
+AC_SUBST([PSQL_SUPPORT])

 
 dnl Check for libxml2
 PKG_CHECK_MODULES(
 
 dnl Check for libxml2
 PKG_CHECK_MODULES(

-  [LIBXML2], [libxml-2.0], 
-  [HAVE_LIBXML2=yes],
-  [HAVE_LIBXML2=no
-   PSPP_OPTIONAL_PREREQ([libxml2])])
+  [LIBXML2], [libxml-2.0], [], [PSPP_REQUIRED_PREREQ([libxml2])])

 
 dnl Check for zlib.
 
 dnl Check for zlib.

-AC_SEARCH_LIBS(
-  [gzopen], [z],
-  [HAVE_ZLIB=yes],
-  [HAVE_ZLIB=no
-   PSPP_OPTIONAL_PREREQ([zlib])])
-AC_CHECK_HEADERS(
-  [zlib.h], 
-  [],
-  [HAVE_ZLIB=no
-   PSPP_OPTIONAL_PREREQ([zlib])])
+AC_SEARCH_LIBS([gzopen], [z], [], [PSPP_REQUIRED_PREREQ([zlib])])
+AC_CHECK_HEADERS([zlib.h], [], [PSPP_REQUIRED_PREREQ([zlib])])

 
 dnl Avoid interference between zlib's crc32() function and gnulib's
 dnl crc32() function, which have different signatures.  PSPP calls
 
 dnl Avoid interference between zlib's crc32() function and gnulib's
 dnl crc32() function, which have different signatures.  PSPP calls


@@ -196,132 +259,65 @@ AC_DEFINE(
   [crc32], [gl_crc32],
   [Avoid making zlib call gnulib's crc32() instead of its own.])
 
   [crc32], [gl_crc32],
   [Avoid making zlib call gnulib's crc32() instead of its own.])
 

-dnl Gnumeric support requires libxml2 and zlib.
-if test $HAVE_LIBXML2 = yes && test $HAVE_ZLIB = yes; then
-  GNM_SUPPORT=yes
-  AC_DEFINE(
-    [GNM_SUPPORT], [1],
-    [Define to 1 if building in support for reading Gnumeric files.])
-else
-  GNM_SUPPORT=no
-fi
-AM_CONDITIONAL([GNM_SUPPORT], [test $GNM_SUPPORT = yes])
-
-dnl ODT support requires libxml2.
-if test $HAVE_LIBXML2 = yes; then
-  AC_DEFINE(
-    [ODT_SUPPORT], [1],
-    [Define to 1 if building in support for writing ODT files.])
-fi
-AM_CONDITIONAL([ODT_SUPPORT], [test $HAVE_LIBXML2 = yes])
-
-AC_ARG_WITH(
-  gui_tools,
-  [AS_HELP_STRING([--with-gui-tools], [build the gui developer tools.  For DEVELOPERS only! There is no reason why users will need this flag.])])
-if test x"$with_gui_tools" = x"yes" ; then 
-       PKG_CHECK_MODULES(GLADE_UI, gladeui-1.0)
-fi
-AM_CONDITIONAL(WITH_GUI_TOOLS, test x"$with_gui_tools" = x"yes")
-
-AC_ARG_WITH(
-  [perl-module],
-  [AS_HELP_STRING([--without-perl-module], [do not build the Perl module])],
-  [case $with_perl_module in # (
-     yes|no) ;; # (
-     *) AC_MSG_FAILURE([--with-perl-module argument must be 'yes' or 'no']) ;;
-   esac
-   WITH_PERL_MODULE=$with_perl_module],
-  [if test x"$cross_compiling" != x"yes"; then
-     WITH_PERL_MODULE=yes
-   else
-     WITH_PERL_MODULE=no
-   fi])
-AC_SUBST([WITH_PERL_MODULE])
-AM_CONDITIONAL(WITH_PERL_MODULE, test $WITH_PERL_MODULE = yes)
+PSPP_PERL_MODULE

 
 AC_SEARCH_LIBS([cblas_dsdot], [gslcblas],,[PSPP_REQUIRED_PREREQ([libgslcblas])])
 
 AC_SEARCH_LIBS([cblas_dsdot], [gslcblas],,[PSPP_REQUIRED_PREREQ([libgslcblas])])

-PKG_CHECK_MODULES([GSL], [gsl >= 1.12], [], [PSPP_REQUIRED_PREREQ([gsl 2.0 version 1.12 or later])])
-
-PSPP_GSL_NEEDS_FGNU89_INLINE
+PKG_CHECK_MODULES([GSL], [gsl >= 1.13], [],
+                        AC_SEARCH_LIBS([gsl_poly_eval_derivs], [gsl],,[PSPP_REQUIRED_PREREQ([gsl version 1.13 or later])]))

 
 

-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_GSL_NEEDS_FGNU89_INLINE

 
 PSPP_READLINE
 
 dnl Checks for header files.
 AC_CHECK_HEADERS([sys/wait.h fpu_control.h ieeefp.h fenv.h pwd.h])
 
 
 PSPP_READLINE
 
 dnl Checks for header files.
 AC_CHECK_HEADERS([sys/wait.h fpu_control.h ieeefp.h fenv.h pwd.h])
 

+dnl Some systems don't have SIGWINCH
+AC_CHECK_DECLS([SIGWINCH], [], [],
+          [#include <signal.h>
+          /* NetBSD declares sys_siglist in unistd.h.  */
+          #ifdef HAVE_UNISTD_H
+          # include <unistd.h>
+          #endif
+          ])
+
+

 # For gnulib.
 gl_INIT
 
 AC_C_INLINE
 
 # For gnulib.
 gl_INIT
 
 AC_C_INLINE
 

-AC_CHECK_SIZEOF(double)
-

 AC_C_BIGENDIAN
 
 AC_C_BIGENDIAN
 

-AC_CHECK_FUNCS([__setfpucw fork execl execlp isinf isnan finite getpid feholdexcept fpsetmask popen round])
+AC_CHECK_FUNCS([__setfpucw fork execl isinf isnan finite getpid feholdexcept fpsetmask popen round])

 
 AC_PROG_LN_S
 
 
 AC_PROG_LN_S
 

-AC_ARG_ENABLE(
-  debug, 
-  [AS_HELP_STRING([--enable-debug], 
-                  [Turn on diagnostic features in the program])])
-if test x"$enable_debug" = x"yes"  ; then
-  AC_DEFINE(DEBUGGING, 1, [Define to 1 if debugging is enabled.])
-fi
-

 # iconv is required
 # 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
 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.
 
 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_LIBRARY_PATH='$(pkglibdir):$(SPREAD_SHEET_WIDGET_LIBDIR)'

 RELOCATABLE_STRIP=:
 
 PSPP_CHECK_PREREQS
 
 RELOCATABLE_STRIP=:
 
 PSPP_CHECK_PREREQS
 

+dnl The makefile needs to know if we're cross compiling, so that
+dnl it can make arrangements to build the documentation examples.
+AM_CONDITIONAL(cross_compiling, test x"$cross_compiling" = x"yes" )
+

 AC_CONFIG_FILES(
 AC_CONFIG_FILES(

-  [Makefile gl/Makefile po/Makefile tests/atlocal perl-module/lib/PSPP.pm])
+  [Makefile po/Makefile tests/atlocal perl-module/lib/PSPP.pm])
+
+AC_CONFIG_COMMANDS([doc/pspp-figures/dummy], [:])
+
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES])

 
 AC_OUTPUT
 echo "PSPP configured successfully."
 
 AC_OUTPUT
 echo "PSPP configured successfully."