X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=acinclude.m4;h=10ea269b93eaffee5857c097c4333a190fdc4806;hb=29e80fa3921b20d8c24d9f31263d7bfe531ef6ea;hp=c281995bbe856380f4d08a407d434b0a3c77c40c;hpb=e570d24a8288851690db14199143d34e6d55a331;p=pspp-builds.git diff --git a/acinclude.m4 b/acinclude.m4 index c281995b..10ea269b 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -68,24 +68,6 @@ AC_DEFUN([PSPP_LIBPLOT], fi ]) -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_DEFUN([PSPP_OFF_T], -[ - 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'.])]) -]) - dnl Check whether a C compiler option is accepted. dnl If so, add it to CFLAGS. dnl Example: PSPP_ENABLE_OPTION(-Wdeclaration-after-statement) @@ -121,7 +103,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]) @@ -139,11 +121,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" @@ -225,4 +205,68 @@ AC_DEFUN([PSPP_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 >&AS_MESSAGE_LOG_FD' +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], + [AS_ECHO(["$as_me: failed source file 1 of 2 was:"]) >&AS_MESSAGE_LOG_FD +sed 's/^/| /' conftest1.$ac_ext >&AS_MESSAGE_LOG_FD +AS_ECHO(["$as_me: failed source file 2 of 2 was:"]) >&AS_MESSAGE_LOG_FD +sed 's/^/| /' conftest2.$ac_ext >&AS_MESSAGE_LOG_FD + $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]) + 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 +]) dnl acinclude.m4 ends here