mirror of
https://gitlab.com/cryptsetup/cryptsetup.git
synced 2025-12-05 16:00:05 +01:00
Define EXTERNAL_LUKS2_TOKENS_PATH even for autoconf
Meson already uses config.h here, do the seame instead of commandline define option. Expanding the variable is tricky, though...
This commit is contained in:
@@ -25,8 +25,7 @@ AM_CPPFLAGS = \
|
|||||||
-DLIBDIR=\""$(libdir)"\" \
|
-DLIBDIR=\""$(libdir)"\" \
|
||||||
-DPREFIX=\""$(prefix)"\" \
|
-DPREFIX=\""$(prefix)"\" \
|
||||||
-DSYSCONFDIR=\""$(sysconfdir)"\" \
|
-DSYSCONFDIR=\""$(sysconfdir)"\" \
|
||||||
-DVERSION=\""$(VERSION)"\" \
|
-DVERSION=\""$(VERSION)"\"
|
||||||
-DEXTERNAL_LUKS2_TOKENS_PATH=\"${EXTERNAL_LUKS2_TOKENS_PATH}\"
|
|
||||||
AM_CFLAGS = -Wall
|
AM_CFLAGS = -Wall
|
||||||
AM_CXXFLAGS = -Wall
|
AM_CXXFLAGS = -Wall
|
||||||
AM_LDFLAGS =
|
AM_LDFLAGS =
|
||||||
|
|||||||
11
configure.ac
11
configure.ac
@@ -833,6 +833,17 @@ else
|
|||||||
EXTERNAL_LUKS2_TOKENS_PATH="\${libdir}/cryptsetup"
|
EXTERNAL_LUKS2_TOKENS_PATH="\${libdir}/cryptsetup"
|
||||||
fi
|
fi
|
||||||
AC_SUBST(EXTERNAL_LUKS2_TOKENS_PATH)
|
AC_SUBST(EXTERNAL_LUKS2_TOKENS_PATH)
|
||||||
|
dnl We need to define expanded EXTERNAL_LUKS2_TOKENS_PATH, but some other code can depend on prefix=NONE.
|
||||||
|
dnl Pretend you do not see this hack :-)
|
||||||
|
saved_prefix=$prefix
|
||||||
|
saved_exec_prefix=$exec_prefix
|
||||||
|
test "x$prefix" = "xNONE" && prefix="$ac_default_prefix"
|
||||||
|
test "x$exec_prefix" = "xNONE" && exec_prefix="$prefix"
|
||||||
|
expanded_EXTERNAL_LUKS2_TOKENS_PATH=$(eval echo "$EXTERNAL_LUKS2_TOKENS_PATH")
|
||||||
|
expanded_EXTERNAL_LUKS2_TOKENS_PATH=$(eval echo "$expanded_EXTERNAL_LUKS2_TOKENS_PATH")
|
||||||
|
AC_DEFINE_UNQUOTED([EXTERNAL_LUKS2_TOKENS_PATH], ["$expanded_EXTERNAL_LUKS2_TOKENS_PATH"], [path to directory with LUKSv2 external token handlers (plugins)])
|
||||||
|
prefix=$saved_prefix
|
||||||
|
exec_prefix=$saved_exec_prefix
|
||||||
|
|
||||||
dnl Override default LUKS format version (for cryptsetup or cryptsetup-reencrypt format actions only).
|
dnl Override default LUKS format version (for cryptsetup or cryptsetup-reencrypt format actions only).
|
||||||
AC_ARG_WITH([default_luks_format],
|
AC_ARG_WITH([default_luks_format],
|
||||||
|
|||||||
Reference in New Issue
Block a user