projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Implemented a dialog box for the ONEWAY command.
[pspp-builds.git]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index 9e9835e83691de5cdf8a5ee2c8154ba4b678ab91..f738c50b49f46d35c3210068ff7f177abd5c1d12 100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-1,10
+1,10
@@
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.
-AX_PREREQ(2.
57
)
-AC_INIT(pspp, 0.4.
2
,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])
AC_CONFIG_HEADERS([config.h])
-AM_INIT_AUTOMAKE
(1.9)
+AM_INIT_AUTOMAKE
dnl Checks for programs.
AC_GNU_SOURCE
dnl Checks for programs.
AC_GNU_SOURCE
@@
-14,41
+14,45
@@
AM_PROG_CC_C_O
AC_LIBTOOL_DLOPEN
AC_PROG_LIBTOOL
AC_LIBTOOL_DLOPEN
AC_PROG_LIBTOOL
-PSPP_ENABLE_
WARNING
(-Wdeclaration-after-statement)
+PSPP_ENABLE_
OPTION
(-Wdeclaration-after-statement)
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.
-AM_GNU_GETTEXT
-AM_GNU_GETTEXT_VERSION([0.1
4.5
])
+AM_GNU_GETTEXT
([external], [need-ngettext])
+AM_GNU_GETTEXT_VERSION([0.1
6.1
])
dnl Checks for libraries.
AC_SYS_LARGEFILE
dnl Checks for libraries.
AC_SYS_LARGEFILE
-AC_FUNC_FSEEKO
AC_CHECK_LIB(m, sin)
PSPP_LIBPLOT
AC_CHECK_LIB(m, sin)
PSPP_LIBPLOT
+PSPP_LC_PAPER
AM_CONDITIONAL(WITHCHARTS, test x"$with_libplot" != x"no")
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
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")
fi
AM_CONDITIONAL(WITHGUI, test x"$with_gui" != x"no")
-AC_ARG_WITH(gui_tools, [ --with-gui-tools build the gui developer tools])
+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
if test x"$with_gui_tools" = x"yes" ; then
- PKG_CHECK_MODULES(GLADE_UI,
lib
gladeui-1.0)
+ PKG_CHECK_MODULES(GLADE_UI, gladeui-1.0)
fi
AM_CONDITIONAL(WITH_GUI_TOOLS, test x"$with_gui_tools" = x"yes")
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])])
AC_CHECK_LIB(gsl, gsl_cdf_chisq_Q,,[PSPP_REQUIRED_PREREQ([libgsl (version 1.4 or later)])])
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)])])
@@
-58,44
+62,46
@@
AC_CHECK_HEADERS(termcap.h)
PSPP_READLINE
dnl Checks for header files.
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
# 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_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_C_BIGENDIAN
-AC_FUNC_VPRINTF
-AC_CHECK_FUNCS([__setfpucw execl fork isinf isnan finite getpid feholdexcept popen round trunc])
+AC_CHECK_FUNCS([__setfpucw fork execl execlp isinf isnan finite getpid feholdexcept fpsetmask popen round])
AC_PROG_LN_S
dnl This is needed otherwise --with-included-gettext fails
AH_BOTTOM([#include <locale.h>])
AC_PROG_LN_S
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
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
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
AC_OUTPUT
+echo "PSPP configured successfully."
dnl configure.ac ends here
dnl configure.ac ends here