autoconf: rework config file locations

If we assume somebody puts the src directory in the include file path to
CC, we don't need relative symlinks to rrd_config.h which will make
separated builds much easier to support.  Then we don't need to have the
config files in the root directory and symlinks back and forth between
there and src.

Signed-off-by: Peter A. Bigot <pab@pabigot.com>

diff --git a/.gitignore b/.gitignore
index 6035261c1d260c8fa99457b8f97d7eae9e9adcb6..08238062a499b974df78d2fde7b47cf4b3b6f3fe 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -35,17 +35,16 @@ Makefile.in
 # autoconf generated files
 Makefile
 .deps/
-/config.h
 /config.log
 /config.status
 /etc/rrdcached.service
 /etc/rrdcached.socket
 /libtool
-/rrd_config.h
 /src/librrd.pc
 /src/librrd.sym.in
 /src/rrd_config.h
-/stamp-h1
+/src/rrd_config.h.in
+/src/stamp-h1
 
 # po
 /ABOUT-NLS

diff --git a/bindings/perl-shared/RRDs.xs b/bindings/perl-shared/RRDs.xs
index 266b5e3423a88995e66f0f72442da348fff02f16..ca7e166ff77862b40b590f1510d02dd972ce0cc3 100644 (file)
--- a/bindings/perl-shared/RRDs.xs
+++ b/bindings/perl-shared/RRDs.xs
@@ -25,9 +25,9 @@ extern "C" {
 #define VERSION_SAVED VERSION
 #undef VERSION
 #ifndef WIN32
-#include "../../rrd_config.h"
+#include "rrd_config.h"
 #endif
-#include "../../src/rrd_tool.h"
+#include "rrd_tool.h"
 #undef VERSION
 #define VERSION VERSION_SAVED
 #undef VERSION_SAVED

diff --git a/bindings/python/rrdtoolmodule.c b/bindings/python/rrdtoolmodule.c
index 502b70c6ccf27d9537b21a845d906b776467b866..9ac1bf3ba904b0ca46c1862a08ac891ecd5badc8 100644 (file)
--- a/bindings/python/rrdtoolmodule.c
+++ b/bindings/python/rrdtoolmodule.c
@@ -38,11 +38,11 @@
 #endif
 
 
-#include "../../rrd_config.h"
+#include "rrd_config.h"
 static const char *__version__ = PACKAGE_VERSION;
 
 #include "Python.h"
-#include "../../src/rrd_tool.h"
+#include "rrd_tool.h"
 //#include "rrd.h"
 //#include "rrd_extra.h"
 

diff --git a/bindings/ruby/main.c b/bindings/ruby/main.c
index 6fa2810d7f607c33d5319c5c614e9a151a29530f..e4cc6443dcaa55e2c5d09de232c6a1bb1f9b7349 100644 (file)
--- a/bindings/ruby/main.c
+++ b/bindings/ruby/main.c
@@ -5,7 +5,7 @@
 #include <unistd.h>
 #include <ruby.h>
 #include <math.h>
-#include "../../src/rrd_tool.h"
+#include "rrd_tool.h"
 
 typedef struct string_arr_t {
     int       len;

diff --git a/configure.ac b/configure.ac
index ce2e66048f330607682dcb57ebb2e55bc4f3460e..8d765f42f8126f3c887b8a7154c40ba5e5eaa65a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -42,7 +42,7 @@ AM_MAINTAINER_MODE
 # Automake-1.11. Disable by either passing --disable-silent-rules to
 # configure or passing V=1 to make
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
-AC_CONFIG_HEADERS([rrd_config.h])
+AC_CONFIG_HEADERS([src/rrd_config.h])
 AC_CONFIG_MACRO_DIR([m4])
 
 dnl all our local stuff like install scripts and include files
@@ -944,13 +944,6 @@ AC_CONFIG_FILES([bindings/lua/Makefile])
 
 AC_CONFIG_COMMANDS([default],[[ chmod +x examples/*.pl]],[[]])
 
-dnl intl requires our config to be called config.h. indulge it.
-AC_CONFIG_COMMANDS_POST([ test -f config.h || ln -s rrd_config.h config.h ])
-
-dnl bindings use nasty path, just make them happy.
-AC_CONFIG_COMMANDS_POST([ test -f src/rrd_config.h || (cd src/ && ln -s ../rrd_config.h) ])
-AC_CONFIG_COMMANDS_POST([ test -f src/rrd_config_bottom.h || (cd src/ && ln -s ../rrd_config_bottom.h) ])
-
 AC_OUTPUT
 
 AC_MSG_CHECKING(in)