xmlsec1-nss.patch

   1 --- xmlsec1-1.2.22/configure.ac.orig    2016-04-20 18:26:22.000000000 +0200
   2 +++ xmlsec1-1.2.22/configure.ac 2016-05-16 19:03:57.729094153 +0200
   3 @@ -683,16 +683,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
  22 @@ -746,7 +741,7 @@
  23      NSS_NSS_H=""
  24
  25      if test "z$with_nss" != "z" ; then
  26 -       NSS_CFLAGS="$NSS_CFLAGS -I$with_nss/include -I$with_nss/include/nss"
  27 +       NSS_CFLAGS="$NSS_CFLAGS -I$with_nss/include -I$with_nss/include/nss -I/usr/include/nspr"
  28         if test "z$with_gnu_ld" = "zyes" ; then
  29             NSS_LIBS="$NSS_LIBS -Wl,-rpath-link -Wl,$with_nss/lib -L$with_nss/lib $NSS_LIBS_LIST"
  30          else
  31 @@ -754,16 +749,11 @@
  32          fi
  33         NSS_INCLUDES_FOUND="yes"
  34         NSS_LIBS_FOUND="yes"
  35 -       NSS_NSS_H="$with_nss/include/nss.h"
  36 +       NSS_NSS_H="$with_nss/include/nss/nss.h"
  37      else
  38         for dir in $ac_nss_inc_dir ; do
  39             if test -f $dir/nss/nss.h ; then
  40 -               dnl do not add -I/usr/include because compiler does it anyway
  41 -               if test "z$dir" = "z/usr/include" ; then
  42 -                   NSS_CFLAGS="$NSS_CFLAGS"
  43 -               else
  44 -                   NSS_CFLAGS="$NSS_CFLAGS -I$dir/nss"
  45 -               fi
  46 +               NSS_CFLAGS="$NSS_CFLAGS -I$dir/nss"
  47                 NSS_INCLUDES_FOUND="yes"
  48                 NSS_NSS_H="$dir/nss/nss.h"
  49                 break