[Kde-imaging] extragear/libs

[Renchi Raju]

SVN commit 423752 by pahlibar:

add configure test to check for presence of kdemacros.h and use
it check for availability of KDE_EXPORT
CCMAIL: kde-imaging at kde.org


 M  +6 -0      libkexif/configure.in.in  
 M  +4 -5      libkexif/libkexif_export.h  
 M  +6 -0      libkipi/configure.in.in  
 M  +4 -5      libkipi/libkipi/libkipi_export.h  


--- trunk/extragear/libs/libkexif/configure.in.in #423751:423752
@@ -85,3 +85,9 @@
 AM_CONDITIONAL(compile_LIBKEXIF, [test x$NO_LIBEXIF != xyes])
 
 AC_OUTPUT([ libkexif/libkexif.pc ])
+
+KDE_CHECK_HEADER(kdemacros.h, have_kdemacros=yes, have_kdemacros=no)
+if test "x$have_kdemacros" = "xyes"; then
+   AC_MSG_NOTICE([kdemacros.h found])
+   AC_DEFINE(HAVE_KDEMACROS, 1, [Defined if kdemacros.h is found])
+fi
--- trunk/extragear/libs/libkexif/libkexif_export.h #423751:423752
@@ -21,16 +21,15 @@
 #ifndef _LIBKEXIF_EXPORT_H
 #define _LIBKEXIF_EXPORT_H
 
-#include <kdeversion.h>
-
-#ifdef __KDE_HAVE_GCC_VISIBILITY
-
+#ifdef HAVE_KDEMACROS
 #include <kdemacros.h>
+#endif
 
+#ifdef KDE_EXPORT
 #define LIBKEXIF_EXPORT KDE_EXPORT
-
 #else
 #define LIBKEXIF_EXPORT
 #endif
+
 #endif /* _LIBKEXIF_EXPORT_H */
 
--- trunk/extragear/libs/libkipi/configure.in.in #423751:423752
@@ -1,2 +1,8 @@
 AC_OUTPUT([ libkipi/libkipi.pc ])
 KDE_ENABLE_HIDDEN_VISIBILITY
+
+KDE_CHECK_HEADER(kdemacros.h, have_kdemacros=yes, have_kdemacros=no)
+if test "x$have_kdemacros" = "xyes"; then
+   AC_MSG_NOTICE([kdemacros.h found])
+   AC_DEFINE(HAVE_KDEMACROS, 1, [Defined if kdemacros.h is found])
+fi
--- trunk/extragear/libs/libkipi/libkipi/libkipi_export.h #423751:423752
@@ -21,16 +21,15 @@
 #ifndef _LIBKIPI_EXPORT_H
 #define _LIBKIPI_EXPORT_H
 
-#include <kdeversion.h>
-
-#ifdef __KDE_HAVE_GCC_VISIBILITY
-
+#ifdef HAVE_KDEMACROS
 #include <kdemacros.h>
+#endif
 
+#ifdef KDE_EXPORT
 #define LIBKIPI_EXPORT KDE_EXPORT
-
 #else
 #define LIBKIPI_EXPORT
 #endif
+
 #endif /* _LIBKIPI_EXPORT_H */