From: Lukáš Lalinský <lalinsky@gmail.com>
Date: Mon, 12 Apr 2010 18:32:04 +0000 (+0000)
Subject: Include taglib_config.h by default
X-Git-Tag: v1.6.3~5
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=414a49cc1640947369c80fa94cd83fbfb2c88721;p=taglib

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 8f0e5c94..0c462954 100644
--- 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 9673d93a..c78f701b 100644
--- 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