hotfix: revert last change to fix the build on OS X.

2007-05-17  Michael Natterer  <mitch@imendio.com>

	* configure.in: hotfix: revert last change to fix the build on OS X.

svn path=/trunk/; revision=5501

diff --git a/ChangeLog b/ChangeLog
index 6f07caf..0a91228 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-05-17  Michael Natterer  <mitch@imendio.com>
+
+       * configure.in: hotfix: revert last change to fix the build on OS X.
+
 2007-05-17  Matthias Clasen  <mclasen@redhat.com>
 
        * glib/goption.c (g_option_context_set_translate_func): Fix

diff --git a/configure.in b/configure.in
index 8b1d9fb..336f52d 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -2508,18 +2508,26 @@ _______EOF
 
        fi
 
+       if test x$g_have_gnuc_visibility = xyes ; then
                cat >>$outfile <<_______EOF
 #if __GNUC__ == 2 && __GNUC_MINOR__ == 95
 #define G_GNUC_INTERNAL
-#elif defined (__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 303)
+#else
 #define G_HAVE_GNUC_VISIBILITY 1
 #define G_GNUC_INTERNAL __attribute__((visibility("hidden")))
-#elif defined(__SUNPRO_C) && (__SUNPRO_C >= 0x550)
+#endif
+_______EOF
+        else
+          if test x$g_have_sunstudio_visibility = xyes ; then
+                cat >>$outfile <<_______EOF
 #define G_GNUC_INTERNAL __hidden
-#else
+_______EOF
+          else
+               cat >>$outfile <<_______EOF
 #define G_GNUC_INTERNAL
-#endif
 _______EOF
+         fi
+       fi
 
 
        echo >>$outfile