aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--acinclude.m420
-rw-r--r--configure.ac1
3 files changed, 7 insertions, 19 deletions
diff --git a/ChangeLog b/ChangeLog
index df4bce620..b5ae69e52 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-10-03 David Shaw <[email protected]>
+
+ * configure.ac, acinclude.m4: Remove GNUPG_CHECK_DOCBOOK_TO_TEXI
+ as we no longer use it. Noted by John Clizbe.
+
2008-08-27 David Shaw <[email protected]>
* configure.ac: Use printf for the most portable SVN version
diff --git a/acinclude.m4 b/acinclude.m4
index e9b1b16b2..71657dc0e 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1,5 +1,6 @@
# macros to configure gnupg
-# Copyright (C) 1998, 1999, 2000, 2001, 2003 Free Software Foundation, Inc.
+# Copyright (C) 1998, 1999, 2000, 2001, 2003, 2004, 2006, 2007,
+# 2008 Free Software Foundation, Inc.
#
# This file is part of GnuPG.
#
@@ -89,23 +90,6 @@ dnl ***]])
dnl fi
])
-dnl GNUPG_CHECK_DOCBOOK_TO_TEXI
-dnl
-AC_DEFUN([GNUPG_CHECK_DOCBOOK_TO_TEXI],
- [
- AC_CHECK_PROG(DOCBOOK_TO_TEXI, docbook2texi, yes, no)
- AC_MSG_CHECKING(for sgml to texi tools)
- working_sgmltotexi=no
- if test "$ac_cv_prog_DOCBOOK_TO_TEXI" = yes; then
- if sgml2xml -v /dev/null 2>&1 | grep 'SP version' >/dev/null 2>&1 ; then
- working_sgmltotexi=yes
- fi
- fi
- AC_MSG_RESULT($working_sgmltotexi)
- AM_CONDITIONAL(HAVE_DOCBOOK_TO_TEXI, test "$working_sgmltotexi" = "yes" )
- ])
-
-
dnl GNUPG_CHECK_ENDIAN
dnl define either LITTLE_ENDIAN_HOST or BIG_ENDIAN_HOST
dnl
diff --git a/configure.ac b/configure.ac
index 03043e709..0470a35a8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -531,7 +531,6 @@ AC_PROG_AWK
AC_CHECK_PROG(DOCBOOK_TO_MAN, docbook-to-man, yes, no)
AM_CONDITIONAL(HAVE_DOCBOOK_TO_MAN, test "$ac_cv_prog_DOCBOOK_TO_MAN" = yes)
GNUPG_CHECK_FAQPROG
-GNUPG_CHECK_DOCBOOK_TO_TEXI
GNUPG_CHECK_USTAR