X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=acinclude.m4;h=e7dd390d6917babdf7743cda447829d8af8fa973;hb=831d3d4ca420713ba8fdffd56b3aec25d8b2ea03;hp=750a87efb19495d35d9cfa454c4cef4acee13b10;hpb=5159636c5cbb560d445d560a6851de2d61fd416a;p=pspp

diff --git a/acinclude.m4 b/acinclude.m4
index 750a87efb1..e7dd390d69 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -66,6 +66,30 @@ AC_DEFUN([PSPP_CHECK_CC_OPTION],
   fi
 ])
 
+# PSPP_ENABLE_OPTION comes from Open vSwitch:
+# ----------------------------------------------------------------------
+# Copyright (c) 2007-2017 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 PSPP_ENABLE_OPTION([OPTION])
+dnl Check whether the given C compiler OPTION is accepted.
+dnl If so, add it to WARNING_FLAGS.
+dnl Example: PSPP_ENABLE_OPTION([-Wdeclaration-after-statement])
+AC_DEFUN([PSPP_ENABLE_OPTION],
+  [PSPP_CHECK_CC_OPTION([$1], [WARNING_FLAGS="$WARNING_FLAGS $1"])
+   AC_SUBST([WARNING_FLAGS])])
+# ----------------------------------------------------------------------
+
 dnl Check for readline and history libraries.
 
 dnl Modified for PSPP, based on readline.m4 serial 3 from
@@ -139,40 +163,6 @@ AC_DEFUN([PSPP_READLINE],
   AC_SUBST(LTLIBREADLINE)
 ])
 
-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_exeext}
-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, [
@@ -276,8 +266,9 @@ EOF
       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])
+       AC_MSG_ERROR([$MAKEINFO does not support @clicksequence.
+Please install a newer or working version, or point the MAKEINFO variable
+to one that is already installed.])
    fi])
 
 dnl Texinfo 4.13 generates broken DocBook XML.  Probably other old
@@ -362,6 +353,10 @@ AC_DEFUN([PSPP_CHECK_XGETTEXT],
    [pspp_cv_progrecent_xgettext],
    [pspp_cv_progrecent_xgettext=maybe
     ver=`$ac_cv_prog_XGETTEXT --version | sed -n -e '/xgettext/s/[[^0-9]]*\([[0-9\.]][[0-9\.]]*\).*/\1/p'`
+    case $ver in # (
+      *.*.*) ;; # (
+      *.*) ver="$ver.0" ;;
+    esac
     majmin=`echo $ver | sed -e 's/\.[[0-9]]*$//'`
     major=`echo $majmin | sed -e 's/\.[[0-9]]*$//'`
     minor=`echo $majmin | sed -e 's/^[[0-9]]*\.//'`