[BACK]Return to configure.in CVS log [TXT] [DIR] Up to [ELWIX - Embedded LightWeight unIX -] / embedaddon / libxml2

Diff for /embedaddon/libxml2/configure.in between versions 1.1.1.2 and 1.1.1.3

version 1.1.1.2, 2013/07/22 01:22:19 version 1.1.1.3, 2014/06/15 19:53:29
Line 1 Line 1
 dnl Process this file with autoconf to produce a configure script.  dnl Process this file with autoconf to produce a configure script.
AC_PREREQ(2.59)AC_PREREQ([2.63])
AC_INIT(entities.c)AC_INIT
AM_CONFIG_HEADER(config.h)AC_CONFIG_SRCDIR([entities.c])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_MACRO_DIR([m4])  AC_CONFIG_MACRO_DIR([m4])
 AC_CANONICAL_HOST  AC_CANONICAL_HOST
   
 LIBXML_MAJOR_VERSION=2  LIBXML_MAJOR_VERSION=2
LIBXML_MINOR_VERSION=8LIBXML_MINOR_VERSION=9
LIBXML_MICRO_VERSION=0LIBXML_MICRO_VERSION=1
 LIBXML_MICRO_VERSION_SUFFIX=  LIBXML_MICRO_VERSION_SUFFIX=
 LIBXML_VERSION=$LIBXML_MAJOR_VERSION.$LIBXML_MINOR_VERSION.$LIBXML_MICRO_VERSION$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  LIBXML_VERSION_INFO=`expr $LIBXML_MAJOR_VERSION + $LIBXML_MINOR_VERSION`:$LIBXML_MICRO_VERSION:$LIBXML_MINOR_VERSION
Line 58  m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) Line 59  m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 dnl Checks for programs.  dnl Checks for programs.
 AC_PROG_CC  AC_PROG_CC
 AC_PROG_INSTALL  AC_PROG_INSTALL
   AC_PROG_LN_S
 AC_PROG_MKDIR_P  AC_PROG_MKDIR_P
 AC_PROG_CPP  AC_PROG_CPP
 AC_PATH_PROG(RM, rm, /bin/rm)  
 AC_PATH_PROG(MV, mv, /bin/mv)  AC_PATH_PROG(MV, mv, /bin/mv)
 AC_PATH_PROG(TAR, tar, /bin/tar)  AC_PATH_PROG(TAR, tar, /bin/tar)
 AC_PATH_PROG(PERL, perl, /usr/bin/perl)  AC_PATH_PROG(PERL, perl, /usr/bin/perl)
Line 68  AC_PATH_PROG(WGET, wget, /usr/bin/wget) Line 69  AC_PATH_PROG(WGET, wget, /usr/bin/wget)
 AC_PATH_PROG(XMLLINT, xmllint, /usr/bin/xmllint)  AC_PATH_PROG(XMLLINT, xmllint, /usr/bin/xmllint)
 AC_PATH_PROG(XSLTPROC, xsltproc, /usr/bin/xsltproc)  AC_PATH_PROG(XSLTPROC, xsltproc, /usr/bin/xsltproc)
   
AC_LIBTOOL_WIN32_DLLLT_INIT
AM_PROG_LIBTOOL 
   
 dnl  dnl
 dnl if the system support linker version scripts for symbol versioning  dnl if the system support linker version scripts for symbol versioning
Line 97  dnl Line 97  dnl
 dnl zlib option might change flags, so we save them initially  dnl zlib option might change flags, so we save them initially
 dnl  dnl
 _cppflags="${CPPFLAGS}"  _cppflags="${CPPFLAGS}"
_ldflags="${LDFLAGS}"_libs="${LIBS}"
   
 AC_ARG_WITH(c14n,  AC_ARG_WITH(c14n,
 [  --with-c14n             add the Canonicalization support (on)])  [  --with-c14n             add the Canonicalization support (on)])
Line 116  AC_ARG_WITH(history, Line 116  AC_ARG_WITH(history,
 AC_ARG_WITH(html,  AC_ARG_WITH(html,
 [  --with-html             add the HTML support (on)])  [  --with-html             add the HTML support (on)])
 dnl Specific dir for HTML output ?  dnl Specific dir for HTML output ?
AC_ARG_WITH(html-dir, AC_HELP_STRING([--with-html-dir=path],AC_ARG_WITH(html-dir, AS_HELP_STRING([--with-html-dir=path],
             [path to base html directory, default $datadir/doc/html]),              [path to base html directory, default $datadir/doc/html]),
             [HTML_DIR=$withval], [HTML_DIR='$(datadir)/doc'])              [HTML_DIR=$withval], [HTML_DIR='$(datadir)/doc'])
   
AC_ARG_WITH(html-subdir, AC_HELP_STRING([--with-html-subdir=path],AC_ARG_WITH(html-subdir, AS_HELP_STRING([--with-html-subdir=path],
             [directory used under html-dir, default $PACKAGE-$VERSION/html]),              [directory used under html-dir, default $PACKAGE-$VERSION/html]),
             [test "x$withval" != "x" && HTML_DIR="$HTML_DIR/$withval"],              [test "x$withval" != "x" && HTML_DIR="$HTML_DIR/$withval"],
             [HTML_DIR="$HTML_DIR/\$(PACKAGE)-\$(VERSION)/html"])              [HTML_DIR="$HTML_DIR/\$(PACKAGE)-\$(VERSION)/html"])
Line 154  AC_ARG_WITH(readline, Line 154  AC_ARG_WITH(readline,
   if test "$withval" != "no" -a "$withval" != "yes"; then    if test "$withval" != "no" -a "$withval" != "yes"; then
     RDL_DIR=$withval      RDL_DIR=$withval
     CPPFLAGS="${CPPFLAGS} -I$withval/include"      CPPFLAGS="${CPPFLAGS} -I$withval/include"
    LDFLAGS="${LDFLAGS} -L$withval/lib"    LIBS="${LIBS} -L$withval/lib"
   fi    fi
 ])  ])
 AC_ARG_WITH(regexps,  AC_ARG_WITH(regexps,
Line 190  AC_ARG_WITH(zlib, Line 190  AC_ARG_WITH(zlib,
   if test "$withval" != "no" -a "$withval" != "yes"; then    if test "$withval" != "no" -a "$withval" != "yes"; then
     Z_DIR=$withval      Z_DIR=$withval
     CPPFLAGS="${CPPFLAGS} -I$withval/include"      CPPFLAGS="${CPPFLAGS} -I$withval/include"
    LDFLAGS="${LDFLAGS} -L$withval/lib"    LIBS="${LIBS} -L$withval/lib"
   fi    fi
 ])  ])
 AC_ARG_WITH(lzma,  AC_ARG_WITH(lzma,
Line 198  AC_ARG_WITH(lzma, Line 198  AC_ARG_WITH(lzma,
   if test "$withval" != "no" -a "$withval" != "yes"; then    if test "$withval" != "no" -a "$withval" != "yes"; then
     LZMA_DIR=$withval      LZMA_DIR=$withval
     CPPFLAGS="${CPPFLAGS} -I$withval/include"      CPPFLAGS="${CPPFLAGS} -I$withval/include"
    LDFLAGS="${LDFLAGS} -L$withval/lib"    LIBS="${LIBS} -L$withval/lib"
   fi    fi
 ])  ])
 AC_ARG_WITH(coverage,  AC_ARG_WITH(coverage,
 [  --with-coverage         build for code coverage with GCC (off)])  [  --with-coverage         build for code coverage with GCC (off)])
   
 AC_ARG_ENABLE(rebuild-docs,  AC_ARG_ENABLE(rebuild-docs,
[  --enable-rebuild-docs[[=yes/no]]  rebuild some generated docs [[default=yes]]])[  --enable-rebuild-docs[[=yes/no]]  rebuild some generated docs [[default=no]]])
AM_CONDITIONAL([REBUILD_DOCS], [test "$enable_rebuild_docs" = "no"])if test "$enable_rebuild_docs" = "yes" -a "$srcdir" != "."; then
   AC_MSG_ERROR([cannot rebuild docs when builddir != srcdir])
 fi
 AM_CONDITIONAL([REBUILD_DOCS], [test "$enable_rebuild_docs" = "yes" -o "$USER" = "veillard"])
   
 dnl  dnl
 dnl hard dependancies on options  dnl hard dependancies on options
Line 428  AC_SUBST(LZMA_LIBS) Line 431  AC_SUBST(LZMA_LIBS)
 AC_SUBST(WITH_LZMA)  AC_SUBST(WITH_LZMA)
   
 CPPFLAGS=${_cppflags}  CPPFLAGS=${_cppflags}
LDFLAGS=${_ldflags}LIBS=${_libs}
   
 echo Checking headers  echo Checking headers
   
Line 500  AC_CHECK_HEADERS([dl.h]) Line 503  AC_CHECK_HEADERS([dl.h])
 AC_CHECK_HEADERS([dlfcn.h])  AC_CHECK_HEADERS([dlfcn.h])
   
   
   echo Checking types
   
   AC_TYPE_UINT32_T
   
   
 echo Checking libraries  echo Checking libraries
   
 dnl Checks for library functions.  dnl Checks for library functions.
Line 509  AC_CHECK_FUNCS(finite isnand fp_class class fpclass) Line 517  AC_CHECK_FUNCS(finite isnand fp_class class fpclass)
 AC_CHECK_FUNCS(strftime localtime gettimeofday ftime)  AC_CHECK_FUNCS(strftime localtime gettimeofday ftime)
 AC_CHECK_FUNCS(stat _stat signal)  AC_CHECK_FUNCS(stat _stat signal)
 AC_CHECK_FUNCS(rand rand_r srand time)  AC_CHECK_FUNCS(rand rand_r srand time)
   AC_CHECK_FUNCS(isascii mmap munmap putenv)
   
   AH_VERBATIM([HAVE_MUNMAP_AFTER],[/* mmap() is no good without munmap() */
   #if defined(HAVE_MMAP) && !defined(HAVE_MUNMAP)
   #  undef /**/ HAVE_MMAP
   #endif])
   
 dnl Checking for va_copy availability  dnl Checking for va_copy availability
 AC_MSG_CHECKING([for va_copy])  AC_MSG_CHECKING([for va_copy])
AC_TRY_LINK([#include <stdarg.h>AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <stdarg.h>
va_list ap1,ap2;], [va_copy(ap1,ap2);],va_list ap1,ap2;]], [[va_copy(ap1,ap2);]])],
 have_va_copy=yes,  have_va_copy=yes,
 have_va_copy=no)  have_va_copy=no)
 AC_MSG_RESULT($have_va_copy)  AC_MSG_RESULT($have_va_copy)
Line 521  if test x"$have_va_copy" = x"yes"; then Line 535  if test x"$have_va_copy" = x"yes"; then
     AC_DEFINE(HAVE_VA_COPY,1,[Whether va_copy() is available])      AC_DEFINE(HAVE_VA_COPY,1,[Whether va_copy() is available])
 else  else
     AC_MSG_CHECKING([for __va_copy])      AC_MSG_CHECKING([for __va_copy])
    AC_TRY_LINK([#include <stdarg.h>    AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <stdarg.h>
    va_list ap1,ap2;], [__va_copy(ap1,ap2);],    va_list ap1,ap2;]], [[__va_copy(ap1,ap2);]])],
     have___va_copy=yes,      have___va_copy=yes,
     have___va_copy=no)      have___va_copy=no)
     AC_MSG_RESULT($have___va_copy)      AC_MSG_RESULT($have___va_copy)
Line 573  then Line 587  then
 fi  fi
 if test $enable_ipv6 = yes; then  if test $enable_ipv6 = yes; then
   have_ipv6=no    have_ipv6=no
  AC_TRY_COMPILE([  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
    #include <sys/types.h>#   include <sys/types.h>
    #include <sys/socket.h>#   include <sys/socket.h>
    ], [    ]], [[
     struct sockaddr_storage ss;      struct sockaddr_storage ss;
     socket(AF_INET6, SOCK_STREAM, 0)      socket(AF_INET6, SOCK_STREAM, 0)
    ],    ]])],
     have_ipv6=yes,      have_ipv6=yes,
     have_ipv6=no      have_ipv6=no
   )    )
Line 597  if test $enable_ipv6 = yes; then Line 611  if test $enable_ipv6 = yes; then
     dnl present.      dnl present.
     dnl ********************************************************************      dnl ********************************************************************
     AC_MSG_CHECKING([struct sockaddr::ss_family])      AC_MSG_CHECKING([struct sockaddr::ss_family])
    AC_TRY_COMPILE([    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
      #include <sys/types.h>#     include <sys/types.h>
      #include <sys/socket.h>#     include <sys/socket.h>
      ], [      ]], [[
       struct sockaddr_storage ss ;        struct sockaddr_storage ss ;
       ss.ss_family = 0 ;        ss.ss_family = 0 ;
      ],      ]])],
       have_ss_family=yes,        have_ss_family=yes,
       have_ss_family=no        have_ss_family=no
     )      )
     AC_MSG_RESULT($have_ss_family)      AC_MSG_RESULT($have_ss_family)
     if test x$have_ss_family = xno ; then      if test x$have_ss_family = xno ; then
       AC_MSG_CHECKING([broken struct sockaddr::ss_family])        AC_MSG_CHECKING([broken struct sockaddr::ss_family])
      AC_TRY_COMPILE([      AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
        #include <sys/types.h>#       include <sys/types.h>
        #include <sys/socket.h>#       include <sys/socket.h>
        ], [        ]], [[
         struct sockaddr_storage ss ;          struct sockaddr_storage ss ;
         ss.__ss_family = 0 ;          ss.__ss_family = 0 ;
        ],        ]])],
         have_broken_ss_family=yes,          have_broken_ss_family=yes,
         have_broken_ss_family=no          have_broken_ss_family=no
       )        )
Line 752  if test "$with_python" != "no" ; then Line 766  if test "$with_python" != "no" ; then
                 if test -x "$PYTHON"                  if test -x "$PYTHON"
                 then                  then
                     echo Found python in environment PYTHON=$PYTHON                      echo Found python in environment PYTHON=$PYTHON
                    with_python=`$PYTHON -c "import sys; print sys.exec_prefix"`                    with_python=`$PYTHON -c "import sys; print(sys.exec_prefix)"`
                 else                  else
                     AC_PATH_PROG(PYTHON, python python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5)                      AC_PATH_PROG(PYTHON, python python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5)
                 fi                  fi
Line 761  if test "$with_python" != "no" ; then Line 775  if test "$with_python" != "no" ; then
     fi      fi
     if test "$PYTHON" != ""      if test "$PYTHON" != ""
     then      then
        PYTHON_VERSION=`$PYTHON -c "import sys; print sys.version[[0:3]]"`        PYTHON_VERSION=`$PYTHON -c "from distutils import sysconfig; print(sysconfig.get_python_version())"`
         PYTHON_INCLUDES=`$PYTHON -c "from distutils import sysconfig; print(sysconfig.get_python_inc())"`
 # does not work as it produce a /usr/lib/python path instead of/usr/lib64/python
 #
 #       PYTHON_SITE_PACKAGES=`$PYTHON -c "from distutils import sysconfig; print(sysconfig.get_python_lib())"`
         echo Found Python version $PYTHON_VERSION          echo Found Python version $PYTHON_VERSION
     fi      fi
    if test "$PYTHON_VERSION" != ""    if test "$PYTHON_VERSION" != "" -a "$PYTHON_INCLUDES" = ""
     then      then
        if test -r $with_python/include/python$PYTHON_VERSION/Python.h -a \        if test -r $with_python/include/python$PYTHON_VERSION/Python.h
           -d $with_python/lib/python$PYTHON_VERSION/site-packages 
         then          then
             PYTHON_INCLUDES=$with_python/include/python$PYTHON_VERSION              PYTHON_INCLUDES=$with_python/include/python$PYTHON_VERSION
             PYTHON_SITE_PACKAGES=$libdir/python$PYTHON_VERSION/site-packages  
         else          else
             if test -r $prefix/include/python$PYTHON_VERSION/Python.h              if test -r $prefix/include/python$PYTHON_VERSION/Python.h
             then              then
                 PYTHON_INCLUDES=$prefix/include/python$PYTHON_VERSION                  PYTHON_INCLUDES=$prefix/include/python$PYTHON_VERSION
                 PYTHON_SITE_PACKAGES=$libdir/python$PYTHON_VERSION/site-packages  
             else              else
                 if test -r /usr/include/python$PYTHON_VERSION/Python.h                  if test -r /usr/include/python$PYTHON_VERSION/Python.h
                 then                  then
                     PYTHON_INCLUDES=/usr/include/python$PYTHON_VERSION                      PYTHON_INCLUDES=/usr/include/python$PYTHON_VERSION
                     PYTHON_SITE_PACKAGES=$libdir/python$PYTHON_VERSION/site-packages  
                 else                  else
                    if test -r $with_python/include/Python.h -a \                    if test -r $with_python/include/Python.h
                       -d $with_python/lib/site-packages 
                     then                      then
                         PYTHON_INCLUDES=$with_python/include                          PYTHON_INCLUDES=$with_python/include
                         PYTHON_SITE_PACKAGES=$with_python/lib/site-packages  
                     else                      else
                         echo could not find python$PYTHON_VERSION/Python.h or $with_python/include/Python.h                          echo could not find python$PYTHON_VERSION/Python.h or $with_python/include/Python.h
                     fi                      fi
                 fi                  fi
             fi              fi
            if test ! -d "$PYTHON_SITE_PACKAGES"        fi
     fi
     if test "$PYTHON_VERSION" != "" -a "$PYTHON_SITE_PACKAGES" = ""
     then
         if test -d $libdir/python$PYTHON_VERSION/site-packages
         then
             PYTHON_SITE_PACKAGES=$libdir/python$PYTHON_VERSION/site-packages
         else
             if test -d $with_python/lib/site-packages
             then              then
                    PYTHON_SITE_PACKAGES=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib()"`                PYTHON_SITE_PACKAGES=$with_python/lib/site-packages
             else
                 PYTHON_SITE_PACKAGES=`$PYTHON -c "from distutils import sysconfig; print(sysconfig.get_python_lib())"`
             fi              fi
         fi          fi
         PYTHON_LIBS=`python$PYTHON_VERSION-config --ldflags`  
     fi      fi
    if test "$with_python" != ""    pythondir='$(PYTHON_SITE_PACKAGES)'
    then    PYTHON_LIBS=`python$PYTHON_VERSION-config --ldflags`
        pythondir='$(PYTHON_SITE_PACKAGES)' 
    else 
        pythondir='$(libdir)/python$(PYTHON_VERSION)/site-packages' 
    fi 
 else  else
     PYTHON=      PYTHON=
 fi  fi
Line 939  WITH_THREADS=0 Line 956  WITH_THREADS=0
 THREAD_CFLAGS=""  THREAD_CFLAGS=""
 TEST_THREADS=""  TEST_THREADS=""
 THREADS_W32=""  THREADS_W32=""
   WITH_THREAD_ALLOC=0
   
 if test "$with_threads" = "no" ; then  if test "$with_threads" = "no" ; then
     echo Disabling multithreaded support      echo Disabling multithreaded support
Line 949  else Line 967  else
     case $host_os in      case $host_os in
        *mingw32*) if test "$with_threads" != "pthread" && test "$with_threads" != "no"; then         *mingw32*) if test "$with_threads" != "pthread" && test "$with_threads" != "no"; then
                WITH_THREADS="1"                 WITH_THREADS="1"
               THREADS_W32="Win32"               THREADS_W32="1"
                THREAD_CFLAGS="$THREAD_CFLAGS -DHAVE_WIN32_THREADS"                 THREAD_CFLAGS="$THREAD_CFLAGS -DHAVE_WIN32_THREADS"
            fi             fi
        ;;         ;;
Line 1002  else Line 1020  else
     fi      fi
 fi  fi
 if test "$with_thread_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"    WITH_THREAD_ALLOC=1
 fi  fi
   
 AC_SUBST(THREAD_LIBS)  AC_SUBST(THREAD_LIBS)
Line 1010  AC_SUBST(BASE_THREAD_LIBS) Line 1028  AC_SUBST(BASE_THREAD_LIBS)
 AC_SUBST(WITH_THREADS)  AC_SUBST(WITH_THREADS)
 AC_SUBST(THREAD_CFLAGS)  AC_SUBST(THREAD_CFLAGS)
 AC_SUBST(TEST_THREADS)  AC_SUBST(TEST_THREADS)
AC_SUBST(THREADS_W32)AC_SUBST(WITH_THREAD_ALLOC)
 AM_CONDITIONAL([THREADS_W32],[test -n "$THREADS_W32"])
   
 dnl  dnl
 dnl xmllint shell history  dnl xmllint shell history
Line 1134  else     Line 1153  else    
     TEST_SAX=SAXtests      TEST_SAX=SAXtests
 fi  fi
 AC_SUBST(WITH_SAX1)  AC_SUBST(WITH_SAX1)
   AM_CONDITIONAL(WITH_SAX1_SOURCES, test "${WITH_TRIO}" = "1")
 AC_SUBST(TEST_SAX)  AC_SUBST(TEST_SAX)
   
 if test "$with_push" = "no" ; then  if test "$with_push" = "no" ; then
Line 1300  else Line 1320  else
   
     AC_CHECK_HEADER(iconv.h,      AC_CHECK_HEADER(iconv.h,
         AC_MSG_CHECKING(for iconv)          AC_MSG_CHECKING(for iconv)
        AC_TRY_LINK([#include <stdlib.h>        AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <stdlib.h>
#include <iconv.h>],[#include <iconv.h>]],[[
 iconv_t cd = iconv_open ("","");  iconv_t cd = iconv_open ("","");
iconv (cd, NULL, NULL, NULL, NULL);],[iconv (cd, NULL, NULL, NULL, NULL);]])],[
             AC_MSG_RESULT(yes)              AC_MSG_RESULT(yes)
             WITH_ICONV=1],[              WITH_ICONV=1],[
             AC_MSG_RESULT(no)              AC_MSG_RESULT(no)
Line 1314  iconv (cd, NULL, NULL, NULL, NULL);],[ Line 1334  iconv (cd, NULL, NULL, NULL, NULL);],[
             LDFLAGS="${LDFLAGS} ${ICONV_LIBS}"              LDFLAGS="${LDFLAGS} ${ICONV_LIBS}"
             LIBS="${LIBS} -liconv"              LIBS="${LIBS} -liconv"
   
            AC_TRY_LINK([#include <stdlib.h>            AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <stdlib.h>
#include <iconv.h>],[#include <iconv.h>]],[[
 iconv_t cd = iconv_open ("","");  iconv_t cd = iconv_open ("","");
iconv (cd, NULL, NULL, NULL, NULL);],[iconv (cd, NULL, NULL, NULL, NULL);]])],[
                 AC_MSG_RESULT(yes)                  AC_MSG_RESULT(yes)
                 WITH_ICONV=1                  WITH_ICONV=1
                 ICONV_LIBS="${ICONV_LIBS} -liconv"                  ICONV_LIBS="${ICONV_LIBS} -liconv"
Line 1330  iconv (cd, NULL, NULL, NULL, NULL);],[ Line 1350  iconv (cd, NULL, NULL, NULL, NULL);],[
         if test "$WITH_ICONV" = "1" ; then          if test "$WITH_ICONV" = "1" ; then
                 AC_MSG_CHECKING([for iconv declaration])                  AC_MSG_CHECKING([for iconv declaration])
                 AC_CACHE_VAL(xml_cv_iconv_arg2, [                  AC_CACHE_VAL(xml_cv_iconv_arg2, [
                        AC_TRY_COMPILE([#include <stdlib.h>                        AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdlib.h>
 #include <iconv.h>  #include <iconv.h>
 extern  extern
 #ifdef __cplusplus  #ifdef __cplusplus
Line 1341  size_t iconv (iconv_t cd, char * *inbuf, size_t *inbyt Line 1361  size_t iconv (iconv_t cd, char * *inbuf, size_t *inbyt
 #else  #else
 size_t iconv();  size_t iconv();
 #endif  #endif
], [], xml_cv_iconv_arg2="", xml_cv_iconv_arg2="const")])]], [])], xml_cv_iconv_arg2="", xml_cv_iconv_arg2="const")])
   
                 xml_cv_iconv_decl="extern size_t iconv (iconv_t cd, $xml_cv_iconv_arg2 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"                  xml_cv_iconv_decl="extern size_t iconv (iconv_t cd, $xml_cv_iconv_arg2 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"
                 AC_MSG_RESULT([${xml_xxx:-                  AC_MSG_RESULT([${xml_xxx:-
Line 1365  XML_LIBTOOLLIBS="libxml2.la" Line 1385  XML_LIBTOOLLIBS="libxml2.la"
 AC_SUBST(WITH_ICONV)  AC_SUBST(WITH_ICONV)
   
 WITH_ICU=0  WITH_ICU=0
   ICU_LIBS=""
 if test "$with_icu" != "yes" ; then  if test "$with_icu" != "yes" ; then
     echo Disabling ICU support      echo Disabling ICU support
 else  else
     ICU_CONFIG=icu-config      ICU_CONFIG=icu-config
     if ${ICU_CONFIG} --cflags >/dev/null 2>&1      if ${ICU_CONFIG} --cflags >/dev/null 2>&1
     then      then
        ICU_LIBS=`icu-config --ldflags`        ICU_LIBS=`${ICU_CONFIG} --ldflags`
        LDFLAGS="$LDFLAGS $ICU_LIBS" 
         WITH_ICU=1          WITH_ICU=1
         echo Enabling ICU support          echo Enabling ICU support
     else      else
Line 1380  else Line 1400  else
     fi      fi
 fi  fi
 AC_SUBST(WITH_ICU)  AC_SUBST(WITH_ICU)
   AC_SUBST(ICU_LIBS)
   
 WITH_ISO8859X=1  WITH_ISO8859X=1
 if test "$WITH_ICONV" != "1" ; then  if test "$WITH_ICONV" != "1" ; then
Line 1550  AC_SUBST(RELDATE) Line 1571  AC_SUBST(RELDATE)
 AC_SUBST(PYTHON_TESTS)  AC_SUBST(PYTHON_TESTS)
   
 rm -f COPYING.LIB COPYING  rm -f COPYING.LIB COPYING
ln -s Copyright COPYINGln -s $srcdir/Copyright COPYING
   
 # keep on one line for cygwin c.f. #130896  # keep on one line for cygwin c.f. #130896
AC_OUTPUT(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 xml2-config libxml-2.0.pc libxml-2.0-uninstalled.pc python/setup.py)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 xml2-config libxml-2.0.pc libxml-2.0-uninstalled.pc python/setup.py])
 AC_OUTPUT
   
 chmod +x xml2-config python/setup.py  chmod +x xml2-config python/setup.py
 echo Done configuring  echo Done configuring
Removed from v.1.1.1.2  
changed lines
  Added in v.1.1.1.3

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>