diff options
| author | Marty E. Plummer <hanetzer@protonmail.com> | 2018-01-08 23:55:04 -0600 |
|---|---|---|
| committer | Ingy döt Net <ingy@ingy.net> | 2018-07-19 14:49:53 -0700 |
| commit | 12dc1bef1f53fb1abdc599fbde1e66c6ca66af62 (patch) | |
| tree | ef718c5240deabde153c630972e1f47c7f5e5dac | |
| parent | df5c05e12080c6f710da54b6e3348288f3506d46 (diff) | |
| download | libyaml-git-12dc1bef1f53fb1abdc599fbde1e66c6ca66af62.tar.gz | |
build: do not install config.h
'config.h' is meant to be a convenience header to be #included at build
time, but not installed. Installing it can cause a host of problems for
various other projects (for instance, attempting to build u-boot from
source while another project's 'config.h' exists in the compiler search
path will cause build failures similar to:
https://github.com/pepe2k/u-boot_mod/issues/148
Further, I've changed '#include <config.h>' to '#include "config.h"',
which should constrain the search path to the current build directories,
so if another package with a bugged build has this file installed, it
will not cause yaml to miscompile/fail.
If you have a file `/usr/include/config.h` on your filesystem, query
your package manager to find out what package owns it, and file a bug
report against it with your distro maintainers.
Signed-off-by: Marty E. Plummer <hanetzer@protonmail.com>
| -rw-r--r-- | CMakeLists.txt | 1 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | src/yaml_private.h | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 5e85aef..1abdd77 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -83,7 +83,6 @@ target_include_directories(yaml PUBLIC install( FILES include/yaml.h - ${config_h} DESTINATION include COMPONENT Development ) diff --git a/configure.ac b/configure.ac index 637447f..8139c77 100644 --- a/configure.ac +++ b/configure.ac @@ -26,7 +26,7 @@ m4_define([YAML_AGE], 0) AC_PREREQ(2.59) AC_INIT([yaml], [YAML_MAJOR.YAML_MINOR.YAML_PATCH], [YAML_BUGS]) AC_CONFIG_AUX_DIR([config]) -AC_CONFIG_HEADERS([config.h]) +AC_CONFIG_HEADERS([include/config.h]) AM_INIT_AUTOMAKE([1.9 foreign]) # Define macro variables for the package version numbers. diff --git a/src/yaml_private.h b/src/yaml_private.h index d2971b8..b3351c4 100644 --- a/src/yaml_private.h +++ b/src/yaml_private.h @@ -1,5 +1,5 @@ #if HAVE_CONFIG_H -#include <config.h> +#include "config.h" #endif #include <yaml.h> |