From a4d46ce990c869efc8b5314940d50a59430af5ee Mon Sep 17 00:00:00 2001
From: Jakub Bogusz <qboosh@pld-linux.org>
Date: Wed, 4 Jun 2008 16:25:09 +0000
Subject: [PATCH] - for 4.7.1, added fix for autoconf 2.62

Changed files:
    nspr-acfix.patch -> 1.5
---
 nspr-acfix.patch | 49 ++++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 45 insertions(+), 4 deletions(-)

diff --git a/nspr-acfix.patch b/nspr-acfix.patch
index 01e6ff5..0784fe0 100644
--- a/nspr-acfix.patch
+++ b/nspr-acfix.patch
@@ -1,6 +1,6 @@
---- nspr-4.6.3/mozilla/nsprpub/configure.in.orig	2006-07-15 00:31:04.000000000 +0200
-+++ nspr-4.6.3/mozilla/nsprpub/configure.in	2006-09-15 18:50:56.224470000 +0200
-@@ -409,7 +409,8 @@
+--- nspr-4.7.1/mozilla/nsprpub/configure.in.orig	2008-04-29 01:21:11.000000000 +0200
++++ nspr-4.7.1/mozilla/nsprpub/configure.in	2008-06-04 18:20:21.085383087 +0200
+@@ -427,7 +427,8 @@
  
      AC_MSG_CHECKING([whether the $host compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works])
      AC_TRY_COMPILE([], [return(0);], 
@@ -10,7 +10,7 @@
          AC_MSG_ERROR([installation or configuration problem: $host compiler $HOST_CC cannot create executables.]) )
  
      CC=$_SAVE_CC
-@@ -2156,8 +2157,8 @@
+@@ -2252,8 +2253,8 @@
      ;;
  *)
      AC_CHECK_LIB(dl, dlopen,
@@ -21,3 +21,44 @@
      ;;
  esac
  
+@@ -2850,7 +2851,7 @@
+ dnl ========================================================
+ dnl Generate output files.
+ dnl ========================================================
+-MAKEFILES="
++m4_define([MAKEFILES], [
+ Makefile 
+ config/Makefile
+ config/autoconf.mk
+@@ -2884,24 +2885,12 @@
+ pr/src/threads/Makefile 
+ pr/tests/Makefile 
+ pr/tests/dll/Makefile 
+-"
+-
+-dnl lib/tests/Makefile
+-dnl pr/tests/w16gui/Makefile
+-dnl tools/Makefile
+-
+-if test -z "$USE_PTHREADS" && test -z "$USE_BTHREADS"; then
+-    MAKEFILES="$MAKEFILES pr/src/threads/combined/Makefile"
+-elif test -n "$USE_PTHREADS"; then
+-    MAKEFILES="$MAKEFILES pr/src/pthreads/Makefile"
+-elif test -n "$USE_BTHREADS"; then
+-    MAKEFILES="$MAKEFILES pr/src/bthreads/Makefile"
+-fi
+-
+-if test -n "$USE_CPLUS"; then
+-    MAKEFILES="$MAKEFILES pr/src/cplus/Makefile pr/src/cplus/tests/Makefile"
+-fi
++pr/src/threads/combined/Makefile
++pr/src/pthreads/Makefile
++pr/src/bthreads/Makefile
++pr/src/cplus/Makefile pr/src/cplus/tests/Makefile
++])
+ 
+-echo $MAKEFILES > unallmakefiles
++echo "MAKEFILES" > unallmakefiles
+ 
+-AC_OUTPUT([$MAKEFILES], [chmod +x config/nspr-config])
++AC_OUTPUT(MAKEFILES, [chmod +x config/nspr-config])
-- 
2.44.0