With meson we generate meson-config.h into the build directory and include it in config.h so there is no need to have separate config-post.h file. Signed-off-by: Pavel Hrdina <phrdina@xxxxxxxxxx> --- config-post.h | 58 --------------------------------------------------- config.h | 41 ++++++++++++++++++++++++++++++++++++ configure.ac | 1 - 3 files changed, 41 insertions(+), 59 deletions(-) delete mode 100644 config-post.h diff --git a/config-post.h b/config-post.h deleted file mode 100644 index 4a49cd4194d..00000000000 --- a/config-post.h +++ /dev/null @@ -1,58 +0,0 @@ -/* - * Copyright (C) 2013 Red Hat, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library. If not, see - * <http://www.gnu.org/licenses/>. - */ - -#ifndef __GNUC__ -# error "Libvirt requires GCC >= 4.8, or CLang" -#endif - -/* - * Define __GNUC_PREREQ to a sane default if it isn't yet defined. - * This is done here so that it's included as early as possible; - */ -#ifndef __GNUC_PREREQ -# define __GNUC_PREREQ(maj, min) \ - ((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min)) -#endif - -#if defined(__clang_major__) && defined(__clang_minor__) -# ifdef __apple_build_version__ -# if __clang_major__ < 5 || (__clang_major__ == 5 && __clang_minor__ < 1) -# error You need at least XCode Clang v5.1 to compile QEMU -# endif -# else -# if __clang_major__ < 3 || (__clang_major__ == 3 && __clang_minor__ < 4) -# error You need at least Clang v3.4 to compile QEMU -# endif -# endif -#elif defined(__GNUC__) && defined(__GNUC_MINOR__) -# if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 8) -# error You need at least GCC v4.8 to compile QEMU -# endif -#else -# error You either need at least GCC 4.8 or Clang 3.4 or XCode Clang 5.1 to compile libvirt -#endif - -/* Ask for warnings for anything that was marked deprecated in - * the defined version, or before. It is a candidate for rewrite. - */ -#define GLIB_VERSION_MIN_REQUIRED GLIB_VERSION_2_48 - -/* Ask for warnings if code tries to use function that did not - * exist in the defined version. These risk breaking builds - */ -#define GLIB_VERSION_MAX_ALLOWED GLIB_VERSION_2_48 diff --git a/config.h b/config.h index 05cd1507f45..9c433ad4c0f 100644 --- a/config.h +++ b/config.h @@ -1 +1,42 @@ #include <meson-config.h> + +#ifndef __GNUC__ +# error "Libvirt requires GCC >= 4.8, or CLang" +#endif + +/* + * Define __GNUC_PREREQ to a sane default if it isn't yet defined. + * This is done here so that it's included as early as possible; + */ +#ifndef __GNUC_PREREQ +# define __GNUC_PREREQ(maj, min) \ + ((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min)) +#endif + +#if defined(__clang_major__) && defined(__clang_minor__) +# ifdef __apple_build_version__ +# if __clang_major__ < 5 || (__clang_major__ == 5 && __clang_minor__ < 1) +# error You need at least XCode Clang v5.1 to compile QEMU +# endif +# else +# if __clang_major__ < 3 || (__clang_major__ == 3 && __clang_minor__ < 4) +# error You need at least Clang v3.4 to compile QEMU +# endif +# endif +#elif defined(__GNUC__) && defined(__GNUC_MINOR__) +# if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 8) +# error You need at least GCC v4.8 to compile QEMU +# endif +#else +# error You either need at least GCC 4.8 or Clang 3.4 or XCode Clang 5.1 to compile libvirt +#endif + +/* Ask for warnings for anything that was marked deprecated in + * the defined version, or before. It is a candidate for rewrite. + */ +#define GLIB_VERSION_MIN_REQUIRED GLIB_VERSION_2_48 + +/* Ask for warnings if code tries to use function that did not + * exist in the defined version. These risk breaking builds + */ +#define GLIB_VERSION_MAX_ALLOWED GLIB_VERSION_2_48 diff --git a/configure.ac b/configure.ac index 84e63063e43..7294b61bc46 100644 --- a/configure.ac +++ b/configure.ac @@ -17,7 +17,6 @@ dnl License along with this library. If not, see dnl <http://www.gnu.org/licenses/>. AC_CONFIG_AUX_DIR([build-aux]) -AH_BOTTOM([#include <config-post.h>]) AC_CONFIG_MACRO_DIR([m4]) dnl Make automake keep quiet about wildcards & other GNUmake-isms AM_INIT_AUTOMAKE([ -- 2.26.2
