X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=acinclude.m4;h=d744317e9d93caae740b10c208a71e9124b5130b;hb=dc4422b56fbca781077be7865856bbc250fb65ab;hp=728359ec46a30d317d70ab32ea844bc2e16a7c25;hpb=8fb130b44c911531772c259c8db06cf097cf6821;p=pspp diff --git a/acinclude.m4 b/acinclude.m4 index 728359ec46..d744317e9d 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -1,4 +1,4 @@ -dnl Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc. +dnl Copyright (C) 2005, 2006, 2007, 2009, 2014, 2015 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. @@ -7,13 +7,13 @@ dnl Prerequisites. dnl Summarize all the missing prerequisites at the end of the run to dnl increase user-friendliness. -AC_DEFUN([PSPP_REQUIRED_PREREQ], +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_DEFUN([PSPP_CHECK_PREREQS], [ if test "$pspp_optional_prereqs" != ""; then AC_MSG_WARN([The following optional prerequisites are not installed. @@ -24,7 +24,7 @@ fi You must install them before PSPP can be built:$pspp_required_prereqs]) fi ]) - + dnl Check that a new enough version of Perl is available. AC_DEFUN([PSPP_PERL], @@ -34,55 +34,35 @@ AC_DEFUN([PSPP_PERL], if test "$PERL" != no && $PERL -e 'require 5.005_03;'; then :; else PSPP_REQUIRED_PREREQ([Perl 5.005_03 (or later)]) fi -]) - -dnl Check that libplot is available. -AC_DEFUN([PSPP_LIBPLOT], -[ - 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 + # The PSPP autobuilder appends a build number to the PSPP version number, + # e.g. "0.7.2-build40". But Perl won't parse version numbers that contain + # anything other than digits and periods, so "-build" causes an error. So we + # define $(VERSION_FOR_PERL) that drops everything from the hyphen onward. + VERSION_FOR_PERL=`echo "$VERSION" | sed 's/-.*//'` + AC_SUBST([VERSION_FOR_PERL]) ]) -dnl Check whether a 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], +dnl Check that Python 2 or 3 is available. +AC_DEFUN([PSPP_PYTHON], + [AC_ARG_VAR([PYTHON], [Python 2 or 3 interpreter]) + AC_CHECK_PROGS([PYTHON], [python python2 python3], [none])]) + +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], + 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 - CFLAGS="$CFLAGS $1" + m4_if([$2], [], [;], [$2]) + else + m4_if([$3], [], [:], [$3]) fi ]) @@ -138,9 +118,13 @@ AC_DEFUN([PSPP_READLINE], ]) if test "$gl_cv_lib_readline" = yes; then - AC_DEFINE(HAVE_READLINE, 1, [Define if you have the readline library.]) + AC_DEFINE([HAVE_READLINE], 1, [Define if you have the readline library.]) AC_MSG_CHECKING([how to link with libreadline]) AC_MSG_RESULT([$LIBREADLINE]) + AC_SEARCH_LIBS([rl_echo_signal_char], [readline], + AC_DEFINE([HAVE_RL_ECHO_SIGNAL_CHAR], 1, [Define if the readline library provides rl_echo_signal_char.]),[],[$LIBREADLINE]) + AC_SEARCH_LIBS([rl_outstream], [readline], + AC_DEFINE([HAVE_RL_OUTSTREAM], 1, [Define if the readline library provides rl_outstream.]),[],[$LIBREADLINE]) else dnl If $LIBREADLINE didn't lead to a usable library, we don't dnl need $INCREADLINE either. @@ -185,8 +169,7 @@ else 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} + test x"${pspp_cv_build_exeext}" != xno && EXEEXT_FOR_BUILD=${pspp_cv_build_exeext} fi AC_SUBST(EXEEXT_FOR_BUILD)]) @@ -203,7 +186,7 @@ AC_DEFUN([PSPP_LC_PAPER], [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.]) + AC_DEFINE([HAVE_LC_PAPER], 1, [Define if you have LC_PAPER.]) fi ]) @@ -258,17 +241,112 @@ AC_DEFUN([PSPP_GSL_NEEDS_FGNU89_INLINE], # 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 + 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]) ]) -dnl acinclude.m4 ends here + +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]) + +dnl Texinfo 4.13 generates broken DocBook XML. Probably other old +dnl versions do too, but that's the one that causes problems. +AC_DEFUN([PSPP_CHECK_MAKEINFO_DOCBOOK_XML], + [AC_REQUIRE([AM_INIT_AUTOMAKE]) # Defines MAKEINFO + AC_CACHE_CHECK( + [whether makeinfo generates broken DocBook XML], + [pspp_cv_broken_docbook_xml], + [AS_CASE( + [$(eval "$MAKEINFO --version | head -1")], + [*texinfo*4.13*], [pspp_cv_broken_docbook_xml=yes], + [*texinfo*], [pspp_cv_broken_docbook_xml=no], + [*], [pspp_cv_broken_docbook_xml=yes])]) + AM_CONDITIONAL( + [BROKEN_DOCBOOK_XML], [test "$pspp_cv_broken_docbook_xml" = yes])]) + +# The following comes from Open vSwitch: +# ---------------------------------------------------------------------- +# Copyright (c) 2008, 2009, 2010, 2011 Nicira Networks. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at: +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +dnl PSPP_ENABLE_WERROR +AC_DEFUN([PSPP_ENABLE_WERROR], + [AC_ARG_ENABLE( + [Werror], + [AC_HELP_STRING([--enable-Werror], [Add -Werror to CFLAGS])], + [], [enable_Werror=no]) + AC_CONFIG_COMMANDS_PRE( + [if test "X$enable_Werror" = Xyes; then + CFLAGS="$CFLAGS -Werror -Wno-error=deprecated-declarations" + fi])]) + +# The following comes from Open vSwitch: +# ---------------------------------------------------------------------- +# Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Nicira, Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at: +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +dnl Checks for dot. +AC_DEFUN([PSPP_CHECK_DOT], + [AC_CACHE_CHECK( + [for dot], + [pspp_cv_dot], + [dnl "dot" writes -V output to stderr: + if (dot -V) 2>&1 | grep '^dot - [[gG]]raphviz version' >/dev/null 2>&1; then + pspp_cv_dot=yes + else + pspp_cv_dot=no + fi]) + AM_CONDITIONAL([HAVE_DOT], [test "$pspp_cv_dot" = yes])])