diff options
| author | Mike Hommey <mh@glandium.org> | 2004-07-06 12:57:17 +0000 |
|---|---|---|
| committer | Mike Hommey <mh@glandium.org> | 2004-07-06 12:57:17 +0000 |
| commit | c14c53a3645d81281058d4bb4cff24fa8d6faf33 (patch) | |
| tree | 29bccc2e7499af078a3d1cdcfb517a1dee891be5 /configure.in | |
| parent | d4e028c96af89ade493b440d4f2de6b684c03a06 (diff) | |
| download | libxml2-c14c53a3645d81281058d4bb4cff24fa8d6faf33.tar.gz | |
Load /tmp/tmp.DIvcnD/libxml2-2.6.11 intoupstream/2.6.11
packages/libxml2/branches/upstream/current.
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/configure.in b/configure.in index 63aea89..52f0af2 100644 --- a/configure.in +++ b/configure.in @@ -6,7 +6,7 @@ AC_CANONICAL_HOST LIBXML_MAJOR_VERSION=2 LIBXML_MINOR_VERSION=6 -LIBXML_MICRO_VERSION=10 +LIBXML_MICRO_VERSION=11 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 @@ -421,8 +421,9 @@ dnl specific tests to setup DV's devel environment with debug etc ... dnl (-Wunreachable-code) dnl if [[ "${LOGNAME}" = "veillard" -a "`pwd`" = "/u/veillard/XML" ]] || \ + [[ "${LOGNAME}" = "veillard" -a "`pwd`" = "/home/veillard/libxml2" ]] || \ [[ "${LOGNAME}" = "bill" -a "`pwd`" = "/home/bill/gnomecvs/xmltest" ]] || \ - [[ "${LOGNAME}" = "bill" -a "`pwd`" = "/home/bill/gnomecvs/xmlnew" ]] + [[ "${LOGNAME}" = "wbrack" -a "`pwd`" = "/Users/wbrack/gnomecvs/xmltest" ]] then if test "$with_minimum" != "yes" then @@ -498,7 +499,7 @@ if test "$with_minimum" = "yes" -a "$with_thread_alloc" = "" then with_thread_alloc=no fi -if test "$with_threads_alloc" = "yes" -a "$WITH_THREADS" = "1" ; then +if test "$with_thread_alloc" = "yes" -a "$WITH_THREADS" = "1" ; then THREAD_CFLAGS="$THREAD_CFLAGS -DLIBXML_THREAD_ALLOC_ENABLED" fi @@ -1007,8 +1008,13 @@ then with_mem_debug=no fi if test "$with_mem_debug" = "yes" ; then - echo Enabling memory debug support - WITH_MEM_DEBUG=1 + if test "$with_thread_alloc" = "yes" ; then + echo Disabling memory debug - cannot use mem-debug with thread-alloc! + WITH_MEM_DEBUG=0 + else + echo Enabling memory debug support + WITH_MEM_DEBUG=1 + fi else WITH_MEM_DEBUG=0 fi |