- nspr/nss headers fix
[packages/xmlsec1.git] / xmlsec1-nss.patch
CommitLineData
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
3@@ -545,7 +545,7 @@
4
5 if test "z$with_nspr" != "z" ; then
6 NSPR_PREFIX="$with_nspr"
7- NSPR_CFLAGS="-I$with_nspr/include"
8+ NSPR_CFLAGS="-I$with_nspr/include/nspr"
9 if test "z$with_gnu_ld" = "zyes" ; then
10 NSPR_LIBS="-Wl,-rpath-link -Wl,$with_nspr/lib -L$with_nspr/lib $NSPR_LIBS_LIST"
11 else
12@@ -553,16 +553,11 @@
13 fi
14 NSPR_INCLUDES_FOUND="yes"
15 NSPR_LIBS_FOUND="yes"
16- NSPR_PRINIT_H="$with_nspr/include/prinit.h"
17+ NSPR_PRINIT_H="$with_nspr/include/nspr/prinit.h"
18 else
19 for dir in $ac_nss_inc_dir ; do
20 if test -f $dir/nspr/prinit.h ; then
21- dnl do not add -I/usr/include because compiler does it anyway
22- if test "z$dir" = "z/usr/include" ; then
23- NSPR_CFLAGS=""
24- else
25- NSPR_CFLAGS="-I$dir/nspr"
26- fi
27+ NSPR_CFLAGS="-I$dir/nspr"
28 NSPR_INCLUDES_FOUND="yes"
29 NSPR_PRINIT_H="$dir/nspr/prinit.h"
30 break
31@@ -616,7 +611,7 @@
32 NSS_NSS_H=""
33
34 if test "z$with_nss" != "z" ; then
35- NSS_CFLAGS="$NSS_CFLAGS -I$with_nss/include"
36+ NSS_CFLAGS="$NSS_CFLAGS -I$with_nss/include/nss"
37 if test "z$with_gnu_ld" = "zyes" ; then
38 NSS_LIBS="$NSS_LIBS -Wl,-rpath-link -Wl,$with_nss/lib -L$with_nss/lib $NSS_LIBS_LIST"
39 else
40@@ -624,16 +619,11 @@
41 fi
42 NSS_INCLUDES_FOUND="yes"
43 NSS_LIBS_FOUND="yes"
44- NSS_NSS_H="$with_nss/include/nss.h"
45+ NSS_NSS_H="$with_nss/include/nss/nss.h"
46 else
47 for dir in $ac_nss_inc_dir ; do
48 if test -f $dir/nss/nss.h ; then
49- dnl do not add -I/usr/include because compiler does it anyway
50- if test "z$dir" = "z/usr/include" ; then
51- NSS_CFLAGS="$NSS_CFLAGS"
52- else
53- NSS_CFLAGS="$NSS_CFLAGS -I$dir/nss"
54- fi
55+ NSS_CFLAGS="$NSS_CFLAGS -I$dir/nss"
56 NSS_INCLUDES_FOUND="yes"
57 NSS_NSS_H="$dir/nss/nss.h"
58 break
This page took 0.061409 seconds and 4 git commands to generate.