Roll libxml to bdec2183f34b37ee89ae1d330c6ad2bb4d76605f

third_party/libxml/src/configure.ac

 dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ([2.63])
 AC_INIT
 AC_CONFIG_SRCDIR([entities.c])
 AC_CONFIG_HEADERS([config.h])
 AM_MAINTAINER_MODE([enable])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CANONICAL_HOST
 
 LIBXML_MAJOR_VERSION=2
@@ skipping 141 matching lines @@
 AC_ARG_WITH(python_install_dir,
 [  --with-python-install-dir=DIR
                           install Python bindings in DIR])
 AC_ARG_WITH(reader,
 [  --with-reader           add the xmlReader parsing interface (on)])
 AC_ARG_WITH(readline,
 [  --with-readline=DIR     use readline in DIR],[
   if test "$withval" != "no" -a "$withval" != "yes"; then
     RDL_DIR=$withval
     CPPFLAGS="${CPPFLAGS} -I$withval/include"
-    LIBS="${LIBS} -L$withval/lib"
+    LDFLAGS="${LDFLAGS} -L$withval/lib"
   fi
 ])
 AC_ARG_WITH(regexps,
 [  --with-regexps          add Regular Expressions support (on)])
 AC_ARG_WITH(run_debug,
 [  --with-run-debug        add the runtime debugging module (off)])
 AC_ARG_WITH(sax1,
 [  --with-sax1             add the older SAX1 interface (on)])
 AC_ARG_WITH(schemas,
 [  --with-schemas          add Relax-NG and Schemas support (on)])
@@ skipping 15 matching lines @@
 [  --with-xpath            add the XPATH support (on)])
 AC_ARG_WITH(xptr,
 [  --with-xptr             add the XPointer support (on)])
 AC_ARG_WITH(modules,
 [  --with-modules          add the dynamic modules support (on)])
 AC_ARG_WITH(zlib,
 [  --with-zlib[[=DIR]]       use libz in DIR],[
   if test "$withval" != "no" -a "$withval" != "yes"; then
     Z_DIR=$withval
     CPPFLAGS="${CPPFLAGS} -I$withval/include"
-    LIBS="${LIBS} -L$withval/lib"
+    LDFLAGS="${LDFLAGS} -L$withval/lib"
   fi
 ])
 AC_ARG_WITH(lzma,
 [  --with-lzma[[=DIR]]       use liblzma in DIR],[
   if test "$withval" != "no" -a "$withval" != "yes"; then
     LZMA_DIR=$withval
     CPPFLAGS="${CPPFLAGS} -I$withval/include"
-    LIBS="${LIBS} -L$withval/lib"
+    LDFLAGS="${LDFLAGS} -L$withval/lib"
   fi
 ])
 AC_ARG_WITH(coverage,
 [  --with-coverage         build for code coverage with GCC (off)])
 
 AC_ARG_ENABLE(rebuild-docs,
 [  --enable-rebuild-docs[[=yes/no]]  rebuild some generated docs [[default=no]]])
 if test "$enable_rebuild_docs" = "yes" -a "$srcdir" != "."; then
   AC_MSG_ERROR([cannot rebuild docs when builddir != srcdir])
 fi
@@ skipping 175 matching lines @@
     echo "Disabling compression support"
 else
     # Try pkg-config first so that static linking works.
     # If this succeeeds, we ignore the WITH_ZLIB directory.
     PKG_CHECK_MODULES([Z],[zlib],
         [have_libz=yes],
         [have_libz=no])
 
      if test "x$have_libz" = "xno"; then
         AC_CHECK_HEADERS(zlib.h,
-            [SAVE_LDFLAGS="${LDFLAGS}"
-             LDFLAGS="-L${Z_DIR}/lib"
             AC_CHECK_LIB(z, gzread,[
                 have_libz=yes
                 if test "x${Z_DIR}" != "x"; then
                     Z_CFLAGS="-I${Z_DIR}/include"
                     Z_LIBS="-L${Z_DIR}/lib -lz"
                     [case ${host} in
                         *-*-solaris*)
                             Z_LIBS="-L${Z_DIR}/lib -R${Z_DIR}/lib -lz"
                             ;;
                     esac]
                 else
                     Z_LIBS="-lz"
                 fi],
                 [have_libz=no])
-             LDFLAGS="${SAVE_LDFLAGS}"])
+             )
     else
         # we still need to check for zlib.h header
         AC_CHECK_HEADERS([zlib.h])
     fi
 
     # Found the library via either method?
     if test "x$have_libz" = "xyes"; then
         AC_DEFINE([HAVE_LIBZ], [1], [Have compression library])
         WITH_ZLIB=1
     fi
@@ skipping 15 matching lines @@
     # If this succeeeds, we ignore the WITH_LZMA directory.
     PKG_CHECK_MODULES([LZMA],[liblzma],
         [have_liblzma=yes],
         [have_liblzma=no])
 
      # If pkg-config failed, fall back to AC_CHECK_LIB. This
      # will not pick up the necessary LIBS flags for liblzma's
      # private dependencies, though, so static linking may fail.
      if test "x$have_liblzma" = "xno"; then
          AC_CHECK_HEADERS(lzma.h,
-            [SAVE_LDFLAGS="${LDFLAGS}"
-             LDFLAGS="-L${LZMA_DIR}/lib"
             AC_CHECK_LIB(lzma, lzma_code,[
                 have_liblzma=yes
                 if test "x${LZMA_DIR}" != "x"; then
                     LZMA_CFLAGS="-I${LZMA_DIR}/include"
                     LZMA_LIBS="-L${LZMA_DIR}/lib -llzma"
                 else
                     LZMA_LIBS="-llzma"
                 fi],
                 [have_liblzma=no])
-             LDFLAGS="${SAVE_LDFLAGS}"])
+             )
     else
         # we still need to check for lzma,h header
         AC_CHECK_HEADERS([lzma.h])
     fi
 
     # Found the library via either method?
     if test "x$have_liblzma" = "xyes"; then
         AC_DEFINE([HAVE_LIBLZMA], [1], [Have compression library])
         WITH_LZMA=1
     fi
@@ skipping 312 matching lines @@
     if test "$with_fexceptions" = "yes"
     then
         #
         # Not activated by default because this inflates the code size
         # Used to allow propagation of C++ exceptions through the library
         #
         CFLAGS="${CFLAGS} -fexceptions"
     fi
 
     # warnings we'd like to see
-    CFLAGS="${CFLAGS} -pedantic -W -Wformat -Wunused -Wimplicit -Wreturn-type -Wswitch -Wcomment -Wtrigraphs -Wformat -Wchar-subscripts -Wuninitialized -Wparentheses -Wshadow -Wpointer-arith -Wcast-align -Wwrite-strings -Waggregate-return -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Winline -Wredundant-decls"
+    CFLAGS="${CFLAGS} -pedantic -W -Wformat -Wno-format-extra-args -Wunused -Wimplicit -Wreturn-type -Wswitch -Wcomment -Wtrigraphs -Wchar-subscripts -Wuninitialized -Wparentheses -Wshadow -Wpointer-arith -Wcast-align -Wwrite-strings -Waggregate-return -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Winline -Wredundant-decls"
     # warnings we'd like to supress
     CFLAGS="${CFLAGS} -Wno-long-long"
     case "${host}" in
           alpha*-*-linux* )
                CFLAGS="${CFLAGS} -mieee"
                ;;
           alpha*-*-osf* )
                CFLAGS="${CFLAGS} -mieee"
                ;;
     esac
@@ skipping 198 matching lines @@
         if test "${with_mem_debug}" = "" ; then
             echo Activating memory debugging
             with_mem_debug="yes"
             with_run_debug="yes"
         fi
         if test "${with_docbook}" = "" ; then
             with_docbook="yes"
         fi
     fi
     if test "${GCC}" = "yes" ; then
-    CFLAGS="-g -O -pedantic -W -Wformat -Wunused -Wimplicit -Wreturn-type -Wswitch -Wcomment -Wtrigraphs -Wformat -Wchar-subscripts -Wuninitialized -Wparentheses -Wshadow -Wpointer-arith -Wcast-align -Wwrite-strings -Waggregate-return -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Winline -Wredundant-decls -Wall"
+    CFLAGS="-g -O -pedantic -W -Wformat -Wno-format-extra-args -Wunused -Wimplicit -Wreturn-type -Wswitch -Wcomment -Wtrigraphs -Wchar-subscripts -Wuninitialized -Wparentheses -Wshadow -Wpointer-arith -Wcast-align -Wwrite-strings -Waggregate-return -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Winline -Wredundant-decls -Wall"
     fi
     STATIC_BINARIES="-static"
 dnl -Wcast-qual -ansi
 else
     STATIC_BINARIES=
 fi
 AC_SUBST(STATIC_BINARIES)
 
 dnl
 dnl Check for trio string functions
@@ skipping 693 matching lines @@
 rm -f COPYING.LIB COPYING
 ln -s $srcdir/Copyright COPYING
 
 # keep on one line for cygwin c.f. #130896
 AC_CONFIG_FILES([libxml2.spec:libxml.spec.in Makefile include/Makefile include/libxml/Makefile doc/Makefile doc/examples/Makefile doc/devhelp/Makefile example/Makefile python/Makefile python/tests/Makefile xstc/Makefile include/libxml/xmlversion.h libxml-2.0.pc libxml-2.0-uninstalled.pc libxml2-config.cmake])
 AC_CONFIG_FILES([python/setup.py], [chmod +x python/setup.py])
 AC_CONFIG_FILES([xml2-config], [chmod +x xml2-config])
 AC_OUTPUT
 
 echo Done configuring