diff options
| author | Peter Foley <pefoley2@verizon.net> | 2013-01-01 09:39:36 -0500 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@suse.cz> | 2013-01-02 16:21:23 +0000 |
| commit | c003d25d24786073229d0f8e545b2863c27fa282 (patch) | |
| tree | c79f8c7f34a51ae34d7599076dccb92a5955516d /libxmlsec | |
| parent | dc277bc6a1c357fe725db2c567d3e1cf16fb7806 (diff) | |
convert nss to gbuild
Change-Id: I59edc4c437abccc201823d97f1cbec230d273b05
Reviewed-on: https://gerrit.libreoffice.org/1529
Reviewed-by: Luboš Luňák <l.lunak@suse.cz>
Tested-by: Luboš Luňák <l.lunak@suse.cz>
Diffstat (limited to 'libxmlsec')
| -rw-r--r-- | libxmlsec/xmlsec1-configure.patch | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/libxmlsec/xmlsec1-configure.patch b/libxmlsec/xmlsec1-configure.patch index ead9050304e1..2db0426c281a 100644 --- a/libxmlsec/xmlsec1-configure.patch +++ b/libxmlsec/xmlsec1-configure.patch @@ -97,10 +97,29 @@ - ac_nss_lib_dir="/usr/lib /usr/lib64 /usr/local/lib /usr/lib/$ac_mozilla_name /usr/local/lib/$ac_mozilla_name" - 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" + ac_nss_lib_dir="${SOLARVERSION}/${INPATH}/lib${UPDMINOREXT}" -+ ac_nss_inc_dir="${SOLARVERSION}/${INPATH}/inc${UPDMINOREXT}/mozilla" ++ ac_nss_inc_dir="${WORKDIR}/UnpackedTarball/nss/mozilla/dist/out/include ${WORKDIR}/UnpackedTarball/nss/mozilla/dist/public" AC_MSG_CHECKING(for nspr libraries >= $NSPR_MIN_VERSION) NSPR_INCLUDES_FOUND="no" +@@ -637,15 +660,15 @@ + NSPR_PRINIT_H="$with_nspr/include/prinit.h" + else + for dir in $ac_nss_inc_dir ; do +- if test -f $dir/nspr/prinit.h ; then ++ if test -f $dir/prinit.h ; then + dnl do not add -I/usr/include because compiler does it anyway + if test "z$dir" = "z/usr/include" ; then + NSPR_CFLAGS="" + else +- NSPR_CFLAGS="-I$dir/nspr" ++ NSPR_CFLAGS="-I$dir" + fi + NSPR_INCLUDES_FOUND="yes" +- NSPR_PRINIT_H="$dir/nspr/prinit.h" ++ NSPR_PRINIT_H="$dir/prinit.h" + break + fi + done @@ -648,7 +671,7 @@ done |