[Xen-changelog] [xen master] tools/configure: Check if Glib is present only when building QEMU

[patchbot@xxxxxxx]

commit 499cb19b120a6ed4a2a4917b7c9e04170bf7c347
Author:     Julien Grall <julien.grall@xxxxxxxxxx>
AuthorDate: Thu Jan 15 21:06:17 2015 +0000
Commit:     Ian Campbell <ian.campbell@xxxxxxxxxx>
CommitDate: Mon Jan 19 16:07:41 2015 +0000

    tools/configure: Check if Glib is present only when building QEMU
    
    Signed-off-by: Julien Grall <julien.grall@xxxxxxxxxx>
    Acked-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
    Acked-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
    [ ijc -- reran autogen.sh ]
---
 tools/configure    |    5 +++++
 tools/configure.ac |    4 ++++
 2 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/tools/configure b/tools/configure
index 1cab804..7131d63 100755
--- a/tools/configure
+++ b/tools/configure
@@ -7462,6 +7462,7 @@ fi
 
 
 
+
 if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
        if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a 
program name with args.
@@ -7575,6 +7576,8 @@ $as_echo "no" >&6; }
                PKG_CONFIG=""
        fi
 fi
+if test "x$qemu_xen" = "xy"; then :
+
 
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for glib" >&5
@@ -7667,6 +7670,8 @@ $as_echo "yes" >&6; }
 
 fi
 
+fi
+
 # Extract the first word of "wget", so it can be a program name with args.
 set dummy wget; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
diff --git a/tools/configure.ac b/tools/configure.ac
index 24fdfc3..fd405c5 100644
--- a/tools/configure.ac
+++ b/tools/configure.ac
@@ -323,7 +323,11 @@ i[[3456]]86|x86_64)
 esac
  AX_CHECK_UUID
  AX_CHECK_CURSES
+
+dnl Glib 2.0 is only required when QEMU is built
+AS_IF([test "x$qemu_xen" = "xy"], [
 PKG_CHECK_MODULES(glib, [glib-2.0 >= 2.12])
+])
 AX_CHECK_FETCHER
 
 # Checks for libraries.
--
generated by git-patchbot for /home/xen/git/xen.git#master

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog