From: Scott Wheeler <wheeler@kde.org>
Date: Fri, 1 Feb 2008 16:20:58 +0000 (+0000)
Subject: More bundle fixes
X-Git-Tag: v1.5~29
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=64bf7d9ce4bf4b96c9750809855f6dacb29d508a;p=taglib

More bundle fixes


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

diff --git a/taglib/mpeg/id3v2/id3v2frame.cpp b/taglib/mpeg/id3v2/id3v2frame.cpp
index 0a849262..ae9e6ef3 100644
--- a/taglib/mpeg/id3v2/id3v2frame.cpp
+++ b/taglib/mpeg/id3v2/id3v2frame.cpp
@@ -23,14 +23,16 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
+#ifndef HAVE_ZLIB
 #include <config.h>
-
-#include <bitset>
+#endif
 
 #if HAVE_ZLIB
 #include <zlib.h>
 #endif
 
+#include <bitset>
+
 #include <tdebug.h>
 #include <tstringlist.h>
 
diff --git a/taglib/mpeg/id3v2/id3v2framefactory.cpp b/taglib/mpeg/id3v2/id3v2framefactory.cpp
index 3b92a824..6cea10bc 100644
--- a/taglib/mpeg/id3v2/id3v2framefactory.cpp
+++ b/taglib/mpeg/id3v2/id3v2framefactory.cpp
@@ -23,7 +23,9 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
+#ifndef HAVE_ZLIB
 #include <config.h>
+#endif
 
 #include <tdebug.h>
 
diff --git a/taglib/taglib.pro b/taglib/taglib.pro
index ddc186e7..49e2ddd1 100644
--- a/taglib/taglib.pro
+++ b/taglib/taglib.pro
@@ -3,9 +3,10 @@
 ######################################################################
 
 TEMPLATE = lib
-CONFIG += lib_bundle staticlib
+CONFIG += lib_bundle
 CONFIG += x86 ppc
 CONFIG -= qt
+DEFINES += HAVE_ZLIB=1
 LIBS += -lz
 TARGET = TagLib
 VERSION = 1.5