projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(close): Rename do_close to avoid naming conflict with POSIX
[pspp]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index 02ef4a5b5f4b4b8fe0cc179c7c046491c621af9e..fec518d4f70da80657395c5883cd9381944a0dfb 100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-2,22
+2,24
@@
dnl Process this file with autoconf to produce a configure script.
dnl Initialize.
AX_PREREQ(2.57)
dnl Initialize.
AX_PREREQ(2.57)
-AC_INIT(pspp, 0.4.
1
,bug-gnu-pspp@gnu.org)
+AC_INIT(pspp, 0.4.
2
,bug-gnu-pspp@gnu.org)
AC_CONFIG_HEADERS([config.h])
AM_INIT_AUTOMAKE(1.9)
dnl Checks for programs.
AC_GNU_SOURCE
AC_PROG_CC
AC_CONFIG_HEADERS([config.h])
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
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" )
AM_CONDITIONAL(cc_is_gcc, test x"$GCC" = x"yes" )
-
+PSPP_CC_FOR_BUILD
PSPP_PERL
dnl Internationalization macros.
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")
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])])
PSPP_OFF_T
AC_CHECK_LIB(gslcblas,main,,[PSPP_REQUIRED_PREREQ([libgslcblas])])
@@
-62,10
+70,6
@@
AC_C_INLINE
dnl Dont use AC_TYPE_OFF_T --- it doesnt generate the HAVE_TYPE macro
AC_CHECK_TYPES(off_t)
dnl Dont use AC_TYPE_OFF_T --- it doesnt generate the HAVE_TYPE macro
AC_CHECK_TYPES(off_t)
-AC_CHECK_SIZEOF(short, 2)
-AC_CHECK_SIZEOF(int, 4)
-AC_CHECK_SIZEOF(long, 4)
-AC_CHECK_SIZEOF(long long, 0)
AC_CHECK_SIZEOF(float, 0)
AC_CHECK_SIZEOF(double, 8)
AC_CHECK_SIZEOF(long double, 0)
AC_CHECK_SIZEOF(float, 0)
AC_CHECK_SIZEOF(double, 8)
AC_CHECK_SIZEOF(long double, 0)
@@
-77,14
+81,10
@@
AC_DEFINE(FPREP_IEEE754, 1,
AC_C_BIGENDIAN
AC_FUNC_VPRINTF
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
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>])
dnl This is needed otherwise --with-included-gettext fails
AH_BOTTOM([#include <locale.h>])
@@
-93,6
+93,11
@@
if test x"$enable_debug" = x"yes" ; then
AC_DEFINE(DEBUGGING, 1, [Define to 1 if debugging is enabled.])
fi
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])
PSPP_CHECK_PREREQS
AC_CONFIG_FILES([Makefile gl/Makefile intl/Makefile po/Makefile.in])