summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--config/Rules.am4
-rw-r--r--config/user-runstatedir.m46
-rw-r--r--config/user.m41
3 files changed, 11 insertions, 0 deletions
diff --git a/config/Rules.am b/config/Rules.am
index 24f94264b..4fb40c4e4 100644
--- a/config/Rules.am
+++ b/config/Rules.am
@@ -8,3 +8,7 @@ AM_CFLAGS += -fno-strict-aliasing
AM_CPPFLAGS = -D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT
AM_CPPFLAGS += -D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64
AM_CPPFLAGS += -D_LARGEFILE64_SOURCE -DTEXT_DOMAIN=\"zfs-linux-user\"
+AM_CPPFLAGS += -DLIBEXECDIR=\"$(libexecdir)\"
+AM_CPPFLAGS += -DRUNSTATEDIR=\"$(runstatedir)\"
+AM_CPPFLAGS += -DSBINDIR=\"$(sbindir)\"
+AM_CPPFLAGS += -DSYSCONFDIR=\"$(sysconfdir)\"
diff --git a/config/user-runstatedir.m4 b/config/user-runstatedir.m4
new file mode 100644
index 000000000..ded1362c7
--- /dev/null
+++ b/config/user-runstatedir.m4
@@ -0,0 +1,6 @@
+dnl For backwards compatibility; runstatedir added in autoconf 2.70.
+AC_DEFUN([ZFS_AC_CONFIG_USER_RUNSTATEDIR], [
+ if test "x$runstatedir" = x; then
+ AC_SUBST([runstatedir], ['${localstatedir}/run'])
+ fi
+])
diff --git a/config/user.m4 b/config/user.m4
index da1cdea33..6c127820c 100644
--- a/config/user.m4
+++ b/config/user.m4
@@ -12,4 +12,5 @@ AC_DEFUN([ZFS_AC_CONFIG_USER], [
ZFS_AC_CONFIG_USER_LIBUUID
ZFS_AC_CONFIG_USER_LIBBLKID
ZFS_AC_CONFIG_USER_FRAME_LARGER_THAN
+ ZFS_AC_CONFIG_USER_RUNSTATEDIR
])