X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=configure.ac;h=fec518d4f70da80657395c5883cd9381944a0dfb;hb=11d2ffde279bad43d0c271f7fbfad383969e063f;hp=7e518cbf089170c47c050b9e8e5fdfad0938a36e;hpb=393668423c1c9456fd82db6b30f25de078915da5;p=pspp-builds.git

diff --git a/configure.ac b/configure.ac
index 7e518cbf..fec518d4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,15 +9,17 @@ AM_INIT_AUTOMAKE(1.9)
 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
 
-PSPP_ENABLE_WARNING(-Wdeclaration-after-statement)
+PSPP_ENABLE_OPTION(-Wdeclaration-after-statement)
+PSPP_ENABLE_OPTION(-mieee)
 
 AM_CONDITIONAL(cc_is_gcc, test x"$GCC" = x"yes" )
 
-
+PSPP_CC_FOR_BUILD
 PSPP_PERL
 
 dnl Internationalization macros.
@@ -40,6 +42,12 @@ if test x"$with_gui" != x"no" ; then
 fi
 AM_CONDITIONAL(WITHGUI, test x"$with_gui" != x"no")
 
+AC_ARG_WITH(gui_tools, [  --with-gui-tools          build the gui developer tools])
+if test x"$with_gui_tools" = x"yes" ; then 
+	PKG_CHECK_MODULES(GLADE_UI, libgladeui-1.0)
+fi
+AM_CONDITIONAL(WITH_GUI_TOOLS, test x"$with_gui_tools" = x"yes")
+
 PSPP_OFF_T
 
 AC_CHECK_LIB(gslcblas,main,,[PSPP_REQUIRED_PREREQ([libgslcblas])])
@@ -73,14 +81,10 @@ AC_DEFINE(FPREP_IEEE754, 1,
 AC_C_BIGENDIAN
 
 AC_FUNC_VPRINTF
-AC_CHECK_FUNCS([strchr strrchr __setfpucw isinf isnan finite getpid feholdexcept])
+AC_CHECK_FUNCS([__setfpucw execl fork isinf isnan finite getpid feholdexcept fpsetmask popen round trunc])
 
 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>])
 
@@ -89,6 +93,11 @@ 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])