diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-03-18 13:06:34 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-03-18 13:06:34 +0000 |
| commit | 399171104ded1294060ea43b59d44e0a28338ac4 (patch) | |
| tree | 9357e977a196fd28765371cb8bf6197a3ea082d1 /libxmlsec | |
| parent | 188ad9a68eb53811650d86d37957fbfe5991a7c8 (diff) | |
INTEGRATION: CWS sb83 (1.21.16); FILE MERGED
2008/02/01 13:30:08 sb 1.21.16.2: RESYNC: (1.21-1.22); FILE MERGED
2008/01/25 16:14:19 sb 1.21.16.1: #i84200# tunnel macosx-dylib-link-list for (potentially) OOo-built libs this module links against into this module's external build machinery (change to configure not reflected in configure.in---would be a waste of time)
Diffstat (limited to 'libxmlsec')
| -rw-r--r-- | libxmlsec/xmlsec1-1.2.6.patch | 29 |
1 files changed, 22 insertions, 7 deletions
diff --git a/libxmlsec/xmlsec1-1.2.6.patch b/libxmlsec/xmlsec1-1.2.6.patch index f50a34f2a7d7..8005fb5b2b5e 100644 --- a/libxmlsec/xmlsec1-1.2.6.patch +++ b/libxmlsec/xmlsec1-1.2.6.patch @@ -754,8 +754,23 @@ fi *************** +*** 26004,26009 **** +--- 26063,26074 ---- + fi + fi + ++ case $host_os in ++ darwin*) ++ NSS_LIBS="$NSS_LIBS "`"$PERL" "$SOLARENV/bin/macosx-dylib-link-list.pl" $NSS_LIBS` ++ ;; ++ esac ++ + if test "z$NSS_FOUND" = "zyes" ; then + XMLSEC_NO_NSS="0" + NSS_CFLAGS="$NSS_CFLAGS -DXMLSEC_CRYPTO_NSS=1" +*************** *** 26037,26042 **** ---- 26096,26204 ---- +--- 26102,26210 ---- @@ -874,7 +889,7 @@ cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure # tests run on this system so they can be shared between configure ---- 26766,26772 ---- +--- 26772,26778 ---- done @@ -884,7 +899,7 @@ # tests run on this system so they can be shared between configure *************** *** 27521,27526 **** ---- 27683,27690 ---- +--- 27689,27696 ---- s,@NSS_MIN_VERSION@,$NSS_MIN_VERSION,;t t s,@NSPR_MIN_VERSION@,$NSPR_MIN_VERSION,;t t s,@MOZILLA_MIN_VERSION@,$MOZILLA_MIN_VERSION,;t t @@ -895,7 +910,7 @@ s,@XMLSEC_NO_SHA1@,$XMLSEC_NO_SHA1,;t t *************** *** 29231,29236 **** ---- 29395,29402 ---- +--- 29401,29408 ---- s,@NSS_MIN_VERSION@,$NSS_MIN_VERSION,;t t s,@NSPR_MIN_VERSION@,$NSPR_MIN_VERSION,;t t s,@MOZILLA_MIN_VERSION@,$MOZILLA_MIN_VERSION,;t t @@ -906,7 +921,7 @@ s,@XMLSEC_NO_SHA1@,$XMLSEC_NO_SHA1,;t t *************** *** 30941,30946 **** ---- 31107,31114 ---- +--- 31113,31120 ---- s,@NSS_MIN_VERSION@,$NSS_MIN_VERSION,;t t s,@NSPR_MIN_VERSION@,$NSPR_MIN_VERSION,;t t s,@MOZILLA_MIN_VERSION@,$MOZILLA_MIN_VERSION,;t t @@ -917,7 +932,7 @@ s,@XMLSEC_NO_SHA1@,$XMLSEC_NO_SHA1,;t t *************** *** 32653,32658 **** ---- 32821,34544 ---- +--- 32827,34550 ---- s,@NSS_MIN_VERSION@,$NSS_MIN_VERSION,;t t s,@NSPR_MIN_VERSION@,$NSPR_MIN_VERSION,;t t s,@MOZILLA_MIN_VERSION@,$MOZILLA_MIN_VERSION,;t t @@ -2644,7 +2659,7 @@ s,@XMLSEC_NO_SHA1@,$XMLSEC_NO_SHA1,;t t *************** *** 34368,34373 **** ---- 36254,36261 ---- +--- 36260,36267 ---- s,@NSS_MIN_VERSION@,$NSS_MIN_VERSION,;t t s,@NSPR_MIN_VERSION@,$NSPR_MIN_VERSION,;t t s,@MOZILLA_MIN_VERSION@,$MOZILLA_MIN_VERSION,;t t |