[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-devel
Subject:    Re: Build question (partly solved) (fixed for gcc 4.0)
From:       Alfons Hoogervorst <alfons () proteus ! demon ! nl>
Date:       2004-12-12 22:16:53
Message-ID: 20041212231653.05700c13 () proteus ! demon ! nl
[Download RAW message or body]

Lo,

On 12-12-04 (Sun) 19:58 +0100 Alfons Hoogervorst wrote: 

| What about the attached patch which works fine with my current setup
| (automake 1.7.1, autoconf 2.56)?

And patch below makes it work for gcc 4.0 too... Or is this just wishful
thinking, and do I miss something obvious?

Bye.

-- 
Ecuación algebraico sin solución posible,
a menos de poseer profundos conocimientos
en matemática - Revueltas (Ocho Por Radio)

["kdemacros.header.patch" (text/plain)]

Index: kdecore/configure.in.in
===================================================================
RCS file: /home/kde/kdelibs/kdecore/configure.in.in,v
retrieving revision 1.47
diff -u -r1.47 configure.in.in
--- kdecore/configure.in.in	17 Nov 2004 11:15:02 -0000	1.47
+++ kdecore/configure.in.in	12 Dec 2004 22:12:53 -0000
@@ -148,8 +148,8 @@
 AC_CHECK_HEADERS(sys/mount.h)  
 
 dnl AC_OUTPUT(kdecore/kde-config.cpp)
-dnl AC_OUTPUT(kdecore/kdemacros.h)
 
+AC_CONFIG_HEADERS(kdecore/kdemacros.h)
 
 SVGICONS=
 	
Index: kdecore/kdemacros.h.in
===================================================================
RCS file: /home/kde/kdelibs/kdecore/kdemacros.h.in,v
retrieving revision 1.17
diff -u -r1.17 kdemacros.h.in
--- kdecore/kdemacros.h.in	21 Nov 2004 19:57:46 -0000	1.17
+++ kdecore/kdemacros.h.in	12 Dec 2004 22:12:53 -0000
@@ -20,6 +20,8 @@
 #ifndef _KDE_MACROS_H_
 #define _KDE_MACROS_H_
 
+#undef __KDE_HAVE_GCC_VISIBILITY
+
 /**
  * The KDE_NO_EXPORT macro marks the symbol of the given variable 
  * to be hidden. A hidden symbol is stripped during the linking step, 
@@ -34,15 +36,15 @@
  * \end
  */
 
-#if @HAVE_GCC_VISIBILITY@
-#define KDE_NO_EXPORT __attribute__ ((visibility("hidden")))
-#define KDE_EXPORT __attribute__ ((visibility("default")))
+#if !defined(__KDE_HAVE_GCC_VISIBILITY) && !defined(Q_WS_WIN)
+#	define KDE_NO_EXPORT
+#	define KDE_EXPORT
 #elif defined(Q_WS_WIN)
-#define KDE_NO_EXPORT
-#define KDE_EXPORT __declspec(dllexport)
+#	define KDE_NO_EXPORT
+#	define KDE_EXPORT __declspec(dllexport)
 #else
-#define KDE_NO_EXPORT
-#define KDE_EXPORT
+#	define KDE_NO_EXPORT __attribute__ ((visibility("hidden")))
+#	define KDE_EXPORT __attribute__ ((visibility("default")))
 #endif
 
 /**


>> Visit http://mail.kde.org/mailman/listinfo/kde-devel#unsub to unsubscribe <<


[prev in list] [next in list] [prev in thread] [next in thread]