[SCM] Debian packaging for XML-Security-C branch, master, updated. debian/1.4.0-4-8-gc0b003e

[Russ Allbery]

The following commit has been merged in the master branch:
commit a60efbdf2bd1e1360435ed9a52b66f6fe941a3b3
Merge: 34111fc6754e83afe338adb84bf39e63a10a4d2c 694a702bdea8180bc59a2140e2245129643d194d
Author: Russ Allbery <rra at debian.org>
Date:   Wed Aug 5 10:21:33 2009 -0700

    Merge commit 'upstream/1.5.1'

diff --combined configure.ac
index 2a35b4c,63e6090..4ef81c8
--- a/configure.ac
+++ b/configure.ac
@@@ -19,12 -19,12 +19,12 @@@
  
  # Process this file with autoconf to produce a configure script
  
- AC_INIT([[XML-Security-C]], [1.4.0], [security-dev at xml.apache.org], [xml-security-c])
+ AC_INIT([[XML-Security-C]], [1.5.1], [security-dev at xml.apache.org], [xml-security-c])
  AC_CONFIG_AUX_DIR([config])
  
  # kick off automake
  
- AM_INIT_AUTOMAKE(xml-security-c, 1.4.0)
+ AM_INIT_AUTOMAKE(xml-security-c, 1.5.1)
  sinclude(m4/acx_pthread.m4)
  AM_PROG_LIBTOOL
  
@@@ -226,7 -226,7 +226,7 @@@ case "${host}" i
  
  						;;
  
 -  *-*-linux*)     platform=LINUX ;
 +  *-*-linux*|*-*-k*bsd*-gnu|*-*-gnu*)     platform=LINUX ;
      shlibsuffix=.so
      lib_name="lib${PACKAGE_TARNAME}.so.${package_lib_version}"
      lib_major_name="lib${PACKAGE_TARNAME}.so.${package_lib_major}"
@@@ -239,7 -239,7 +239,7 @@@
  
      # Should use -D_REENTRANT - but not yet OK
      PLATFORM_OPTIONS=["${PLATFORM_OPTIONS} -DLINUX"]
 -    SHARED_OPTIONS=["-Wl,-soname,\$(LIBNAME) -DLINUX -shared"]
 +    SHARED_OPTIONS=["-Wl,-soname,\$(LIBMAJORNAME) -DLINUX -shared"]
      LINK_OPTIONS=["-DLINUX -ldl"]
  
  						;;
@@@ -275,7 -275,19 +275,19 @@@
  #                            *)            osver=HPUX11;;
  #                        esac;;
  #        *-*-mvs*)       platform=OS390 ;;
- #        *-*-osf*)       platform=TRU64 ;;
+ 
+   *-*-osf*)
+     platform=TRU64
+     shlibsuffix=.so
+     lib_name="lib${PACKAGE_TARNAME}.so.${package_lib_version}"
+     lib_major_name="lib${PACKAGE_TARNAME}.so.${package_lib_major}"
+     lib_short_name="lib${PACKAGE_TARNAME}.so"
+ 
+     # Should use -D_REENTRANT - but not yet OK
+     PLATFORM_OPTIONS=["${PLATFORM_OPTIONS} -DTRU64"]
+     SHARED_OPTIONS=["-Wl,-soname,\$(LIBNAME) -DTRU64 -shared"]
+     LINK_OPTIONS=["-DTRU64"]
+                         ;;
  
    *-apple-darwin*)
      platform=MACOSX 
@@@ -382,7 -394,7 +394,7 @@@ if test $XERCESCROOT; the
  
  fi
  
- if test -z $xerces_found ; then
+ if test -z "$xerces_found" ; then
  
    # Xerces was not found
  
@@@ -403,7 -415,7 +415,7 @@@ f
  # Where is the Xerces lib?
  AC_MSG_CHECKING([for Xerces 2.x or 3.x library naming convention])
  OLD_LIBS=$LIBS
- if test -z xerces_lib_base; then
+ if test -z "$xerces_lib_base" ; then
    LIBS="${LIBS} -lxerces-c"
  else
    LIBS="-L${xerces_lib_base}/lib -lxerces-c ${LIBS}"
@@@ -415,8 -427,8 +427,8 @@@ AC_TRY_LINK([#include <xercesc/util/Pla
     xerceslib_found=yes,
     [LIBS=$OLD_LIBS])
  
- if test -z $xerceslib_found; then
-   if test -z xerces_lib_base; then
+ if test -z "$xerceslib_found" ; then
+   if test -z "$xerces_lib_base" ; then
      LIBS="${LIBS} -lxerces-3.0"
    else
      LIBS="-L${xerces_lib_base}/lib -lxerces-3.0 ${LIBS}"
@@@ -432,6 -444,28 +444,28 @@@ f
  
  # Find out some properties of the version of Xerces we have
  
+ AC_MSG_CHECKING([whether Xerces is 64-bit clean])
+ 
+ AC_TRY_COMPILE([#include <xercesc/framework/MemBufInputSource.hpp>],
+     [using namespace XERCES_CPP_NAMESPACE;
+       XMLFilePos testvar;
+     ],
+     [AC_MSG_RESULT([yes])]
+     [AC_DEFINE(XSEC_XERCES_64BITSAFE)],
+     [AC_MSG_RESULT([no])])
+ 
+ AC_MSG_CHECKING([whether Xerces BinInputStream requires getContentType])
+ 
+ AC_TRY_COMPILE([#include <xercesc/util/BinMemInputStream.hpp>],
+     [using namespace XERCES_CPP_NAMESPACE;
+       XMLByte buf[1024];
+       BinMemInputStream in(buf,1024);
+       in.getContentType();
+     ],
+     [AC_MSG_RESULT([yes])]
+     [AC_DEFINE(XSEC_XERCES_INPUTSTREAM_HAS_CONTENTTYPE)],
+     [AC_MSG_RESULT([no])])
+ 
  AC_MSG_CHECKING([whether Xerces XMLFormatter requires a version])
  
  AC_TRY_COMPILE([#include <xercesc/framework/XMLFormatter.hpp>
@@@ -475,7 -509,7 +509,7 @@@ AC_TRY_COMPILE([#include <xercesc/dom/D
  	[AC_DEFINE(XSEC_XERCES_HAS_SETIDATTRIBUTE)],
  	[AC_MSG_RESULT([no])])
  
- if test -z $xerces_has_setidattribute; then
+ if test -z "$xerces_has_setidattribute" ; then
  
    AC_MSG_CHECKING([whether Xerces XMLElement has ::setIdAttribute(XMLCh*, bool)])
    AC_TRY_COMPILE([#include <xercesc/dom/DOM.hpp>],
@@@ -537,7 -571,7 +571,7 @@@ if test x"$use_xalan" != x"no" ; the
  
    fi
  
-   if test -z $xalan_found ; then
+   if test -z "$xalan_found" ; then
  
      AC_MSG_CHECKING([for Xalan in system includes])
      AC_TRY_CPP([#include <xalanc/Include/XalanVersion.hpp>], 
@@@ -740,7 -774,7 +774,7 @@@ AC_TRY_LINK([#include <openssl/evp.h>]
     openssllib_found=yes,
     [LIBS=$OLD_LIBS])
  
-    if test -z $openssllib_found ; then
+    if test -z "$openssllib_found" ; then
  
     LIBS=["${LIBS} -L${OPENSSL}/lib -lcrypto"]
     AC_TRY_LINK([#include <openssl/evp.h>],
@@@ -755,7 -789,7 +789,7 @@@
  
  fi
  
- if test -z $openssl_found ; then
+ if test -z "$openssl_found" ; then
  
      AC_PATH_PROG(PKG_CONFIG, pkg-config)
      if test "x$PKG_CONFIG" != x && test "x$PKG_CONFIG" != "xno" ; then

-- 
Debian packaging for XML-Security-C