Reintroduce HAVE_CONFIG_H so that TagLib can be built without CMake

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 91e1901d7db8c94c1aef462e1dd43e36ef528abd..f410e098dec5ab8bc5e236abf6c1545c4bb4b7dd 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -21,6 +21,7 @@ option(BUILD_EXAMPLES "Build the examples"  OFF)
 
 option(NO_ITUNES_HACKS "Disable workarounds for iTunes bugs"  OFF)
 
+add_definitions(-DHAVE_CONFIG_H)
 set(TESTS_DIR "${CMAKE_CURRENT_SOURCE_DIR}/tests/")
 
 ## the following are directories where stuff will be installed to

diff --git a/bindings/c/tag_c.cpp b/bindings/c/tag_c.cpp
index 5b739d6f452155bc7919fc6eac2f6da847e7a6ee..2ae8c7dda145f67a035eb900931e5abd2766118b 100644 (file)
--- a/bindings/c/tag_c.cpp
+++ b/bindings/c/tag_c.cpp
@@ -19,7 +19,6 @@
  *   USA                                                                   *
  ***************************************************************************/
 
-#include "taglib_config.h"
 #include <stdlib.h>
 #include <fileref.h>
 #include <tfile.h>

diff --git a/taglib/asf/asfproperties.cpp b/taglib/asf/asfproperties.cpp
index 638baf6ea2edb6e1c602416dd0a7139c29b2484b..b82c131a70fa83d42977a6a43a113c692ea958f9 100644 (file)
--- a/taglib/asf/asfproperties.cpp
+++ b/taglib/asf/asfproperties.cpp
@@ -23,7 +23,6 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include "taglib_config.h"
 #include <tdebug.h>
 #include <tstring.h>
 #include "asfproperties.h"

diff --git a/taglib/asf/asftag.cpp b/taglib/asf/asftag.cpp
index 0767817fd4299f593488f3f34c491e848bbccd2b..c07abe94d14059f6641a3b6fc5ede9ddce7ff135 100644 (file)
--- a/taglib/asf/asftag.cpp
+++ b/taglib/asf/asftag.cpp
@@ -23,7 +23,6 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include "taglib_config.h"
 #include <tpropertymap.h>
 #include "asftag.h"
 

diff --git a/taglib/fileref.cpp b/taglib/fileref.cpp
index d13a283791701daf3a2178f358564192a4dd20b7..4403a5fbfa3c4ec797635e460feee69548c4419f 100644 (file)
--- a/taglib/fileref.cpp
+++ b/taglib/fileref.cpp
@@ -27,8 +27,6 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include "taglib_config.h"
-
 #include <tfile.h>
 #include <tstring.h>
 #include <tdebug.h>

diff --git a/taglib/mp4/mp4properties.cpp b/taglib/mp4/mp4properties.cpp
index d704b452def4f3a78eb9fb4d6687a027684414ea..058cc61cf51ffe7c1f478f92ae47861e81a5374d 100644 (file)
--- a/taglib/mp4/mp4properties.cpp
+++ b/taglib/mp4/mp4properties.cpp
@@ -23,7 +23,6 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include "taglib_config.h"
 #include <tdebug.h>
 #include <tstring.h>
 #include "mp4file.h"

diff --git a/taglib/mp4/mp4tag.cpp b/taglib/mp4/mp4tag.cpp
index 1edeace7fdae0b9390a6aae73982825d1179d2fb..bbe3301d97167362c994d66f393319b20bc5a59b 100644 (file)
--- a/taglib/mp4/mp4tag.cpp
+++ b/taglib/mp4/mp4tag.cpp
@@ -23,7 +23,6 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include "taglib_config.h"
 #include <tdebug.h>
 #include <tstring.h>
 #include <tpropertymap.h>

diff --git a/taglib/mpeg/id3v2/id3v2frame.cpp b/taglib/mpeg/id3v2/id3v2frame.cpp
index 424ac2d27561efe61102a3fd9483a7db5d154221..c5c5585d48a9c332602b67a11ff906b34628c60a 100644 (file)
--- a/taglib/mpeg/id3v2/id3v2frame.cpp
+++ b/taglib/mpeg/id3v2/id3v2frame.cpp
@@ -23,8 +23,9 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include "config.h"
-#include "taglib_config.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #if HAVE_ZLIB
 #include <zlib.h>

diff --git a/taglib/mpeg/id3v2/id3v2framefactory.cpp b/taglib/mpeg/id3v2/id3v2framefactory.cpp
index 3138f90ad3be2e074dad4a3d80e78838466584b3..3371ca7ddb9797334ecd45b79ba911ab1405011b 100644 (file)
--- a/taglib/mpeg/id3v2/id3v2framefactory.cpp
+++ b/taglib/mpeg/id3v2/id3v2framefactory.cpp
@@ -23,8 +23,10 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include "config.h"
-#include "taglib_config.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <tdebug.h>
 
 #include "id3v2framefactory.h"

diff --git a/taglib/mpeg/id3v2/id3v2tag.cpp b/taglib/mpeg/id3v2/id3v2tag.cpp
index a1b169e1d18bb3b7703ce24066564dd0c137dcde..57637a36e9b8d0887f07bd10740dfb28d8f4ac7a 100644 (file)
--- a/taglib/mpeg/id3v2/id3v2tag.cpp
+++ b/taglib/mpeg/id3v2/id3v2tag.cpp
@@ -23,6 +23,10 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <tfile.h>
 
 #include "id3v2tag.h"

diff --git a/taglib/toolkit/tbytevector.cpp b/taglib/toolkit/tbytevector.cpp
index 631acc8774dc060148d55659cdd1713d176526c8..63bce4ccef88077c1699418b52211e8130c5a381 100644 (file)
--- a/taglib/toolkit/tbytevector.cpp
+++ b/taglib/toolkit/tbytevector.cpp
@@ -23,7 +23,9 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include "config.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include <iostream>
 #include <cstdio>

diff --git a/taglib/toolkit/tdebug.cpp b/taglib/toolkit/tdebug.cpp
index 65c51efedd251e93b2fab86d0ca6cc5ca39cb9e6..71350af7c3f251ef4b1e6a7328ef834eca808c65 100644 (file)
--- a/taglib/toolkit/tdebug.cpp
+++ b/taglib/toolkit/tdebug.cpp
@@ -23,7 +23,9 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include "config.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include "tdebug.h"
 #include "tstring.h"

diff --git a/taglib/toolkit/trefcounter.cpp b/taglib/toolkit/trefcounter.cpp
index 327d72454881fde937d6fd71c0ea51e11c2c05ae..71f3c2f283c6ceacf5e8394f0a5623e0a61e7f61 100644 (file)
--- a/taglib/toolkit/trefcounter.cpp
+++ b/taglib/toolkit/trefcounter.cpp
@@ -23,7 +23,10 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include "config.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "trefcounter.h"
 
 #if defined(HAVE_STD_ATOMIC)

diff --git a/taglib/toolkit/tstring.cpp b/taglib/toolkit/tstring.cpp
index 7b4d204059f6c45a32cd3d0cafedb0fe4ee78d8f..8fcbb2debbed669bd01eb2579c3ef28330b485bb 100644 (file)
--- a/taglib/toolkit/tstring.cpp
+++ b/taglib/toolkit/tstring.cpp
@@ -25,7 +25,9 @@
 
 // This class assumes that std::basic_string<T> has a contiguous and null-terminated buffer.
 
-#include "config.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include "tstring.h"
 #include "tdebug.h"

diff --git a/tests/test_id3v2.cpp b/tests/test_id3v2.cpp
index 42d0f138acf8d9c7bbcaf89eca1283b2969e1640..9f5ffe01ddeacb0969685f724b479314b66fd401 100644 (file)
--- a/tests/test_id3v2.cpp
+++ b/tests/test_id3v2.cpp
@@ -1,6 +1,9 @@
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <string>
 #include <stdio.h>
-#include <config.h>
 // so evil :(
 #define protected public
 #include <id3v2tag.h>

diff --git a/tests/utils.h b/tests/utils.h
index a2d997eb2a3f1b60e01702733bfe2a5dd6238012..00cef628ac61afa349687443bcbfd46598474207 100644 (file)
--- a/tests/utils.h
+++ b/tests/utils.h
@@ -1,4 +1,6 @@
-#include "config.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #ifdef _WIN32
 #include <windows.h>