From c47444c9314a742223db7dd3c7cf120f657dc591 Mon Sep 17 00:00:00 2001
From: "benjamin%smedbergs.us" <benjamin%smedbergs.us>
Date: Fri, 25 Aug 2006 14:02:07 +0000
Subject: [PATCH] Bug 312366 (part "mozilla") - the configure test for hidden
 visibility doesn't detect mac assembly, and decouple NSPR visibility from
 Mozilla visibility, r=mento

---
 config/system-headers | 48 +++++++++++++++++++++++++++++++++++++++++++
 configure.in          |  8 ++++----
 2 files changed, 52 insertions(+), 4 deletions(-)

diff --git a/config/system-headers b/config/system-headers
index 3cd589cd509..50ee3e045a1 100644
--- a/config/system-headers
+++ b/config/system-headers
@@ -904,3 +904,51 @@ nssckbi.h
 pkcs12.h
 p12plcy.h
 pk11sdr.h
+nspr.h
+pratom.h
+prbit.h
+prclist.h
+prcmon.h
+prcountr.h
+prcvar.h
+prdtoa.h
+prenv.h
+prerr.h
+prerror.h
+prinet.h
+prinit.h
+prinrval.h
+prio.h
+pripcsem.h
+prlink.h
+prlock.h
+prlog.h
+prlong.h
+prmem.h
+prmon.h
+prmwait.h
+prnetdb.h
+prolock.h
+prpdce.h
+prprf.h
+prproces.h
+prrng.h
+prrwlock.h
+prshm.h
+prshma.h
+prsystem.h
+prthread.h
+prtime.h
+prtpool.h
+prtrace.h
+prtypes.h
+prvrsion.h
+prwin16.h
+plbase64.h
+plerror.h
+plgetopt.h
+plresolv.h
+plstr.h
+plarenas.h
+plarena.h
+plhash.h
diff --git a/configure.in b/configure.in
index 5b5907ac2a6..97ddf93112f 100644
--- a/configure.in
+++ b/configure.in
@@ -2583,7 +2583,7 @@ if test "$GNU_CC"; then
 EOF
                   ac_cv_visibility_hidden=no
                   if ${CC-cc} -Werror -S conftest.c -o conftest.s >/dev/null 2>&1; then
-                    if grep '\.hidden.*foo' conftest.s >/dev/null; then
+                    if egrep '\.(hidden|private_extern).*foo' conftest.s >/dev/null; then
                       ac_cv_visibility_hidden=yes
                     fi
                   fi
@@ -2599,7 +2599,7 @@ EOF
 EOF
                     ac_cv_visibility_default=no
                     if ${CC-cc} -fvisibility=hidden -Werror -S conftest.c -o conftest.s >/dev/null 2>&1; then
-                      if ! grep '\.hidden.*foo' conftest.s >/dev/null; then
+                      if ! egrep '\.(hidden|private_extern).*foo' conftest.s >/dev/null; then
                         ac_cv_visibility_default=yes
                       fi
                     fi
@@ -2618,8 +2618,8 @@ EOF
 EOF
                       ac_cv_visibility_pragma=no
                       if ${CC-cc} -Werror -S conftest.c -o conftest.s >/dev/null 2>&1; then
-                        if grep '\.hidden.*foo_hidden' conftest.s >/dev/null; then
-                          if ! grep '\.hidden.*foo_default' conftest.s > /dev/null; then
+                        if egrep '\.(hidden|extern_private).*foo_hidden' conftest.s >/dev/null; then
+                          if ! egrep '\.(hidden|extern_private).*foo_default' conftest.s > /dev/null; then
                             ac_cv_visibility_pragma=yes
                           fi
                         fi