[Gsrc-commit] /srv/bzr/gsrc/trunk r1393: include gnustep-base patch

[Brandon Invergo]

------------------------------------------------------------
revno: 1393
committer: Brandon Invergo <address@hidden>
branch nick: trunk
timestamp: Mon 2012-12-10 23:54:40 +0100
message:
  include gnustep-base patch
added:
  gnustep/gnustep-base/files/
  gnustep/gnustep-base/files/gnustep-base-1.24.0-conf-ignore-xmltest.diff

=== added directory 'gnustep/gnustep-base/files'
=== added file 
'gnustep/gnustep-base/files/gnustep-base-1.24.0-conf-ignore-xmltest.diff'
--- a/gnustep/gnustep-base/files/gnustep-base-1.24.0-conf-ignore-xmltest.diff   
1970-01-01 00:00:00 +0000
+++ b/gnustep/gnustep-base/files/gnustep-base-1.24.0-conf-ignore-xmltest.diff   
2012-12-10 22:54:40 +0000
@@ -0,0 +1,132 @@
+diff -x config.log -x config.status -ru work/gnustep-base-1.24.0/configure.ac 
work/gnustep-base-1.24.0/configure.ac
+--- work/gnustep-base-1.24.0/configure.ac      2012-01-29 17:57:06.000000000 
+0100
++++ work/gnustep-base-1.24.0/configure.ac      2012-12-09 23:26:33.309349941 
+0100
+@@ -2769,68 +2769,68 @@
+   [  --disable-xml                    Compile even if XML-dependencies are 
not met],,
+   enable_xml=yes)
+ 
+-if test $enable_xml = yes; then
+-  # Save CFLAGS and LIBS as AM_PATH_XML clobbers these variables regardless
+-  # of the success of the macro.
+-  saved_LIBS="$LIBS"
+-  saved_CFLAGS="$CFLAGS"
++dnl if test $enable_xml = yes; then
++dnl   # Save CFLAGS and LIBS as AM_PATH_XML clobbers these variables 
regardless
++dnl   # of the success of the macro.
++dnl   saved_LIBS="$LIBS"
++dnl   saved_CFLAGS="$CFLAGS"
+ 
+-  AM_PATH_XML(2.3.0, enable_libxml=yes, enable_libxml=no)
+-  if test $enable_libxml = yes; then
+-    CPPFLAGS="$CPPFLAGS $XML_CFLAGS"
+-    INCLUDE_FLAGS="$INCLUDE_FLAGS $XML_CFLAGS"
+-    LIBS="$XML_LIBS $LIBS"
+-    HAVE_LIBXML=1
+-    AC_DEFINE(HAVE_LIBXML,1,[Define if libxml available])
+-    AC_CHECK_HEADERS(libxml/SAX2.h)
+-    #--------------------------------------------------------------------
+-    # Check for (optional) libxslt
+-    #--------------------------------------------------------------------
+-    AC_ARG_ENABLE(xslt,
+-      [  --disable-xslt               Compile even if XSLT-dependency is not 
met],,
+-      enable_xslt=yes)
++dnl   AM_PATH_XML(2.3.0, enable_libxml=yes, enable_libxml=no)
++dnl   if test $enable_libxml = yes; then
++dnl     CPPFLAGS="$CPPFLAGS $XML_CFLAGS"
++dnl     INCLUDE_FLAGS="$INCLUDE_FLAGS $XML_CFLAGS"
++dnl     LIBS="$XML_LIBS $LIBS"
++dnl     HAVE_LIBXML=1
++dnl     AC_DEFINE(HAVE_LIBXML,1,[Define if libxml available])
++dnl     AC_CHECK_HEADERS(libxml/SAX2.h)
++dnl     #--------------------------------------------------------------------
++dnl     # Check for (optional) libxslt
++dnl     #--------------------------------------------------------------------
++dnl     AC_ARG_ENABLE(xslt,
++dnl       [  --disable-xslt           Compile even if XSLT-dependency is not 
met],,
++dnl       enable_xslt=yes)
+ 
+-    if test $enable_xslt = yes; then
+-      AC_CHECK_LIB(xslt, xsltApplyStylesheet, xslt_ok=yes, xslt_ok=no)
+-      if test "$xslt_ok" = "yes"; then
+-      AC_CHECK_HEADER(libxslt/xslt.h, xslthdr_ok=yes, xslthdr_ok=no)
+-      if test "$xslthdr_ok" = "no"; then
+-        xslt_ok=no
+-      fi
+-      fi
+-      if test "$xslt_ok" = "yes"; then
+-      HAVE_LIBXSLT=1
+-      AC_DEFINE(HAVE_LIBXSLT,1,[Define if libxslt available])
+-      LIBS="-lxslt $LIBS"
+-      else
+-      echo
+-      echo "You may not want to build base without XSLT support."
+-      echo "Doing so will disable the XSLT extensions."
+-      echo "If you really want to build -base without XSLT support,"
+-      echo "add --disable-xslt to the configure arguments."
+-      AC_MSG_WARN([Missing support for XSLT functionality.])
+-      fi
+-    else
+-      HAVE_LIBXSLT=0
+-      AC_MSG_WARN([Disabled support for XSLT funtionality.])
+-    fi
+-    AC_SUBST(HAVE_LIBXSLT)
+-  else
+-    HAVE_LIBXML=0
+-    # Restore the CFLAGS and LIBS because AM_PATH_XML messes them
+-    LIBS="$saved_LIBS"
+-    CFLAGS="$saved_CFLAGS"
+-    echo
+-    echo "You may not want to build base without libxml2."
+-    echo "Doing so will disable the XML, XPATH, and XMLRPC extensions."
+-    echo "If you really want to build -base without XML support,"
+-    echo "add --disable-xml to the configure arguments."
+-    AC_MSG_ERROR([Missing support for XML functionality.])
+-  fi
+-else
+-  AC_MSG_WARN([Disabled support for XML funtionality.])
+-  HAVE_LIBXML=0
+-fi
++dnl     if test $enable_xslt = yes; then
++dnl       AC_CHECK_LIB(xslt, xsltApplyStylesheet, xslt_ok=yes, xslt_ok=no)
++dnl       if test "$xslt_ok" = "yes"; then
++dnl   AC_CHECK_HEADER(libxslt/xslt.h, xslthdr_ok=yes, xslthdr_ok=no)
++dnl   if test "$xslthdr_ok" = "no"; then
++dnl     xslt_ok=no
++dnl   fi
++dnl       fi
++dnl       if test "$xslt_ok" = "yes"; then
++dnl   HAVE_LIBXSLT=1
++dnl   AC_DEFINE(HAVE_LIBXSLT,1,[Define if libxslt available])
++dnl   LIBS="-lxslt $LIBS"
++dnl       else
++dnl   echo
++dnl   echo "You may not want to build base without XSLT support."
++dnl   echo "Doing so will disable the XSLT extensions."
++dnl   echo "If you really want to build -base without XSLT support,"
++dnl   echo "add --disable-xslt to the configure arguments."
++dnl   AC_MSG_WARN([Missing support for XSLT functionality.])
++dnl       fi
++dnl     else
++dnl       HAVE_LIBXSLT=0
++dnl       AC_MSG_WARN([Disabled support for XSLT funtionality.])
++dnl     fi
++dnl     AC_SUBST(HAVE_LIBXSLT)
++dnl   else
++dnl     HAVE_LIBXML=0
++dnl     # Restore the CFLAGS and LIBS because AM_PATH_XML messes them
++dnl     LIBS="$saved_LIBS"
++dnl     CFLAGS="$saved_CFLAGS"
++dnl     echo
++dnl     echo "You may not want to build base without libxml2."
++dnl     echo "Doing so will disable the XML, XPATH, and XMLRPC extensions."
++dnl     echo "If you really want to build -base without XML support,"
++dnl     echo "add --disable-xml to the configure arguments."
++dnl     AC_MSG_ERROR([Missing support for XML functionality.])
++dnl   fi
++dnl else
++dnl   AC_MSG_WARN([Disabled support for XML funtionality.])
++dnl   HAVE_LIBXML=0
++dnl fi
+ AC_SUBST(HAVE_LIBXML)
+ 
+ #--------------------------------------------------------------------