Load /tmp/tmp.zfIyNk/libxml2-2.6.20 intoupstream/2.6.20

packages/libxml2/branches/upstream/current.

1 files changed, 54 insertions, 11 deletions

diff --git a/configure.in b/configure.in
index d9dfb03..6777c94 100644
--- a/configure.in
+++ b/configure.in
@@ -5,7 +5,7 @@ AC_CANONICAL_HOST
 
 LIBXML_MAJOR_VERSION=2
 LIBXML_MINOR_VERSION=6
-LIBXML_MICRO_VERSION=19
+LIBXML_MICRO_VERSION=20
 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
@@ -127,7 +127,7 @@ AC_ARG_WITH(run_debug,
 AC_ARG_WITH(sax1,
 [  --with-sax1             add the older SAX1 interface (on)])
 AC_ARG_WITH(schemas,
-[  --with-schemas          add Relax-NG and experimental Schemas support (on)])
+[  --with-schemas          add Relax-NG and Schemas support (on)])
 AC_ARG_WITH(threads,
 [  --with-threads          add multithread support(on)])
 AC_ARG_WITH(thread-alloc,
@@ -156,6 +156,22 @@ AC_ARG_WITH(zlib,
 ])
 
 dnl
+dnl hard dependancies on options
+dnl
+if test "$with_schemas" = "yes"
+then
+    with_pattern=yes
+    with_regexp=yes
+fi
+if test "$with_reader" = "yes"
+then
+    with_push=yes
+fi
+if test "$with_xptr" = "yes"
+then
+    with_xpath=yes
+fi
+dnl
 dnl option to build a minimal libxml2 library
 dnl
 if test "$with_minimum" = "yes"
@@ -466,22 +482,41 @@ if test $enable_ipv6 = yes; then
     dnl *********************************************************************
     dnl on some platforms (like AIX 5L), the structure sockaddr doesn't have
     dnl a ss_family member, but rather __ss_family. Let's detect that
-    dnl and define the HAVE_BROKEN_SS_FAMILY when we are on one of these platforms.
+    dnl and define the HAVE_BROKEN_SS_FAMILY when we are on one of these
+    dnl platforms.  However, we should only do this if ss_family is not
+    dnl present.
     dnl ********************************************************************
-    AC_MSG_CHECKING([broken struct sockaddr::ss_family])
+    AC_MSG_CHECKING([struct sockaddr::ss_family])
     AC_TRY_COMPILE([
       #include <sys/socket.h>
       #include <sys/types.h>], [
       struct sockaddr_storage ss ;
-      ss.__ss_family = 0 ;
+      ss.ss_family = 0 ;
       ],
-      have_broken_ss_family=yes,
-      have_broken_ss_family=no
+      have_ss_family=yes,
+      have_ss_family=no
     )
-    AC_MSG_RESULT($have_broken_ss_family)
-    if test x$have_broken_ss_family = xyes ; then
-      AC_DEFINE(HAVE_BROKEN_SS_FAMILY, [], [Whether struct sockaddr::__ss_family exists]) 
-      AC_DEFINE(ss_family, __ss_family, [ss_family is not defined here, use __ss_family instead])
+    AC_MSG_RESULT($have_ss_family)
+    if test x$have_ss_family = xno ; then
+      AC_MSG_CHECKING([broken struct sockaddr::ss_family])
+      AC_TRY_COMPILE([
+        #include <sys/socket.h>
+        #include <sys/types.h>], [
+        struct sockaddr_storage ss ;
+        ss.__ss_family = 0 ;
+        ],
+        have_broken_ss_family=yes,
+        have_broken_ss_family=no
+      )
+      AC_MSG_RESULT($have_broken_ss_family)
+      if test x$have_broken_ss_family = xyes ; then
+        AC_DEFINE(HAVE_BROKEN_SS_FAMILY, [],
+	  [Whether struct sockaddr::__ss_family exists]) 
+        AC_DEFINE(ss_family, __ss_family,
+	  [ss_family is not defined here, use __ss_family instead])
+      else
+        AC_MSG_WARN(ss_family and __ss_family not found)
+      fi
     fi
 
     have_getaddrinfo=no
@@ -719,6 +754,7 @@ dnl
 dnl Thread-related stuff
 dnl
 THREAD_LIBS=""
+BASE_THREAD_LIBS=""
 WITH_THREADS=0
 THREAD_CFLAGS=""
 TEST_THREADS=""
@@ -745,6 +781,12 @@ else
        *beos*) WITH_THREADS="1"
 	   THREAD_CFLAGS="$THREAD_CFLAGS -DHAVE_BEOS_THREADS"
        ;;
+       *linux*)
+           if test "${CC}" = "gcc" -a "${THREAD_LIBS}" = "-lpthread" ; then
+	       THREAD_LIBS=""
+	       BASE_THREAD_LIBS="-lpthread"
+	   fi
+       ;;
     esac
     if test "$WITH_THREADS" = "1" ; then
 	THREAD_CFLAGS="$THREAD_CFLAGS -D_REENTRANT"
@@ -756,6 +798,7 @@ if test "$with_thread_alloc" = "yes" -a "$WITH_THREADS" = "1" ; then
 fi
 
 AC_SUBST(THREAD_LIBS)
+AC_SUBST(BASE_THREAD_LIBS)
 AC_SUBST(WITH_THREADS)
 AC_SUBST(THREAD_CFLAGS)
 AC_SUBST(TEST_THREADS)