X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?p=pspp-builds.git;a=blobdiff_plain;f=acinclude.m4;h=a3275a32afd4be6c3427deee8ef07b29b17258af;hp=aa6e4d77b3ea756eb24deb1d675b2de20a3b7964;hb=HEAD;hpb=009350385d97d9fba2b33ea68cfe8b1aeebf1529 diff --git a/acinclude.m4 b/acinclude.m4 index aa6e4d77..a3275a32 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -1,91 +1,103 @@ -dnl Copyright (C) 2005, 2006 Free Software Foundation, Inc. +dnl Copyright (C) 2005, 2006, 2007, 2009 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. -dnl Check longest integer in digits. +dnl Prerequisites. -AC_DEFUN([BLP_INT_DIGITS], +dnl Summarize all the missing prerequisites at the end of the run to +dnl increase user-friendliness. +AC_DEFUN([PSPP_REQUIRED_PREREQ], + [AC_MSG_WARN([You must install $1 before building PSPP.]) +pspp_required_prereqs="$pspp_required_prereqs + $1"]) +AC_DEFUN([PSPP_OPTIONAL_PREREQ], [pspp_optional_prereqs="$pspp_optional_prereqs + $1"]) +AC_DEFUN([PSPP_CHECK_PREREQS], [ -AC_MSG_CHECKING(number of digits in LONG_MIN (incl. sign)) -AC_CACHE_VAL(blp_int_digits, - [AC_TRY_RUN([#include - #include - int - main() - { - int len; - char s[80]; - sprintf(s, "%ld", LONG_MAX); - len = strlen(s); - sprintf(s, "%ld", LONG_MIN); - if(strlen(s)>len) len=strlen(s); - sprintf(s, "%lu", ULONG_MAX); - if(strlen(s)>len) len=strlen(s); - exit(len); - } - ], - eval "blp_int_digits=19", - eval "blp_int_digits=$?" - if test "$blp_int_digits" -lt 11; then - blp_int_digits=11 - fi, - eval "blp_int_digits=19") - ]) -AC_DEFINE_UNQUOTED([INT_DIGITS], $blp_int_digits, - [Number of digits in longest `long' value, including sign. - This is usually 11, for 32-bit `long's, or 19, for 64-bit - `long's.]) -AC_MSG_RESULT($blp_int_digits) ])dnl - -dnl Check quality of this machine's sprintf implementation. - -AC_DEFUN([BLP_IS_SPRINTF_GOOD], -[ -AC_MSG_CHECKING(if sprintf returns a char count) -AC_CACHE_VAL(blp_is_sprintf_good, - [AC_TRY_RUN([#include - int - main() - { - char s[8]; - exit((int)sprintf(s, "abcdefg")!=7); - } - ], - eval "blp_is_sprintf_good=yes", - eval "blp_is_sprintf_good=no", - eval "blp_is_sprintf_good=no") - ]) -if test "$blp_is_sprintf_good" = yes; then - AC_DEFINE([HAVE_GOOD_SPRINTF], 1, - [Define if sprintf() returns the number of characters written - to the destination string, excluding the null terminator.]) - AC_MSG_RESULT(yes) -else - AC_MSG_RESULT(no) + if test "$pspp_optional_prereqs" != ""; then + AC_MSG_WARN([The following optional prerequisites are not installed. +You may wish to install them to obtain additional functionality:$pspp_optional_prereqs]) +fi + if test "$pspp_required_prereqs" != ""; then + AC_MSG_ERROR([The following required prerequisites are not installed. +You must install them before PSPP can be built:$pspp_required_prereqs]) fi -])dnl +]) + -dnl Check for proper random number generator. +dnl Check that a new enough version of Perl is available. +AC_DEFUN([PSPP_PERL], +[ + AC_PATH_PROG([PERL], perl, no) + AC_SUBST([PERL])dnl + if test "$PERL" != no && $PERL -e 'require 5.005_03;'; then :; else + PSPP_REQUIRED_PREREQ([Perl 5.005_03 (or later)]) + fi +]) -AC_DEFUN([BLP_RANDOM], +dnl Check that libplot is available. +AC_DEFUN([PSPP_LIBPLOT], [ -AC_MSG_CHECKING(random number generator) -AC_CACHE_VAL(blp_random_good, - AC_TRY_COMPILE([#include ], [int x=RAND_MAX;], - blp_random_good=yes, blp_random_good=no)) -if test "$blp_random_good" = yes; then - AC_DEFINE([HAVE_GOOD_RANDOM], 1, - [Define if rand() and company work according to ANSI.]) - AC_MSG_RESULT(good) -else - AC_MSG_RESULT(bad) -fi -])dnl + AC_ARG_WITH( + libplot, + [AS_HELP_STRING([--without-libplot], + [don't compile in support of charts (using libplot)])]) + + if test x"$with_libplot" != x"no" ; then + # Check whether we can link against libplot without any extra libraries. + AC_CHECK_LIB(plot, pl_newpl_r, [LIBPLOT_LIBS="-lplot"]) + + # Check whether we can link against libplot if we also link X. + if test x"$LIBPLOT_LIBS" = x""; then + AC_PATH_XTRA + extra_libs="-lXaw -lXmu -lXt $X_PRE_LIBS -lXext -lX11 $X_EXTRA_LIBS -lm" + AC_CHECK_LIB(plot, pl_newpl_r, + [LIBPLOT_LIBS="-lplot $extra_libs" + LDFLAGS="$LDFLAGS $X_LIBS"],, + [$extra_libs]) + fi + + # Still can't link? + if test x"$LIBPLOT_LIBS" = x""; then + PSPP_REQUIRED_PREREQ([libplot (or use --without-libplot)]) + fi + + # Set up to make everything work. + LIBS="$LIBPLOT_LIBS $LIBS" + AC_DEFINE(HAVE_LIBPLOT, 1, + [Define to 1 if you have the `libplot' library (-lplot).]) + fi +]) + +dnl PSPP_CHECK_CC_OPTION([OPTION], [ACTION-IF-ACCEPTED], [ACTION-IF-REJECTED]) +dnl Check whether the given C compiler OPTION is accepted. +dnl If so, execute ACTION-IF-ACCEPTED, otherwise ACTION-IF-REJECTED. +AC_DEFUN([PSPP_CHECK_CC_OPTION], +[ + m4_define([pspp_cv_name], [pspp_cv_[]m4_translit([$1], [-], [_])])dnl + AC_CACHE_CHECK([whether $CC accepts $1], [pspp_cv_name], + [pspp_save_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $1" + AC_COMPILE_IFELSE([AC_LANG_PROGRAM(,)], [pspp_cv_name[]=yes], [pspp_cv_name[]=no]) + CFLAGS="$pspp_save_CFLAGS"]) + if test $pspp_cv_name = yes; then + m4_if([$2], [], [;], [$2]) + else + m4_if([$3], [], [:], [$3]) + fi +]) + +dnl PSPP_ENABLE_OPTION([OPTION]) +dnl Check whether the given C compiler OPTION is accepted. +dnl If so, add it to CFLAGS. +dnl Example: PSPP_ENABLE_OPTION([-Wdeclaration-after-statement]) +AC_DEFUN([PSPP_ENABLE_OPTION], + [PSPP_CHECK_CC_OPTION([$1], [CFLAGS="$CFLAGS $1"])]) dnl Check for readline and history libraries. -dnl Modified for PSPP by Ben Pfaff, based on readline.m4 serial 3 from +dnl Modified for PSPP, based on readline.m4 serial 3 from dnl gnulib, which was written by Simon Josefsson, with help from Bruno dnl Haible and Oskar Liljeblad. @@ -102,7 +114,7 @@ AC_DEFUN([PSPP_READLINE], dnl Add $INCREADLINE to CPPFLAGS before performing the following checks, dnl because if the user has installed libreadline and not disabled its use - dnl via --without-libreadline-prefix, he wants to use it. The AC_TRY_LINK + dnl via --without-libreadline-prefix, he wants to use it. The AC_LINK_IFELSE dnl will then succeed. am_save_CPPFLAGS="$CPPFLAGS" AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCREADLINE $INCHISTORY]) @@ -120,11 +132,9 @@ AC_DEFUN([PSPP_READLINE], if test -n "$extra_lib"; then LIBS="$LIBS -l$extra_lib" fi - AC_TRY_LINK([#include + AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include #include -#include ], - [readline((char*)0); add_history((char*)0);], - gl_cv_lib_readline=yes) +#include ]], [[readline((char*)0); add_history((char*)0);]])],[gl_cv_lib_readline=yes],[]) if test "$gl_cv_lib_readline" = yes; then if test -n "$extra_lib"; then LIBREADLINE="$LIBREADLINE $LIBHISTORY -l$extra_lib" @@ -138,9 +148,6 @@ AC_DEFUN([PSPP_READLINE], if test "$gl_cv_lib_readline" = yes; then AC_DEFINE(HAVE_READLINE, 1, [Define if you have the readline library.]) - fi - - if test "$gl_cv_lib_readline" = yes; then AC_MSG_CHECKING([how to link with libreadline]) AC_MSG_RESULT([$LIBREADLINE]) else @@ -151,9 +158,150 @@ AC_DEFUN([PSPP_READLINE], LTLIBREADLINE= LIBHISTORY= LTLIBHISTORY= + PSPP_OPTIONAL_PREREQ([libreadline (which may itself require libncurses or libtermcap)]) fi AC_SUBST(LIBREADLINE) AC_SUBST(LTLIBREADLINE) ]) -dnl aclocal.m4 ends here +dnl Check for build tools. Adapted from bfd library. + +AC_DEFUN([PSPP_CC_FOR_BUILD], +[# Put a plausible default for CC_FOR_BUILD in Makefile. +if test -z "$CC_FOR_BUILD"; then + if test "x$cross_compiling" = "xno"; then + CC_FOR_BUILD='$(CC)' + else + CC_FOR_BUILD=cc + fi +fi +AC_SUBST(CC_FOR_BUILD) +# Also set EXEEXT_FOR_BUILD. +if test "x$cross_compiling" = "xno"; then + EXEEXT_FOR_BUILD='$(EXEEXT)' +else + AC_CACHE_CHECK([for build system executable suffix], pspp_cv_build_exeext, + [rm -f conftest* + echo 'int main () { return 0; }' > conftest.c + pspp_cv_build_exeext= + ${CC_FOR_BUILD} -o conftest conftest.c 1>&5 2>&5 + for file in conftest.*; do + case $file in # ( + *.c | *.o | *.obj | *.ilk | *.pdb) ;; # ( + *) pspp_cv_build_exeext=`echo $file | sed -e s/conftest//` ;; + esac + done + rm -f conftest* + test x"${pspp_cv_build_exeext}" = x && pspp_cv_build_exeext=no]) + EXEEXT_FOR_BUILD="" + test x"${pspp_cv_build_exeext}" != xno && EXEEXT_FOR_BUILD=${pspp_cv_build_exeex +t} +fi +AC_SUBST(EXEEXT_FOR_BUILD)]) + +dnl Check for LC_PAPER, _NL_PAPER_WIDTH, _NL_PAPER_HEIGHT. +AC_DEFUN([PSPP_LC_PAPER], +[AC_CACHE_CHECK(for LC_PAPER, pspp_cv_lc_paper, [ + pspp_cv_lc_paper=no + AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM( + [#include +#include +], + [(void) LC_PAPER; (void) _NL_PAPER_WIDTH; (void) _NL_PAPER_HEIGHT])], + [pspp_cv_lc_paper=yes]) + ]) + if test "$pspp_cv_lc_paper" = yes; then + AC_DEFINE(HAVE_LC_PAPER, 1, [Define if you have LC_PAPER.]) + fi +]) + + +# PSPP_LINK2_IFELSE(SOURCE1, SOURCE2, [ACTION-IF-TRUE], [ACTION-IF-FALSE]) +# ------------------------------------------------------------- +# Based on AC_LINK_IFELSE, but tries to link both SOURCE1 and SOURCE2 +# into a program. +# +# Test that resulting file is executable; see the problem reported by mwoehlke +# in . +# But skip the test when cross-compiling, to prevent problems like the one +# reported by Chris Johns in +# . +# +m4_define([PSPP_LINK2_IFELSE], +[m4_ifvaln([$1], [AC_LANG_CONFTEST([$1])])dnl +mv conftest.$ac_ext conftest1.$ac_ext +m4_ifvaln([$2], [AC_LANG_CONFTEST([$2])])dnl +mv conftest.$ac_ext conftest2.$ac_ext +rm -f conftest1.$ac_objext conftest2.$ac_objext conftest$ac_exeext +pspp_link2='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest1.$ac_ext conftest2.$ac_ext $LIBS >&5' +AS_IF([_AC_DO_STDERR($pspp_link2) && { + test -z "$ac_[]_AC_LANG_ABBREV[]_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + AS_TEST_X([conftest$ac_exeext]) + }], + [$3], + [echo "$as_me: failed source file 1 of 2 was:" >&5 +sed 's/^/| /' conftest1.$ac_ext >&5 +echo "$as_me: failed source file 2 of 2 was:" >&5 +sed 's/^/| /' conftest2.$ac_ext >&5 + $4]) +dnl Delete also the IPA/IPO (Inter Procedural Analysis/Optimization) +dnl information created by the PGI compiler (conftest_ipa8_conftest.oo), +dnl as it would interfere with the next link command. +rm -rf conftest.dSYM conftest1.dSYM conftest2.dSYM +rm -f core conftest.err conftest1.err conftest2.err +rm -f conftest1.$ac_objext conftest2.$ac_objext conftest*_ipa8_conftest*.oo +rm -f conftest$ac_exeext +rm -f m4_ifval([$1], [conftest1.$ac_ext]) m4_ifval([$2], [conftest1.$ac_ext])[]dnl +])# PSPP_LINK2_IFELSE + +# GSL uses "extern inline" without determining whether the compiler uses +# GCC inline rules or C99 inline rules. If it uses the latter then GSL +# will be broken without passing -fgnu89-inline to GCC. +AC_DEFUN([PSPP_GSL_NEEDS_FGNU89_INLINE], +[# GSL only uses "inline" at all if HAVE_INLINE is defined as a macro. + # In turn, gnulib's gl_INLINE is one macro that does that. We need to + # make sure that it has run by the time we run this test, otherwise we'll + # get a false result. + AC_REQUIRE([gl_INLINE]) + PSPP_CHECK_CC_OPTION( + [-fgnu89-inline], + [AC_CACHE_CHECK([whether GSL needs -fgnu89-inline to link], + pspp_cv_gsl_needs_fgnu89_inline, [ + PSPP_LINK2_IFELSE( + [AC_LANG_PROGRAM([#include + ], [GSL_MAX_INT(1,2);])], + [AC_LANG_SOURCE([#include + void x (void) {}])], + [pspp_cv_gsl_needs_fgnu89_inline=no], + [pspp_cv_gsl_needs_fgnu89_inline=yes])]) + if test "$pspp_cv_gsl_needs_fgnu89_inline" = "yes"; then + CFLAGS="$CFLAGS -fgnu89-inline" + fi]) +]) + +AC_DEFUN([PSPP_CHECK_CLICKSEQUENCE], + [AC_REQUIRE([AM_INIT_AUTOMAKE]) # Defines MAKEINFO + AC_CACHE_CHECK([whether makeinfo supports @clicksequence], + [pspp_cv_have_clicksequence], + [cat > conftest.texi <&AS_MESSAGE_LOG_FD" >&AS_MESSAGE_LOG_FD + eval "$MAKEINFO conftest.texi >&AS_MESSAGE_LOG_FD 2>&1" + retval=$? + echo "configure:__oline__: \$? = $retval" >&AS_MESSAGE_LOG_FD + if test $retval = 0; then + pspp_cv_have_clicksequence=yes + else + pspp_cv_have_clicksequence=no + fi + rm -f conftest.texi conftest.info]) + if test $pspp_cv_have_clicksequence = no; then + AM_MAKEINFOFLAGS="$AM_MAKEINFOFLAGS -DMISSING_CLICKSEQUENCE" + AC_SUBST([AM_MAKEINFOFLAGS]) + fi])