[svn] GnuPG - r4847 - branches/STABLE-BRANCH-1-4

[svn author dshaw]

Author: dshaw
Date: 2008-10-03 23:26:33 +0200 (Fri, 03 Oct 2008)
New Revision: 4847

Modified:
   branches/STABLE-BRANCH-1-4/ChangeLog
   branches/STABLE-BRANCH-1-4/acinclude.m4
   branches/STABLE-BRANCH-1-4/configure.ac
Log:
* configure.ac, acinclude.m4: Remove GNUPG_CHECK_DOCBOOK_TO_TEXI as we
no longer use it.  Noted by John Clizbe.


Modified: branches/STABLE-BRANCH-1-4/ChangeLog
===================================================================
--- branches/STABLE-BRANCH-1-4/ChangeLog	2008-10-03 20:00:46 UTC (rev 4846)
+++ branches/STABLE-BRANCH-1-4/ChangeLog	2008-10-03 21:26:33 UTC (rev 4847)
@@ -1,3 +1,8 @@
+2008-10-03  David Shaw  <dshaw at jabberwocky.com>
+
+	* 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  <dshaw at jabberwocky.com>
 
 	* configure.ac: Use printf for the most portable SVN version

Modified: branches/STABLE-BRANCH-1-4/acinclude.m4
===================================================================
--- branches/STABLE-BRANCH-1-4/acinclude.m4	2008-10-03 20:00:46 UTC (rev 4846)
+++ branches/STABLE-BRANCH-1-4/acinclude.m4	2008-10-03 21:26:33 UTC (rev 4847)
@@ -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     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

Modified: branches/STABLE-BRANCH-1-4/configure.ac
===================================================================
--- branches/STABLE-BRANCH-1-4/configure.ac	2008-10-03 20:00:46 UTC (rev 4846)
+++ branches/STABLE-BRANCH-1-4/configure.ac	2008-10-03 21:26:33 UTC (rev 4847)
@@ -531,7 +531,6 @@
 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