| Index: third_party/libxml/configure.in
|
| diff --git a/third_party/libxml/configure.in b/third_party/libxml/configure.in
|
| index 8fc76e55102b0ef0223677646f6049bb3a21da91..17c11cde6821193c97474f26464b85804c9013e5 100644
|
| --- a/third_party/libxml/configure.in
|
| +++ b/third_party/libxml/configure.in
|
| @@ -1,11 +1,12 @@
|
| dnl Process this file with autoconf to produce a configure script.
|
| AC_INIT(entities.c)
|
| AM_CONFIG_HEADER(config.h)
|
| +AC_CONFIG_MACRO_DIR([m4])
|
| AC_CANONICAL_HOST
|
|
|
| LIBXML_MAJOR_VERSION=2
|
| -LIBXML_MINOR_VERSION=6
|
| -LIBXML_MICRO_VERSION=32
|
| +LIBXML_MINOR_VERSION=7
|
| +LIBXML_MICRO_VERSION=7
|
| LIBXML_MICRO_VERSION_SUFFIX=
|
| LIBXML_VERSION=$LIBXML_MAJOR_VERSION.$LIBXML_MINOR_VERSION.$LIBXML_MICRO_VERSION$LIBXML_MICRO_VERSION_SUFFIX
|
| LIBXML_VERSION_INFO=`expr $LIBXML_MAJOR_VERSION + $LIBXML_MINOR_VERSION`:$LIBXML_MICRO_VERSION:$LIBXML_MINOR_VERSION
|
| @@ -26,6 +27,14 @@ else if test -d .svn ; then
|
| then
|
| LIBXML_VERSION_EXTRA="-SVN$extra"
|
| fi
|
| +else if test -d .git ; then
|
| + extra=`git describe | sed 's+LIBXML[[0-9.]]*-++'`
|
| + echo extra=$extra
|
| + if test "$extra" != ""
|
| + then
|
| + LIBXML_VERSION_EXTRA="-GIT$extra"
|
| + fi
|
| +fi
|
| fi
|
| fi
|
| AC_SUBST(LIBXML_MAJOR_VERSION)
|
| @@ -60,6 +69,22 @@ AC_LIBTOOL_WIN32_DLL
|
| AM_PROG_LIBTOOL
|
|
|
| dnl
|
| +dnl if the system support linker version scripts for symbol versioning
|
| +dnl then add it
|
| +dnl
|
| +VERSION_SCRIPT_FLAGS=
|
| +# lt_cv_prog_gnu_ld is from libtool 2.+
|
| +if test "$lt_cv_prog_gnu_ld" = yes; then
|
| + VERSION_SCRIPT_FLAGS=-Wl,--version-script=
|
| +else
|
| + case $host in
|
| + *-*-sunos*) VERSION_SCRIPT_FLAGS="-Wl,-M -Wl,";;
|
| + esac
|
| +fi
|
| +AC_SUBST(VERSION_SCRIPT_FLAGS)
|
| +AM_CONDITIONAL([USE_VERSION_SCRIPT], [test -n "$VERSION_SCRIPT_FLAGS"])
|
| +
|
| +dnl
|
| dnl We process the AC_ARG_WITH first so that later we can modify
|
| dnl some of them to try to prevent impossible combinations. This
|
| dnl also allows up so alphabetize the choices
|
| @@ -163,6 +188,12 @@ AC_ARG_WITH(zlib,
|
| 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=yes]]])
|
| +AM_CONDITIONAL([REBUILD_DOCS], [test "$enable_rebuild_docs" = "no"])
|
|
|
| dnl
|
| dnl hard dependancies on options
|
| @@ -376,6 +407,8 @@ AC_CHECK_HEADERS([malloc.h])
|
| AC_CHECK_HEADERS([stdarg.h])
|
| AC_CHECK_HEADERS([sys/stat.h])
|
| AC_CHECK_HEADERS([sys/types.h])
|
| +AC_CHECK_HEADERS([stdint.h])
|
| +AC_CHECK_HEADERS([inttypes.h.h])
|
| AC_CHECK_HEADERS([time.h])
|
| AC_CHECK_HEADERS([ansidecl.h])
|
| AC_CHECK_HEADERS([ieeefp.h])
|
| @@ -406,6 +439,7 @@ AC_CHECK_HEADERS([arpa/inet.h], [], [],
|
| AC_CHECK_HEADERS([netdb.h])
|
| AC_CHECK_HEADERS([sys/time.h])
|
| AC_CHECK_HEADERS([sys/select.h])
|
| +AC_CHECK_HEADERS([poll.h])
|
| AC_CHECK_HEADERS([sys/mman.h])
|
| AC_CHECK_HEADERS([sys/timeb.h])
|
| AC_CHECK_HEADERS([signal.h])
|
| @@ -465,7 +499,7 @@ fi
|
|
|
| dnl Checks for inet libraries:
|
| AC_SEARCH_LIBS(gethostent, [nsl])
|
| -AC_SEARCH_LIBS(setsockopt, [socket net])
|
| +AC_SEARCH_LIBS(setsockopt, [socket net network])
|
| AC_SEARCH_LIBS(connect, [inet])
|
|
|
| dnl Determine what socket length (socklen_t) data type is
|
| @@ -713,6 +747,7 @@ if test "$with_python" != "no" ; then
|
| PYTHON_SITE_PACKAGES=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib()"`
|
| fi
|
| fi
|
| + PYTHON_LIBS=`python$PYTHON_VERSION-config --ldflags`
|
| fi
|
| if test "$with_python" != ""
|
| then
|
| @@ -732,6 +767,7 @@ else
|
| fi
|
| AC_SUBST(pythondir)
|
| AC_SUBST(PYTHON_SUBDIR)
|
| +AC_SUBST(PYTHON_LIBS)
|
|
|
| dnl check for dso support
|
| WITH_MODULES=0
|
| @@ -747,6 +783,10 @@ if test "$with_modules" != "no" ; then
|
| AC_DEFINE([HAVE_DLOPEN], [], [Have dlopen based dso])
|
| ])
|
| ;;
|
| + *-*-mingw*)
|
| + MODULE_EXTENSION=".dll"
|
| + WITH_MODULES=1
|
| + ;;
|
| *)
|
| AC_CHECK_FUNC(shl_load, libxml_have_shl_load=yes, [
|
| AC_CHECK_LIB(dld, shl_load, [
|
| @@ -854,17 +894,21 @@ if test "$with_threads" = "no" ; then
|
| echo Disabling multithreaded support
|
| else
|
| echo Enabling multithreaded support
|
| -
|
| - AC_CHECK_HEADER(pthread.h,
|
| - AC_CHECK_LIB(pthread, pthread_join,[
|
| - THREAD_LIBS="-lpthread"
|
| - AC_DEFINE([HAVE_LIBPTHREAD], [], [Define if pthread library is there (-lpthread)])
|
| - AC_DEFINE([HAVE_PTHREAD_H], [], [Define if <pthread.h> is there])
|
| - WITH_THREADS="1"]))
|
| + dnl Use pthread by default
|
| + if test "$with_threads" = "pthread" || test "$with_threads" = "" || test "$with_threads" = "yes" ; then
|
| + AC_CHECK_HEADER(pthread.h,
|
| + AC_CHECK_LIB(pthread, pthread_join,[
|
| + THREAD_LIBS="-lpthread"
|
| + AC_DEFINE([HAVE_LIBPTHREAD], [], [Define if pthread library is there (-lpthread)])
|
| + AC_DEFINE([HAVE_PTHREAD_H], [], [Define if <pthread.h> is there])
|
| + WITH_THREADS="1"]))
|
| + fi
|
| case $host_os in
|
| - *mingw32*) WITH_THREADS="1"
|
| - THREADS_W32="Win32"
|
| - THREAD_CFLAGS="$THREAD_CFLAGS -DHAVE_WIN32_THREADS"
|
| + *mingw32*) if test "$THREAD_LIBS" != "-lpthread"; then
|
| + WITH_THREADS="1"
|
| + THREADS_W32="Win32"
|
| + THREAD_CFLAGS="$THREAD_CFLAGS -DHAVE_WIN32_THREADS"
|
| + fi
|
| ;;
|
| *cygwin*) THREAD_LIBS=""
|
| ;;
|
| @@ -882,7 +926,7 @@ else
|
| THREAD_LIBS=""
|
| BASE_THREAD_LIBS="-lpthread"
|
| else
|
| - if expr ${GCC_MAJOR} \> 3 > /dev/null
|
| + if expr ${GCC_MAJOR} \> 3 > /dev/null
|
| then
|
| THREAD_LIBS=""
|
| BASE_THREAD_LIBS="-lpthread"
|
| @@ -1253,6 +1297,8 @@ case "$host" in
|
| ;;
|
| *beos*) M_LIBS=""
|
| ;;
|
| + *haiku*) M_LIBS=""
|
| + ;;
|
| *) M_LIBS="-lm"
|
| ;;
|
| esac
|
| @@ -1371,8 +1417,18 @@ AC_SUBST(WIN32_EXTRA_LDFLAGS)
|
| AC_SUBST(CYGWIN_EXTRA_LDFLAGS)
|
| AC_SUBST(CYGWIN_EXTRA_PYTHON_LIBADD)
|
|
|
| +if test "$with_coverage" = "yes" -a "${GCC}" = "yes"
|
| +then
|
| + echo Enabling code coverage for GCC
|
| + CFLAGS="$CFLAGS -fprofile-arcs -ftest-coverage"
|
| + LDFLAGS="$LDFLAGS -fprofile-arcs -ftest-coverage"
|
| +else
|
| + echo Disabling code coverage for GCC
|
| +fi
|
| +
|
| AC_SUBST(CPPFLAGS)
|
| AC_SUBST(CFLAGS)
|
| +AC_SUBST(LDFLAGS)
|
| AC_SUBST(XML_CFLAGS)
|
|
|
| AC_SUBST(XML_LIBDIR)
|
|
|