tools: set DEBUG_DIR from configure

Allow the path to be set from a configure command line option.

Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
Acked-by: Wei Liu <wei.liu2@citrix.com>
[ wei: run autogen.sh ]

diff --git a/config/Paths.mk.in b/config/Paths.mk.in
index a60329514632a4f744507a4b687ede59cfe4c447..8a518d5a5d586f44298e8bbf91a53ae9e4a03874 100644 (file)
--- a/config/Paths.mk.in
+++ b/config/Paths.mk.in
@@ -51,6 +51,7 @@ BASH_COMPLETION_DIR      := $(CONFIG_DIR)/bash_completion.d
 XEN_LOCK_DIR             := @XEN_LOCK_DIR@
 XEN_PAGING_DIR           := @XEN_PAGING_DIR@
 XEN_DUMP_DIR             := @XEN_DUMP_DIR@
+DEBUG_DIR                := @DEBUG_DIR@
 
 XENFIRMWAREDIR           := @XENFIRMWAREDIR@
 

diff --git a/configure b/configure
index 5a1860737cd8e15f61e190621cb7aafb7fe4967b..22e7c00c90a7056271603357dfe33902290f14cc 100755 (executable)
--- a/configure
+++ b/configure
@@ -595,6 +595,7 @@ tools
 xen
 subdirs
 githttp
+DEBUG_DIR
 XEN_DUMP_DIR
 XEN_PAGING_DIR
 XEN_LOCK_DIR
@@ -671,6 +672,7 @@ with_sysconfig_leaf_dir
 with_libexec_leaf_dir
 with_xen_dumpdir
 with_rundir
+with_debugdir
 enable_githttp
 enable_xen
 enable_tools
@@ -1330,6 +1332,8 @@ Optional Packages:
                           [LOCALSTATEDIR/lib/xen/dump]
   --with-rundir=DIR       Path to directory for runtime data.
                           [LOCALSTATEDIR/run]
+  --with-debugdir=DIR     Path to directory for debug symbols.
+                          [PREFIX/lib/debug]
 
 Report bugs to <xen-devel@lists.xen.org>.
 Xen Hypervisor home page: <http://www.xen.org/>.
@@ -1991,6 +1995,15 @@ else
 fi
 
 
+
+# Check whether --with-debugdir was given.
+if test "${with_debugdir+set}" = set; then :
+  withval=$with_debugdir; debugdir_path=$withval
+else
+  debugdir_path=$prefix/lib/debug
+fi
+
+
 if test "$libexecdir" = '${exec_prefix}/libexec' ; then
     case "$host_os" in
          *netbsd*) ;;
@@ -2054,6 +2067,9 @@ XEN_PAGING_DIR=$localstatedir/lib/xen/xenpaging
 XEN_DUMP_DIR=$xen_dumpdir_path
 
 
+DEBUG_DIR=$debugdir_path
+
+
 
 # Check whether --enable-githttp was given.
 if test "${enable_githttp+set}" = set; then :

diff --git a/docs/configure b/docs/configure
index fe75033d66767f2fb921adb46ca690f7eb79ea1b..bde954d3822d9043d4a19292ebc3ba37f225ed32 100755 (executable)
--- a/docs/configure
+++ b/docs/configure
@@ -594,6 +594,7 @@ POD2TEXT
 POD2HTML
 POD2MAN
 FIG2DEV
+DEBUG_DIR
 XEN_DUMP_DIR
 XEN_PAGING_DIR
 XEN_LOCK_DIR
@@ -662,6 +663,7 @@ with_sysconfig_leaf_dir
 with_libexec_leaf_dir
 with_xen_dumpdir
 with_rundir
+with_debugdir
 '
       ac_precious_vars='build_alias
 host_alias
@@ -1305,6 +1307,8 @@ Optional Packages:
                           [LOCALSTATEDIR/lib/xen/dump]
   --with-rundir=DIR       Path to directory for runtime data.
                           [LOCALSTATEDIR/run]
+  --with-debugdir=DIR     Path to directory for debug symbols.
+                          [PREFIX/lib/debug]
 
 Some influential environment variables:
   FIG2DEV     Path to fig2dev tool
@@ -1897,6 +1901,15 @@ else
 fi
 
 
+
+# Check whether --with-debugdir was given.
+if test "${with_debugdir+set}" = set; then :
+  withval=$with_debugdir; debugdir_path=$withval
+else
+  debugdir_path=$prefix/lib/debug
+fi
+
+
 if test "$libexecdir" = '${exec_prefix}/libexec' ; then
     case "$host_os" in
          *netbsd*) ;;
@@ -1960,6 +1973,9 @@ XEN_PAGING_DIR=$localstatedir/lib/xen/xenpaging
 XEN_DUMP_DIR=$xen_dumpdir_path
 
 
+DEBUG_DIR=$debugdir_path
+
+
 
 
 

diff --git a/m4/paths.m4 b/m4/paths.m4
index f208b7e39f01560da7a27967c30a90752c70539c..89d3bb83123162a27243dc75b482ed6c39e1e76a 100644 (file)
--- a/m4/paths.m4
+++ b/m4/paths.m4
@@ -82,6 +82,12 @@ AC_ARG_WITH([rundir],
     [rundir_path=$withval],
     [rundir_path=$localstatedir/run])
 
+AC_ARG_WITH([debugdir],
+    AS_HELP_STRING([--with-debugdir=DIR],
+    [Path to directory for debug symbols. [PREFIX/lib/debug]]),
+    [debugdir_path=$withval],
+    [debugdir_path=$prefix/lib/debug])
+
 if test "$libexecdir" = '${exec_prefix}/libexec' ; then
     case "$host_os" in
          *netbsd*) ;;
@@ -146,6 +152,9 @@ AC_SUBST(XEN_PAGING_DIR)
 
 XEN_DUMP_DIR=$xen_dumpdir_path
 AC_SUBST(XEN_DUMP_DIR)
+
+DEBUG_DIR=$debugdir_path
+AC_SUBST(DEBUG_DIR)
 ])
 
 case "$host_os" in

diff --git a/tools/configure b/tools/configure
index 00fce2637ecc39eb8d9398edeb30f487b34bbb71..f282e9f5b36d5387d9d28f86fb65009d63b2f91c 100755 (executable)
--- a/tools/configure
+++ b/tools/configure
@@ -710,6 +710,7 @@ ocamltools
 monitors
 githttp
 rpath
+DEBUG_DIR
 XEN_DUMP_DIR
 XEN_PAGING_DIR
 XEN_LOCK_DIR
@@ -796,6 +797,7 @@ with_sysconfig_leaf_dir
 with_libexec_leaf_dir
 with_xen_dumpdir
 with_rundir
+with_debugdir
 enable_rpath
 enable_githttp
 enable_monitors
@@ -1510,6 +1512,8 @@ Optional Packages:
                           [LOCALSTATEDIR/lib/xen/dump]
   --with-rundir=DIR       Path to directory for runtime data.
                           [LOCALSTATEDIR/run]
+  --with-debugdir=DIR     Path to directory for debug symbols.
+                          [PREFIX/lib/debug]
   --with-linux-backend-modules="mod1 mod2"
                           List of Linux backend module or modalias names to be
                           autoloaded on startup.
@@ -3941,6 +3945,15 @@ else
 fi
 
 
+
+# Check whether --with-debugdir was given.
+if test "${with_debugdir+set}" = set; then :
+  withval=$with_debugdir; debugdir_path=$withval
+else
+  debugdir_path=$prefix/lib/debug
+fi
+
+
 if test "$libexecdir" = '${exec_prefix}/libexec' ; then
     case "$host_os" in
          *netbsd*) ;;
@@ -4004,6 +4017,9 @@ XEN_PAGING_DIR=$localstatedir/lib/xen/xenpaging
 XEN_DUMP_DIR=$xen_dumpdir_path
 
 
+DEBUG_DIR=$debugdir_path
+
+
 
 # Enable/disable options