summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenedikt Morbach <benedikt.morbach@googlemail.com>2013-03-09 14:33:52 +0100
committerBastien Nocera <hadess@hadess.net>2013-10-21 10:30:06 +0200
commit90df3546b05a27b21411cb487d171e8f4060f035 (patch)
tree16cabd19529d2fe8d8d071d2c94795af3da9e6e4
parent543a9506315333c3cea9e1cdb1c4a9219a2586c6 (diff)
build: Fix --without-systemdunitdir / --without-systemdutildir
would take the with_*=no as a value and try to install to a "no" directory https://bugs.freedesktop.org/show_bug.cgi?id=62060
-rw-r--r--configure.ac12
1 files changed, 8 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac
index a26b3da..aad0b54 100644
--- a/configure.ac
+++ b/configure.ac
@@ -165,15 +165,19 @@ AC_ARG_WITH([systemdutildir],
AS_HELP_STRING([--with-systemdutildir=DIR], [Directory for systemd utilities]),
[],
[with_systemdutildir=$($PKG_CONFIG --variable=systemdutildir systemd)])
-AC_SUBST([systemdutildir], [$with_systemdutildir])
-AM_CONDITIONAL(HAVE_SYSTEMDUTILDIR, [test -n "$with_systemdutildir"])
+if test x$with_systemdutildir != xno; then
+ AC_SUBST([systemdutildir], [$with_systemdutildir])
+fi
+AM_CONDITIONAL(HAVE_SYSTEMDUTILDIR, [test -n "$systemdutildir"])
AC_ARG_WITH([systemdsystemunitdir],
AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files]),
[],
[with_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd)])
-AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir])
-AM_CONDITIONAL(HAVE_SYSTEMDSYSTEMUNITDIR, [test -n "$with_systemdsystemunitdir"])
+if test x$with_systemdsystemunitdir != xno; then
+ AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir])
+fi
+AM_CONDITIONAL(HAVE_SYSTEMDSYSTEMUNITDIR, [test -n "$systemdsystemunitdir"])
dnl ---------------------------------------------------------------------------
dnl - Compile time default choice of backend