From 605d7bde6acf4f49978046ccdda254d192dab2de Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 24 Mar 2007 11:11:42 +0000
Subject: [PATCH] fix Hikaru's broken build (older gcc)

---
 acinclude.m4 | 12 ++++++++++--
 configure.ac |  5 +++--
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/acinclude.m4 b/acinclude.m4
index 18046aef8..3bba05041 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1262,7 +1262,7 @@ else
 fi
 ])
 
-AC_DEFUN([QF_CC_OPTION], [
+AC_DEFUN([QF_CC_OPTION_TEST], [
 AC_MSG_CHECKING(whether $1 works)
 save_CFLAGS="$CFLAGS"
 CFLAGS="$CFLAGS $1"
@@ -1276,6 +1276,14 @@ AC_TRY_COMPILE(
 )
 CFLAGS="$save_CFLAGS"
 if test "x$qf_opt_ok" = xyes; then
-	CFLAGS="$CFLAGS $1"
+	true
+	$2
+else
+	true
+	$3
 fi
 ])
+
+AC_DEFUN([QF_CC_OPTION], [
+QF_CC_OPTION_TEST([$1], [CFLAGS="$CFLAGS $1"])
+])
diff --git a/configure.ac b/configure.ac
index 74a0ab688..e4a8472b5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1628,6 +1628,7 @@ if test "x$check_pipe" = xyes; then
 	QF_CC_OPTION(-pipe)
 fi
 QF_CC_OPTION(-Wsign-compare)
+QF_CC_OPTION_TEST([-fvisibility=hidden], [VISIBILITY=-fvisibility=hidden])
 
 dnl QuakeForge uses lots of BCPL-style (//) comments, which can cause problems
 dnl with many compilers that don't support the latest ISO standards. Well,
@@ -2098,8 +2099,8 @@ if test "x$enable_shared" = xno; then
 	PREFER_PIC=
 	PREFER_NON_PIC=
 else
-	PREFER_PIC="-prefer-pic -fvisibility=hidden"
-	PREFER_NON_PIC="-prefer-non-pic -fvisibility=hidden"
+	PREFER_PIC="-prefer-pic $(VISIBILITY)"
+	PREFER_NON_PIC="-prefer-non-pic $(VISIBILITY)"
 fi
 if test "x$enable_static" = xno; then
 	STATIC=