]>
Commit | Line | Data |
---|---|---|
181f6a69 JB |
1 | --- xmlsec1-1.2.6/configure.in.orig 2004-08-26 04:49:24.000000000 +0200 |
2 | +++ xmlsec1-1.2.6/configure.in 2004-10-31 00:56:57.447586088 +0200 | |
181f6a69 JB |
3 | @@ -553,16 +553,11 @@ |
4 | fi | |
5 | NSPR_INCLUDES_FOUND="yes" | |
6 | NSPR_LIBS_FOUND="yes" | |
7 | - NSPR_PRINIT_H="$with_nspr/include/prinit.h" | |
8 | + NSPR_PRINIT_H="$with_nspr/include/nspr/prinit.h" | |
9 | else | |
10 | for dir in $ac_nss_inc_dir ; do | |
11 | if test -f $dir/nspr/prinit.h ; then | |
12 | - dnl do not add -I/usr/include because compiler does it anyway | |
13 | - if test "z$dir" = "z/usr/include" ; then | |
14 | - NSPR_CFLAGS="" | |
15 | - else | |
16 | - NSPR_CFLAGS="-I$dir/nspr" | |
17 | - fi | |
18 | + NSPR_CFLAGS="-I$dir/nspr" | |
19 | NSPR_INCLUDES_FOUND="yes" | |
20 | NSPR_PRINIT_H="$dir/nspr/prinit.h" | |
21 | break | |
181f6a69 JB |
22 | @@ -624,16 +619,11 @@ |
23 | fi | |
24 | NSS_INCLUDES_FOUND="yes" | |
25 | NSS_LIBS_FOUND="yes" | |
26 | - NSS_NSS_H="$with_nss/include/nss.h" | |
27 | + NSS_NSS_H="$with_nss/include/nss/nss.h" | |
28 | else | |
29 | for dir in $ac_nss_inc_dir ; do | |
30 | if test -f $dir/nss/nss.h ; then | |
31 | - dnl do not add -I/usr/include because compiler does it anyway | |
32 | - if test "z$dir" = "z/usr/include" ; then | |
33 | - NSS_CFLAGS="$NSS_CFLAGS" | |
34 | - else | |
35 | - NSS_CFLAGS="$NSS_CFLAGS -I$dir/nss" | |
36 | - fi | |
37 | + NSS_CFLAGS="$NSS_CFLAGS -I$dir/nss" | |
38 | NSS_INCLUDES_FOUND="yes" | |
39 | NSS_NSS_H="$dir/nss/nss.h" | |
40 | break | |
2edf2798 AM |
41 | --- xmlsec1-1.2.14/configure.in~ 2010-04-26 09:58:24.901946082 +0200 |
42 | +++ xmlsec1-1.2.14/configure.in 2010-04-26 10:01:17.278214712 +0200 | |
43 | @@ -689,7 +689,7 @@ | |
44 | NSS_NSS_H="" | |
45 | ||
46 | if test "z$with_nss" != "z" ; then | |
47 | - NSS_CFLAGS="$NSS_CFLAGS -I$with_nss/include -I$with_nss/include/nss" | |
48 | + NSS_CFLAGS="$NSS_CFLAGS -I$with_nss/include -I$with_nss/include/nss -I/usr/include/nspr" | |
49 | if test "z$with_gnu_ld" = "zyes" ; then | |
50 | NSS_LIBS="$NSS_LIBS -Wl,-rpath-link -Wl,$with_nss/lib -L$with_nss/lib $NSS_LIBS_LIST" | |
51 | else |