[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.1 and 1.1.1.2

version 1.1.1.1, 2012/02/21 23:37:58 version 1.1.1.2, 2013/07/22 01:22:19
Line 6  AC_CONFIG_MACRO_DIR([m4]) Line 6  AC_CONFIG_MACRO_DIR([m4])
 AC_CANONICAL_HOST  AC_CANONICAL_HOST
   
 LIBXML_MAJOR_VERSION=2  LIBXML_MAJOR_VERSION=2
LIBXML_MINOR_VERSION=7LIBXML_MINOR_VERSION=8
LIBXML_MICRO_VERSION=8LIBXML_MICRO_VERSION=0
 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 29  else if test -d .svn ; then Line 29  else if test -d .svn ; then
       LIBXML_VERSION_EXTRA="-SVN$extra"        LIBXML_VERSION_EXTRA="-SVN$extra"
   fi    fi
 else if test -d .git ; then  else if test -d .git ; then
  extra=`git describe | sed 's+LIBXML[[0-9.]]*-++'`  extra=`git describe 2>/dev/null | sed 's+LIBXML[[0-9.]]*-++'`
   echo extra=$extra    echo extra=$extra
   if test "$extra" != ""    if test "$extra" != ""
   then    then
Line 50  VERSION=${LIBXML_VERSION} Line 50  VERSION=${LIBXML_VERSION}
   
 AM_INIT_AUTOMAKE(libxml2, $VERSION)  AM_INIT_AUTOMAKE(libxml2, $VERSION)
   
   # Support silent build rules, requires at least automake-1.11. Disable
   # by either passing --disable-silent-rules to configure or passing V=1
   # to make
   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
Line 63  AC_PATH_PROG(WGET, wget, /usr/bin/wget) Line 68  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)
   
 dnl Make sure we have an ANSI compiler  
 AM_C_PROTOTYPES  
 test "x$U" != "x" && AC_MSG_ERROR(Compiler not ANSI compliant)  
   
 AC_LIBTOOL_WIN32_DLL  AC_LIBTOOL_WIN32_DLL
 AM_PROG_LIBTOOL  AM_PROG_LIBTOOL
   
Line 84  else Line 85  else
   esac    esac
 fi  fi
 AC_SUBST(VERSION_SCRIPT_FLAGS)  AC_SUBST(VERSION_SCRIPT_FLAGS)
AM_CONDITIONAL([USE_VERSION_SCRIPT], [test -z "$VERSION_SCRIPT_FLAGS"])AM_CONDITIONAL([USE_VERSION_SCRIPT], [test -n "$VERSION_SCRIPT_FLAGS"])
   
 dnl  dnl
 dnl We process the AC_ARG_WITH first so that later we can modify  dnl We process the AC_ARG_WITH first so that later we can modify
Line 192  AC_ARG_WITH(zlib, Line 193  AC_ARG_WITH(zlib,
     LDFLAGS="${LDFLAGS} -L$withval/lib"      LDFLAGS="${LDFLAGS} -L$withval/lib"
   fi    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"
       LDFLAGS="${LDFLAGS} -L$withval/lib"
     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)])
   
Line 394  AC_SUBST(Z_CFLAGS) Line 403  AC_SUBST(Z_CFLAGS)
 AC_SUBST(Z_LIBS)  AC_SUBST(Z_LIBS)
 AC_SUBST(WITH_ZLIB)  AC_SUBST(WITH_ZLIB)
   
   echo Checking lzma
   
   dnl Checks for lzma library.
   
   WITH_LZMA=0
   if test "$with_lzma" = "no"; then
       echo "Disabling compression support"
   else
       AC_CHECK_HEADERS(lzma.h,
           AC_CHECK_LIB(lzma, lzma_code,[
               AC_DEFINE([HAVE_LIBLZMA], [1], [Have compression library])
               WITH_LZMA=1
               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]))
   fi
   
   AC_SUBST(LZMA_CFLAGS)
   AC_SUBST(LZMA_LIBS)
   AC_SUBST(WITH_LZMA)
   
 CPPFLAGS=${_cppflags}  CPPFLAGS=${_cppflags}
 LDFLAGS=${_ldflags}  LDFLAGS=${_ldflags}
   
Line 412  AC_CHECK_HEADERS([stdarg.h]) Line 445  AC_CHECK_HEADERS([stdarg.h])
 AC_CHECK_HEADERS([sys/stat.h])  AC_CHECK_HEADERS([sys/stat.h])
 AC_CHECK_HEADERS([sys/types.h])  AC_CHECK_HEADERS([sys/types.h])
 AC_CHECK_HEADERS([stdint.h])  AC_CHECK_HEADERS([stdint.h])
AC_CHECK_HEADERS([inttypes.h.h])AC_CHECK_HEADERS([inttypes.h])
 AC_CHECK_HEADERS([time.h])  AC_CHECK_HEADERS([time.h])
 AC_CHECK_HEADERS([ansidecl.h])  AC_CHECK_HEADERS([ansidecl.h])
 AC_CHECK_HEADERS([ieeefp.h])  AC_CHECK_HEADERS([ieeefp.h])
Line 475  AC_CHECK_FUNCS(strdup strndup strerror) Line 508  AC_CHECK_FUNCS(strdup strndup strerror)
 AC_CHECK_FUNCS(finite isnand fp_class class fpclass)  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)
   
 dnl Checking the standard string functions availability  
 AC_CHECK_FUNCS(printf sprintf fprintf snprintf vfprintf vsprintf vsnprintf sscanf,,  
                NEED_TRIO=1)  
   
 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_TRY_LINK([#include <stdarg.h>
Line 659  else Line 689  else
         #          #
         CFLAGS="${CFLAGS} -fexceptions"          CFLAGS="${CFLAGS} -fexceptions"
     fi      fi
       
    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"     # 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"
     # warnings we'd like to supress
     CFLAGS="${CFLAGS} -Wno-long-long"
     case "${host}" in      case "${host}" in
           alpha*-*-linux* )            alpha*-*-linux* )
                CFLAGS="${CFLAGS} -mieee"                 CFLAGS="${CFLAGS} -mieee"
Line 911  if test "$with_threads" = "no" ; then Line 944  if test "$with_threads" = "no" ; then
     echo Disabling multithreaded support      echo Disabling multithreaded support
 else  else
     echo Enabling multithreaded support      echo Enabling multithreaded support
    dnl Use pthread by default
    if test "$with_threads" = "pthread" || test "$with_threads" = "" || test "$with_threads" = "yes" ; then    dnl Default to native threads on Win32
        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      case $host_os in
       *mingw32*) if test "$THREAD_LIBS" != "-lpthread"; then       *mingw32*) if test "$with_threads" != "pthread" && test "$with_threads" != "no"; then
                WITH_THREADS="1"                 WITH_THREADS="1"
                THREADS_W32="Win32"                 THREADS_W32="Win32"
               THREAD_CFLAGS="$THREAD_CFLAGS -DHAVE_WIN32_THREADS"               THREAD_CFLAGS="$THREAD_CFLAGS -DHAVE_WIN32_THREADS"
            fi             fi
        ;;         ;;
       esac
   
       dnl Use pthread by default in other cases
       if test -z "$THREADS_W32"; then
           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
       fi
   
       case $host_os in
        *cygwin*) THREAD_LIBS=""         *cygwin*) THREAD_LIBS=""
        ;;         ;;
        *beos*) WITH_THREADS="1"         *beos*) WITH_THREADS="1"
Line 1436  case "$host" in Line 1477  case "$host" in
  WIN32_EXTRA_LIBADD="-lws2_32"   WIN32_EXTRA_LIBADD="-lws2_32"
  WIN32_EXTRA_LDFLAGS="-no-undefined"   WIN32_EXTRA_LDFLAGS="-no-undefined"
  AC_DEFINE([_WINSOCKAPI_],1,[Using the Win32 Socket implementation])   AC_DEFINE([_WINSOCKAPI_],1,[Using the Win32 Socket implementation])
  AC_DEFINE([snprintf],[_snprintf],[Win32 Std C name mangling work-around])  
  AC_DEFINE([vsnprintf],[_vsnprintf],[Win32 Std C name mangling work-around])  
  if test "${PYTHON}" != ""   if test "${PYTHON}" != ""
  then   then
   WIN32_EXTRA_PYTHON_LIBADD="-L${pythondir}/../../libs -lpython${PYTHON_VERSION//./}"   WIN32_EXTRA_PYTHON_LIBADD="-L${pythondir}/../../libs -lpython$(echo ${PYTHON_VERSION} | tr -d .)"
  fi   fi
  ;;   ;;
  *-*-cygwin*)   *-*-cygwin*)
Line 1456  AC_SUBST(WIN32_EXTRA_LDFLAGS) Line 1495  AC_SUBST(WIN32_EXTRA_LDFLAGS)
 AC_SUBST(WIN32_EXTRA_PYTHON_LIBADD)  AC_SUBST(WIN32_EXTRA_PYTHON_LIBADD)
 AC_SUBST(CYGWIN_EXTRA_LDFLAGS)  AC_SUBST(CYGWIN_EXTRA_LDFLAGS)
 AC_SUBST(CYGWIN_EXTRA_PYTHON_LIBADD)  AC_SUBST(CYGWIN_EXTRA_PYTHON_LIBADD)
   
   dnl Checking the standard string functions availability
   dnl
   dnl Note mingw* has C99 implementation that produce expected xml numbers
   dnl if code use {v}snprintf functions.
   dnl If you like to activate at run-time C99 compatible number output
   dnl see release note for mingw runtime 3.15:
   dnl  http://sourceforge.net/project/shownotes.php?release_id=24832
   dnl
   dnl Also *win32*config.h files redefine them for various MSC compilers.
   dnl
   dnl So do not redefine {v}snprintf to _{v}snprintf like follwing:
   dnl  AC_DEFINE([snprintf],[_snprintf],[Win32 Std C name mangling work-around])
   dnl  AC_DEFINE([vsnprintf],[_vsnprintf],[Win32 Std C name mangling work-around])
   dnl and do not redefine those functions is C-source files.
   dnl
   AC_CHECK_FUNCS(printf sprintf fprintf snprintf vfprintf vsprintf vsnprintf sscanf,,
           NEED_TRIO=1)
   
 if test "$with_coverage" = "yes" -a "${GCC}" = "yes"  if test "$with_coverage" = "yes" -a "${GCC}" = "yes"
 then  then
Removed from v.1.1.1.1  
changed lines
  Added in v.1.1.1.2

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