build: add --with-rundir option to configure

There have been reports that Fedora 25 uses /run instead of /var/run.

Add a --with-rundir option ito configure to be able to specify that
directory. Default is still /var/run.

A re-run of autogen.sh is required.

Signed-off-by: Juergen Gross <jgross@suse.com>
[ wei: run autogen.sh ]
Acked-by: Wei Liu <wei.liu2@citrix.com>

diff --git a/configure b/configure
index d293af85af39c445cb7bf68d78b28a07bcb96de7..46fa04b6bb65101a51c56cf2581349034b023bd7 100755 (executable)
--- a/configure
+++ b/configure
@@ -667,6 +667,7 @@ with_initddir
 with_sysconfig_leaf_dir
 with_libexec_leaf_dir
 with_xen_dumpdir
+with_rundir
 enable_githttp
 enable_xen
 enable_tools
@@ -1313,6 +1314,8 @@ Optional Packages:
                           Name of subdirectory in libexecdir to use.
   --with-xen-dumpdir=DIR  Path to directory for domU crash dumps.
                           [LOCALSTATEDIR/lib/xen/dump]
+  --with-rundir=DIR       Path to directory for runtime data.
+                          [LOCALSTATEDIR/run]
 
 Report bugs to <xen-devel@lists.xen.org>.
 Xen Hypervisor home page: <http://www.xen.org/>.
@@ -1953,6 +1956,15 @@ else
 fi
 
 
+
+# Check whether --with-rundir was given.
+if test "${with_rundir+set}" = set; then :
+  withval=$with_rundir; rundir_path=$withval
+else
+  rundir_path=$localstatedir/run
+fi
+
+
 if test "$libexecdir" = '${exec_prefix}/libexec' ; then
     case "$host_os" in
          *netbsd*) ;;
@@ -1973,7 +1985,7 @@ LIBEXEC_INC=${LIBEXEC}/include
 XENFIRMWAREDIR=${LIBEXEC}/boot
 
 
-XEN_RUN_DIR=$localstatedir/run/xen
+XEN_RUN_DIR=$rundir_path/xen
 
 
 XEN_LOG_DIR=$localstatedir/log/xen
@@ -1982,7 +1994,7 @@ XEN_LOG_DIR=$localstatedir/log/xen
 XEN_LIB_STORED=$localstatedir/lib/xenstored
 
 
-XEN_RUN_STORED=$localstatedir/run/xenstored
+XEN_RUN_STORED=$rundir_path/xenstored
 
 
 XEN_LIB_DIR=$localstatedir/lib/xen

diff --git a/docs/configure b/docs/configure
index a497d1f28df4cd31ee75baa6d5929f1cde9b43ce..d05b9a805896b5b60e6a67e03b3199a5e85e50b0 100755 (executable)
--- a/docs/configure
+++ b/docs/configure
@@ -658,6 +658,7 @@ with_initddir
 with_sysconfig_leaf_dir
 with_libexec_leaf_dir
 with_xen_dumpdir
+with_rundir
 '
       ac_precious_vars='build_alias
 host_alias
@@ -1288,6 +1289,8 @@ Optional Packages:
                           Name of subdirectory in libexecdir to use.
   --with-xen-dumpdir=DIR  Path to directory for domU crash dumps.
                           [LOCALSTATEDIR/lib/xen/dump]
+  --with-rundir=DIR       Path to directory for runtime data.
+                          [LOCALSTATEDIR/run]
 
 Some influential environment variables:
   FIG2DEV     Path to fig2dev tool
@@ -1859,6 +1862,15 @@ else
 fi
 
 
+
+# Check whether --with-rundir was given.
+if test "${with_rundir+set}" = set; then :
+  withval=$with_rundir; rundir_path=$withval
+else
+  rundir_path=$localstatedir/run
+fi
+
+
 if test "$libexecdir" = '${exec_prefix}/libexec' ; then
     case "$host_os" in
          *netbsd*) ;;
@@ -1879,7 +1891,7 @@ LIBEXEC_INC=${LIBEXEC}/include
 XENFIRMWAREDIR=${LIBEXEC}/boot
 
 
-XEN_RUN_DIR=$localstatedir/run/xen
+XEN_RUN_DIR=$rundir_path/xen
 
 
 XEN_LOG_DIR=$localstatedir/log/xen
@@ -1888,7 +1900,7 @@ XEN_LOG_DIR=$localstatedir/log/xen
 XEN_LIB_STORED=$localstatedir/lib/xenstored
 
 
-XEN_RUN_STORED=$localstatedir/run/xenstored
+XEN_RUN_STORED=$rundir_path/xenstored
 
 
 XEN_LIB_DIR=$localstatedir/lib/xen

diff --git a/m4/paths.m4 b/m4/paths.m4
index 722a8aa4a9be5d38f7f64d1e802ec469dc3d61d8..93ce89ab404c7aed8a655e43f16dd45362c2bcb4 100644 (file)
--- a/m4/paths.m4
+++ b/m4/paths.m4
@@ -76,6 +76,12 @@ AC_ARG_WITH([xen-dumpdir],
     [xen_dumpdir_path=$withval],
     [xen_dumpdir_path=$localstatedir/lib/xen/dump])
 
+AC_ARG_WITH([rundir],
+    AS_HELP_STRING([--with-rundir=DIR],
+    [Path to directory for runtime data. [LOCALSTATEDIR/run]]),
+    [rundir_path=$withval],
+    [rundir_path=$localstatedir/run])
+
 if test "$libexecdir" = '${exec_prefix}/libexec' ; then
     case "$host_os" in
          *netbsd*) ;;
@@ -98,7 +104,7 @@ AC_SUBST(LIBEXEC_INC)
 XENFIRMWAREDIR=${LIBEXEC}/boot
 AC_SUBST(XENFIRMWAREDIR)
 
-XEN_RUN_DIR=$localstatedir/run/xen
+XEN_RUN_DIR=$rundir_path/xen
 AC_SUBST(XEN_RUN_DIR)
 
 XEN_LOG_DIR=$localstatedir/log/xen
@@ -107,7 +113,7 @@ AC_SUBST(XEN_LOG_DIR)
 XEN_LIB_STORED=$localstatedir/lib/xenstored
 AC_SUBST(XEN_LIB_STORED)
 
-XEN_RUN_STORED=$localstatedir/run/xenstored
+XEN_RUN_STORED=$rundir_path/xenstored
 AC_SUBST(XEN_RUN_STORED)
 
 XEN_LIB_DIR=$localstatedir/lib/xen

diff --git a/tools/configure b/tools/configure
index ae96f6b8395c87508b2c298e9d2b1b67d3ff8a35..851e0f0b7f86a54b9c2ba34ecf7851943d44dd3b 100755 (executable)
--- a/tools/configure
+++ b/tools/configure
@@ -794,6 +794,7 @@ with_initddir
 with_sysconfig_leaf_dir
 with_libexec_leaf_dir
 with_xen_dumpdir
+with_rundir
 enable_rpath
 enable_githttp
 enable_monitors
@@ -1498,6 +1499,8 @@ Optional Packages:
                           Name of subdirectory in libexecdir to use.
   --with-xen-dumpdir=DIR  Path to directory for domU crash dumps.
                           [LOCALSTATEDIR/lib/xen/dump]
+  --with-rundir=DIR       Path to directory for runtime data.
+                          [LOCALSTATEDIR/run]
   --with-linux-backend-modules="mod1 mod2"
                           List of Linux backend module or modalias names to be
                           autoloaded on startup.
@@ -3910,6 +3913,15 @@ else
 fi
 
 
+
+# Check whether --with-rundir was given.
+if test "${with_rundir+set}" = set; then :
+  withval=$with_rundir; rundir_path=$withval
+else
+  rundir_path=$localstatedir/run
+fi
+
+
 if test "$libexecdir" = '${exec_prefix}/libexec' ; then
     case "$host_os" in
          *netbsd*) ;;
@@ -3930,7 +3942,7 @@ LIBEXEC_INC=${LIBEXEC}/include
 XENFIRMWAREDIR=${LIBEXEC}/boot
 
 
-XEN_RUN_DIR=$localstatedir/run/xen
+XEN_RUN_DIR=$rundir_path/xen
 
 
 XEN_LOG_DIR=$localstatedir/log/xen
@@ -3939,7 +3951,7 @@ XEN_LOG_DIR=$localstatedir/log/xen
 XEN_LIB_STORED=$localstatedir/lib/xenstored
 
 
-XEN_RUN_STORED=$localstatedir/run/xenstored
+XEN_RUN_STORED=$rundir_path/xenstored
 
 
 XEN_LIB_DIR=$localstatedir/lib/xen