Reintroduce HAVE_CONFIG_H so that TagLib can be built without CMake

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

bindings/c/tag_c.cpp

@@ -19,7 +19,6 @@
  *   USA                                                                   *
  ***************************************************************************/
 
-#include "taglib_config.h"
 #include <stdlib.h>
 #include <fileref.h>
 #include <tfile.h>

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"

taglib/asf/asftag.cpp

@@ -23,7 +23,6 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include "taglib_config.h"
 #include <tpropertymap.h>
 #include "asftag.h"
 

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>

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"

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>

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>

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"

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"

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>

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"

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)

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"

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>

tests/utils.h

@@ -1,4 +1,6 @@
-#include "config.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #ifdef _WIN32
 #include <windows.h>