summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorDaniel Mack <github@zonque.org>2015-06-03 18:01:21 +0200
committerDaniel Mack <github@zonque.org>2015-06-03 18:01:21 +0200
commit75db28c8f2a874d74579eb08ebce78fa0290277c (patch)
treeeece45d41a0dad4a2ead4897c76a5c0b96b65b86 /configure.ac
parent2b4919a68cf826efbe939291e6dc4f08e824dc41 (diff)
parente013d21b6218011c99dbbcd4c61fc73a24490a94 (diff)
Merge pull request #55 from filbranden/rootprefix_empty1
Fix --with-rootprefix= (empty) with a workaround for now.
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac7
1 files changed, 7 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac
index ea29ab475a..62df8484b5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1387,6 +1387,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],