[jhbuild] Add generated configure bits to nspr patches

[Frederic Peters <fpeters src gnome org>]

commit 8f45f7e0536ed32591a6abcd106b523393090b0f
Author: Frédéric Péters <fpeters 0d be>
Date:   Sat Jun 19 18:24:46 2010 +0200

    Add generated configure bits to nspr patches

 patches/nspr.config_64bits.patch |   66 ++++++++++++++++++++++++++++++++++++++
 patches/nspr.pkgconfig.patch     |   11 ++++++
 2 files changed, 77 insertions(+), 0 deletions(-)
---
diff --git a/patches/nspr.config_64bits.patch b/patches/nspr.config_64bits.patch
index 0b6043c..06469dc 100644
--- a/patches/nspr.config_64bits.patch
+++ b/patches/nspr.config_64bits.patch
@@ -47,3 +47,69 @@
  AC_ARG_ENABLE(mdupdate,
      [  --enable-mdupdate       Enable use of certain compilers' mdupdate feature],
      [ if test "$enableval" = "yes"; then
+--- nspr-4.8.4-orig/mozilla/nsprpub/configure	2010-02-08 19:41:35.000000000 +0100
++++ nspr-4.8.4/mozilla/nsprpub/configure	2010-06-19 18:20:13.884928754 +0200
+@@ -39,7 +39,7 @@
+ ac_help="$ac_help
+   --enable-n32            Enable n32 ABI support (IRIX only)"
+ ac_help="$ac_help
+-  --enable-64bit          Enable 64-bit support (on certain platforms)"
++  --disable-64bit         Disable 64-bit support (on 64-bit platforms)"
+ ac_help="$ac_help
+   --enable-mdupdate       Enable use of certain compilers' mdupdate feature"
+ ac_help="$ac_help
+@@ -702,7 +702,7 @@
+ USE_USER_PTHREADS=
+ USE_NSPR_THREADS=
+ USE_N32=
+-USE_64=
++USE_64=maybe
+ USE_CPLUS=
+ USE_IPV6=
+ USE_MDUPDATE=
+@@ -928,12 +928,44 @@
+ # Check whether --enable-64bit or --disable-64bit was given.
+ if test "${enable_64bit+set}" = set; then
+   enableval="$enable_64bit"
+-   if test "$enableval" = "yes"; then
++   if test "$enableval" = "no"; then
++	    USE_64=
++      else
+ 	    USE_64=1
+       fi 
+ fi
+ 
+ 
++if test "${USE_64}"; then
++    echo $ac_n "checking for 64-bit OS""... $ac_c" 1>&6
++echo "configure:942: checking for 64-bit OS" >&5
++    cat > conftest.$ac_ext <<EOF
++#line 944 "configure"
++#include "confdefs.h"
++
++int main() {
++int assert[(sizeof(long) == 8) ? 1: -1]
++; return 0; }
++EOF
++if { (eval echo configure:951: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++  rm -rf conftest*
++  result="yes"
++else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  result="no"
++fi
++rm -f conftest*
++    echo "$ac_t"""$result"" 1>&6
++    if test "$result" = "no" && test "$USE_64" = 1; then
++        { echo "configure: error: Can't --enable-64bit on non 64-bit platforms" 1>&2; exit 1; }
++    fi
++    if test "$result" = "yes"; then
++        USE_64=1
++    fi
++fi
++
+ # Check whether --enable-mdupdate or --disable-mdupdate was given.
+ if test "${enable_mdupdate+set}" = set; then
+   enableval="$enable_mdupdate"
diff --git a/patches/nspr.pkgconfig.patch b/patches/nspr.pkgconfig.patch
index a4ba9a7..462732c 100644
--- a/patches/nspr.pkgconfig.patch
+++ b/patches/nspr.pkgconfig.patch
@@ -39,3 +39,14 @@
  lib/Makefile 
  lib/ds/Makefile 
  lib/libc/Makefile 
+diff -Naur nspr-4.8.4-orig/mozilla/nsprpub/configure nspr-4.8.4/mozilla/nsprpub/configure
+--- nspr-4.8.4-orig//mozilla/nsprpub/configure	2010-02-08 19:41:35.000000000 +0100
++++ nspr-4.8.4/mozilla/nsprpub/configure	2010-06-19 18:20:13.884928754 +0200
+@@ -6008,6 +6040,7 @@
+ config/nsprincl.mk
+ config/nsprincl.sh
+ config/nspr-config
++config/nspr.pc
+ lib/Makefile 
+ lib/ds/Makefile 
+ lib/libc/Makefile