From: Ian Campbell <ian.campbell@citrix.com>
Date: Tue, 23 Sep 2014 13:08:51 +0000 (+0100)
Subject: Rerun autogen.sh after 7d7147762282 "Use configure --sysconfdir=DIR to se..."
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~4356
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=5c0581e88626dd1f7c9aeea0f4c9251fd7f4c880;p=xen.git

Rerun autogen.sh after 7d7147762282 "Use configure --sysconfdir=DIR to se..."

I tried to do this but failed to commit --amend correctly before pushing.

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
---

diff --git a/configure b/configure
index 5090baf27b..68e6eb00b2 100755
--- a/configure
+++ b/configure
@@ -1852,6 +1852,24 @@ case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
 test "x$prefix" = "xNONE" && prefix=$ac_default_prefix
 test "x$exec_prefix" = "xNONE" && exec_prefix=${prefix}
 
+if test "x$sysconfdir" = 'x${prefix}/etc' ; then
+    case "$host_os" in
+         *freebsd*)
+         sysconfdir=$prefix/etc
+         ;;
+         *solaris*)
+         if test "$prefix" = "/usr" ; then
+             sysconfdir=/etc
+         else
+             sysconfdir=$prefix/etc
+         fi
+         ;;
+         *)
+         sysconfdir=/etc
+         ;;
+    esac
+fi
+
 BINDIR=$prefix/bin
 
 
@@ -1888,7 +1906,7 @@ PRIVATE_BINDIR=$PRIVATE_PREFIX/bin
 XENFIRMWAREDIR=$prefix/lib/xen/boot
 
 
-CONFIG_DIR=/etc
+CONFIG_DIR=$sysconfdir
 
 
 XEN_CONFIG_DIR=$CONFIG_DIR/xen
diff --git a/tools/configure b/tools/configure
index 3830da4ac7..705559573f 100755
--- a/tools/configure
+++ b/tools/configure
@@ -3683,6 +3683,24 @@ esac
 test "x$prefix" = "xNONE" && prefix=$ac_default_prefix
 test "x$exec_prefix" = "xNONE" && exec_prefix=${prefix}
 
+if test "x$sysconfdir" = 'x${prefix}/etc' ; then
+    case "$host_os" in
+         *freebsd*)
+         sysconfdir=$prefix/etc
+         ;;
+         *solaris*)
+         if test "$prefix" = "/usr" ; then
+             sysconfdir=/etc
+         else
+             sysconfdir=$prefix/etc
+         fi
+         ;;
+         *)
+         sysconfdir=/etc
+         ;;
+    esac
+fi
+
 BINDIR=$prefix/bin
 
 
@@ -3719,7 +3737,7 @@ PRIVATE_BINDIR=$PRIVATE_PREFIX/bin
 XENFIRMWAREDIR=$prefix/lib/xen/boot
 
 
-CONFIG_DIR=/etc
+CONFIG_DIR=$sysconfdir
 
 
 XEN_CONFIG_DIR=$CONFIG_DIR/xen