tools: move CONFIG_DIR and XEN_CONFIG_DIR in paths.m4

Upcoming changes need to reuse XEN_CONFIG_DIR.

In its current location the assignment happens too late. Move it up
in the file, along with CONFIG_DIR. Their only dependency is
sysconfdir, which may also be adjusted in this file.

No functional change intended.

[autoconf rerun -iwj]

Signed-off-by: Olaf Hering <olaf@aepfle.de>
Reviewed-by: Ian Jackson <iwj@xenproject.org>
Release-Acked-by: Ian Jackson <iwj@xenproject.org>

diff --git a/configure b/configure
index e174dbd238168788450e785842ec6ec85347eda8..2fe26c1bf7af9b623eb722e004f297434181ee76 100755 (executable)
--- a/configure
+++ b/configure
@@ -600,9 +600,7 @@ XEN_DUMP_DIR
 XEN_PAGING_DIR
 XEN_LOCK_DIR
 XEN_SCRIPT_DIR
-XEN_CONFIG_DIR
 INITD_DIR
-CONFIG_DIR
 SHAREDIR
 XEN_LIB_DIR
 XEN_RUN_STORED
@@ -615,6 +613,8 @@ LIBEXEC_LIB
 LIBEXEC_BIN
 LIBEXEC
 CONFIG_LEAF_DIR
+XEN_CONFIG_DIR
+CONFIG_DIR
 XENSTORED_PORT
 XENSTORED_KVA
 host_os
@@ -1936,6 +1936,12 @@ if test "x$sysconfdir" = 'x${prefix}/etc' ; then
     esac
 fi
 
+CONFIG_DIR=$sysconfdir
+
+
+XEN_CONFIG_DIR=$CONFIG_DIR/xen
+
+
 
 # Check whether --with-initddir was given.
 if test "${with_initddir+set}" = set; then :
@@ -2042,15 +2048,9 @@ XEN_LIB_DIR=$localstatedir/lib/xen
 SHAREDIR=$prefix/share
 
 
-CONFIG_DIR=$sysconfdir
-
-
 INITD_DIR=$initddir_path
 
 
-XEN_CONFIG_DIR=$CONFIG_DIR/xen
-
-
 XEN_SCRIPT_DIR=$XEN_CONFIG_DIR/scripts
 
 

diff --git a/docs/configure b/docs/configure
index 1582d477e387424aada72ed118e960ce21fb806d..18075e4e0044abe815e0f9e66bff59c3292d3e37 100755 (executable)
--- a/docs/configure
+++ b/docs/configure
@@ -598,9 +598,7 @@ XEN_DUMP_DIR
 XEN_PAGING_DIR
 XEN_LOCK_DIR
 XEN_SCRIPT_DIR
-XEN_CONFIG_DIR
 INITD_DIR
-CONFIG_DIR
 SHAREDIR
 XEN_LIB_DIR
 XEN_RUN_STORED
@@ -613,6 +611,8 @@ LIBEXEC_LIB
 LIBEXEC_BIN
 LIBEXEC
 CONFIG_LEAF_DIR
+XEN_CONFIG_DIR
+CONFIG_DIR
 XENSTORED_PORT
 XENSTORED_KVA
 target_alias
@@ -1839,6 +1839,12 @@ if test "x$sysconfdir" = 'x${prefix}/etc' ; then
     esac
 fi
 
+CONFIG_DIR=$sysconfdir
+
+
+XEN_CONFIG_DIR=$CONFIG_DIR/xen
+
+
 
 # Check whether --with-initddir was given.
 if test "${with_initddir+set}" = set; then :
@@ -1945,15 +1951,9 @@ XEN_LIB_DIR=$localstatedir/lib/xen
 SHAREDIR=$prefix/share
 
 
-CONFIG_DIR=$sysconfdir
-
-
 INITD_DIR=$initddir_path
 
 
-XEN_CONFIG_DIR=$CONFIG_DIR/xen
-
-
 XEN_SCRIPT_DIR=$XEN_CONFIG_DIR/scripts
 
 

diff --git a/m4/paths.m4 b/m4/paths.m4
index 1c107b1a61abdcb6340a913fb868f20d00326534..a736f57d8d46a8232a3183294514bdc96f08715d 100644 (file)
--- a/m4/paths.m4
+++ b/m4/paths.m4
@@ -34,6 +34,12 @@ if test "x$sysconfdir" = 'x${prefix}/etc' ; then
     esac
 fi
 
+CONFIG_DIR=$sysconfdir
+AC_SUBST(CONFIG_DIR)
+
+XEN_CONFIG_DIR=$CONFIG_DIR/xen
+AC_SUBST(XEN_CONFIG_DIR)
+
 AC_ARG_WITH([initddir],
     AS_HELP_STRING([--with-initddir=DIR],
     [Path to directory with sysv runlevel scripts. [SYSCONFDIR/init.d]]),
@@ -128,15 +134,9 @@ AC_SUBST(XEN_LIB_DIR)
 SHAREDIR=$prefix/share
 AC_SUBST(SHAREDIR)
 
-CONFIG_DIR=$sysconfdir
-AC_SUBST(CONFIG_DIR)
-
 INITD_DIR=$initddir_path
 AC_SUBST(INITD_DIR)
 
-XEN_CONFIG_DIR=$CONFIG_DIR/xen
-AC_SUBST(XEN_CONFIG_DIR)
-
 XEN_SCRIPT_DIR=$XEN_CONFIG_DIR/scripts
 AC_SUBST(XEN_SCRIPT_DIR)
 

diff --git a/tools/configure b/tools/configure
index 519efb71eeabab7e77009d0b06305f0d01193077..86de2e27364a15b860f8fb577bf08c4d89164d08 100755 (executable)
--- a/tools/configure
+++ b/tools/configure
@@ -721,9 +721,7 @@ XEN_DUMP_DIR
 XEN_PAGING_DIR
 XEN_LOCK_DIR
 XEN_SCRIPT_DIR
-XEN_CONFIG_DIR
 INITD_DIR
-CONFIG_DIR
 SHAREDIR
 XEN_LIB_DIR
 XEN_RUN_STORED
@@ -736,6 +734,8 @@ LIBEXEC_LIB
 LIBEXEC_BIN
 LIBEXEC
 CONFIG_LEAF_DIR
+XEN_CONFIG_DIR
+CONFIG_DIR
 XENSTORED_PORT
 XENSTORED_KVA
 FILE_OFFSET_BITS
@@ -3918,6 +3918,12 @@ if test "x$sysconfdir" = 'x${prefix}/etc' ; then
     esac
 fi
 
+CONFIG_DIR=$sysconfdir
+
+
+XEN_CONFIG_DIR=$CONFIG_DIR/xen
+
+
 
 # Check whether --with-initddir was given.
 if test "${with_initddir+set}" = set; then :
@@ -4024,15 +4030,9 @@ XEN_LIB_DIR=$localstatedir/lib/xen
 SHAREDIR=$prefix/share
 
 
-CONFIG_DIR=$sysconfdir
-
-
 INITD_DIR=$initddir_path
 
 
-XEN_CONFIG_DIR=$CONFIG_DIR/xen
-
-
 XEN_SCRIPT_DIR=$XEN_CONFIG_DIR/scripts