ports/textproc/scrollkeeper/files/patch-configure
Joe Marcus Clarke f2ee099462 Fix two long-standing bugs where scrollkeeper would overwrite the
SGML catalogs in favor of its own XML format catalogs as well as prevent
scrollkeeper from making HTTP connections to obtain DTDs for OMF
validation.

PR:	39504 46179
Tested by:	Stephen Hilton <nospam@hiltonbsd.com>
		Mezz bsdforums.org <reigncracks@hotmail.com>
2003-01-20 00:30:26 +00:00

38 lines
2 KiB
Text

--- configure.orig Wed Jul 24 22:26:07 2002
+++ configure Thu Jan 16 02:24:32 2003
@@ -5299,6 +5299,7 @@
# This can be used to rebuild libtool when needed
LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
# Always use our own libtool.
LIBTOOL='$(SHELL) $(top_builddir)/libtool'
@@ -6277,14 +6278,14 @@
;;
*)
- echo $ac_n "checking for docbook-dtd412-xml""... $ac_c" 1>&6
-echo "configure:6282: checking for docbook-dtd412-xml" >&5
- if xmlcatalog /etc/xml/catalog "-//OASIS//DTD DocBook XML V4.1.2//EN" | grep "No entry" >/dev/null ; then
+ echo $ac_n "checking for docbook-dtd42-xml""... $ac_c" 1>&6
+echo "configure:6282: checking for docbook-dtd42-xml" >&5
+ if test ! -f $LOCALBASE/share/sk/docbook/catalog ; then
echo "* ERROR * "
echo " "
echo "Couldn't find the DocBook XML V4.1.2 DTD. Please make sure that you have the docbook-dtd412-xml package installed. If it is installed, the package probably did not register the DTD in the catalog properly. Consult http://scrollkeeper.sourceforge.net/docbook.shtml for more information."
echo " "
- { echo "configure: error: DocBook XML V4.1.2 DTD not present in /etc/xml/catalog. Make sure docbook-dtd412-xml is installed and registers DTD in catalog." 1>&2; exit 1; }
+ { echo "configure: error: DocBook XML V4.1.2 DTD not present in $LOCALBASE/share/sk. Make sure docbook-dtd412-xml is installed and registers DTD in catalog." 1>&2; exit 1; }
fi
echo "$ac_t""found" 1>&6
;;
@@ -7181,7 +7182,7 @@
else
echo $ac_n "checking version of bison""... $ac_c" 1>&6
echo "configure:7184: checking version of bison" >&5
- ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison .* \([0-9]*\.[0-9.]*\).*$/\1/p'`
+ ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'`
case $ac_prog_version in
'') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
1.2[6-9]* | 1.[3-9][0-9]* | [2-9].*)