X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=configure.ac;h=54e8b883a9fb11e908e08447f4d773cbed36d063;hb=afbd9bcace01167e6e2d00031e523aa80e68a4fb;hp=1528d72c34fb1c6f23bb1a8e78f91b3b1bc7334b;hpb=cf4da7ffcb1c9f1016c4fa013deb8ce40c431e19;p=pspp-builds.git diff --git a/configure.ac b/configure.ac index 1528d72c..54e8b883 100644 --- a/configure.ac +++ b/configure.ac @@ -1,76 +1,58 @@ -0dnl Process this file with autoconf to produce a configure script. +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 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 -AM_CONDITIONAL(cc_is_gcc, test x"$GCC" = x"yes" ) +PSPP_ENABLE_OPTION(-Wdeclaration-after-statement) +AM_CONDITIONAL(cc_is_gcc, test x"$GCC" = x"yes" ) -dnl Check that Perl is available. -AC_PATH_PROG([PERL], perl, no) -AC_SUBST([PERL])dnl -if test "$PERL" = no; then - AC_MSG_ERROR([perl is not found]) -fi -$PERL -e 'require 5.005_03;' || { - AC_MSG_ERROR([Perl 5.005_03 or better is required]) -} +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) -AC_ARG_WITH(libplot, [ --without-libplot don't compile in support of charts (using libplot)]) - -if test x"$with_libplot" != x"no" ; then - AC_CHECK_LIB(plot, pl_newpl_r,, - AC_MSG_ERROR([You must install libplot development libraries (or use --without-libplot)]) - ) -fi +PSPP_LIBPLOT AM_CONDITIONAL(WITHCHARTS, test x"$with_libplot" != x"no") AC_ARG_WITH(gui, [ --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,, + [PSPP_REQUIRED_PREREQ([libglade 2.0 (or use --without-gui)])]) 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 -dnl Check that off_t is defined as an integer type. -dnl Solaris sometimes declares it as a struct, if it -dnl thinks that the compiler does not support `long long'. -AC_COMPILE_IFELSE([#include -#include -off_t x = 0; -int main (void) -{ - lseek (0, 1, 2); - return 0; -}], [], [AC_MSG_ERROR( -[Your system's definition of off_t is broken. You are probably -using Solaris. You can probably fix the problem with -`--disable-largefile' or `CFLAGS=-ansi'.])]) - -AC_CHECK_LIB(gslcblas,main,,AC_MSG_ERROR([You must install libgslcblas development libraries])) -AC_CHECK_LIB(gsl, gsl_cdf_chisq_Q,, - AC_MSG_ERROR([You must install development libraries for 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)])]) AC_CHECK_LIB(ncurses, tgetent) AC_CHECK_HEADERS(termcap.h) @@ -89,10 +71,6 @@ 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(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) @@ -103,20 +81,11 @@ AC_DEFINE(FPREP_IEEE754, 1, AC_C_BIGENDIAN -BLP_INT_DIGITS - 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 - -AH_BOTTOM([#include ]) - - -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 ]) @@ -125,21 +94,15 @@ if test x"$enable_debug" = x"yes" ; then AC_DEFINE(DEBUGGING, 1, [Define to 1 if debugging is enabled.]) fi -AC_CONFIG_FILES([Makefile gl/Makefile intl/Makefile po/Makefile.in]) - -AC_CONFIG_COMMANDS([pref.h],[ - # Copy pref.h from pref.h.orig if prudent - if test ! -f pref.h; then - echo "creating pref.h" - cp $ac_top_srcdir/pref.h.orig pref.h - elif test "`ls -t pref.h.orig pref.h 2>/dev/null | sed 1q`" = pref.h.orig; then - echo "replacing pref.h with newer pref.h.orig" - cp $ac_top_srcdir/pref.h.orig pref.h - else - echo "pref.h exists" - fi - if test -f pref.h; then touch pref.h; 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 po/Makefile.in]) + AC_OUTPUT dnl configure.ac ends here