[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Xen-changelog] [xen master] configure: don't silently disable systemd support



commit 250f988c6c41004bd46990edb9d5662bb606cf92
Author:     Wei Liu <wei.liu2@xxxxxxxxxx>
AuthorDate: Thu Sep 10 12:18:03 2015 +0100
Commit:     Ian Campbell <ian.campbell@xxxxxxxxxx>
CommitDate: Thu Sep 10 12:31:23 2015 +0100

    configure: don't silently disable systemd support
    
    Originally when user runs ./configure --enable-systemd and systemd
    development library is not available the build system silently disables
    systemd support. This is not in line with normal expectation.
    
    Instead, configure should error out when user has asked for systemd
    support but development libraries can't be found.
    
    Reported-by: George Dunlap <george.dunlap@xxxxxxxxxxxxx>
    Signed-off-by: Wei Liu <wei.liu2@xxxxxxxxxx>
    Acked-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
---
 m4/systemd.m4   |    6 +++++-
 tools/configure |    6 ++++++
 2 files changed, 11 insertions(+), 1 deletions(-)

diff --git a/m4/systemd.m4 b/m4/systemd.m4
index 8284993..e4b1aa5 100644
--- a/m4/systemd.m4
+++ b/m4/systemd.m4
@@ -85,7 +85,11 @@ AC_DEFUN([AX_CHECK_SYSTEMD], [
                AC_DEFINE([HAVE_SYSTEMD], [1], [Systemd available and enabled])
                        systemd=y
                        AX_CHECK_SYSTEMD_LIBS()
-           ],[systemd=n])
+           ],[
+               AS_IF([test "x$enable_systemd" = "xyes"],
+                       [AC_MSG_ERROR([Unable to find systemd development 
library])],
+                       [systemd=n])
+           ])
        ],[systemd=n])
 ])
 
diff --git a/tools/configure b/tools/configure
index 99677d1..41bed77 100755
--- a/tools/configure
+++ b/tools/configure
@@ -9318,9 +9318,15 @@ fi
 
 
 else
+
+               if test "x$enable_systemd" = "xyes"; then :
+  as_fn_error $? "Unable to find systemd development library" "$LINENO" 5
+else
   systemd=n
 fi
 
+fi
+
 else
   systemd=n
 fi
--
generated by git-patchbot for /home/xen/git/xen.git#master

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


 


Rackspace

Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.