| OLD | NEW |
| 1 dnl Process this file with autoconf to produce a configure script. | 1 dnl Process this file with autoconf to produce a configure script. |
| 2 AC_INIT(entities.c) | 2 AC_INIT(entities.c) |
| 3 AM_CONFIG_HEADER(config.h) | 3 AM_CONFIG_HEADER(config.h) |
| 4 AC_CONFIG_MACRO_DIR([m4]) |
| 4 AC_CANONICAL_HOST | 5 AC_CANONICAL_HOST |
| 5 | 6 |
| 6 LIBXML_MAJOR_VERSION=2 | 7 LIBXML_MAJOR_VERSION=2 |
| 7 LIBXML_MINOR_VERSION=6 | 8 LIBXML_MINOR_VERSION=7 |
| 8 LIBXML_MICRO_VERSION=32 | 9 LIBXML_MICRO_VERSION=7 |
| 9 LIBXML_MICRO_VERSION_SUFFIX= | 10 LIBXML_MICRO_VERSION_SUFFIX= |
| 10 LIBXML_VERSION=$LIBXML_MAJOR_VERSION.$LIBXML_MINOR_VERSION.$LIBXML_MICRO_VERSION
$LIBXML_MICRO_VERSION_SUFFIX | 11 LIBXML_VERSION=$LIBXML_MAJOR_VERSION.$LIBXML_MINOR_VERSION.$LIBXML_MICRO_VERSION
$LIBXML_MICRO_VERSION_SUFFIX |
| 11 LIBXML_VERSION_INFO=`expr $LIBXML_MAJOR_VERSION + $LIBXML_MINOR_VERSION`:$LIBXML
_MICRO_VERSION:$LIBXML_MINOR_VERSION | 12 LIBXML_VERSION_INFO=`expr $LIBXML_MAJOR_VERSION + $LIBXML_MINOR_VERSION`:$LIBXML
_MICRO_VERSION:$LIBXML_MINOR_VERSION |
| 12 | 13 |
| 13 LIBXML_VERSION_NUMBER=`expr $LIBXML_MAJOR_VERSION \* 10000 + $LIBXML_MINOR_VERSI
ON \* 100 + $LIBXML_MICRO_VERSION` | 14 LIBXML_VERSION_NUMBER=`expr $LIBXML_MAJOR_VERSION \* 10000 + $LIBXML_MINOR_VERSI
ON \* 100 + $LIBXML_MICRO_VERSION` |
| 14 | 15 |
| 15 if test -f CVS/Entries ; then | 16 if test -f CVS/Entries ; then |
| 16 extra=`grep ChangeLog CVS/Entries | grep -v LIBXML | sed -e s\%/ChangeLog/1\.%
% -e s\%/.*$%%` | 17 extra=`grep ChangeLog CVS/Entries | grep -v LIBXML | sed -e s\%/ChangeLog/1\.%
% -e s\%/.*$%%` |
| 17 echo extra=$extra | 18 echo extra=$extra |
| 18 if test "$extra" != "" | 19 if test "$extra" != "" |
| 19 then | 20 then |
| 20 LIBXML_VERSION_EXTRA="-CVS$extra" | 21 LIBXML_VERSION_EXTRA="-CVS$extra" |
| 21 fi | 22 fi |
| 22 else if test -d .svn ; then | 23 else if test -d .svn ; then |
| 23 extra=`svn info | grep Revision | sed 's+Revision: ++'` | 24 extra=`svn info | grep Revision | sed 's+Revision: ++'` |
| 24 echo extra=$extra | 25 echo extra=$extra |
| 25 if test "$extra" != "" | 26 if test "$extra" != "" |
| 26 then | 27 then |
| 27 LIBXML_VERSION_EXTRA="-SVN$extra" | 28 LIBXML_VERSION_EXTRA="-SVN$extra" |
| 28 fi | 29 fi |
| 30 else if test -d .git ; then |
| 31 extra=`git describe | sed 's+LIBXML[[0-9.]]*-++'` |
| 32 echo extra=$extra |
| 33 if test "$extra" != "" |
| 34 then |
| 35 LIBXML_VERSION_EXTRA="-GIT$extra" |
| 36 fi |
| 37 fi |
| 29 fi | 38 fi |
| 30 fi | 39 fi |
| 31 AC_SUBST(LIBXML_MAJOR_VERSION) | 40 AC_SUBST(LIBXML_MAJOR_VERSION) |
| 32 AC_SUBST(LIBXML_MINOR_VERSION) | 41 AC_SUBST(LIBXML_MINOR_VERSION) |
| 33 AC_SUBST(LIBXML_MICRO_VERSION) | 42 AC_SUBST(LIBXML_MICRO_VERSION) |
| 34 AC_SUBST(LIBXML_VERSION) | 43 AC_SUBST(LIBXML_VERSION) |
| 35 AC_SUBST(LIBXML_VERSION_INFO) | 44 AC_SUBST(LIBXML_VERSION_INFO) |
| 36 AC_SUBST(LIBXML_VERSION_NUMBER) | 45 AC_SUBST(LIBXML_VERSION_NUMBER) |
| 37 AC_SUBST(LIBXML_VERSION_EXTRA) | 46 AC_SUBST(LIBXML_VERSION_EXTRA) |
| 38 | 47 |
| (...skipping 14 matching lines...) Expand all Loading... |
| 53 AC_PATH_PROG(XSLTPROC, xsltproc, /usr/bin/xsltproc) | 62 AC_PATH_PROG(XSLTPROC, xsltproc, /usr/bin/xsltproc) |
| 54 | 63 |
| 55 dnl Make sure we have an ANSI compiler | 64 dnl Make sure we have an ANSI compiler |
| 56 AM_C_PROTOTYPES | 65 AM_C_PROTOTYPES |
| 57 test "x$U" != "x" && AC_MSG_ERROR(Compiler not ANSI compliant) | 66 test "x$U" != "x" && AC_MSG_ERROR(Compiler not ANSI compliant) |
| 58 | 67 |
| 59 AC_LIBTOOL_WIN32_DLL | 68 AC_LIBTOOL_WIN32_DLL |
| 60 AM_PROG_LIBTOOL | 69 AM_PROG_LIBTOOL |
| 61 | 70 |
| 62 dnl | 71 dnl |
| 72 dnl if the system support linker version scripts for symbol versioning |
| 73 dnl then add it |
| 74 dnl |
| 75 VERSION_SCRIPT_FLAGS= |
| 76 # lt_cv_prog_gnu_ld is from libtool 2.+ |
| 77 if test "$lt_cv_prog_gnu_ld" = yes; then |
| 78 VERSION_SCRIPT_FLAGS=-Wl,--version-script= |
| 79 else |
| 80 case $host in |
| 81 *-*-sunos*) VERSION_SCRIPT_FLAGS="-Wl,-M -Wl,";; |
| 82 esac |
| 83 fi |
| 84 AC_SUBST(VERSION_SCRIPT_FLAGS) |
| 85 AM_CONDITIONAL([USE_VERSION_SCRIPT], [test -n "$VERSION_SCRIPT_FLAGS"]) |
| 86 |
| 87 dnl |
| 63 dnl We process the AC_ARG_WITH first so that later we can modify | 88 dnl We process the AC_ARG_WITH first so that later we can modify |
| 64 dnl some of them to try to prevent impossible combinations. This | 89 dnl some of them to try to prevent impossible combinations. This |
| 65 dnl also allows up so alphabetize the choices | 90 dnl also allows up so alphabetize the choices |
| 66 dnl | 91 dnl |
| 67 | 92 |
| 68 dnl | 93 dnl |
| 69 dnl zlib option might change flags, so we save them initially | 94 dnl zlib option might change flags, so we save them initially |
| 70 dnl | 95 dnl |
| 71 _cppflags="${CPPFLAGS}" | 96 _cppflags="${CPPFLAGS}" |
| 72 _ldflags="${LDFLAGS}" | 97 _ldflags="${LDFLAGS}" |
| (...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 156 AC_ARG_WITH(modules, | 181 AC_ARG_WITH(modules, |
| 157 [ --with-modules add the dynamic modules support (on)]) | 182 [ --with-modules add the dynamic modules support (on)]) |
| 158 AC_ARG_WITH(zlib, | 183 AC_ARG_WITH(zlib, |
| 159 [ --with-zlib[[=DIR]] use libz in DIR],[ | 184 [ --with-zlib[[=DIR]] use libz in DIR],[ |
| 160 if test "$withval" != "no" -a "$withval" != "yes"; then | 185 if test "$withval" != "no" -a "$withval" != "yes"; then |
| 161 Z_DIR=$withval | 186 Z_DIR=$withval |
| 162 CPPFLAGS="${CPPFLAGS} -I$withval/include" | 187 CPPFLAGS="${CPPFLAGS} -I$withval/include" |
| 163 LDFLAGS="${LDFLAGS} -L$withval/lib" | 188 LDFLAGS="${LDFLAGS} -L$withval/lib" |
| 164 fi | 189 fi |
| 165 ]) | 190 ]) |
| 191 AC_ARG_WITH(coverage, |
| 192 [ --with-coverage build for code coverage with GCC (off)]) |
| 193 |
| 194 AC_ARG_ENABLE(rebuild-docs, |
| 195 [ --enable-rebuild-docs[[=yes/no]] rebuild some generated docs [[default=yes]]
]) |
| 196 AM_CONDITIONAL([REBUILD_DOCS], [test "$enable_rebuild_docs" = "no"]) |
| 166 | 197 |
| 167 dnl | 198 dnl |
| 168 dnl hard dependancies on options | 199 dnl hard dependancies on options |
| 169 dnl | 200 dnl |
| 170 if test "$with_schemas" = "yes" | 201 if test "$with_schemas" = "yes" |
| 171 then | 202 then |
| 172 with_pattern=yes | 203 with_pattern=yes |
| 173 with_regexps=yes | 204 with_regexps=yes |
| 174 fi | 205 fi |
| 175 if test "$with_schematron" = "yes" | 206 if test "$with_schematron" = "yes" |
| (...skipping 193 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 369 AC_HEADER_STDC | 400 AC_HEADER_STDC |
| 370 AC_CHECK_HEADERS([fcntl.h]) | 401 AC_CHECK_HEADERS([fcntl.h]) |
| 371 AC_CHECK_HEADERS([unistd.h]) | 402 AC_CHECK_HEADERS([unistd.h]) |
| 372 AC_CHECK_HEADERS([ctype.h]) | 403 AC_CHECK_HEADERS([ctype.h]) |
| 373 AC_CHECK_HEADERS([dirent.h]) | 404 AC_CHECK_HEADERS([dirent.h]) |
| 374 AC_CHECK_HEADERS([errno.h]) | 405 AC_CHECK_HEADERS([errno.h]) |
| 375 AC_CHECK_HEADERS([malloc.h]) | 406 AC_CHECK_HEADERS([malloc.h]) |
| 376 AC_CHECK_HEADERS([stdarg.h]) | 407 AC_CHECK_HEADERS([stdarg.h]) |
| 377 AC_CHECK_HEADERS([sys/stat.h]) | 408 AC_CHECK_HEADERS([sys/stat.h]) |
| 378 AC_CHECK_HEADERS([sys/types.h]) | 409 AC_CHECK_HEADERS([sys/types.h]) |
| 410 AC_CHECK_HEADERS([stdint.h]) |
| 411 AC_CHECK_HEADERS([inttypes.h.h]) |
| 379 AC_CHECK_HEADERS([time.h]) | 412 AC_CHECK_HEADERS([time.h]) |
| 380 AC_CHECK_HEADERS([ansidecl.h]) | 413 AC_CHECK_HEADERS([ansidecl.h]) |
| 381 AC_CHECK_HEADERS([ieeefp.h]) | 414 AC_CHECK_HEADERS([ieeefp.h]) |
| 382 AC_CHECK_HEADERS([nan.h]) | 415 AC_CHECK_HEADERS([nan.h]) |
| 383 AC_CHECK_HEADERS([math.h]) | 416 AC_CHECK_HEADERS([math.h]) |
| 384 AC_CHECK_HEADERS([limits.h]) | 417 AC_CHECK_HEADERS([limits.h]) |
| 385 AC_CHECK_HEADERS([fp_class.h]) | 418 AC_CHECK_HEADERS([fp_class.h]) |
| 386 AC_CHECK_HEADERS([float.h]) | 419 AC_CHECK_HEADERS([float.h]) |
| 387 AC_CHECK_HEADERS([stdlib.h]) | 420 AC_CHECK_HEADERS([stdlib.h]) |
| 388 AC_CHECK_HEADERS([sys/socket.h], [], [], | 421 AC_CHECK_HEADERS([sys/socket.h], [], [], |
| (...skipping 10 matching lines...) Expand all Loading... |
| 399 [#if HAVE_SYS_TYPES_H | 432 [#if HAVE_SYS_TYPES_H |
| 400 # include <sys/types.h> | 433 # include <sys/types.h> |
| 401 # endif | 434 # endif |
| 402 #if HAVE_ARPA_INET_H | 435 #if HAVE_ARPA_INET_H |
| 403 # include <arpa/inet.h> | 436 # include <arpa/inet.h> |
| 404 # endif | 437 # endif |
| 405 ]) | 438 ]) |
| 406 AC_CHECK_HEADERS([netdb.h]) | 439 AC_CHECK_HEADERS([netdb.h]) |
| 407 AC_CHECK_HEADERS([sys/time.h]) | 440 AC_CHECK_HEADERS([sys/time.h]) |
| 408 AC_CHECK_HEADERS([sys/select.h]) | 441 AC_CHECK_HEADERS([sys/select.h]) |
| 442 AC_CHECK_HEADERS([poll.h]) |
| 409 AC_CHECK_HEADERS([sys/mman.h]) | 443 AC_CHECK_HEADERS([sys/mman.h]) |
| 410 AC_CHECK_HEADERS([sys/timeb.h]) | 444 AC_CHECK_HEADERS([sys/timeb.h]) |
| 411 AC_CHECK_HEADERS([signal.h]) | 445 AC_CHECK_HEADERS([signal.h]) |
| 412 AC_CHECK_HEADERS([arpa/nameser.h], [], [], | 446 AC_CHECK_HEADERS([arpa/nameser.h], [], [], |
| 413 [#if HAVE_SYS_TYPES_H | 447 [#if HAVE_SYS_TYPES_H |
| 414 # include <sys/types.h> | 448 # include <sys/types.h> |
| 415 # endif | 449 # endif |
| 416 ]) | 450 ]) |
| 417 AC_CHECK_HEADERS([resolv.h], [], [], | 451 AC_CHECK_HEADERS([resolv.h], [], [], |
| 418 [#if HAVE_SYS_TYPES_H | 452 [#if HAVE_SYS_TYPES_H |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 458 have___va_copy=yes, | 492 have___va_copy=yes, |
| 459 have___va_copy=no) | 493 have___va_copy=no) |
| 460 AC_MSG_RESULT($have___va_copy) | 494 AC_MSG_RESULT($have___va_copy) |
| 461 if test x"$have___va_copy" = x"yes"; then | 495 if test x"$have___va_copy" = x"yes"; then |
| 462 AC_DEFINE(HAVE___VA_COPY,1,[Whether __va_copy() is available]) | 496 AC_DEFINE(HAVE___VA_COPY,1,[Whether __va_copy() is available]) |
| 463 fi | 497 fi |
| 464 fi | 498 fi |
| 465 | 499 |
| 466 dnl Checks for inet libraries: | 500 dnl Checks for inet libraries: |
| 467 AC_SEARCH_LIBS(gethostent, [nsl]) | 501 AC_SEARCH_LIBS(gethostent, [nsl]) |
| 468 AC_SEARCH_LIBS(setsockopt, [socket net]) | 502 AC_SEARCH_LIBS(setsockopt, [socket net network]) |
| 469 AC_SEARCH_LIBS(connect, [inet]) | 503 AC_SEARCH_LIBS(connect, [inet]) |
| 470 | 504 |
| 471 dnl Determine what socket length (socklen_t) data type is | 505 dnl Determine what socket length (socklen_t) data type is |
| 472 AC_MSG_CHECKING([for type of socket length (socklen_t)]) | 506 AC_MSG_CHECKING([for type of socket length (socklen_t)]) |
| 473 AC_TRY_COMPILE2([ | 507 AC_TRY_COMPILE2([ |
| 474 #include <stddef.h> | 508 #include <stddef.h> |
| 475 #include <sys/types.h> | 509 #include <sys/types.h> |
| 476 #include <sys/socket.h>],[ | 510 #include <sys/socket.h>],[ |
| 477 (void)getsockopt (1, 1, 1, NULL, (socklen_t *)NULL)],[ | 511 (void)getsockopt (1, 1, 1, NULL, (socklen_t *)NULL)],[ |
| 478 AC_MSG_RESULT(socklen_t *) | 512 AC_MSG_RESULT(socklen_t *) |
| (...skipping 227 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 706 PYTHON_SITE_PACKAGES=$libdir/python$PYTHON_VERSION/site-pack
ages | 740 PYTHON_SITE_PACKAGES=$libdir/python$PYTHON_VERSION/site-pack
ages |
| 707 else | 741 else |
| 708 echo could not find python$PYTHON_VERSION/Python.h | 742 echo could not find python$PYTHON_VERSION/Python.h |
| 709 fi | 743 fi |
| 710 fi | 744 fi |
| 711 if test ! -d "$PYTHON_SITE_PACKAGES" | 745 if test ! -d "$PYTHON_SITE_PACKAGES" |
| 712 then | 746 then |
| 713 PYTHON_SITE_PACKAGES=`$PYTHON -c "from distutils import sysc
onfig; print sysconfig.get_python_lib()"` | 747 PYTHON_SITE_PACKAGES=`$PYTHON -c "from distutils import sysc
onfig; print sysconfig.get_python_lib()"` |
| 714 fi | 748 fi |
| 715 fi | 749 fi |
| 750 PYTHON_LIBS=`python$PYTHON_VERSION-config --ldflags` |
| 716 fi | 751 fi |
| 717 if test "$with_python" != "" | 752 if test "$with_python" != "" |
| 718 then | 753 then |
| 719 pythondir='$(PYTHON_SITE_PACKAGES)' | 754 pythondir='$(PYTHON_SITE_PACKAGES)' |
| 720 else | 755 else |
| 721 pythondir='$(libdir)/python$(PYTHON_VERSION)/site-packages' | 756 pythondir='$(libdir)/python$(PYTHON_VERSION)/site-packages' |
| 722 fi | 757 fi |
| 723 else | 758 else |
| 724 PYTHON= | 759 PYTHON= |
| 725 fi | 760 fi |
| 726 AM_CONDITIONAL(WITH_PYTHON, test "$PYTHON_INCLUDES" != "") | 761 AM_CONDITIONAL(WITH_PYTHON, test "$PYTHON_INCLUDES" != "") |
| 727 if test "$PYTHON_INCLUDES" != "" | 762 if test "$PYTHON_INCLUDES" != "" |
| 728 then | 763 then |
| 729 PYTHON_SUBDIR=python | 764 PYTHON_SUBDIR=python |
| 730 else | 765 else |
| 731 PYTHON_SUBDIR= | 766 PYTHON_SUBDIR= |
| 732 fi | 767 fi |
| 733 AC_SUBST(pythondir) | 768 AC_SUBST(pythondir) |
| 734 AC_SUBST(PYTHON_SUBDIR) | 769 AC_SUBST(PYTHON_SUBDIR) |
| 770 AC_SUBST(PYTHON_LIBS) |
| 735 | 771 |
| 736 dnl check for dso support | 772 dnl check for dso support |
| 737 WITH_MODULES=0 | 773 WITH_MODULES=0 |
| 738 TEST_MODULES= | 774 TEST_MODULES= |
| 739 | 775 |
| 740 if test "$with_modules" != "no" ; then | 776 if test "$with_modules" != "no" ; then |
| 741 case "$host" in | 777 case "$host" in |
| 742 *-*-cygwin*) | 778 *-*-cygwin*) |
| 743 MODULE_EXTENSION=".dll" | 779 MODULE_EXTENSION=".dll" |
| 744 AC_CHECK_LIB(cygwin, dlopen, [ | 780 AC_CHECK_LIB(cygwin, dlopen, [ |
| 745 WITH_MODULES=1 | 781 WITH_MODULES=1 |
| 746 MODULE_PLATFORM_LIBS= | 782 MODULE_PLATFORM_LIBS= |
| 747 AC_DEFINE([HAVE_DLOPEN], [], [Have dlopen based dso]) | 783 AC_DEFINE([HAVE_DLOPEN], [], [Have dlopen based dso]) |
| 748 ]) | 784 ]) |
| 749 ;; | 785 ;; |
| 786 *-*-mingw*) |
| 787 MODULE_EXTENSION=".dll" |
| 788 WITH_MODULES=1 |
| 789 ;; |
| 750 *) | 790 *) |
| 751 AC_CHECK_FUNC(shl_load, libxml_have_shl_load=yes, [ | 791 AC_CHECK_FUNC(shl_load, libxml_have_shl_load=yes, [ |
| 752 AC_CHECK_LIB(dld, shl_load, [ | 792 AC_CHECK_LIB(dld, shl_load, [ |
| 753 MODULE_PLATFORM_LIBS="-ldld" | 793 MODULE_PLATFORM_LIBS="-ldld" |
| 754 libxml_have_shl_load=yes], [ | 794 libxml_have_shl_load=yes], [ |
| 755 AC_CHECK_FUNC(dlopen, libxml_have_dlopen=yes, [ | 795 AC_CHECK_FUNC(dlopen, libxml_have_dlopen=yes, [ |
| 756 AC_CHECK_LIB(dl, dlopen, [ | 796 AC_CHECK_LIB(dl, dlopen, [ |
| 757 MODULE_PLATFORM_LIBS="-ldl" | 797 MODULE_PLATFORM_LIBS="-ldl" |
| 758 libxml_have_dlopen=yes])])])]) | 798 libxml_have_dlopen=yes])])])]) |
| 759 | 799 |
| (...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 847 BASE_THREAD_LIBS="" | 887 BASE_THREAD_LIBS="" |
| 848 WITH_THREADS=0 | 888 WITH_THREADS=0 |
| 849 THREAD_CFLAGS="" | 889 THREAD_CFLAGS="" |
| 850 TEST_THREADS="" | 890 TEST_THREADS="" |
| 851 THREADS_W32="" | 891 THREADS_W32="" |
| 852 | 892 |
| 853 if test "$with_threads" = "no" ; then | 893 if test "$with_threads" = "no" ; then |
| 854 echo Disabling multithreaded support | 894 echo Disabling multithreaded support |
| 855 else | 895 else |
| 856 echo Enabling multithreaded support | 896 echo Enabling multithreaded support |
| 857 | 897 dnl Use pthread by default |
| 858 AC_CHECK_HEADER(pthread.h, | 898 if test "$with_threads" = "pthread" || test "$with_threads" = "" || test "$w
ith_threads" = "yes" ; then |
| 859 » AC_CHECK_LIB(pthread, pthread_join,[ | 899 AC_CHECK_HEADER(pthread.h, |
| 860 » THREAD_LIBS="-lpthread" | 900 » AC_CHECK_LIB(pthread, pthread_join,[ |
| 861 » AC_DEFINE([HAVE_LIBPTHREAD], [], [Define if pthread library is there
(-lpthread)]) | 901 » THREAD_LIBS="-lpthread" |
| 862 » AC_DEFINE([HAVE_PTHREAD_H], [], [Define if <pthread.h> is there]) | 902 » AC_DEFINE([HAVE_LIBPTHREAD], [], [Define if pthread library is th
ere (-lpthread)]) |
| 863 » WITH_THREADS="1"])) | 903 » AC_DEFINE([HAVE_PTHREAD_H], [], [Define if <pthread.h> is there]) |
| 904 » WITH_THREADS="1"])) |
| 905 fi |
| 864 case $host_os in | 906 case $host_os in |
| 865 *mingw32*) WITH_THREADS="1" | 907 *mingw32*) if test "$THREAD_LIBS" != "-lpthread"; then |
| 866 THREADS_W32="Win32" | 908 WITH_THREADS="1" |
| 867 » THREAD_CFLAGS="$THREAD_CFLAGS -DHAVE_WIN32_THREADS" | 909 THREADS_W32="Win32" |
| 910 » THREAD_CFLAGS="$THREAD_CFLAGS -DHAVE_WIN32_THREADS" |
| 911 fi |
| 868 ;; | 912 ;; |
| 869 *cygwin*) THREAD_LIBS="" | 913 *cygwin*) THREAD_LIBS="" |
| 870 ;; | 914 ;; |
| 871 *beos*) WITH_THREADS="1" | 915 *beos*) WITH_THREADS="1" |
| 872 THREAD_CFLAGS="$THREAD_CFLAGS -DHAVE_BEOS_THREADS" | 916 THREAD_CFLAGS="$THREAD_CFLAGS -DHAVE_BEOS_THREADS" |
| 873 ;; | 917 ;; |
| 874 *linux*) | 918 *linux*) |
| 875 if test "${GCC}" = "yes" ; then | 919 if test "${GCC}" = "yes" ; then |
| 876 GCC_VERSION=`${CC} --version | head -1 | awk '{print $3}'` | 920 GCC_VERSION=`${CC} --version | head -1 | awk '{print $3}'` |
| 877 GCC_MAJOR=`echo ${GCC_VERSION} | sed 's+\..*++'` | 921 GCC_MAJOR=`echo ${GCC_VERSION} | sed 's+\..*++'` |
| 878 GCC_MEDIUM=`echo ${GCC_VERSION} | sed 's+[[0-9]]*\.++' | sed 's+\
..*++'` | 922 GCC_MEDIUM=`echo ${GCC_VERSION} | sed 's+[[0-9]]*\.++' | sed 's+\
..*++'` |
| 879 if test "${THREAD_LIBS}" = "-lpthread" ; then | 923 if test "${THREAD_LIBS}" = "-lpthread" ; then |
| 880 if expr ${GCC_MEDIUM} \> 2 \& ${GCC_MAJOR} = 3 > /dev/null | 924 if expr ${GCC_MEDIUM} \> 2 \& ${GCC_MAJOR} = 3 > /dev/null |
| 881 then | 925 then |
| 882 THREAD_LIBS="" | 926 THREAD_LIBS="" |
| 883 BASE_THREAD_LIBS="-lpthread" | 927 BASE_THREAD_LIBS="-lpthread" |
| 884 else | 928 else |
| 885 » » if expr ${GCC_MAJOR} \> 3 > /dev/null | 929 » » if expr ${GCC_MAJOR} \> 3 > /dev/null |
| 886 then | 930 then |
| 887 THREAD_LIBS="" | 931 THREAD_LIBS="" |
| 888 BASE_THREAD_LIBS="-lpthread" | 932 BASE_THREAD_LIBS="-lpthread" |
| 889 else | 933 else |
| 890 echo old GCC disabling weak symbols for pthread | 934 echo old GCC disabling weak symbols for pthread |
| 891 fi | 935 fi |
| 892 fi | 936 fi |
| 893 fi | 937 fi |
| 894 fi | 938 fi |
| 895 ;; | 939 ;; |
| (...skipping 350 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1246 }$xml_cv_iconv_decl]) | 1290 }$xml_cv_iconv_decl]) |
| 1247 AC_DEFINE_UNQUOTED(ICONV_CONST, $xml_cv_iconv_arg2, | 1291 AC_DEFINE_UNQUOTED(ICONV_CONST, $xml_cv_iconv_arg2, |
| 1248 [Define as const if the declaration of iconv() needs con
st.]) | 1292 [Define as const if the declaration of iconv() needs con
st.]) |
| 1249 fi | 1293 fi |
| 1250 fi | 1294 fi |
| 1251 case "$host" in | 1295 case "$host" in |
| 1252 *mingw*) M_LIBS="" | 1296 *mingw*) M_LIBS="" |
| 1253 ;; | 1297 ;; |
| 1254 *beos*) M_LIBS="" | 1298 *beos*) M_LIBS="" |
| 1255 ;; | 1299 ;; |
| 1300 *haiku*) M_LIBS="" |
| 1301 ;; |
| 1256 *) M_LIBS="-lm" | 1302 *) M_LIBS="-lm" |
| 1257 ;; | 1303 ;; |
| 1258 esac | 1304 esac |
| 1259 XML_LIBS="-lxml2 $Z_LIBS $THREAD_LIBS $ICONV_LIBS $M_LIBS $LIBS" | 1305 XML_LIBS="-lxml2 $Z_LIBS $THREAD_LIBS $ICONV_LIBS $M_LIBS $LIBS" |
| 1260 XML_LIBTOOLLIBS="libxml2.la" | 1306 XML_LIBTOOLLIBS="libxml2.la" |
| 1261 AC_SUBST(WITH_ICONV) | 1307 AC_SUBST(WITH_ICONV) |
| 1262 | 1308 |
| 1263 WITH_ISO8859X=1 | 1309 WITH_ISO8859X=1 |
| 1264 if test "$WITH_ICONV" != "1" ; then | 1310 if test "$WITH_ICONV" != "1" ; then |
| 1265 if test "$with_iso8859x" = "no" ; then | 1311 if test "$with_iso8859x" = "no" ; then |
| (...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1364 then | 1410 then |
| 1365 CYGWIN_EXTRA_PYTHON_LIBADD="-L/usr/lib/python${PYTHON_VERSION}/config -lpytho
n${PYTHON_VERSION}" | 1411 CYGWIN_EXTRA_PYTHON_LIBADD="-L/usr/lib/python${PYTHON_VERSION}/config -lpytho
n${PYTHON_VERSION}" |
| 1366 fi | 1412 fi |
| 1367 ;; | 1413 ;; |
| 1368 esac | 1414 esac |
| 1369 AC_SUBST(WIN32_EXTRA_LIBADD) | 1415 AC_SUBST(WIN32_EXTRA_LIBADD) |
| 1370 AC_SUBST(WIN32_EXTRA_LDFLAGS) | 1416 AC_SUBST(WIN32_EXTRA_LDFLAGS) |
| 1371 AC_SUBST(CYGWIN_EXTRA_LDFLAGS) | 1417 AC_SUBST(CYGWIN_EXTRA_LDFLAGS) |
| 1372 AC_SUBST(CYGWIN_EXTRA_PYTHON_LIBADD) | 1418 AC_SUBST(CYGWIN_EXTRA_PYTHON_LIBADD) |
| 1373 | 1419 |
| 1420 if test "$with_coverage" = "yes" -a "${GCC}" = "yes" |
| 1421 then |
| 1422 echo Enabling code coverage for GCC |
| 1423 CFLAGS="$CFLAGS -fprofile-arcs -ftest-coverage" |
| 1424 LDFLAGS="$LDFLAGS -fprofile-arcs -ftest-coverage" |
| 1425 else |
| 1426 echo Disabling code coverage for GCC |
| 1427 fi |
| 1428 |
| 1374 AC_SUBST(CPPFLAGS) | 1429 AC_SUBST(CPPFLAGS) |
| 1375 AC_SUBST(CFLAGS) | 1430 AC_SUBST(CFLAGS) |
| 1431 AC_SUBST(LDFLAGS) |
| 1376 AC_SUBST(XML_CFLAGS) | 1432 AC_SUBST(XML_CFLAGS) |
| 1377 | 1433 |
| 1378 AC_SUBST(XML_LIBDIR) | 1434 AC_SUBST(XML_LIBDIR) |
| 1379 AC_SUBST(XML_LIBS) | 1435 AC_SUBST(XML_LIBS) |
| 1380 AC_SUBST(XML_LIBTOOLLIBS) | 1436 AC_SUBST(XML_LIBTOOLLIBS) |
| 1381 AC_SUBST(ICONV_LIBS) | 1437 AC_SUBST(ICONV_LIBS) |
| 1382 AC_SUBST(XML_INCLUDEDIR) | 1438 AC_SUBST(XML_INCLUDEDIR) |
| 1383 AC_SUBST(HTML_DIR) | 1439 AC_SUBST(HTML_DIR) |
| 1384 AC_SUBST(HAVE_ISNAN) | 1440 AC_SUBST(HAVE_ISNAN) |
| 1385 AC_SUBST(HAVE_ISINF) | 1441 AC_SUBST(HAVE_ISINF) |
| (...skipping 11 matching lines...) Expand all Loading... |
| 1397 AC_SUBST(PYTHON_TESTS) | 1453 AC_SUBST(PYTHON_TESTS) |
| 1398 | 1454 |
| 1399 rm -f COPYING.LIB COPYING | 1455 rm -f COPYING.LIB COPYING |
| 1400 ln -s Copyright COPYING | 1456 ln -s Copyright COPYING |
| 1401 | 1457 |
| 1402 # keep on one line for cygwin c.f. #130896 | 1458 # keep on one line for cygwin c.f. #130896 |
| 1403 AC_OUTPUT(libxml2.spec:libxml.spec.in Makefile include/Makefile include/libxml/M
akefile doc/Makefile doc/examples/Makefile doc/devhelp/Makefile example/Makefile
python/Makefile python/tests/Makefile xstc/Makefile include/libxml/xmlversion.h
xml2-config libxml-2.0.pc libxml-2.0-uninstalled.pc python/setup.py) | 1459 AC_OUTPUT(libxml2.spec:libxml.spec.in Makefile include/Makefile include/libxml/M
akefile doc/Makefile doc/examples/Makefile doc/devhelp/Makefile example/Makefile
python/Makefile python/tests/Makefile xstc/Makefile include/libxml/xmlversion.h
xml2-config libxml-2.0.pc libxml-2.0-uninstalled.pc python/setup.py) |
| 1404 | 1460 |
| 1405 chmod +x xml2-config python/setup.py | 1461 chmod +x xml2-config python/setup.py |
| 1406 echo Done configuring | 1462 echo Done configuring |
| OLD | NEW |