X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=configure.ac;h=5bc3e1d133e5e7beec99977b108ac744dccd5e28;hb=de96ef07c8db0783ef8db3f812c9ee5923db03d3;hp=02003a27606f688ed14cac47bf85ac2e5b302e65;hpb=b485afa83b0747b743346a372fc608bc1bb34992;p=pspp-builds.git diff --git a/configure.ac b/configure.ac index 02003a27..5bc3e1d1 100644 --- a/configure.ac +++ b/configure.ac @@ -1,104 +1,74 @@ dnl Process this file with autoconf to produce a configure script. dnl Initialize. -AX_PREREQ(2.57) -AC_INIT(pspp, 0.3.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 +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" ) +PSPP_CC_FOR_BUILD +PSPP_PERL dnl Internationalization macros. -AM_GNU_GETTEXT -AM_GNU_GETTEXT_VERSION dnl Prevents autoreconf complaint. +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 (or use --without-libplot)]) - ) -fi +PSPP_LIBPLOT AM_CONDITIONAL(WITHCHARTS, test x"$with_libplot" != x"no") -AC_CHECK_LIB(gmp, mpf_get_str,, - AC_CHECK_LIB(gmp, __gmpf_get_str,, - AC_MSG_ERROR([You must install libgmp]) - ) -) - -AC_CHECK_LIB(gslcblas,main,,AC_MSG_ERROR([You must install libgslcblas])) -AC_CHECK_LIB(gsl, gsl_cdf_chisq_Q,, - AC_MSG_ERROR([You must install libgsl version 1.4 or later])) - -AC_CHECK_LIB(gnugetopt,getopt_long) -AC_CHECK_FUNC(getopt_long,, - AC_MSG_ERROR(`This application depends upon getopt_long')) - -AC_ARG_WITH(ncurses, -[ --without-ncurses don't compile in ncurses command line editing]) +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) +fi +AM_CONDITIONAL(WITHGUI, test x"$with_gui" != x"no") -if test "x$with_ncurses" = x"yes"; then -AC_CHECK_LIB(ncurses, tgetent, LIBS="-lncurses $LIBS" termcap=yes, - AC_CHECK_LIB(termcap, tgetent, LIBS="-ltermcap $LIBS" termcap=yes, - termcap=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 -if test "$termcap" = yes; then - AC_CHECK_HEADERS(termcap.h) - AC_DEFINE(HAVE_LIBTERMCAP, 1, - [Define if you have the termcap library (-ltermcap).]) -fi +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(readline, readline) -if test "$ac_cv_lib_readline_readline" = yes; then - AC_CHECK_HEADERS(readline/readline.h) - AC_CHECK_LIB(readline, add_history, history=yes, - AC_CHECK_LIB(history, add_history, LIBS="-lhistory" history=yes, - history=no)) - if test "$history" = yes; then - AC_CHECK_HEADERS(readline/history.h) - AC_DEFINE(HAVE_LIBHISTORY, 1, - [Define if you have the history library (-lhistory).]) - fi -fi +AC_CHECK_LIB(ncurses, tgetent) +AC_CHECK_HEADERS(termcap.h) + +PSPP_READLINE dnl Checks for header files. -AC_ARG_WITH(valgrind, [ --without-valgrind don't compile in valgrind]) -if test "x$with_valgrind" != x"no"; then - AC_CHECK_HEADERS([valgrind/valgrind.h]) -fi 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_HEADER_STAT -AC_HEADER_STDC -AC_HEADER_TIME +# 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_TYPE_SIZE_T -AC_STRUCT_TM - -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) @@ -109,28 +79,11 @@ AC_DEFINE(FPREP_IEEE754, 1, AC_C_BIGENDIAN -BLP_IS_SPRINTF_GOOD -BLP_INT_DIGITS -BLP_RANDOM - -AC_FUNC_ALLOCA -AC_FUNC_MEMCMP AC_FUNC_VPRINTF -AC_REPLACE_FUNCS([memmove memset stpcpy strpbrk strerror strtol strtoul \ - memchr getline getdelim strcasecmp strncasecmp memmem \ - strtok_r]) -AC_CHECK_FUNCS([gethostname strstr strtod __setfpucw isinf isnan finite \ - getpid feholdexcept mkdtemp]) +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 ]) @@ -139,23 +92,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 po/Makefile.in m4/Makefile - lib/Makefile lib/julcal/Makefile lib/misc/Makefile - doc/Makefile src/Makefile - config/Makefile tests/Makefile]) -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_given_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_given_srcdir/pref.h.orig pref.h - else - echo "pref.h exists" - fi - if test -f pref.h; then touch pref.h; fi - ]) -AC_OUTPUT(intl/Makefile) +# 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