X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=configure.ac;h=2704edeedda7fa9d031d410348da778ad2702c39;hb=ee5e3404e49ef08437cd6b6e4c5b83d190efa053;hp=39abe9d96fef19e8171e02e2b7401084a66229e8;hpb=a0baeddb8aa745007d0302ed06247cabb8facb32;p=tinc

diff --git a/configure.ac b/configure.ac
index 39abe9d9..2704edee 100644
--- a/configure.ac
+++ b/configure.ac
@@ -115,7 +115,7 @@ AC_ARG_WITH(systemd,
   [ systemd=false ]
 )
 
-AS_IF([test "x$with_systemd" = "xyes"], [systemd_path="/lib/systemd/system"],
+AS_IF([test "x$with_systemd" = "xyes"], [systemd_path="\${libdir}/systemd/system"],
       [AS_IF([test "x$with_systemd" = "xno"], [systemd=false])])
 
 AC_SUBST(systemd_path, $systemd_path)
@@ -255,6 +255,11 @@ AC_ARG_ENABLE(jumbograms,
   ]
 )
 
+dnl Ensure runstatedir is set if we are using a version of autoconf that does not suppport it
+if test "x$runstatedir" = "x"; then
+  AC_SUBST([runstatedir], ['${localstatedir}/run'])
+fi
+
 AC_CONFIG_FILES([Makefile src/Makefile doc/Makefile gui/Makefile test/Makefile systemd/Makefile])
 
 AC_OUTPUT