summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFilipe Brandenburger <filbranden@google.com>2015-06-03 07:31:12 -0700
committerFilipe Brandenburger <filbranden@google.com>2015-06-03 07:34:42 -0700
commite013d21b6218011c99dbbcd4c61fc73a24490a94 (patch)
tree6e174d025c449a75bc352fff93f8f88505342c4b
parent759b98c5682171e6d5bf4d71f6ff038ae0115956 (diff)
build-sys: Work around --with-rootprefix= (empty) not producing /
Since we introduced AX_NORMALIZE_PATH, using --with-rootprefix=/ does produce an empty string, but using --with-rootprefix= (empty) now produces "." instead which is wrong. Work around it until we can find a better solution for AX_NORMALIZE_PATH upstream at autoconf-archive. Bug: https://github.com/systemd/systemd/issues/54
-rw-r--r--configure.ac7
1 files changed, 7 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac
index deafcc195b..18e0ac9ca9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1378,6 +1378,13 @@ AX_NORMALIZE_PATH([with_zshcompletiondir])
AC_ARG_WITH([rootprefix],
AS_HELP_STRING([--with-rootprefix=DIR], [rootfs directory prefix for config files and kernel modules]),
[], [with_rootprefix=${ac_default_prefix}])
+# --with-rootprefix= (empty) should default to "/" but AX_NORMALIZE_PATH
+# defaults those to ".", solve that here for now until we can find a suitable
+# fix for AX_NORMALIZE_PATH upstream at autoconf-archive.
+# See: https://github.com/systemd/systemd/issues/54
+if test "x${with_rootprefix}" = "x"; then
+ with_rootprefix="/"
+fi
AX_NORMALIZE_PATH([with_rootprefix])
AC_ARG_WITH([rootlibdir],