X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=configure.ac;h=6dae49b058554ed9564417325137cf0e1ed00107;hb=ee648635fff4fe04a9617df5c84a4bc10c60d130;hp=6c8820c7bfb51031d115a7f773948b7b131baf97;hpb=0e8ce9b60375ae15ddd8dafc27bad1cc26856b08;p=pspp-builds.git

diff --git a/configure.ac b/configure.ac
index 6c8820c7..6dae49b0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,46 +1,72 @@
 dnl Process this file with autoconf to produce a configure script.
 
 dnl Initialize.
-AX_PREREQ(2.57)
-AC_INIT(pspp, 0.4.1,bug-gnu-pspp@gnu.org)
+AX_PREREQ(2.60)
+AC_INIT(pspp, 0.4.3,bug-gnu-pspp@gnu.org)
 AC_CONFIG_HEADERS([config.h])
-AM_INIT_AUTOMAKE(1.9)
+AM_INIT_AUTOMAKE
 
 dnl Checks for programs.
 AC_GNU_SOURCE
 AC_PROG_CC
-AM_PROG_CC_C_O
-AC_PROG_RANLIB
 gl_EARLY
+AM_PROG_CC_C_O
+AC_LIBTOOL_DLOPEN
+AC_PROG_LIBTOOL
+PKG_PROG_PKG_CONFIG
 
-PSPP_ENABLE_WARNING(-Wdeclaration-after-statement)
+PSPP_ENABLE_OPTION(-Wdeclaration-after-statement)
 
 AM_CONDITIONAL(cc_is_gcc, test x"$GCC" = x"yes" )
 
-
+PSPP_CC_FOR_BUILD
 PSPP_PERL
 
 dnl Internationalization macros.
-AM_GNU_GETTEXT
-AM_GNU_GETTEXT_VERSION([0.14.5])
+AM_GNU_GETTEXT([external], [need-ngettext])
+AM_GNU_GETTEXT_VERSION([0.16.1])
 
 dnl Checks for libraries.
 AC_SYS_LARGEFILE
-AC_FUNC_FSEEKO
 AC_CHECK_LIB(m, sin)
 PSPP_LIBPLOT
+PSPP_LC_PAPER
 AM_CONDITIONAL(WITHCHARTS, test x"$with_libplot" != x"no")
 
 
-AC_ARG_WITH(gui, [  --without-gui         don't build the PSPPIRE gui])
+AC_ARG_WITH(
+  gui, 
+  [AS_HELP_STRING([--without-gui], [don't build the PSPPIRE gui])])
 
 if test x"$with_gui" != x"no" ; then 
-	PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.6.0)
-	PKG_CHECK_MODULES(GLADE, libglade-2.0)
+  PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.8.0,,
+    [PSPP_REQUIRED_PREREQ([gtk+ 2.0 v2.8.0 or later (or use --without-gui)])])
+  PKG_CHECK_MODULES(GLADE, libglade-2.0 >= 2.6.0,,
+    [PSPP_REQUIRED_PREREQ([libglade 2.0 (or use --without-gui)])])
 fi
 AM_CONDITIONAL(WITHGUI, test x"$with_gui" != x"no")
 
-PSPP_OFF_T
+
+dnl Checks needed for gnumeric reader
+gnm_support=yes;
+PKG_CHECK_MODULES(LIBXML2, libxml-2.0,,
+			   [PSPP_OPTIONAL_PREREQ([libxml2]); gnm_support=no;]);
+AC_SEARCH_LIBS(gzopen,z,,[PSPP_OPTIONAL_PREREQ([zlib]); gnm_support=no;])
+AC_CHECK_HEADERS(zlib.h,,[PSPP_OPTIONAL_PREREQ([zlib]); gnm_support=no;])
+
+if test x"$gnm_support" = x"yes" ; then 
+   AC_DEFINE([GNM_SUPPORT], 1,
+   [Define to 1 if building in support for reading Gnumeric files.])
+fi
+AM_CONDITIONAL(GNM_SUPPORT, test x"$gnm_support" = x"yes")
+
+AC_ARG_WITH(
+  gui_tools,
+  [AS_HELP_STRING([--with-gui-tools], [build the gui developer tools])])
+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_CHECK_LIB(gslcblas,main,,[PSPP_REQUIRED_PREREQ([libgslcblas])])
 AC_CHECK_LIB(gsl, gsl_cdf_chisq_Q,,[PSPP_REQUIRED_PREREQ([libgsl (version 1.4 or later)])])
@@ -51,48 +77,46 @@ AC_CHECK_HEADERS(termcap.h)
 PSPP_READLINE
 
 dnl Checks for header files.
-AC_CHECK_HEADERS([limits.h memory.h sys/stat.h sys/time.h sys/types.h \
-                  fpu_control.h sys/mman.h sys/wait.h ieeefp.h fenv.h] )
+AC_CHECK_HEADERS([sys/wait.h fpu_control.h ieeefp.h fenv.h])
 
 # For gnulib.
 gl_INIT
 
-AC_C_CONST
 AC_C_INLINE
 
 dnl  Dont use AC_TYPE_OFF_T --- it doesnt generate the HAVE_TYPE macro
 AC_CHECK_TYPES(off_t) 
-AC_CHECK_SIZEOF(float, 0)
-AC_CHECK_SIZEOF(double, 8)
-AC_CHECK_SIZEOF(long double, 0)
-
-AC_DEFINE(FPREP_IEEE754, 1,
-	[Define for machines that have IEEE 754 floating point arithmetic,
-         the most common format today.])
+AC_CHECK_SIZEOF(float)
+AC_CHECK_SIZEOF(double)
+AC_CHECK_SIZEOF(long double)
 
 AC_C_BIGENDIAN
 
-AC_FUNC_VPRINTF
-AC_CHECK_FUNCS([strchr strrchr __setfpucw isinf isnan finite getpid feholdexcept])
+AC_CHECK_FUNCS([__setfpucw fork execl execlp isinf isnan finite getpid feholdexcept fpsetmask popen round])
 
 AC_PROG_LN_S
 
-
-AM_CONDITIONAL(unix, test x"$host_os" != x"msdos" )
-AM_CONDITIONAL(msdos, test x"$host_os" = x"msdos" )
-
 dnl This is needed otherwise --with-included-gettext fails
 AH_BOTTOM([#include <locale.h>])
 
-AC_ARG_ENABLE(debug, [  --enable-debug          Turn on diagnostic features in the program])
+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
+if test "$am_cv_func_iconv" != "yes"; then
+   PSPP_REQUIRED_PREREQ([iconv (see http://www.gnu.org/software/libiconv/)])
+fi
+
 PSPP_CHECK_PREREQS
 
-AC_CONFIG_FILES([Makefile gl/Makefile intl/Makefile po/Makefile.in])
+AC_CONFIG_FILES([Makefile gl/Makefile po/Makefile.in])
 
 AC_OUTPUT
+echo "PSPP configured successfully."
 
 dnl configure.ac ends here