Include taglib_config.h by default

git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/kdesupport/taglib@1114090 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

diff --git a/taglib/taglib.pro b/taglib/taglib.pro
index 8f0e5c945058607e5be70d5eec768328eedf625b..0c462954fafbd1d4e03949fdffb381f84dac3115 100644 (file)
--- a/taglib/taglib.pro
+++ b/taglib/taglib.pro
@@ -6,7 +6,7 @@ TEMPLATE = lib
 CONFIG += lib_bundle staticlib
 CONFIG += x86 x86_64 ppc
 CONFIG -= qt
-DEFINES += HAVE_ZLIB=1 NDEBUG WITH_ASF WITH_MP4
+DEFINES += HAVE_ZLIB=1 NDEBUG WITH_ASF WITH_MP4 TAGLIB_NO_CONFIG
 LIBS += -lz
 TARGET = TagLib
 VERSION = 1.6.3

diff --git a/taglib/taglib_export.h b/taglib/taglib_export.h
index 9673d93aa6b9ea573042d168a40db7a48709d064..c78f701b80202c3b5d5975147bc877ed1ccf3678 100644 (file)
--- a/taglib/taglib_export.h
+++ b/taglib/taglib_export.h
@@ -38,7 +38,7 @@
 #define TAGLIB_EXPORT
 #endif
 
-#ifdef HAVE_CONFIG_H
+#ifndef TAGLIB_NO_CONFIG
 #include "taglib_config.h"
 #endif