]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
build-sys: Work around --with-rootprefix= (empty) not producing / 55/head
authorFilipe Brandenburger <filbranden@google.com>
Wed, 3 Jun 2015 14:31:12 +0000 (07:31 -0700)
committerFilipe Brandenburger <filbranden@google.com>
Wed, 3 Jun 2015 14:34:42 +0000 (07:34 -0700)
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

configure.ac

index deafcc195bbce32a55f985a6381618d989eed8e7..18e0ac9ca9e1c5737c3f2efefd581d74b4e5d225 100644 (file)
@@ -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],