Description: Don't install config.h or include it in headers. config.h is an artefact of the GNU autotools and is dependent on the local build environment. It is not meant to be distributed to other systems, nor installed as headers, since it would then conflict with other generated config.h files in projects that include these headers, because they define the same macros. For more details, see: - http://stackoverflow.com/questions/1810216/autoconf-where-does-config-h-go - http://inaugust.com/post/68 - http://gnu-autoconf.7623.n7.nabble.com/make-install-config-h-td18986.html Author: Ximin Luo Origin: vendor Bug: http://code.google.com/p/curlpp/issues/detail?id=26 --- This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ diff --git a/include/curlpp/Makefile.am b/include/curlpp/Makefile.am index db10941..b7a5c59 100644 --- a/include/curlpp/Makefile.am +++ b/include/curlpp/Makefile.am @@ -11,9 +11,6 @@ pkginclude_HEADERS = \ OptionBase.hpp \ Options.hpp \ Types.hpp \ - cURLpp.hpp \ - config.h.in \ - config.h.sample \ - config.win32.h + cURLpp.hpp pkgincludedir=$(includedir)/curlpp diff --git a/include/curlpp/Makefile.in b/include/curlpp/Makefile.in index 53ebe5d..7c25101 100644 --- a/include/curlpp/Makefile.in +++ b/include/curlpp/Makefile.in @@ -205,10 +205,7 @@ pkginclude_HEADERS = \ OptionBase.hpp \ Options.hpp \ Types.hpp \ - cURLpp.hpp \ - config.h.in \ - config.h.sample \ - config.win32.h + cURLpp.hpp all: config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive diff --git a/include/curlpp/Types.hpp b/include/curlpp/Types.hpp index 26ed04e..57c354b 100644 --- a/include/curlpp/Types.hpp +++ b/include/curlpp/Types.hpp @@ -25,8 +25,6 @@ #define CURLPP_TYPES_HPP -#include "internal/global.h" - #ifdef HAVE_BOOST #include #endif diff --git a/include/curlpp/config.h.sample b/include/curlpp/config.h.sample deleted file mode 100644 index 48a92b7..0000000 --- a/include/curlpp/config.h.sample +++ /dev/null @@ -1,71 +0,0 @@ -/* curlpp/config.h. Generated from config.h.in by configure. */ -/* curlpp/config.h.in. Generated from configure.ac by autoheader. */ - -/* when building cURLpp itself */ -/* #undef BUILDING_CURLPP */ - -/* when not building a shared library */ -/* #undef CURLPP_STATICLIB */ - -/* define if the Boost library is available */ -/* #undef HAVE_BOOST */ - -/* Define to 1 if you have the header file. */ -#define HAVE_CURL_CURL_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_DLFCN_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_INTTYPES_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_MEMORY_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_OSTREAM 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_STDINT_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_STDLIB_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_STRINGS_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_STRING_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_SYS_STAT_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_SYS_TYPES_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_UNISTD_H 1 - -/* Name of package */ -#define PACKAGE "curlpp" - -/* Define to the address where bug reports for this package should be sent. */ -#define PACKAGE_BUGREPORT "" - -/* Define to the full name of this package. */ -#define PACKAGE_NAME "" - -/* Define to the full name and version of this package. */ -#define PACKAGE_STRING "" - -/* Define to the one symbol short name of this package. */ -#define PACKAGE_TARNAME "" - -/* Define to the version of this package. */ -#define PACKAGE_VERSION "" - -/* Define to 1 if you have the ANSI C header files. */ -/* #undef STDC_HEADERS */ - -/* Version number of package */ -#define VERSION "0.7.2" diff --git a/include/curlpp/internal/Makefile.am b/include/curlpp/internal/Makefile.am index af431de..bc15112 100644 --- a/include/curlpp/internal/Makefile.am +++ b/include/curlpp/internal/Makefile.am @@ -5,7 +5,6 @@ pkginclude_HEADERS = \ OptionList.hpp \ OptionSetter.hpp OptionSetter.inl \ SList.hpp \ - buildconfig.h \ - global.h + buildconfig.h pkgincludedir=$(includedir)/curlpp/internal diff --git a/include/curlpp/internal/Makefile.in b/include/curlpp/internal/Makefile.in index f702e33..c33acc1 100644 --- a/include/curlpp/internal/Makefile.in +++ b/include/curlpp/internal/Makefile.in @@ -189,8 +189,7 @@ pkginclude_HEADERS = \ OptionList.hpp \ OptionSetter.hpp OptionSetter.inl \ SList.hpp \ - buildconfig.h \ - global.h + buildconfig.h all: all-am diff --git a/include/curlpp/internal/global.h b/include/curlpp/internal/global.h deleted file mode 100644 index 6020c6a..0000000 --- a/include/curlpp/internal/global.h +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright (c) <2002-2009> - * - * Permission is hereby granted, free of charge, to any person obtaining - * a copy of this software and associated documentation files - * (curlpp), to deal in the Software without restriction, - * including without limitation the rights to use, copy, modify, merge, - * publish, distribute, sublicense, and/or sell copies of the Software, - * and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. - * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY - * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, - * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE - * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -#ifndef CURLPP_GLOBAL_H -#define CURLPP_GLOBAL_H - -#ifndef HAVE_CONFIG_H - #include "curlpp/config.win32.h" -#else - #include "curlpp/config.h" -#endif - -#endif // #ifndef CURLPP_GLOBAL_H diff --git a/src/curlpp/Easy.cpp b/src/curlpp/Easy.cpp index dc2ae1c..86f1232 100644 --- a/src/curlpp/Easy.cpp +++ b/src/curlpp/Easy.cpp @@ -24,7 +24,7 @@ #include "curlpp/Easy.hpp" #include "curlpp/Options.hpp" -#include "curlpp/internal/global.h" +#include "config.h" #include "curlpp/internal/buildconfig.h" diff --git a/src/curlpp/Exception.cpp b/src/curlpp/Exception.cpp index e2cc97a..efa2300 100644 --- a/src/curlpp/Exception.cpp +++ b/src/curlpp/Exception.cpp @@ -21,7 +21,7 @@ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "curlpp/internal/global.h" +#include "config.h" #include "curlpp/Exception.hpp" curlpp::RuntimeError::~RuntimeError() throw() diff --git a/src/curlpp/Form.cpp b/src/curlpp/Form.cpp index e2704ce..e759379 100644 --- a/src/curlpp/Form.cpp +++ b/src/curlpp/Form.cpp @@ -21,7 +21,7 @@ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "curlpp/internal/global.h" +#include "config.h" #include "curlpp/Form.hpp" diff --git a/src/curlpp/Info.cpp b/src/curlpp/Info.cpp index 8bbb4ac..ee8e713 100644 --- a/src/curlpp/Info.cpp +++ b/src/curlpp/Info.cpp @@ -1,4 +1,4 @@ -#include "curlpp/internal/global.h" +#include "config.h" #include "curlpp/internal/SList.hpp" #include "curlpp/Info.hpp" diff --git a/src/curlpp/Multi.cpp b/src/curlpp/Multi.cpp index 360ba17..0af5f97 100644 --- a/src/curlpp/Multi.cpp +++ b/src/curlpp/Multi.cpp @@ -21,7 +21,7 @@ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "curlpp/internal/global.h" +#include "config.h" #include "curlpp/Easy.hpp" #include "curlpp/Exception.hpp" diff --git a/src/curlpp/OptionBase.cpp b/src/curlpp/OptionBase.cpp index 1d82816..85075f8 100644 --- a/src/curlpp/OptionBase.cpp +++ b/src/curlpp/OptionBase.cpp @@ -21,7 +21,7 @@ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "curlpp/internal/global.h" +#include "config.h" #include "curlpp/OptionBase.hpp" diff --git a/src/curlpp/Options.cpp b/src/curlpp/Options.cpp index 21063d7..3219e50 100644 --- a/src/curlpp/Options.cpp +++ b/src/curlpp/Options.cpp @@ -21,7 +21,7 @@ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "curlpp/internal/global.h" +#include "config.h" #include "curlpp/Options.hpp" #include "curlpp/Easy.hpp" diff --git a/src/curlpp/cURLpp.cpp b/src/curlpp/cURLpp.cpp index ec96a59..5a9087f 100644 --- a/src/curlpp/cURLpp.cpp +++ b/src/curlpp/cURLpp.cpp @@ -1,7 +1,7 @@ #include "utilspp/singleton/SingletonHolder.hpp" #include "utilspp/singleton/CreationStatic.hpp" -#include "curlpp/internal/global.h" +#include "config.h" #include "curlpp/cURLpp.hpp" #include "curlpp/Exception.hpp" diff --git a/src/curlpp/internal/CurlHandle.cpp b/src/curlpp/internal/CurlHandle.cpp index e4ce138..f159916 100644 --- a/src/curlpp/internal/CurlHandle.cpp +++ b/src/curlpp/internal/CurlHandle.cpp @@ -21,7 +21,7 @@ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "curlpp/internal/global.h" +#include "config.h" #include "curlpp/internal/CurlHandle.hpp" #include "curlpp/cURLpp.hpp" diff --git a/src/curlpp/internal/OptionList.cpp b/src/curlpp/internal/OptionList.cpp index ef9ecd8..1f86f64 100644 --- a/src/curlpp/internal/OptionList.cpp +++ b/src/curlpp/internal/OptionList.cpp @@ -21,7 +21,7 @@ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "curlpp/internal/global.h" +#include "config.h" #include "curlpp/internal/OptionList.hpp" #include diff --git a/src/curlpp/internal/OptionSetter.cpp b/src/curlpp/internal/OptionSetter.cpp index 117ec90..168a41b 100644 --- a/src/curlpp/internal/OptionSetter.cpp +++ b/src/curlpp/internal/OptionSetter.cpp @@ -21,7 +21,7 @@ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "curlpp/internal/global.h" +#include "config.h" #include "curlpp/internal/CurlHandle.hpp" #include "curlpp/internal/OptionSetter.hpp" diff --git a/src/curlpp/internal/SList.cpp b/src/curlpp/internal/SList.cpp index bdda998..ce9d13b 100644 --- a/src/curlpp/internal/SList.cpp +++ b/src/curlpp/internal/SList.cpp @@ -1,5 +1,5 @@ #include "curlpp/internal/SList.hpp" -#include "curlpp/internal/global.h" +#include "config.h" #if HAVE_OSTREAM # include