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

List:       kde-commits
Subject:    kdesupport/taglib/taglib
From:       Scott Wheeler <wheeler () kde ! org>
Date:       2008-02-01 16:20:59
Message-ID: 1201882859.959713.10584.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 769557 by wheeler:

More bundle fixes


 M  +4 -2      mpeg/id3v2/id3v2frame.cpp  
 M  +2 -0      mpeg/id3v2/id3v2framefactory.cpp  
 M  +2 -1      taglib.pro  


--- trunk/kdesupport/taglib/taglib/mpeg/id3v2/id3v2frame.cpp #769556:769557
@@ -23,14 +23,16 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
+#ifndef HAVE_ZLIB
 #include <config.h>
+#endif
 
-#include <bitset>
-
 #if HAVE_ZLIB
 #include <zlib.h>
 #endif
 
+#include <bitset>
+
 #include <tdebug.h>
 #include <tstringlist.h>
 
--- trunk/kdesupport/taglib/taglib/mpeg/id3v2/id3v2framefactory.cpp #769556:769557
@@ -23,7 +23,9 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
+#ifndef HAVE_ZLIB
 #include <config.h>
+#endif
 
 #include <tdebug.h>
 
--- trunk/kdesupport/taglib/taglib/taglib.pro #769556:769557
@@ -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
[prev in list] [next in list] [prev in thread] [next in thread]