- updated to 1.2.23
[packages/xmlsec1.git] / xmlsec1-nss.patch
1 --- xmlsec1-1.2.23/configure.ac.orig    2016-10-17 00:48:17.000000000 +0200
2 +++ xmlsec1-1.2.23/configure.ac 2016-12-18 21:51:03.254443658 +0100
3 @@ -673,23 +673,14 @@
4      if test "z$with_nspr" != "z" ; then
5         NSPR_PREFIX="$with_nspr"
6         NSPR_CFLAGS="-I$with_nspr/include -I$with_nspr/include/nspr"
7 -       if test "z$with_gnu_ld" = "zyes" ; then
8 -           NSPR_LIBS="-Wl,-rpath-link -Wl,$with_nspr/lib -L$with_nspr/lib $NSPR_LIBS_LIST"
9 -       else
10 -           NSPR_LIBS="-L$with_nspr/lib $NSPR_LIBS_LIST"
11 -       fi
12 +           NSPR_LIBS="$NSPR_LIBS_LIST"
13         NSPR_INCLUDES_FOUND="yes"
14         NSPR_LIBS_FOUND="yes"
15 -       NSPR_PRINIT_H="$with_nspr/include/prinit.h"
16 +       NSPR_PRINIT_H="$with_nspr/include/nspr/prinit.h"
17      else
18         for dir in $ac_nss_inc_dir ; do
19             if test -f $dir/nspr/prinit.h ; then
20 -               dnl do not add -I/usr/include because compiler does it anyway
21 -               if test "z$dir" = "z/usr/include" ; then
22 -                   NSPR_CFLAGS=""
23 -               else
24 -                   NSPR_CFLAGS="-I$dir/nspr"
25 -               fi
26 +               NSPR_CFLAGS="-I$dir/nspr"
27                 NSPR_INCLUDES_FOUND="yes"
28                 NSPR_PRINIT_H="$dir/nspr/prinit.h"
29                 break
30 @@ -698,16 +689,7 @@
31         
32         for dir in $ac_nss_lib_dir ; do
33             if test -f $dir/libnspr4$shrext ; then
34 -               dnl do not add -L/usr/lib because compiler does it anyway
35 -               if test "z$dir" = "z/usr/lib" ; then
36                     NSPR_LIBS="$NSPR_LIBS_LIST"
37 -               else
38 -                   if test "z$with_gnu_ld" = "zyes" ; then
39 -                       NSPR_LIBS="-Wl,-rpath-link -Wl,$dir -L$dir $NSPR_LIBS_LIST"
40 -                   else
41 -                       NSPR_LIBS="-L$dir $NSPR_LIBS_LIST"
42 -                   fi
43 -               fi
44                 NSPR_LIBS_FOUND="yes"
45                 break
46             fi
47 @@ -743,24 +725,15 @@
48      NSS_NSS_H=""
49  
50      if test "z$with_nss" != "z" ; then
51 -       NSS_CFLAGS="$NSS_CFLAGS -I$with_nss/include -I$with_nss/include/nss"
52 -       if test "z$with_gnu_ld" = "zyes" ; then
53 -           NSS_LIBS="$NSS_LIBS -Wl,-rpath-link -Wl,$with_nss/lib -L$with_nss/lib $NSS_LIBS_LIST"
54 -        else
55 -           NSS_LIBS="$NSS_LIBS -L$with_nss/lib $NSS_LIBS_LIST"
56 -        fi
57 +       NSS_CFLAGS="$NSS_CFLAGS -I$with_nss/include -I$with_nss/include/nss -I/usr/include/nspr"
58 +           NSS_LIBS="$NSS_LIBS $NSS_LIBS_LIST"
59         NSS_INCLUDES_FOUND="yes"
60         NSS_LIBS_FOUND="yes"
61 -       NSS_NSS_H="$with_nss/include/nss.h"
62 +       NSS_NSS_H="$with_nss/include/nss/nss.h"
63      else
64         for dir in $ac_nss_inc_dir ; do
65             if test -f $dir/nss/nss.h ; then
66 -               dnl do not add -I/usr/include because compiler does it anyway
67 -               if test "z$dir" = "z/usr/include" ; then
68 -                   NSS_CFLAGS="$NSS_CFLAGS"
69 -               else
70 -                   NSS_CFLAGS="$NSS_CFLAGS -I$dir/nss"
71 -               fi
72 +               NSS_CFLAGS="$NSS_CFLAGS -I$dir/nss"
73                 NSS_INCLUDES_FOUND="yes"
74                 NSS_NSS_H="$dir/nss/nss.h"
75                 break
76 @@ -770,15 +743,7 @@
77          for dir in $ac_nss_lib_dir ; do
78             if test -f $dir/libnss3$shrext ; then
79                 dnl do not add -L/usr/lib because compiler does it anyway
80 -               if test "z$dir" = "z/usr/lib" ; then
81                     NSS_LIBS="$NSS_LIBS_LIST"
82 -                else
83 -                   if test "z$with_gnu_ld" = "zyes" ; then
84 -                       NSS_LIBS="-Wl,-rpath-link -Wl,$dir -L$dir $NSS_LIBS_LIST"
85 -                   else
86 -                       NSS_LIBS="-L$dir $NSS_LIBS_LIST"
87 -                   fi
88 -               fi
89                 NSS_LIBS_FOUND="yes"
90                 break
91             fi
92 @@ -940,7 +905,7 @@
93      SAVE_LDFLAGS="$LDFLAGS"
94      if test "z$with_gnutls" != "z" -a "z$with_gnutls" != "zno" ; then
95          GNUTLS_CFLAGS="-I$with_gnutls/include"
96 -        GNUTLS_LIBS="-L$with_gnutls/lib -lgnutls"
97 +        GNUTLS_LIBS="-lgnutls"
98          CFLAGS="$GNUTLS_CFLAGS $CFLAGS"
99          LDFLAGS="$GNUTLS_LIBS $LDFLAGS"
100      fi
This page took 0.14156 seconds and 3 git commands to generate.