Change config file name to bmcweb_config.h
config.h is a generic filename, unprefixed by any sort of name, that
other dependencies could use. Namely, nghttp2 uses an identical
filename, which can cause issues with getting the right one. This
commit renames that file to bmcweb_config.h to disambiguate it from
generic config.h files.
Tested:
Compiled bmcweb and observed compile time params get applied. There are
no defaults on any of this stuff, so there's no way to silently miss the
config file.
Signed-off-by: Ed Tanous <edtanous@google.com>
Change-Id: I9a3e73c37161fa438c5612344dfb01f1f19aff2c
diff --git a/.gitignore b/.gitignore
index ef61d38..46831eb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,7 +3,7 @@
*.crt
*.key
-/include/config.h
+/include/bmcweb_config.h
# Created by https://www.toptal.com/developers/gitignore/api/osx,linux,windows,pycharm,intellij,visualstudio,visualstudiocode,eclipse,meson
# Edit at https://www.toptal.com/developers/gitignore?templates=osx,linux,windows,pycharm,intellij,visualstudio,visualstudiocode,eclipse,meson
diff --git a/config.h.in b/bmcweb_config.h.in
similarity index 100%
rename from config.h.in
rename to bmcweb_config.h.in
diff --git a/http/http_connection.hpp b/http/http_connection.hpp
index 6840fc0..d7b74ad 100644
--- a/http/http_connection.hpp
+++ b/http/http_connection.hpp
@@ -1,5 +1,5 @@
#pragma once
-#include "config.h"
+#include "bmcweb_config.h"
#include "authorization.hpp"
#include "http_response.hpp"
diff --git a/meson.build b/meson.build
index a08c8dd..48f7691 100644
--- a/meson.build
+++ b/meson.build
@@ -339,8 +339,8 @@
xss_enabled = get_option('insecure-disable-xss')
conf_data.set10('BMCWEB_INSECURE_DISABLE_XSS_PREVENTION', xss_enabled)
conf_data.set('MESON_INSTALL_PREFIX', get_option('prefix'))
-configure_file(input: 'config.h.in',
- output: 'config.h',
+configure_file(input: 'bmcweb_config.h.in',
+ output: 'bmcweb_config.h',
configuration: conf_data)
# Configure and install systemd unit files