X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=acinclude.m4;h=b830dd8dc9f4d46523588b1828187f633e0f76b8;hb=a549c5f8473a4962b637f3ffd7fb2e46ab97086b;hp=e6c1adbf3d0c92302dc833549c0e27ff5d4c543b;hpb=bbb073424738ac65571ee2e7ea6471c695881302;p=pspp

diff --git a/acinclude.m4 b/acinclude.m4
index e6c1adbf3d..b830dd8dc9 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -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],
@@ -54,7 +54,7 @@ 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])
@@ -118,13 +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_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])
+        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.
@@ -187,7 +187,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
 ])
 
@@ -281,6 +281,21 @@ EOF
        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.