From ecfa48fffa93f3d1b66354d2d46872ff614c4a68 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Fri, 5 Oct 2018 15:14:58 +0200 Subject: build: Move config.h to conf/config.h * conf/: New dir. * configure.ac (AC_CONFIG_HEADER): Move header to conf dir. * doc/Makefile.am (mkdefsinc): Adjust rule. * lang/python/Makefile.am (copystamp): Ditto. -- C++ uses those stupid files without a suffix and thus the new standard header as included by newer other libc++ versions may conflict with the VERSION file in out top directory. This change should solve the problem. GnuPG-bug-id: 4168 Signed-off-by: Werner Koch --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 1813cc57..b190e4b1 100644 --- a/configure.ac +++ b/configure.ac @@ -88,7 +88,7 @@ VERSION_MICRO=mym4_version_micro AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_SRCDIR(src/gpgme.h.in) -AC_CONFIG_HEADER(config.h) +AC_CONFIG_HEADER(conf/config.h) AM_INIT_AUTOMAKE([serial-tests dist-bzip2 no-dist-gzip]) AM_MAINTAINER_MODE AC_CANONICAL_HOST -- cgit v1.2.3