libxmlsec/xmlsec1-configure.patch

   1 --- misc/xmlsec1-1.2.14/Makefile.in     2009-06-25 22:53:34.000000000 +0200
   2 +++ misc/build/xmlsec1-1.2.14/Makefile.in       2009-10-01 10:32:48.708515261 +0200
   3 @@ -341,8 +341,9 @@
   4  top_srcdir = @top_srcdir@
   5  NULL =
   6  SAFE_VERSION = @XMLSEC_VERSION_SAFE@
   7 -SUBDIRS = include src apps man docs
   8 -TEST_APP = apps/xmlsec1$(EXEEXT)
   9 +#Do not build xmlsec1 app. It is not needed. Also the libtool includes
  10 +#a -L/path_to_lib_dir which may contain an incompatible lixbml2.
  11 +SUBDIRS = include src man docs
  12  DEFAULT_CRYPTO = @XMLSEC_CRYPTO@
  13  bin_SCRIPTS = xmlsec1-config
  14  pkgconfig_DATA = xmlsec1.pc @XMLSEC_CRYPTO_PC_FILES_LIST@
  15 --- misc/xmlsec1-1.2.14/configure.in    2009-06-25 22:53:18.000000000 +0200
  16 +++ misc/build/xmlsec1-1.2.14/configure.in      2009-10-01 10:28:50.990755126 +0200
  17 @@ -190,8 +190,14 @@
  18  dnl ==========================================================================
  19  dnl find libxml
  20  dnl ==========================================================================
  21 -LIBXML_MIN_VERSION="2.7.4"
  22  LIBXML_CONFIG="xml2-config"
  23 +if test -f "$SOLARVERSION/$INPATH/bin$UPDMINOREXT/xml2-config" ; then
  24 +  LIBXML_CONFIG="$SOLARVERSION/$INPATH/bin$UPDMINOREXT/xml2-config"
  25 +elif test -n "$MINGW_SYSROOT" -a -x "$MINGW_SYSROOT/bin/xml2-config" ; then
  26 +  LIBXML_CONFIG="$MINGW_SYSROOT/bin/xml2-config"
  27 +else
  28 +  LIBXML_CONFIG="xml2-config"
  29 +fi
  30  LIBXML_CFLAGS=""
  31  LIBXML_LIBS=""
  32  LIBXML_FOUND="no"
  33 @@ -555,12 +559,26 @@
  34
  35  XMLSEC_NO_NSS="1"
  36  MOZILLA_MIN_VERSION="1.4"
  37 +if test "z$MOZ_FLAVOUR" = "zfirefox" ; then
  38 +    MOZILLA_MIN_VERSION="1.0"
  39 +fi
  40  NSS_MIN_VERSION="3.2"
  41  NSPR_MIN_VERSION="4.0"
  42  NSS_CFLAGS=""
  43  NSS_LIBS=""
  44 -NSS_LIBS_LIST="-lnss3 -lsmime3"
  45 -NSPR_LIBS_LIST="-lnspr4 -lplds4 -lplc4"
  46 +
  47 +case $host_os in
  48 +cygwin* | mingw* | pw32*)
  49 +  NSS_LIBS_LIST="-lnss3 -lsmime3"
  50 +  NSPR_LIBS_LIST="-lnspr4"
  51 +  ;;
  52 +
  53 +*)
  54 +  NSS_LIBS_LIST="-lnss3 -lsmime3"
  55 +  NSPR_LIBS_LIST="-lnspr4 -lplds4 -lplc4"
  56 +  ;;
  57 +esac
  58 +
  59  NSS_CRYPTO_LIB="$XMLSEC_PACKAGE-nss"
  60  NSS_FOUND="no"
  61  NSPR_PACKAGE=mozilla-nspr
  62 @@ -586,6 +604,16 @@
  63      dnl We are going to try all options
  64      dnl
  65      if test "z$NSS_FOUND" = "zno" ; then
  66 +        PKG_CHECK_MODULES(NSS, $MOZ_FLAVOUR-nspr >= $MOZILLA_MIN_VERSION $MOZ_FLAVOUR >= $MOZILLA_MIN_VERSION,
  67 +           [NSS_FOUND=yes NSPR_PACKAGE=$MOZ_FLAVOUR-nspr NSS_PACKAGE=$MOZ_FLAVOUR-nss],
  68 +           [NSS_FOUND=no])
  69 +    fi
  70 +    if test "z$NSS_FOUND" = "zno" ; then
  71 +        PKG_CHECK_MODULES(NSS, nss >= 3.9.3 nspr >= 4.8,
  72 +           [NSS_FOUND=yes NSPR_PACKAGE=nspr NSS_PACKAGE=nss],
  73 +           [NSS_FOUND=no])
  74 +    fi
  75 +    if test "z$NSS_FOUND" = "zno" ; then
  76          PKG_CHECK_MODULES(NSS, mozilla-nspr >= $MOZILLA_MIN_VERSION mozilla-nss >= $MOZILLA_MIN_VERSION,
  77             [NSS_FOUND=yes NSPR_PACKAGE=mozilla-nspr NSS_PACKAGE=mozilla-nss],
  78             [NSS_FOUND=no])
  79 @@ -612,8 +635,8 @@
  80          ac_mozilla_name=mozilla-$MOZILLA_MIN_VERSION
  81      fi
  82
  83 -    ac_nss_lib_dir="/usr/lib /usr/lib64 /usr/local/lib /usr/lib/$ac_mozilla_name /usr/local/lib/$ac_mozilla_name"
  84 -    ac_nss_inc_dir="/usr/include /usr/include/mozilla /usr/local/include /usr/local/include/mozilla /usr/include/$ac_mozilla_name /usr/local/include/$ac_mozilla_name"
  85 +    ac_nss_lib_dir="${SOLARVERSION}/${INPATH}/lib${UPDMINOREXT}"
  86 +    ac_nss_inc_dir="${SOLARVERSION}/${INPATH}/inc${UPDMINOREXT}/mozilla"
  87
  88      AC_MSG_CHECKING(for nspr libraries >= $NSPR_MIN_VERSION)
  89      NSPR_INCLUDES_FOUND="no"
  90 @@ -648,7 +671,7 @@
  91         done
  92
  93         for dir in $ac_nss_lib_dir ; do
  94 -           if test -f $dir/libnspr4$shrext ; then
  95 +           if test -f $dir/libnspr4.so -o -f $dir/libnspr4.dylib ; then
  96                 dnl do not add -L/usr/lib because compiler does it anyway
  97                 if test "z$dir" = "z/usr/lib" ; then
  98                     NSPR_LIBS="$NSPR_LIBS_LIST"
  99 @@ -719,7 +742,7 @@
 100          done
 101
 102          for dir in $ac_nss_lib_dir ; do
 103 -           if test -f $dir/libnss3$shrext ; then
 104 +            if test -f $dir/libnss3.so -o -f $dir/libnss3.dylib ; then
 105                 dnl do not add -L/usr/lib because compiler does it anyway
 106                 if test "z$dir" = "z/usr/lib" ; then
 107                     NSS_LIBS="$NSS_LIBS_LIST"
 108 @@ -738,7 +761,7 @@
 109
 110      if test "z$NSS_INCLUDES_FOUND" = "zyes" -a "z$NSS_LIBS_FOUND" = "zyes" ; then
 111         OLD_CPPFLAGS=$CPPFLAGS
 112 -       CPPFLAGS="$NSS_CFLAGS"
 113 +       CPPFLAGS="$NSS_CFLAGS $NSPR_CFLAGS"
 114         AC_EGREP_CPP(yes,[
 115            #include <nss.h>
 116            #if NSS_VMAJOR >= 3 && NSS_VMINOR >= 2
 117 --- misc/xmlsec1-1.2.14/win32/Makefile.msvc     2009-06-25 22:53:18.000000000 +0200
 118 +++ misc/build/xmlsec1-1.2.14/win32/Makefile.msvc       2009-10-01 10:28:50.997747312 +0200
 119 @@ -376,7 +376,7 @@
 120  XMLSEC_OPENSSL_SOLIBS   = libeay32.lib wsock32.lib kernel32.lib user32.lib gdi32.lib
 121  XMLSEC_OPENSSL_ALIBS    = libeay32.lib wsock32.lib kernel32.lib user32.lib gdi32.lib
 122
 123 -XMLSEC_NSS_SOLIBS      = smime3.lib ssl3.lib nss3.lib libnspr4.lib libplds4.lib libplc4.lib kernel32.lib user32.lib gdi32.lib
 124 +XMLSEC_NSS_SOLIBS      = smime3.lib nss3.lib nspr4.lib kernel32.lib user32.lib gdi32.lib
 125  XMLSEC_NSS_ALIBS       = smime3.lib ssl3.lib nss3.lib libnspr4_s.lib libplds4_s.lib libplc4_s.lib kernel32.lib user32.lib gdi32.lib
 126
 127  XMLSEC_MSCRYPTO_SOLIBS  = kernel32.lib user32.lib gdi32.lib Crypt32.lib Advapi32.lib