Work on fixing bug #462960

* add Apache's version of config.guess and config.sub, which are both
  recent, and have some helpful mods

* buildconf.sh: tweak call to libtoolize to avoid overwriting the above

* conftools/.cvsignore: the new files are supposed to be there

* Makefile.in: tweak to use $(prefix) for the manual page so that it
  picks up install-time prefix changes. tossed an old comment. tweak
  the 'extraclean' rule to avoid tossing the added config.* files.

expat/Makefile.in

@@ -17,16 +17,6 @@
 # TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 # SOFTWARE OR THE USE OR OTHER DEALINGS IN EXPAT.
 #
-#  ---
-#  I started using automake, but
-#		1) it seemed like overkill
-#		2) I don't want all the GNU policies
-#		3) I wanted more explicit control over what gets built
-#
-#  So I'm doing my Makefile.in files manually. But a fair part is based
-#  on what I learned from perusing the Makefile.in's generated by automake,
-#  and the automake authors still get my kudos.
-#
 
 SHELL = @SHELL@
 
@@ -40,7 +30,7 @@ exec_prefix = @exec_prefix@
 bindir = @bindir@
 libdir = @libdir@
 includedir = @includedir@
-mandir = @prefix@/man/man1
+mandir = ${prefix}/man/man1
 
 top_builddir = .
 
@@ -72,7 +62,6 @@ distclean: clean
 
 extraclean: distclean
 	rm -f expat_config.h.in configure
-	rm -f conftools/config.guess conftools/config.sub
 	rm -f conftools/ltconfig conftools/ltmain.sh
 
 check: tests/runtests

expat/buildconf.sh

@@ -14,13 +14,18 @@ if [ "x$libtoolize" = "x" ]; then
     exit 1
 fi
 
+# Remove any libtool files so one can switch between libtool 1.3
+# and libtool 1.4 by simply rerunning the buildconf script.
+(cd conftools/; rm -f ltmain.sh ltconfig)
+
+#
+# Note: we don't use --force (any more) since we have a special
+# config.guess/config.sub that we want to ensure is used.
 #
-# --force to ensure that we replace with current files
 # --copy to avoid symlinks; we want originals for the distro
 # --automake to make it shut up about "things to do"
 #
-(cd conftools/; rm -f ltmain.sh ltconfig)
-$libtoolize --force --copy --automake
+$libtoolize --copy --automake
 
 ltpath=`dirname $libtoolize`
 ltfile=`cd $ltpath/../share/aclocal ; pwd`/libtool.m4

expat/conftools/.gitignore

@@ -1,5 +1,3 @@
 libtool.m4
-config.guess
-config.sub
 ltconfig
 ltmain.sh