diff -Nurd -x'*~' xmlstarlet-0.6.0.orig/configure.in xmlstarlet-0.6.0/configure.in --- xmlstarlet-0.6.0.orig/configure.in 2003-09-01 23:13:47.000000000 -0400 +++ xmlstarlet-0.6.0/configure.in 2003-12-02 06:29:16.000000000 -0500 @@ -7,7 +7,7 @@ AM_MAINTAINER_MODE AC_CANONICAL_HOST -CFLAGS="-Wall -g -pedantic" +CFLAGS="-Wall -g" EXTRA_LIBS= dnl @@ -15,60 +15,18 @@ dnl the ability to specify the location of the libxml dnl library during linking and compilation. dnl -LIBXML_PREFIX="/usr" -AC_ARG_WITH(libxml-prefix, - [ --with-libxml-prefix=[PFX] Specify location of libxml], - LIBXML_PREFIX=$withval - LIBXML_CFLAGS="-I$withval/include/libxml2 -I$withval/include/libxml" - LIBXML_LIBS="$withval/lib/libxml2.a -lz -lm -lpthread" -) - -AC_ARG_WITH(libxml-include-prefix, - [ --with-libxml-include-prefix=[PFX] Specify location of libxml headers], - LIBXML_CFLAGS="-I$withval/libxml2 -I$withval/libxml -I$withval" -) - -AC_ARG_WITH(libxml-libs-prefix, - [ --with-libxml-libs-prefix=[PFX] Specify location of libxml libs], - LIBXML_LIBS="$withval/libxml2.a -lz -lm -lpthread" -) - -AC_ARG_WITH(libxml-src, - [ --with-libxml-src=[DIR] For libxml thats not installed yet (sets all three above)], - LIBXML_SRC="$withval" - LIBXML_LIBS="$withval/.libs/libxml2.a -lz -lm -lpthread" - LIBXML_CFLAGS="-I$withval/include/libxml2 -I$withval/include/libxml -I$withval/include" -) + LIBXML_PREFIX=`xml2-config --prefix` + LIBXML_CFLAGS=`xml2-config --cflags` + LIBXML_LIBS=`xml2-config --libs` dnl dnl The following parameters offer dnl the ability to specify the location of the libxslt dnl library during linking and compilation. dnl -LIBXSLT_PREFIX="/usr" -AC_ARG_WITH(libxslt-prefix, - [ --with-libxslt-prefix=[PFX] Specify location of libxslt], - LIBXSLT_PREFIX=$withval - LIBXSLT_CFLAGS="-I$withval/include/libxslt -I$withval/include/libexslt" - LIBXSLT_LIBS="$withval/lib/libxslt.a $withval/lib/libexslt.a -lz -lm -lpthread" -) - -AC_ARG_WITH(libxslt-include-prefix, - [ --with-libxslt-include-prefix=[PFX] Specify location of libxslt headers], - LIBXSLT_CFLAGS="-I$withval/libxslt -I$withval/libexslt -I$withval" -) - -AC_ARG_WITH(libxslt-libs-prefix, - [ --with-libxslt-libs-prefix=[PFX] Specify location of libxslt libs], - LIBXSLT_LIBS="$withval/libxslt.a $withval/libexslt.a -lz -lm -lpthread" -) - -AC_ARG_WITH(libxslt-src, - [ --with-libxml-src=[DIR] For libxslt thats not installed yet (sets all three above)], - LIBXSLT_SRC="$withval" - LIBXSLT_LIBS="$withval/libxslt/.libs/libxslt.a $withval/libexslt/.libs/libexslt.a -lz -lm -lpthread" - LIBXSLT_CFLAGS="-I$withval/libxslt -I$withval/libexslt -I$withval" -) + LIBXSLT_PREFIX=`xslt-config --prefix` + LIBXSLT_CFLAGS=`xslt-config --cflags` + LIBXSLT_LIBS="`xslt-config --libs` -lexslt" LIBICONV_PREFIX="/usr" AC_ARG_WITH(libiconv-prefix,