- Avoid a crash on 64bit platforms

- Use system NSPR

3 files changed, 1145 insertions, 4 deletions

diff --git a/firefox-1.0-imgloader-comarray.patch b/firefox-1.0-imgloader-comarray.patch
new file mode 100644
index 0000000..547e19a
--- /dev/null
+++ b/firefox-1.0-imgloader-comarray.patch
@@ -0,0 +1,74 @@
+Index: modules/libpr0n/src/imgLoader.cpp
+===================================================================
+RCS file: /cvsroot/mozilla/modules/libpr0n/src/imgLoader.cpp,v
+retrieving revision 1.78.2.2
+diff -d -u -p -r1.78.2.2 imgLoader.cpp
+--- modules/libpr0n/src/imgLoader.cpp	16 Aug 2004 18:06:37 -0000	1.78.2.2
++++ modules/libpr0n/src/imgLoader.cpp	15 Jul 2005 04:31:06 -0000
+@@ -896,7 +896,7 @@ void imgCacheValidator::AddProxy(imgRequ
+   // the network.
+   aProxy->AddToLoadGroup();
+ 
+-  mProxies.AppendElement(aProxy);
++  mProxies.AppendObject(aProxy);
+ }
+ 
+ /** nsIRequestObserver methods **/
+@@ -909,13 +909,10 @@ NS_IMETHODIMP imgCacheValidator::OnStart
+     PRBool isFromCache;
+     if (NS_SUCCEEDED(cacheChan->IsFromCache(&isFromCache)) && isFromCache) {
+ 
+-      PRUint32 count;
+-      mProxies.Count(&count);
++      PRUint32 count = mProxies.Count();
+       for (PRInt32 i = count-1; i>=0; i--) {
+-        imgRequestProxy *proxy;
+-        mProxies.GetElementAt(i, (nsISupports**)&proxy);
++        imgRequestProxy *proxy = NS_STATIC_CAST(imgRequestProxy *, mProxies[i]);
+         mRequest->NotifyProxyListener(proxy);
+-        NS_RELEASE(proxy);
+       }
+ 
+       mRequest->SetLoadId(mContext);
+@@ -964,14 +961,11 @@ NS_IMETHODIMP imgCacheValidator::OnStart
+ 
+   mDestListener = NS_STATIC_CAST(nsIStreamListener*, pl);
+ 
+-  PRUint32 count;
+-  mProxies.Count(&count);
++  PRUint32 count = mProxies.Count();
+   for (PRInt32 i = count-1; i>=0; i--) {
+-    imgRequestProxy *proxy;
+-    mProxies.GetElementAt(i, (nsISupports**)&proxy);
++    imgRequestProxy *proxy = NS_STATIC_CAST(imgRequestProxy *, mProxies[i]);
+     proxy->ChangeOwner(request);
+     request->NotifyProxyListener(proxy);
+-    NS_RELEASE(proxy);
+   }
+ 
+   NS_RELEASE(request);
+Index: modules/libpr0n/src/imgLoader.h
+===================================================================
+RCS file: /cvsroot/mozilla/modules/libpr0n/src/imgLoader.h,v
+retrieving revision 1.10.38.1
+diff -d -u -p -r1.10.38.1 imgLoader.h
+--- modules/libpr0n/src/imgLoader.h	16 Aug 2004 18:06:37 -0000	1.10.38.1
++++ modules/libpr0n/src/imgLoader.h	15 Jul 2005 04:31:06 -0000
+@@ -90,7 +90,7 @@ private:
+  * validate checker
+  */
+ 
+-#include "nsSupportsArray.h"
++#include "nsCOMArray.h"
+ 
+ class imgCacheValidator : public nsIStreamListener
+ {
+@@ -109,7 +109,7 @@ private:
+   nsCOMPtr<nsIStreamListener> mDestListener;
+ 
+   imgRequest *mRequest;
+-  nsSupportsArray mProxies;
++  nsCOMArray<imgIRequest> mProxies;
+ 
+   void *mContext;
+ };
diff --git a/firefox-1.0-system-nspr-ldap.patch b/firefox-1.0-system-nspr-ldap.patch
new file mode 100644
index 0000000..e587385
--- /dev/null
+++ b/firefox-1.0-system-nspr-ldap.patch
@@ -0,0 +1,1056 @@
+Index: directory/c-sdk/configure.in
+===================================================================
+RCS file: /cvsroot/mozilla/directory/c-sdk/configure.in,v
+retrieving revision 5.0.2.28
+diff -u -r5.0.2.28 configure.in
+--- directory/c-sdk/configure.in	26 Aug 2004 23:03:00 -0000	5.0.2.28
++++ directory/c-sdk/configure.in	28 Apr 2005 21:23:12 -0000
+@@ -43,6 +43,7 @@
+ dnl ========================================================
+ dnl = Defaults
+ dnl ========================================================
++NSPR_VERSION=4
+ _HAVE_PTHREADS=
+ USE_PTHREADS=
+ USE_USER_PTHREADS=
+@@ -217,29 +223,27 @@
+ AC_ARG_WITH(system-nspr,
+     [  --with-system-nspr   Use system installed NSPR],
+     [   if test "$withval" = "yes"; then
+-            _NO_NSPR=
++            _SYSTEM_NSPR=1
+ 	    else
+-            _NO_NSPR=1
+-	    fi])
++            _SYSTEM_NSPR=
++	    fi], _SYSTEM_NSPR= )
+ 
+ if test "$_WIN32_MSVC"; then
+-    _NO_NSPR=1
++    _SYSTEM_NSPR=
+ fi
+ 	
+-if test -z "$_NO_NSPR"; then
++if test -n "$_SYSTEM_NSPR"; then
+     AM_PATH_NSPR(4.0.0, [MOZ_NATIVE_NSPR=1], [MOZ_NATIVE_NSPR=])
+ fi
+ 
+ if test -z "$MOZ_NATIVE_NSPR"; then
+-    NSPR_CFLAGS='`$(NSDEPTH)/nsprpub/config/nspr-config --prefix=$(DIST) --cflags`'
++    NSPR_CFLAGS='-I$(DIST)/include/nspr'
++    NSPR_LIBS='-L$(DIST)/lib '"-lplds$NSPR_VERSION -lplc$NSPR_VERSION -lnspr$NSPR_VERSION"
+     # explicitly set libs for Visual Age C++ for OS/2
+     if test "$VACPP" = "yes"; then
+         NSPR_LIBS='$(DIST)/lib/nspr'$NSPR_VERSION'.lib $(DIST)/lib/plc'$NSPR_VERSION'.lib $(DIST)/lib/plds'$NSPR_VERSION'.lib '$_PTHREAD_LDFLAGS''
+     elif test "$_WIN32_MSVC"; then
+             NSPR_LIBS='$(DIST)/lib/nspr'$NSPR_VERSION'.lib $(DIST)/lib/plc'$NSPR_VERSION'.lib $(DIST)/lib/plds'$NSPR_VERSION'.lib '
+-            NSPR_CFLAGS='-I$(DIST)/include/nspr'
+-    else
+-        NSPR_LIBS='`$(NSDEPTH)/nsprpub/config/nspr-config --prefix=$(DIST) --libs`'
+     fi
+ fi
+ 
+Index: directory/c-sdk/config/autoconf.mk.in
+===================================================================
+RCS file: /cvsroot/mozilla/directory/c-sdk/config/autoconf.mk.in,v
+retrieving revision 5.0.2.3
+diff -u -r5.0.2.3 autoconf.mk.in
+--- directory/c-sdk/config/autoconf.mk.in	7 Mar 2003 20:57:13 -0000	5.0.2.3
++++ directory/c-sdk/config/autoconf.mk.in	28 Apr 2005 21:23:12 -0000
+@@ -45,6 +45,9 @@
+ PTHREADS_USER	= @USE_USER_PTHREADS@
+ CLASSIC_NSPR	= @USE_NSPR_THREADS@
+ 
++NSPR_CFLAGS	= @NSPR_CFLAGS@
++NSPR_LIBS	= @NSPR_LIBS@
++
+ AS		= @AS@
+ ASFLAGS		= @ASFLAGS@
+ CC		= @CC@
+Index: directory/c-sdk/ldap/include/Makefile.in
+===================================================================
+RCS file: /cvsroot/mozilla/directory/c-sdk/ldap/include/Makefile.in,v
+retrieving revision 5.0.2.4
+diff -u -r5.0.2.4 Makefile.in
+--- directory/c-sdk/ldap/include/Makefile.in	24 Apr 2002 23:03:25 -0000	5.0.2.4
++++ directory/c-sdk/ldap/include/Makefile.in	28 Apr 2005 21:23:12 -0000
+@@ -63,7 +63,6 @@
+ 
+ INCLUDEDIR	= $(DIST)/public/ldap
+ PRIVATEINCDIR	= $(DIST)/public/ldap-private
+-NSPRINCDIR	= $(DIST)/public/ldap-nspr
+ GENHEADERS	= $(addprefix $(INCLUDEDIR)/, $(GENERATED_HEADERS))
+ 
+ GARBAGE		+= sdkver.h dirver.h $(GENHEADERS)
+@@ -72,11 +71,8 @@
+ 
+ all export::	$(INCLUDEDIR) $(GENHEADERS)
+ 	$(NSINSTALL) -D $(PRIVATEINCDIR)
+-	$(NSINSTALL) -D $(NSPRINCDIR)
+ 	$(INSTALL) $(INSTALLFLAGS) -m 644 $(HEADERS) $(INCLUDEDIR)
+ 	$(INSTALL) $(INSTALLFLAGS) -m 644 $(PRIVATEHEADERS) $(PRIVATEINCDIR)
+-	rm -rf $(NSPRINCDIR)/*
+-	cp -r $(DIST)/$(OBJDIR_NAME)/include/nspr/* $(NSPRINCDIR)
+ 
+ $(INCLUDEDIR):	FORCE
+ 	$(NSINSTALL) -D $(INCLUDEDIR)
+Index: directory/c-sdk/ldap/libraries/libprldap/Makefile.in
+===================================================================
+RCS file: /cvsroot/mozilla/directory/c-sdk/ldap/libraries/libprldap/Makefile.in,v
+retrieving revision 5.0.2.16
+diff -u -r5.0.2.16 Makefile.in
+--- directory/c-sdk/ldap/libraries/libprldap/Makefile.in	10 Mar 2004 18:47:26 -0000	5.0.2.16
++++ directory/c-sdk/ldap/libraries/libprldap/Makefile.in	28 Apr 2005 21:23:12 -0000
+@@ -56,9 +56,9 @@
+ 
+ GARBAGE 	+= $(LIBPRLDAP) $(DLLPRLDAP)
+ 
+-LOCAL_INCLUDES  = -I$(PUBLIC)/nspr
++LOCAL_INCLUDES  = 
+ INCLUDES	+= -I$(DISTHDIR) -I$(HDIR) -I$(INSTALLDIR)/include \
+-                   -I$(DIST)/include/nspr
++		   $(NSPR_CFLAGS)
+ DEFINES		+= $(DEFS)
+ 
+ PLATFORMCFLAGS	= -DUSE_WAITPID -DNEEDPROTOS
+Index: directory/c-sdk/configure
+===================================================================
+RCS file: /cvsroot/mozilla/directory/c-sdk/configure,v
+retrieving revision 5.0.2.25.2.1
+diff -d -u -p -r5.0.2.25.2.1 configure
+--- directory/c-sdk/configure	14 Sep 2004 21:14:38 -0000	5.0.2.25.2.1
++++ directory/c-sdk/configure	12 Jul 2005 22:23:32 -0000
+@@ -682,6 +682,7 @@ test "$host_alias" != "$target_alias" &&
+   program_prefix=${target_alias}-
+ 
+ 
++NSPR_VERSION=4
+ _HAVE_PTHREADS=
+ USE_PTHREADS=
+ USE_USER_PTHREADS=
+@@ -718,7 +719,7 @@ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:722: checking for $ac_word" >&5
++echo "configure:723: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -903,18 +904,20 @@ fi
+ if test "${with_system_nspr+set}" = set; then
+   withval="$with_system_nspr"
+      if test "$withval" = "yes"; then
+-            _NO_NSPR=
++            _SYSTEM_NSPR=1
+ 	    else
+-            _NO_NSPR=1
++            _SYSTEM_NSPR=
+ 	    fi
++else
++  _SYSTEM_NSPR= 
+ fi
+ 
+ 
+ if test "$_WIN32_MSVC"; then
+-    _NO_NSPR=1
++    _SYSTEM_NSPR=
+ fi
+ 	
+-if test -z "$_NO_NSPR"; then
++if test -n "$_SYSTEM_NSPR"; then
+     
+ # Check whether --with-nspr-prefix or --without-nspr-prefix was given.
+ if test "${with_nspr_prefix+set}" = set; then
+@@ -951,7 +954,7 @@ fi
+ 	# Extract the first word of "nspr-config", so it can be a program name with args.
+ set dummy nspr-config; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:955: checking for $ac_word" >&5
++echo "configure:958: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_NSPR_CONFIG'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -986,7 +989,7 @@ fi
+ 
+ 	min_nspr_version=4.0.0
+ 	echo $ac_n "checking for NSPR - version >= $min_nspr_version (skipping)""... $ac_c" 1>&6
+-echo "configure:990: checking for NSPR - version >= $min_nspr_version (skipping)" >&5
++echo "configure:993: checking for NSPR - version >= $min_nspr_version (skipping)" >&5
+ 
+ 	no_nspr=""
+ 	if test "$NSPR_CONFIG" = "no"; then
+@@ -1018,15 +1021,13 @@ echo "configure:990: checking for NSPR -
+ fi
+ 
+ if test -z "$MOZ_NATIVE_NSPR"; then
+-    NSPR_CFLAGS='`$(NSDEPTH)/nsprpub/config/nspr-config --prefix=$(DIST) --cflags`'
++    NSPR_CFLAGS='-I$(DIST)/include/nspr'
++    NSPR_LIBS='-L$(DIST)/lib '"-lplds$NSPR_VERSION -lplc$NSPR_VERSION -lnspr$NSPR_VERSION"
+     # explicitly set libs for Visual Age C++ for OS/2
+     if test "$VACPP" = "yes"; then
+         NSPR_LIBS='$(DIST)/lib/nspr'$NSPR_VERSION'.lib $(DIST)/lib/plc'$NSPR_VERSION'.lib $(DIST)/lib/plds'$NSPR_VERSION'.lib '$_PTHREAD_LDFLAGS''
+     elif test "$_WIN32_MSVC"; then
+             NSPR_LIBS='$(DIST)/lib/nspr'$NSPR_VERSION'.lib $(DIST)/lib/plc'$NSPR_VERSION'.lib $(DIST)/lib/plds'$NSPR_VERSION'.lib '
+-            NSPR_CFLAGS='-I$(DIST)/include/nspr'
+-    else
+-        NSPR_LIBS='`$(NSDEPTH)/nsprpub/config/nspr-config --prefix=$(DIST) --libs`'
+     fi
+ fi
+ 
+@@ -1119,7 +1120,7 @@ if test -z "$SKIP_PATH_CHECKS"; then
+     # Extract the first word of "$WHOAMI whoami", so it can be a program name with args.
+ set dummy $WHOAMI whoami; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:1123: checking for $ac_word" >&5
++echo "configure:1124: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_WHOAMI'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -1194,13 +1195,13 @@ if test "$target" != "$host"; then
+     _SAVE_LDFLAGS="$LDFLAGS"
+ 
+     echo $ac_n "checking for $host compiler""... $ac_c" 1>&6
+-echo "configure:1198: checking for $host compiler" >&5
++echo "configure:1199: checking for $host compiler" >&5
+     for ac_prog in gcc cc /usr/ucb/cc
+ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:1204: checking for $ac_word" >&5
++echo "configure:1205: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_HOST_CC'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -1246,16 +1247,16 @@ test -n "$HOST_CC" || HOST_CC=""""
+     LDFLAGS="$HOST_LDFLAGS"
+ 
+     echo $ac_n "checking whether the $host compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works""... $ac_c" 1>&6
+-echo "configure:1250: checking whether the $host compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works" >&5
++echo "configure:1251: checking whether the $host compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works" >&5
+     cat > conftest.$ac_ext <<EOF
+-#line 1252 "configure"
++#line 1253 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+ return(0);
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1259: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:1260: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_prog_host_cc_works=1 echo "$ac_t""yes" 1>&6
+ else
+@@ -1275,7 +1276,7 @@ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:1279: checking for $ac_word" >&5
++echo "configure:1280: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -1309,7 +1310,7 @@ test -n "$CC" || CC="echo"
+     # Extract the first word of "gcc", so it can be a program name with args.
+ set dummy gcc; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:1313: checking for $ac_word" >&5
++echo "configure:1314: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -1339,7 +1340,7 @@ if test -z "$CC"; then
+   # Extract the first word of "cc", so it can be a program name with args.
+ set dummy cc; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:1343: checking for $ac_word" >&5
++echo "configure:1344: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -1390,7 +1391,7 @@ fi
+       # Extract the first word of "cl", so it can be a program name with args.
+ set dummy cl; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:1394: checking for $ac_word" >&5
++echo "configure:1395: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -1422,7 +1423,7 @@ fi
+ fi
+ 
+ echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
+-echo "configure:1426: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
++echo "configure:1427: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+ 
+ ac_ext=c
+ # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+@@ -1433,12 +1434,12 @@ cross_compiling=$ac_cv_prog_cc_cross
+ 
+ cat > conftest.$ac_ext << EOF
+ 
+-#line 1437 "configure"
++#line 1438 "configure"
+ #include "confdefs.h"
+ 
+ main(){return(0);}
+ EOF
+-if { (eval echo configure:1442: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:1443: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   ac_cv_prog_cc_works=yes
+   # If we can't run a trivial program, we are probably using a cross compiler.
+   if (./conftest; exit) 2>/dev/null; then
+@@ -1464,12 +1465,12 @@ if test $ac_cv_prog_cc_works = no; then
+   { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
+ fi
+ echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
+-echo "configure:1468: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
++echo "configure:1469: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+ echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
+ cross_compiling=$ac_cv_prog_cc_cross
+ 
+ echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
+-echo "configure:1473: checking whether we are using GNU C" >&5
++echo "configure:1474: checking whether we are using GNU C" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -1478,7 +1479,7 @@ else
+   yes;
+ #endif
+ EOF
+-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1482: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
++if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1483: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+   ac_cv_prog_gcc=yes
+ else
+   ac_cv_prog_gcc=no
+@@ -1497,7 +1498,7 @@ ac_test_CFLAGS="${CFLAGS+set}"
+ ac_save_CFLAGS="$CFLAGS"
+ CFLAGS=
+ echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
+-echo "configure:1501: checking whether ${CC-cc} accepts -g" >&5
++echo "configure:1502: checking whether ${CC-cc} accepts -g" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -1533,7 +1534,7 @@ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:1537: checking for $ac_word" >&5
++echo "configure:1538: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -1569,7 +1570,7 @@ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:1573: checking for $ac_word" >&5
++echo "configure:1574: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -1601,7 +1602,7 @@ test -n "$CXX" || CXX="gcc"
+ 
+ 
+ echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
+-echo "configure:1605: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
++echo "configure:1606: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
+ 
+ ac_ext=C
+ # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+@@ -1612,12 +1613,12 @@ cross_compiling=$ac_cv_prog_cxx_cross
+ 
+ cat > conftest.$ac_ext << EOF
+ 
+-#line 1616 "configure"
++#line 1617 "configure"
+ #include "confdefs.h"
+ 
+ int main(){return(0);}
+ EOF
+-if { (eval echo configure:1621: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:1622: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   ac_cv_prog_cxx_works=yes
+   # If we can't run a trivial program, we are probably using a cross compiler.
+   if (./conftest; exit) 2>/dev/null; then
+@@ -1643,12 +1644,12 @@ if test $ac_cv_prog_cxx_works = no; then
+   { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; }
+ fi
+ echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
+-echo "configure:1647: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
++echo "configure:1648: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
+ echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6
+ cross_compiling=$ac_cv_prog_cxx_cross
+ 
+ echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6
+-echo "configure:1652: checking whether we are using GNU C++" >&5
++echo "configure:1653: checking whether we are using GNU C++" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -1657,7 +1658,7 @@ else
+   yes;
+ #endif
+ EOF
+-if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1661: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
++if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1662: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+   ac_cv_prog_gxx=yes
+ else
+   ac_cv_prog_gxx=no
+@@ -1676,7 +1677,7 @@ ac_test_CXXFLAGS="${CXXFLAGS+set}"
+ ac_save_CXXFLAGS="$CXXFLAGS"
+ CXXFLAGS=
+ echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6
+-echo "configure:1680: checking whether ${CXX-g++} accepts -g" >&5
++echo "configure:1681: checking whether ${CXX-g++} accepts -g" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -1717,7 +1718,7 @@ for ac_declaration in \
+    'void exit (int);'
+ do
+   cat > conftest.$ac_ext <<EOF
+-#line 1721 "configure"
++#line 1722 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ $ac_declaration
+@@ -1725,7 +1726,7 @@ int main() {
+ exit (42);
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1729: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:1730: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   :
+ else
+   echo "configure: failed program was:" >&5
+@@ -1735,14 +1736,14 @@ else
+ fi
+ rm -f conftest*
+   cat > conftest.$ac_ext <<EOF
+-#line 1739 "configure"
++#line 1740 "configure"
+ #include "confdefs.h"
+ $ac_declaration
+ int main() {
+ exit (42);
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1746: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:1747: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   break
+ else
+@@ -1763,7 +1764,7 @@ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:1767: checking for $ac_word" >&5
++echo "configure:1768: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -1798,7 +1799,7 @@ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:1802: checking for $ac_word" >&5
++echo "configure:1803: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -1833,7 +1834,7 @@ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:1837: checking for $ac_word" >&5
++echo "configure:1838: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -1868,7 +1869,7 @@ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:1872: checking for $ac_word" >&5
++echo "configure:1873: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_LD'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -1903,7 +1904,7 @@ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:1907: checking for $ac_word" >&5
++echo "configure:1908: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -1938,7 +1939,7 @@ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:1942: checking for $ac_word" >&5
++echo "configure:1943: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_WINDRES'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -1975,7 +1976,7 @@ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:1979: checking for $ac_word" >&5
++echo "configure:1980: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -2007,7 +2008,7 @@ test -n "$CXX" || CXX="gcc"
+ 
+ 
+ echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
+-echo "configure:2011: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
++echo "configure:2012: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
+ 
+ ac_ext=C
+ # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+@@ -2018,12 +2019,12 @@ cross_compiling=$ac_cv_prog_cxx_cross
+ 
+ cat > conftest.$ac_ext << EOF
+ 
+-#line 2022 "configure"
++#line 2023 "configure"
+ #include "confdefs.h"
+ 
+ int main(){return(0);}
+ EOF
+-if { (eval echo configure:2027: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:2028: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   ac_cv_prog_cxx_works=yes
+   # If we can't run a trivial program, we are probably using a cross compiler.
+   if (./conftest; exit) 2>/dev/null; then
+@@ -2049,12 +2050,12 @@ if test $ac_cv_prog_cxx_works = no; then
+   { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; }
+ fi
+ echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
+-echo "configure:2053: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
++echo "configure:2054: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
+ echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6
+ cross_compiling=$ac_cv_prog_cxx_cross
+ 
+ echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6
+-echo "configure:2058: checking whether we are using GNU C++" >&5
++echo "configure:2059: checking whether we are using GNU C++" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -2063,7 +2064,7 @@ else
+   yes;
+ #endif
+ EOF
+-if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:2067: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
++if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:2068: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+   ac_cv_prog_gxx=yes
+ else
+   ac_cv_prog_gxx=no
+@@ -2082,7 +2083,7 @@ ac_test_CXXFLAGS="${CXXFLAGS+set}"
+ ac_save_CXXFLAGS="$CXXFLAGS"
+ CXXFLAGS=
+ echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6
+-echo "configure:2086: checking whether ${CXX-g++} accepts -g" >&5
++echo "configure:2087: checking whether ${CXX-g++} accepts -g" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -2123,7 +2124,7 @@ for ac_declaration in \
+    'void exit (int);'
+ do
+   cat > conftest.$ac_ext <<EOF
+-#line 2127 "configure"
++#line 2128 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ $ac_declaration
+@@ -2131,7 +2132,7 @@ int main() {
+ exit (42);
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2135: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:2136: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   :
+ else
+   echo "configure: failed program was:" >&5
+@@ -2141,14 +2142,14 @@ else
+ fi
+ rm -f conftest*
+   cat > conftest.$ac_ext <<EOF
+-#line 2145 "configure"
++#line 2146 "configure"
+ #include "confdefs.h"
+ $ac_declaration
+ int main() {
+ exit (42);
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2152: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:2153: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   break
+ else
+@@ -2170,7 +2171,7 @@ fi
+         # Extract the first word of "gcc", so it can be a program name with args.
+ set dummy gcc; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:2174: checking for $ac_word" >&5
++echo "configure:2175: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -2200,7 +2201,7 @@ if test -z "$CC"; then
+   # Extract the first word of "cc", so it can be a program name with args.
+ set dummy cc; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:2204: checking for $ac_word" >&5
++echo "configure:2205: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -2251,7 +2252,7 @@ fi
+       # Extract the first word of "cl", so it can be a program name with args.
+ set dummy cl; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:2255: checking for $ac_word" >&5
++echo "configure:2256: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -2283,7 +2284,7 @@ fi
+ fi
+ 
+ echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
+-echo "configure:2287: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
++echo "configure:2288: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+ 
+ ac_ext=c
+ # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+@@ -2294,12 +2295,12 @@ cross_compiling=$ac_cv_prog_cc_cross
+ 
+ cat > conftest.$ac_ext << EOF
+ 
+-#line 2298 "configure"
++#line 2299 "configure"
+ #include "confdefs.h"
+ 
+ main(){return(0);}
+ EOF
+-if { (eval echo configure:2303: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:2304: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   ac_cv_prog_cc_works=yes
+   # If we can't run a trivial program, we are probably using a cross compiler.
+   if (./conftest; exit) 2>/dev/null; then
+@@ -2325,12 +2326,12 @@ if test $ac_cv_prog_cc_works = no; then
+   { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
+ fi
+ echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
+-echo "configure:2329: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
++echo "configure:2330: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+ echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
+ cross_compiling=$ac_cv_prog_cc_cross
+ 
+ echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
+-echo "configure:2334: checking whether we are using GNU C" >&5
++echo "configure:2335: checking whether we are using GNU C" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -2339,7 +2340,7 @@ else
+   yes;
+ #endif
+ EOF
+-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2343: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
++if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2344: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+   ac_cv_prog_gcc=yes
+ else
+   ac_cv_prog_gcc=no
+@@ -2358,7 +2359,7 @@ ac_test_CFLAGS="${CFLAGS+set}"
+ ac_save_CFLAGS="$CFLAGS"
+ CFLAGS=
+ echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
+-echo "configure:2362: checking whether ${CC-cc} accepts -g" >&5
++echo "configure:2363: checking whether ${CC-cc} accepts -g" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -2391,7 +2392,7 @@ fi
+ 
+     fi
+     echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
+-echo "configure:2395: checking how to run the C preprocessor" >&5
++echo "configure:2396: checking how to run the C preprocessor" >&5
+ # On Suns, sometimes $CPP names a directory.
+ if test -n "$CPP" && test -d "$CPP"; then
+   CPP=
+@@ -2406,13 +2407,13 @@ else
+   # On the NeXT, cc -E runs the code through the compiler's parser,
+   # not just through cpp.
+   cat > conftest.$ac_ext <<EOF
+-#line 2410 "configure"
++#line 2411 "configure"
+ #include "confdefs.h"
+ #include <assert.h>
+ Syntax Error
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:2416: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:2417: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+   :
+@@ -2423,13 +2424,13 @@ else
+   rm -rf conftest*
+   CPP="${CC-cc} -E -traditional-cpp"
+   cat > conftest.$ac_ext <<EOF
+-#line 2427 "configure"
++#line 2428 "configure"
+ #include "confdefs.h"
+ #include <assert.h>
+ Syntax Error
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:2433: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:2434: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+   :
+@@ -2440,13 +2441,13 @@ else
+   rm -rf conftest*
+   CPP="${CC-cc} -nologo -E"
+   cat > conftest.$ac_ext <<EOF
+-#line 2444 "configure"
++#line 2445 "configure"
+ #include "confdefs.h"
+ #include <assert.h>
+ Syntax Error
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:2450: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:2451: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+   :
+@@ -2473,7 +2474,7 @@ echo "$ac_t""$CPP" 1>&6
+     # Extract the first word of "ranlib", so it can be a program name with args.
+ set dummy ranlib; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:2477: checking for $ac_word" >&5
++echo "configure:2478: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -2505,7 +2506,7 @@ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:2509: checking for $ac_word" >&5
++echo "configure:2510: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_AS'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -2546,7 +2547,7 @@ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:2550: checking for $ac_word" >&5
++echo "configure:2551: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_AR'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -2587,7 +2588,7 @@ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:2591: checking for $ac_word" >&5
++echo "configure:2592: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_LD'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -2628,7 +2629,7 @@ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:2632: checking for $ac_word" >&5
++echo "configure:2633: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_STRIP'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -2669,7 +2670,7 @@ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:2673: checking for $ac_word" >&5
++echo "configure:2674: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_WINDRES'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -2731,7 +2732,7 @@ else
+ fi
+ 
+ echo $ac_n "checking for gcc -pipe support""... $ac_c" 1>&6
+-echo "configure:2735: checking for gcc -pipe support" >&5
++echo "configure:2736: checking for gcc -pipe support" >&5
+ if test -n "$GNU_CC" && test -n "$GNU_CXX" && test -n "$GNU_AS"; then
+     echo '#include <stdio.h>' > dummy-hello.c
+     echo 'int main() { printf("Hello World\n"); exit(0); }' >> dummy-hello.c
+@@ -2746,14 +2747,14 @@ if test -n "$GNU_CC" && test -n "$GNU_CX
+         _SAVE_CFLAGS=$CFLAGS
+         CFLAGS="$CFLAGS -pipe"
+         cat > conftest.$ac_ext <<EOF
+-#line 2750 "configure"
++#line 2751 "configure"
+ #include "confdefs.h"
+  #include <stdio.h> 
+ int main() {
+ printf("Hello World\n");
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2757: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:2758: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   _res_gcc_pipe="yes"
+ else
+@@ -2786,7 +2787,7 @@ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:2790: checking for $ac_word" >&5
++echo "configure:2791: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_PERL'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -3020,17 +3021,17 @@ EOF
+     DSO_LDOPTS='-brtl -bM:SRE -bnoentry -bexpall -blibpath:/usr/lib:/lib'
+     ac_safe=`echo "sys/atomic_op.h" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for sys/atomic_op.h""... $ac_c" 1>&6
+-echo "configure:3024: checking for sys/atomic_op.h" >&5
++echo "configure:3025: checking for sys/atomic_op.h" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 3029 "configure"
++#line 3030 "configure"
+ #include "confdefs.h"
+ #include <sys/atomic_op.h>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:3034: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:3035: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+   rm -rf conftest*
+@@ -3188,7 +3189,7 @@ EOF
+         _DEBUG_FLAGS='-gdwarf-2 -O0'
+         MKSHLIB='$(CCC) $(DSO_LDOPTS) -o $@'
+         echo $ac_n "checking for gethostbyaddr in -lbind""... $ac_c" 1>&6
+-echo "configure:3192: checking for gethostbyaddr in -lbind" >&5
++echo "configure:3193: checking for gethostbyaddr in -lbind" >&5
+ ac_lib_var=`echo bind'_'gethostbyaddr | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -3196,7 +3197,7 @@ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-lbind  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 3200 "configure"
++#line 3201 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -3207,7 +3208,7 @@ int main() {
+ gethostbyaddr()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3211: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3212: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -4429,17 +4430,17 @@ EOF
+ 
+     ac_safe=`echo "machine/builtins.h" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for machine/builtins.h""... $ac_c" 1>&6
+-echo "configure:4433: checking for machine/builtins.h" >&5
++echo "configure:4434: checking for machine/builtins.h" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 4438 "configure"
++#line 4439 "configure"
+ #include "confdefs.h"
+ #include <machine/builtins.h>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:4443: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:4444: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+   rm -rf conftest*
+@@ -4837,12 +4838,12 @@ esac
+ if test -z "$SKIP_LIBRARY_CHECKS"; then
+ 
+ echo $ac_n "checking for dlopen""... $ac_c" 1>&6
+-echo "configure:4841: checking for dlopen" >&5
++echo "configure:4842: checking for dlopen" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_dlopen'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 4846 "configure"
++#line 4847 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char dlopen(); below.  */
+@@ -4865,7 +4866,7 @@ dlopen();
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4869: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4870: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_dlopen=yes"
+ else
+@@ -4884,7 +4885,7 @@ else
+   echo "$ac_t""no" 1>&6
+ 
+     echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
+-echo "configure:4888: checking for dlopen in -ldl" >&5
++echo "configure:4889: checking for dlopen in -ldl" >&5
+ ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -4892,7 +4893,7 @@ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-ldl  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 4896 "configure"
++#line 4897 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -4903,7 +4904,7 @@ int main() {
+ dlopen()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4907: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4908: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -4931,13 +4932,13 @@ fi
+ 
+ if test $ac_cv_prog_gcc = yes; then
+     echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6
+-echo "configure:4935: checking whether ${CC-cc} needs -traditional" >&5
++echo "configure:4936: checking whether ${CC-cc} needs -traditional" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+     ac_pattern="Autoconf.*'x'"
+   cat > conftest.$ac_ext <<EOF
+-#line 4941 "configure"
++#line 4942 "configure"
+ #include "confdefs.h"
+ #include <sgtty.h>
+ Autoconf TIOCGETP
+@@ -4955,7 +4956,7 @@ rm -f conftest*
+ 
+   if test $ac_cv_prog_gcc_traditional = no; then
+     cat > conftest.$ac_ext <<EOF
+-#line 4959 "configure"
++#line 4960 "configure"
+ #include "confdefs.h"
+ #include <termio.h>
+ Autoconf TCGETA
+@@ -4979,12 +4980,12 @@ fi
+ for ac_func in lchown strerror
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:4983: checking for $ac_func" >&5
++echo "configure:4984: checking for $ac_func" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 4988 "configure"
++#line 4989 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -5007,7 +5008,7 @@ $ac_func();
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5011: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5012: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=yes"
+ else
+@@ -5045,7 +5046,7 @@ fi
+ 
+ 
+ echo $ac_n "checking for pthread_create in -lpthreads""... $ac_c" 1>&6
+-echo "configure:5049: checking for pthread_create in -lpthreads" >&5
++echo "configure:5050: checking for pthread_create in -lpthreads" >&5
+ echo "
+     #include <pthread.h> 
+     void *foo(void *v) { int a = 1;  } 
+@@ -5067,7 +5068,7 @@ echo "
+         echo "$ac_t""no" 1>&6
+         
+ echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6
+-echo "configure:5071: checking for pthread_create in -lpthread" >&5
++echo "configure:5072: checking for pthread_create in -lpthread" >&5
+ echo "
+     #include <pthread.h> 
+     void *foo(void *v) { int a = 1;  } 
+@@ -5089,7 +5090,7 @@ echo "
+         echo "$ac_t""no" 1>&6
+         
+ echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6
+-echo "configure:5093: checking for pthread_create in -lc_r" >&5
++echo "configure:5094: checking for pthread_create in -lc_r" >&5
+ echo "
+     #include <pthread.h> 
+     void *foo(void *v) { int a = 1;  } 
+@@ -5111,7 +5112,7 @@ echo "
+         echo "$ac_t""no" 1>&6
+         
+ echo $ac_n "checking for pthread_create in -lc""... $ac_c" 1>&6
+-echo "configure:5115: checking for pthread_create in -lc" >&5
++echo "configure:5116: checking for pthread_create in -lc" >&5
+ echo "
+     #include <pthread.h> 
+     void *foo(void *v) { int a = 1;  } 
+@@ -5261,7 +5262,7 @@ if test -n "$USE_PTHREADS"; then
+       rm -f conftest*
+    ac_cv_have_dash_pthread=no
+    echo $ac_n "checking whether ${CC-cc} accepts -pthread""... $ac_c" 1>&6
+-echo "configure:5265: checking whether ${CC-cc} accepts -pthread" >&5
++echo "configure:5266: checking whether ${CC-cc} accepts -pthread" >&5
+    echo 'int main() { return 0; }' | cat > conftest.c
+    ${CC-cc} -pthread -o conftest conftest.c > conftest.out 2>&1
+    if test $? -eq 0; then
+@@ -5277,7 +5278,7 @@ echo "configure:5265: checking whether $
+ 			    ac_cv_have_dash_pthreads=no
+     if test "$ac_cv_have_dash_pthread" = "no"; then
+ 	    echo $ac_n "checking whether ${CC-cc} accepts -pthreads""... $ac_c" 1>&6
+-echo "configure:5281: checking whether ${CC-cc} accepts -pthreads" >&5
++echo "configure:5282: checking whether ${CC-cc} accepts -pthreads" >&5
+     	echo 'int main() { return 0; }' | cat > conftest.c
+ 	    ${CC-cc} -pthreads -o conftest conftest.c > conftest.out 2>&1
+     	if test $? -eq 0; then
diff --git a/firefox.spec b/firefox.spec
index 8fb340e..2b26a1d 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -1,16 +1,17 @@
 # Option: Freetype Patch (FC3+)
 %define freetype_fc3 1
 
+%define nspr_version 4.6
 %define desktop_file_utils_version 0.9
 
 %define indexhtml file:///usr/share/doc/HTML/index.html
 
-ExclusiveArch: i386 x86_64 ia64 ppc s390 s390x
+ExcludeArch:    ppc64
 
 Summary:        Mozilla Firefox Web browser.
 Name:           firefox
 Version:        1.0.4
-Release:        5
+Release:        6
 Epoch:          0
 URL:            http://www.mozilla.org/projects/firefox/
 License:        MPL/LGPL
@@ -38,6 +39,7 @@ Patch3:         firefox-1.0-gcc4-compile.patch
 Patch4:         firefox-1.0-recv-fortify.patch
 Patch5:         firefox-1.0-gfxshared_s.patch
 Patch6:         firefox-1.0-nss-system-nspr.patch
+Patch7:         firefox-1.0-system-nspr-ldap.patch
 
 # customization patches
 Patch20:        firefox-redhat-homepage.patch
@@ -73,8 +75,10 @@ Patch103:       firefox-1.0-gtk-system-colors.patch
 Patch104:       firefox-1.0-remote-intern-atoms.patch
 Patch105:       firefox-1.0-g-application-name.patch
 Patch106:       firefox-1.0-candidate-window.patch
+Patch107:       firefox-1.0-imgloader-comarray.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:  nspr-devel >= %{nspr_version}
 BuildRequires:  libpng-devel, libjpeg-devel
 BuildRequires:  zlib-devel, zip
 BuildRequires:  libIDL-devel
@@ -92,6 +96,7 @@ BuildRequires:  freetype-devel >= 2.1.9
 BuildRequires:  freetype-devel
 %endif
 
+Requires:       nspr >= %{nspr_version}
 Requires:       desktop-file-utils >= %{desktop_file_utils_version}
 Obsoletes:      phoenix, mozilla-firebird, MozillaFirebird
 Provides:       mozilla-firebird = %{epoch}:%{version}, MozillaFirebird = %{epoch}:%{version}
@@ -120,6 +125,7 @@ compliance, performance and portability.
 %patch4  -p0
 %patch5  -p0
 %patch6  -p1
+%patch7  -p0
 %patch20 -p0
 %patch21 -p1
 %patch22 -p1
@@ -147,6 +153,7 @@ compliance, performance and portability.
 %patch104 -p0
 %patch105 -p0
 %patch106 -p1
+%patch107 -p0
 
 %{__rm} -f .mozconfig
 %{__cp} %{SOURCE10} .mozconfig
@@ -232,7 +239,7 @@ cd $RPM_BUILD_ROOT%{ffdir}/chrome
 find . -name "*" -type d -maxdepth 1 -exec %{__rm} -rf {} \;
 cd -
 
-cat > $RPM_BUILD_ROOT%{ffdir}/defaults/pref/firefox-l10n.js << EOF
+%{__cat} > $RPM_BUILD_ROOT%{ffdir}/defaults/pref/firefox-l10n.js << EOF
 pref("general.useragent.locale", "chrome://global/locale/intl.properties");
 EOF
 chmod 644 $RPM_BUILD_ROOT%{ffdir}/defaults/pref/firefox-l10n.js
@@ -325,7 +332,11 @@ fi
 #---------------------------------------------------------------------
 
 %changelog
-* Thu Jun 23 2005 Kristian Høgsberg <krh@redhat.com>  0:1.0.4-3
+* Sun Jul 17 2005 Christopher Aillon <caillon@redhat.com> 0:1.0.4-6
+- Avoid a crash on 64bit platforms
+- Use system NSPR
+
+* Thu Jun 23 2005 Kristian Høgsberg <krh@redhat.com>  0:1.0.45
 - Add firefox-1.0-pango-cairo.patch to get rid of the last few Xft
   references, fixing the "no fonts" problem.
 - Copy over changes from FC4 branch.