diff --git a/ChangeLog b/ChangeLog
index e76e1638b..28b6cbe37 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2005-02-04  Matthias Clasen  <mclasen@redhat.com>
+
+	* configure.in: Define a HAVE_GNUC_VISIBILITY automake
+	conditional.
+
+	* glib/Makefile.am (TESTS): Only check the abi if
+	the compiler supports visibility, otherwise we
+	know there will be (harmless) extra symbols.  
+	(#166181, Ed Avis)
+
 2005-02-02  Matthias Clasen  <mclasen@redhat.com>
 
 	* configure.in: Post-release version bump
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index e76e1638b..28b6cbe37 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,13 @@
+2005-02-04  Matthias Clasen  <mclasen@redhat.com>
+
+	* configure.in: Define a HAVE_GNUC_VISIBILITY automake
+	conditional.
+
+	* glib/Makefile.am (TESTS): Only check the abi if
+	the compiler supports visibility, otherwise we
+	know there will be (harmless) extra symbols.  
+	(#166181, Ed Avis)
+
 2005-02-02  Matthias Clasen  <mclasen@redhat.com>
 
 	* configure.in: Post-release version bump
diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index e76e1638b..28b6cbe37 100644
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,13 @@
+2005-02-04  Matthias Clasen  <mclasen@redhat.com>
+
+	* configure.in: Define a HAVE_GNUC_VISIBILITY automake
+	conditional.
+
+	* glib/Makefile.am (TESTS): Only check the abi if
+	the compiler supports visibility, otherwise we
+	know there will be (harmless) extra symbols.  
+	(#166181, Ed Avis)
+
 2005-02-02  Matthias Clasen  <mclasen@redhat.com>
 
 	* configure.in: Post-release version bump
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index e76e1638b..28b6cbe37 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,13 @@
+2005-02-04  Matthias Clasen  <mclasen@redhat.com>
+
+	* configure.in: Define a HAVE_GNUC_VISIBILITY automake
+	conditional.
+
+	* glib/Makefile.am (TESTS): Only check the abi if
+	the compiler supports visibility, otherwise we
+	know there will be (harmless) extra symbols.  
+	(#166181, Ed Avis)
+
 2005-02-02  Matthias Clasen  <mclasen@redhat.com>
 
 	* configure.in: Post-release version bump
diff --git a/configure.in b/configure.in
index bcc667899..dfcc648cd 100644
--- a/configure.in
+++ b/configure.in
@@ -760,6 +760,7 @@ int main (int argc, char **argv)
 }
 ],g_have_gnuc_visibility=yes,g_have_gnuc_visibility=no)
 AC_MSG_RESULT($g_have_gnuc_visibility)
+AM_CONDITIONAL(HAVE_GNUC_VISIBILITY, [test x$g_have_gnuc_visibility = xyes])
 
 # check for bytesex stuff
 AC_C_BIGENDIAN
diff --git a/glib/Makefile.am b/glib/Makefile.am
index 9b5bcc27d..3b8b14d4b 100644
--- a/glib/Makefile.am
+++ b/glib/Makefile.am
@@ -20,8 +20,10 @@ galias.h: glib.symbols
 	  $(PERL) $(srcdir)/makegalias.pl < $(srcdir)/glib.symbols > galias.h
 
 if OS_LINUX
+if HAVE_GNUC_VISIBILITY
 TESTS = abicheck.sh
 endif
+endif
 
 BUILT_SOURCES = galias.h
 
diff --git a/gobject/Makefile.am b/gobject/Makefile.am
index de1c5473b..bf7a5f749 100644
--- a/gobject/Makefile.am
+++ b/gobject/Makefile.am
@@ -20,8 +20,10 @@ gobjectalias.h: gobject.symbols
 	$(PERL) $(srcdir)/makegobjectalias.pl < $(srcdir)/gobject.symbols > gobjectalias.h
 
 if OS_LINUX
+if HAVE_GNUC_VISIBILITY
 TESTS = abicheck.sh
 endif
+endif
 
 libglib = $(top_builddir)/glib/libglib-2.0.la