* main - configure: update
@ 2021-10-18 17:19 Zdenek Kabelac
0 siblings, 0 replies; 12+ messages in thread
From: Zdenek Kabelac @ 2021-10-18 17:19 UTC (permalink / raw)
To: lvm-devel
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=c60bac466175949b56b768b5e8d01ea5655a423e
Commit: c60bac466175949b56b768b5e8d01ea5655a423e
Parent: 1b104ddb5539f998389afa3394cbc81d9410b390
Author: Zdenek Kabelac <zkabelac@redhat.com>
AuthorDate: Mon Oct 18 19:13:58 2021 +0200
Committer: Zdenek Kabelac <zkabelac@redhat.com>
CommitterDate: Mon Oct 18 19:17:27 2021 +0200
configure: update
---
configure | 116 +++++++++----------------------------------------
include/configure.h.in | 3 --
2 files changed, 21 insertions(+), 98 deletions(-)
diff --git a/configure b/configure
index 5719be836..cfad36e51 100755
--- a/configure
+++ b/configure
@@ -773,10 +773,10 @@ PYTHON
LVM2CMD_LIB
UDEV_LIBS
UDEV_CFLAGS
-SYSTEMD_LIBS
-SYSTEMD_CFLAGS
BLKID_LIBS
BLKID_CFLAGS
+SYSTEMD_LIBS
+SYSTEMD_CFLAGS
LOCKD_IDM_LIBS
LOCKD_IDM_CFLAGS
LOCKD_DLM_CONTROL_LIBS
@@ -964,7 +964,6 @@ enable_udev_systemd_background_jobs
enable_udev_sync
enable_udev_rules
enable_udev_rule_exec_detection
-enable_compat
enable_units_compat
enable_ioctl
enable_o_direct
@@ -1029,10 +1028,10 @@ LOCKD_DLM_CONTROL_CFLAGS
LOCKD_DLM_CONTROL_LIBS
LOCKD_IDM_CFLAGS
LOCKD_IDM_LIBS
-BLKID_CFLAGS
-BLKID_LIBS
SYSTEMD_CFLAGS
SYSTEMD_LIBS
+BLKID_CFLAGS
+BLKID_LIBS
UDEV_CFLAGS
UDEV_LIBS
PYTHON
@@ -1705,7 +1704,6 @@ Optional Features:
--enable-udev_rules install rule files needed for udev synchronisation
--enable-udev-rule-exec-detection
enable executable path detection in udev rules
- --enable-compat enable support for old device-mapper versions
--enable-units-compat enable output compatibility with old versions that
that do not use KiB-style unit suffixes
--disable-ioctl disable ioctl calls to device-mapper in the kernel
@@ -1853,13 +1851,13 @@ Some influential environment variables:
C compiler flags for LOCKD_IDM, overriding pkg-config
LOCKD_IDM_LIBS
linker flags for LOCKD_IDM, overriding pkg-config
- BLKID_CFLAGS
- C compiler flags for BLKID, overriding pkg-config
- BLKID_LIBS linker flags for BLKID, overriding pkg-config
SYSTEMD_CFLAGS
C compiler flags for SYSTEMD, overriding pkg-config
SYSTEMD_LIBS
linker flags for SYSTEMD, overriding pkg-config
+ BLKID_CFLAGS
+ C compiler flags for BLKID, overriding pkg-config
+ BLKID_LIBS linker flags for BLKID, overriding pkg-config
UDEV_CFLAGS C compiler flags for UDEV, overriding pkg-config
UDEV_LIBS linker flags for UDEV, overriding pkg-config
PYTHON the Python interpreter
@@ -3142,10 +3140,6 @@ case "$host_os" in
LIB_SUFFIX=so
DEVMAPPER=yes
BUILD_LVMPOLLD=no
- LOCKDSANLOCK=no
- LOCKDDLM=no
- LOCKDDLM_CONTROL=no
- LOCKDIDM=no
ODIRECT=yes
DM_IOCTLS=yes
SELINUX=yes
@@ -8471,6 +8465,7 @@ if test "${with_default_use_devices_file+set}" = set; then :
else
DEFAULT_USE_DEVICES_FILE=0
fi
+
case "$DEFAULT_USE_DEVICES_FILE" in
0|1);;
*) as_fn_error $? "--with-default-use-devices-file parameter invalid" "$LINENO" 5;;
@@ -11000,6 +10995,8 @@ $as_echo_n "checking whether to build lvmpolld... " >&6; }
# Check whether --enable-lvmpolld was given.
if test "${enable_lvmpolld+set}" = set; then :
enableval=$enable_lvmpolld; LVMPOLLD=$enableval
+else
+ LVMPOLLD=no
fi
test -n "$LVMPOLLD" && BUILD_LVMPOLLD=$LVMPOLLD
@@ -11014,6 +11011,8 @@ $as_echo_n "checking whether to build lvmlockdsanlock... " >&6; }
# Check whether --enable-lvmlockd-sanlock was given.
if test "${enable_lvmlockd_sanlock+set}" = set; then :
enableval=$enable_lvmlockd_sanlock; LOCKDSANLOCK=$enableval
+else
+ LOCKDSANLOCK=no
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $LOCKDSANLOCK" >&5
@@ -11105,6 +11104,8 @@ $as_echo_n "checking whether to build lvmlockddlm... " >&6; }
# Check whether --enable-lvmlockd-dlm was given.
if test "${enable_lvmlockd_dlm+set}" = set; then :
enableval=$enable_lvmlockd_dlm; LOCKDDLM=$enableval
+else
+ LOCKDDLM=no
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $LOCKDDLM" >&5
@@ -11196,6 +11197,8 @@ $as_echo_n "checking whether to build lvmlockddlmcontrol... " >&6; }
# Check whether --enable-lvmlockd-dlmcontrol was given.
if test "${enable_lvmlockd_dlmcontrol+set}" = set; then :
enableval=$enable_lvmlockd_dlmcontrol; LOCKDDLM_CONTROL=$enableval
+else
+ LOCKDDLM_CONTROL=no
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $LOCKDDLM_CONTROL" >&5
@@ -11287,6 +11290,8 @@ $as_echo_n "checking whether to build lvmlockdidm... " >&6; }
# Check whether --enable-lvmlockd-idm was given.
if test "${enable_lvmlockd_idm+set}" = set; then :
enableval=$enable_lvmlockd_idm; LOCKDIDM=$enableval
+else
+ LOCKDIDM=no
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $LOCKDIDM" >&5
@@ -11366,76 +11371,15 @@ else
$as_echo "yes" >&6; }
HAVE_LOCKD_IDM=yes
fi
-
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BLKID" >&5
-$as_echo_n "checking for BLKID... " >&6; }
-
-if test -n "$BLKID_CFLAGS"; then
- pkg_cv_BLKID_CFLAGS="$BLKID_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"blkid >= 2.24\""; } >&5
($PKG_CONFIG --exists --print-errors "blkid >= 2.24") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_BLKID_CFLAGS=`$PKG_CONFIG --cflags "blkid >= 2.24" 2>/dev/null`
- test "x$?" != "x0" && pkg_failed=yes
+ HAVE_LOCKD_IDM=yes
else
- pkg_failed=yes
-fi
- else
- pkg_failed=untried
-fi
-if test -n "$BLKID_LIBS"; then
- pkg_cv_BLKID_LIBS="$BLKID_LIBS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"blkid >= 2.24\""; } >&5
- ($PKG_CONFIG --exists --print-errors "blkid >= 2.24") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
- pkg_cv_BLKID_LIBS=`$PKG_CONFIG --libs "blkid >= 2.24" 2>/dev/null`
- test "x$?" != "x0" && pkg_failed=yes
-else
- pkg_failed=yes
-fi
- else
- pkg_failed=untried
-fi
-
-
-
-if test $pkg_failed = yes; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
- _pkg_short_errors_supported=yes
-else
- _pkg_short_errors_supported=no
-fi
- if test $_pkg_short_errors_supported = yes; then
- BLKID_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "blkid >= 2.24" 2>&1`
- else
- BLKID_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "blkid >= 2.24" 2>&1`
- fi
- # Put the nasty error message in config.log where it belongs
- echo "$BLKID_PKG_ERRORS" >&5
-
- $bailout
-elif test $pkg_failed = untried; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- $bailout
-else
- BLKID_CFLAGS=$pkg_cv_BLKID_CFLAGS
- BLKID_LIBS=$pkg_cv_BLKID_LIBS
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
- HAVE_LOCKD_IDM=yes
+ $bailout
fi
$as_echo "#define LOCKDIDM_SUPPORT 1" >>confdefs.h
@@ -12085,24 +12029,6 @@ $as_echo_n "checking whether udev supports built-in blkid... " >&6; }
$as_echo "$UDEV_HAS_BUILTIN_BLKID" >&6; }
fi
-################################################################################
-# Check whether --enable-compat was given.
-if test "${enable_compat+set}" = set; then :
- enableval=$enable_compat; DM_COMPAT=$enableval
-else
- DM_COMPAT=no
-fi
-
-
-if test "$DM_COMPAT" = yes; then :
-
-$as_echo "#define DM_COMPAT 1" >>confdefs.h
-
- as_fn_error $? "--enable-compat is not currently supported.
-Since device-mapper version 1.02.66, only one version (4) of the device-mapper
-ioctl protocol is supported." "$LINENO" 5
-fi
-
################################################################################
# Check whether --enable-units-compat was given.
if test "${enable_units_compat+set}" = set; then :
diff --git a/include/configure.h.in b/include/configure.h.in
index 7efa83661..e0d971bbf 100644
--- a/include/configure.h.in
+++ b/include/configure.h.in
@@ -114,9 +114,6 @@
/* Define to 1 to enable the device-mapper filemap daemon. */
#undef DMFILEMAPD
-/* Define to enable compat protocol */
-#undef DM_COMPAT
-
/* Define default group for device node */
#undef DM_DEVICE_GID
^ permalink raw reply related [flat|nested] 12+ messages in thread* main - configure: update
@ 2023-04-06 11:47 Zdenek Kabelac
0 siblings, 0 replies; 12+ messages in thread
From: Zdenek Kabelac @ 2023-04-06 11:47 UTC (permalink / raw)
To: lvm-devel
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=a7cf55c6a19a0a70dab7f2b8a406d52e24d5e3cd
Commit: a7cf55c6a19a0a70dab7f2b8a406d52e24d5e3cd
Parent: 0f2c48a10e6085d483d560277b9d582835582ec4
Author: Zdenek Kabelac <zkabelac@redhat.com>
AuthorDate: Wed Mar 1 09:40:53 2023 +0100
Committer: Zdenek Kabelac <zkabelac@redhat.com>
CommitterDate: Thu Apr 6 11:06:04 2023 +0200
configure: update
autoreconf
---
aclocal.m4 | 34 ++---
configure | 442 +++++++++++++++++++++++++++++--------------------------------
2 files changed, 226 insertions(+), 250 deletions(-)
diff --git a/aclocal.m4 b/aclocal.m4
index 56c51c7a5..a1ba0f473 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -69,8 +69,8 @@ AC_DEFUN([AX_PYTHON_MODULE],[
fi
])
-# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
-# serial 11 (pkg-config-0.29.1)
+# pkg.m4 - Macros to locate and use pkg-config. -*- Autoconf -*-
+# serial 12 (pkg-config-0.29.2)
dnl Copyright ?? 2004 Scott James Remnant <scott@netsplit.com>.
dnl Copyright ?? 2012-2015 Dan Nicholson <dbn.lists@gmail.com>
@@ -112,7 +112,7 @@ dnl
dnl See the "Since" comment for each macro you use to see what version
dnl of the macros you require.
m4_defun([PKG_PREREQ],
-[m4_define([PKG_MACROS_VERSION], [0.29.1])
+[m4_define([PKG_MACROS_VERSION], [0.29.2])
m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1,
[m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])])
])dnl PKG_PREREQ
@@ -157,7 +157,7 @@ dnl Check to see whether a particular set of modules exists. Similar to
dnl PKG_CHECK_MODULES(), but does not set variables or print errors.
dnl
dnl Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
-dnl only at the first occurence in configure.ac, so if the first place
+dnl only at the first occurrence in configure.ac, so if the first place
dnl it's called might be skipped (such as if it is within an "if", you
dnl have to call PKG_CHECK_EXISTS manually
AC_DEFUN([PKG_CHECK_EXISTS],
@@ -213,7 +213,7 @@ AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
pkg_failed=no
-AC_MSG_CHECKING([for $1])
+AC_MSG_CHECKING([for $2])
_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
_PKG_CONFIG([$1][_LIBS], [libs], [$2])
@@ -223,17 +223,17 @@ and $1[]_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.])
if test $pkg_failed = yes; then
- AC_MSG_RESULT([no])
+ AC_MSG_RESULT([no])
_PKG_SHORT_ERRORS_SUPPORTED
if test $_pkg_short_errors_supported = yes; then
- $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
- else
- $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
+ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
+ else
+ $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
fi
- # Put the nasty error message in config.log where it belongs
- echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
+ # Put the nasty error message in config.log where it belongs
+ echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
- m4_default([$4], [AC_MSG_ERROR(
+ m4_default([$4], [AC_MSG_ERROR(
[Package requirements ($2) were not met:
$$1_PKG_ERRORS
@@ -244,8 +244,8 @@ installed software in a non-standard prefix.
_PKG_TEXT])[]dnl
])
elif test $pkg_failed = untried; then
- AC_MSG_RESULT([no])
- m4_default([$4], [AC_MSG_FAILURE(
+ AC_MSG_RESULT([no])
+ m4_default([$4], [AC_MSG_FAILURE(
[The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
@@ -255,10 +255,10 @@ _PKG_TEXT
To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl
])
else
- $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
- $1[]_LIBS=$pkg_cv_[]$1[]_LIBS
+ $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
+ $1[]_LIBS=$pkg_cv_[]$1[]_LIBS
AC_MSG_RESULT([yes])
- $3
+ $3
fi[]dnl
])dnl PKG_CHECK_MODULES
diff --git a/configure b/configure
index 7f50d6fe3..75ceade03 100755
--- a/configure
+++ b/configure
@@ -967,7 +967,6 @@ enable_use_lvmlockd
with_lvmlockd_pidfile
enable_use_lvmpolld
with_lvmpolld_pidfile
-enable_dmfilemapd
enable_notify_dbus
enable_systemd_journal
enable_app_machineid
@@ -990,6 +989,7 @@ enable_fsadm
enable_lvmimportvdo
enable_blkdeactivate
enable_dmeventd
+enable_dmfilemapd
enable_selinux
enable_blkzeroout
enable_nls
@@ -1706,7 +1706,6 @@ Optional Features:
--enable-lvmlockd-idm enable the LVM lock daemon using idm
--disable-use-lvmlockd disable usage of LVM lock daemon
--disable-use-lvmpolld disable usage of LVM Poll Daemon
- --enable-dmfilemapd enable the dmstats filemap daemon
--enable-notify-dbus enable LVM notification using dbus
--disable-systemd-journal
disable LVM systemd journaling
@@ -1729,6 +1728,7 @@ Optional Features:
--disable-lvmimportvdo disable lvm_import_vdo
--disable-blkdeactivate disable blkdeactivate
--enable-dmeventd enable the device-mapper event daemon
+ --enable-dmfilemapd enable the dmstats filemap daemon
--disable-selinux disable selinux support
--disable-blkzeroout do not use BLKZEROOUT for device zeroing
--enable-nls enable Native Language Support
@@ -11206,8 +11206,8 @@ then :
pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for CPG" >&5
-printf %s "checking for CPG... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libcpg" >&5
+printf %s "checking for libcpg... " >&6; }
if test -n "$CPG_CFLAGS"; then
pkg_cv_CPG_CFLAGS="$CPG_CFLAGS"
@@ -11247,7 +11247,7 @@ fi
if test $pkg_failed = yes; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
printf "%s\n" "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -11256,14 +11256,14 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- CPG_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libcpg" 2>&1`
+ CPG_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libcpg" 2>&1`
else
- CPG_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libcpg" 2>&1`
+ CPG_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libcpg" 2>&1`
fi
- # Put the nasty error message in config.log where it belongs
- echo "$CPG_PKG_ERRORS" >&5
+ # Put the nasty error message in config.log where it belongs
+ echo "$CPG_PKG_ERRORS" >&5
- as_fn_error $? "Package requirements (libcpg) were not met:
+ as_fn_error $? "Package requirements (libcpg) were not met:
$CPG_PKG_ERRORS
@@ -11274,9 +11274,9 @@ Alternatively, you may set the environment variables CPG_CFLAGS
and CPG_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details." "$LINENO" 5
elif test $pkg_failed = untried; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
printf "%s\n" "no" >&6; }
- { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
@@ -11289,8 +11289,8 @@ See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details" "$LINENO" 5; }
else
- CPG_CFLAGS=$pkg_cv_CPG_CFLAGS
- CPG_LIBS=$pkg_cv_CPG_LIBS
+ CPG_CFLAGS=$pkg_cv_CPG_CFLAGS
+ CPG_LIBS=$pkg_cv_CPG_LIBS
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
printf "%s\n" "yes" >&6; }
@@ -11888,8 +11888,8 @@ printf "%s\n" "$VALGRIND_POOL" >&6; }
pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for VALGRIND" >&5
-printf %s "checking for VALGRIND... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for valgrind" >&5
+printf %s "checking for valgrind... " >&6; }
if test -n "$VALGRIND_CFLAGS"; then
pkg_cv_VALGRIND_CFLAGS="$VALGRIND_CFLAGS"
@@ -11929,7 +11929,7 @@ fi
if test $pkg_failed = yes; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
printf "%s\n" "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -11938,12 +11938,12 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- VALGRIND_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "valgrind" 2>&1`
+ VALGRIND_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "valgrind" 2>&1`
else
- VALGRIND_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "valgrind" 2>&1`
+ VALGRIND_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "valgrind" 2>&1`
fi
- # Put the nasty error message in config.log where it belongs
- echo "$VALGRIND_PKG_ERRORS" >&5
+ # Put the nasty error message in config.log where it belongs
+ echo "$VALGRIND_PKG_ERRORS" >&5
if test "$VALGRIND_POOL" = "yes"
@@ -11952,7 +11952,7 @@ then :
fi
elif test $pkg_failed = untried; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
printf "%s\n" "no" >&6; }
if test "$VALGRIND_POOL" = "yes"
@@ -11961,11 +11961,11 @@ then :
fi
else
- VALGRIND_CFLAGS=$pkg_cv_VALGRIND_CFLAGS
- VALGRIND_LIBS=$pkg_cv_VALGRIND_LIBS
+ VALGRIND_CFLAGS=$pkg_cv_VALGRIND_CFLAGS
+ VALGRIND_LIBS=$pkg_cv_VALGRIND_LIBS
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
printf "%s\n" "yes" >&6; }
- HAVE_VALGRIND="yes"
+ HAVE_VALGRIND="yes"
fi
@@ -12043,8 +12043,8 @@ then :
pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for LIBSANLOCKCLIENT" >&5
-printf %s "checking for LIBSANLOCKCLIENT... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libsanlock_client >= 3.3.0" >&5
+printf %s "checking for libsanlock_client >= 3.3.0... " >&6; }
if test -n "$LIBSANLOCKCLIENT_CFLAGS"; then
pkg_cv_LIBSANLOCKCLIENT_CFLAGS="$LIBSANLOCKCLIENT_CFLAGS"
@@ -12084,7 +12084,7 @@ fi
if test $pkg_failed = yes; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
printf "%s\n" "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -12093,14 +12093,14 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- LIBSANLOCKCLIENT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libsanlock_client >= 3.3.0" 2>&1`
+ LIBSANLOCKCLIENT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libsanlock_client >= 3.3.0" 2>&1`
else
- LIBSANLOCKCLIENT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libsanlock_client >= 3.3.0" 2>&1`
+ LIBSANLOCKCLIENT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libsanlock_client >= 3.3.0" 2>&1`
fi
- # Put the nasty error message in config.log where it belongs
- echo "$LIBSANLOCKCLIENT_PKG_ERRORS" >&5
+ # Put the nasty error message in config.log where it belongs
+ echo "$LIBSANLOCKCLIENT_PKG_ERRORS" >&5
- as_fn_error $? "Package requirements (libsanlock_client >= 3.3.0) were not met:
+ as_fn_error $? "Package requirements (libsanlock_client >= 3.3.0) were not met:
$LIBSANLOCKCLIENT_PKG_ERRORS
@@ -12111,9 +12111,9 @@ Alternatively, you may set the environment variables LIBSANLOCKCLIENT_CFLAGS
and LIBSANLOCKCLIENT_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details." "$LINENO" 5
elif test $pkg_failed = untried; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
printf "%s\n" "no" >&6; }
- { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
@@ -12126,11 +12126,11 @@ See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details" "$LINENO" 5; }
else
- LIBSANLOCKCLIENT_CFLAGS=$pkg_cv_LIBSANLOCKCLIENT_CFLAGS
- LIBSANLOCKCLIENT_LIBS=$pkg_cv_LIBSANLOCKCLIENT_LIBS
+ LIBSANLOCKCLIENT_CFLAGS=$pkg_cv_LIBSANLOCKCLIENT_CFLAGS
+ LIBSANLOCKCLIENT_LIBS=$pkg_cv_LIBSANLOCKCLIENT_LIBS
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
printf "%s\n" "yes" >&6; }
- BUILD_LVMLOCKD="yes"
+ BUILD_LVMLOCKD="yes"
fi
printf "%s\n" "#define LOCKDSANLOCK_SUPPORT 1" >>confdefs.h
@@ -12157,8 +12157,8 @@ then :
pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for LIBDLM" >&5
-printf %s "checking for LIBDLM... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libdlm_lt" >&5
+printf %s "checking for libdlm_lt... " >&6; }
if test -n "$LIBDLM_CFLAGS"; then
pkg_cv_LIBDLM_CFLAGS="$LIBDLM_CFLAGS"
@@ -12198,7 +12198,7 @@ fi
if test $pkg_failed = yes; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
printf "%s\n" "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -12207,14 +12207,14 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- LIBDLM_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libdlm_lt" 2>&1`
+ LIBDLM_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libdlm_lt" 2>&1`
else
- LIBDLM_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libdlm_lt" 2>&1`
+ LIBDLM_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libdlm_lt" 2>&1`
fi
- # Put the nasty error message in config.log where it belongs
- echo "$LIBDLM_PKG_ERRORS" >&5
+ # Put the nasty error message in config.log where it belongs
+ echo "$LIBDLM_PKG_ERRORS" >&5
- as_fn_error $? "Package requirements (libdlm_lt) were not met:
+ as_fn_error $? "Package requirements (libdlm_lt) were not met:
$LIBDLM_PKG_ERRORS
@@ -12225,9 +12225,9 @@ Alternatively, you may set the environment variables LIBDLM_CFLAGS
and LIBDLM_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details." "$LINENO" 5
elif test $pkg_failed = untried; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
printf "%s\n" "no" >&6; }
- { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
@@ -12240,11 +12240,11 @@ See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details" "$LINENO" 5; }
else
- LIBDLM_CFLAGS=$pkg_cv_LIBDLM_CFLAGS
- LIBDLM_LIBS=$pkg_cv_LIBDLM_LIBS
+ LIBDLM_CFLAGS=$pkg_cv_LIBDLM_CFLAGS
+ LIBDLM_LIBS=$pkg_cv_LIBDLM_LIBS
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
printf "%s\n" "yes" >&6; }
- BUILD_LVMLOCKD="yes"
+ BUILD_LVMLOCKD="yes"
fi
printf "%s\n" "#define LOCKDDLM_SUPPORT 1" >>confdefs.h
@@ -12280,8 +12280,8 @@ then :
pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for LIBDLMCONTROL" >&5
-printf %s "checking for LIBDLMCONTROL... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libdlmcontrol >= 3.2" >&5
+printf %s "checking for libdlmcontrol >= 3.2... " >&6; }
if test -n "$LIBDLMCONTROL_CFLAGS"; then
pkg_cv_LIBDLMCONTROL_CFLAGS="$LIBDLMCONTROL_CFLAGS"
@@ -12321,7 +12321,7 @@ fi
if test $pkg_failed = yes; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
printf "%s\n" "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -12330,14 +12330,14 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- LIBDLMCONTROL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libdlmcontrol >= 3.2" 2>&1`
+ LIBDLMCONTROL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libdlmcontrol >= 3.2" 2>&1`
else
- LIBDLMCONTROL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libdlmcontrol >= 3.2" 2>&1`
+ LIBDLMCONTROL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libdlmcontrol >= 3.2" 2>&1`
fi
- # Put the nasty error message in config.log where it belongs
- echo "$LIBDLMCONTROL_PKG_ERRORS" >&5
+ # Put the nasty error message in config.log where it belongs
+ echo "$LIBDLMCONTROL_PKG_ERRORS" >&5
- as_fn_error $? "Package requirements (libdlmcontrol >= 3.2) were not met:
+ as_fn_error $? "Package requirements (libdlmcontrol >= 3.2) were not met:
$LIBDLMCONTROL_PKG_ERRORS
@@ -12348,9 +12348,9 @@ Alternatively, you may set the environment variables LIBDLMCONTROL_CFLAGS
and LIBDLMCONTROL_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details." "$LINENO" 5
elif test $pkg_failed = untried; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
printf "%s\n" "no" >&6; }
- { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
@@ -12363,11 +12363,11 @@ See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details" "$LINENO" 5; }
else
- LIBDLMCONTROL_CFLAGS=$pkg_cv_LIBDLMCONTROL_CFLAGS
- LIBDLMCONTROL_LIBS=$pkg_cv_LIBDLMCONTROL_LIBS
+ LIBDLMCONTROL_CFLAGS=$pkg_cv_LIBDLMCONTROL_CFLAGS
+ LIBDLMCONTROL_LIBS=$pkg_cv_LIBDLMCONTROL_LIBS
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
printf "%s\n" "yes" >&6; }
- BUILD_LVMLOCKD="yes"
+ BUILD_LVMLOCKD="yes"
fi
printf "%s\n" "#define LOCKDDLM_CONTROL_SUPPORT 1" >>confdefs.h
@@ -12401,8 +12401,8 @@ then :
pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for LIBSEAGATEILM" >&5
-printf %s "checking for LIBSEAGATEILM... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libseagate_ilm >= 0.1.0" >&5
+printf %s "checking for libseagate_ilm >= 0.1.0... " >&6; }
if test -n "$LIBSEAGATEILM_CFLAGS"; then
pkg_cv_LIBSEAGATEILM_CFLAGS="$LIBSEAGATEILM_CFLAGS"
@@ -12442,7 +12442,7 @@ fi
if test $pkg_failed = yes; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
printf "%s\n" "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -12451,14 +12451,14 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- LIBSEAGATEILM_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libseagate_ilm >= 0.1.0" 2>&1`
+ LIBSEAGATEILM_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libseagate_ilm >= 0.1.0" 2>&1`
else
- LIBSEAGATEILM_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libseagate_ilm >= 0.1.0" 2>&1`
+ LIBSEAGATEILM_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libseagate_ilm >= 0.1.0" 2>&1`
fi
- # Put the nasty error message in config.log where it belongs
- echo "$LIBSEAGATEILM_PKG_ERRORS" >&5
+ # Put the nasty error message in config.log where it belongs
+ echo "$LIBSEAGATEILM_PKG_ERRORS" >&5
- as_fn_error $? "Package requirements (libseagate_ilm >= 0.1.0) were not met:
+ as_fn_error $? "Package requirements (libseagate_ilm >= 0.1.0) were not met:
$LIBSEAGATEILM_PKG_ERRORS
@@ -12469,9 +12469,9 @@ Alternatively, you may set the environment variables LIBSEAGATEILM_CFLAGS
and LIBSEAGATEILM_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details." "$LINENO" 5
elif test $pkg_failed = untried; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
printf "%s\n" "no" >&6; }
- { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
@@ -12484,11 +12484,11 @@ See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details" "$LINENO" 5; }
else
- LIBSEAGATEILM_CFLAGS=$pkg_cv_LIBSEAGATEILM_CFLAGS
- LIBSEAGATEILM_LIBS=$pkg_cv_LIBSEAGATEILM_LIBS
+ LIBSEAGATEILM_CFLAGS=$pkg_cv_LIBSEAGATEILM_CFLAGS
+ LIBSEAGATEILM_LIBS=$pkg_cv_LIBSEAGATEILM_LIBS
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
printf "%s\n" "yes" >&6; }
- BUILD_LVMLOCKD="yes"
+ BUILD_LVMLOCKD="yes"
fi
printf "%s\n" "#define LOCKDIDM_SUPPORT 1" >>confdefs.h
@@ -12510,6 +12510,7 @@ printf %s "checking whether to build lvmlockd... " >&6; }
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $BUILD_LVMLOCKD" >&5
printf "%s\n" "$BUILD_LVMLOCKD" >&6; }
+DEFAULT_USE_LVMLOCKD=0
if test "$BUILD_LVMLOCKD" = "yes"
then :
@@ -12527,16 +12528,15 @@ printf %s "checking defaults for use_lvmlockd... " >&6; }
# Check whether --enable-use_lvmlockd was given.
if test ${enable_use_lvmlockd+y}
then :
- enableval=$enable_use_lvmlockd; if test "$enableval" = "yes"
-then :
- DEFAULT_USE_LVMLOCKD=1
+ enableval=$enable_use_lvmlockd; use_lvmlockd=$enableval
else $as_nop
- DEFAULT_USE_LVMLOCKD=0
+ use_lvmlockd="yes"
fi
-else $as_nop
+
+ if test "$use_lvmlockd" = "yes"
+then :
DEFAULT_USE_LVMLOCKD=1
fi
-
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $DEFAULT_USE_LVMLOCKD" >&5
printf "%s\n" "$DEFAULT_USE_LVMLOCKD" >&6; }
@@ -12556,16 +12556,13 @@ fi
printf "%s\n" "#define LVMLOCKD_PIDFILE \"$LVMLOCKD_PIDFILE\"" >>confdefs.h
-else $as_nop
-
- DEFAULT_USE_LVMLOCKD=0
-
fi
printf "%s\n" "#define DEFAULT_USE_LVMLOCKD $DEFAULT_USE_LVMLOCKD" >>confdefs.h
################################################################################
+DEFAULT_USE_LVMPOLLD=0
if test "$BUILD_LVMPOLLD" = "yes"
then :
@@ -12574,16 +12571,15 @@ printf %s "checking defaults for use_lvmpolld... " >&6; }
# Check whether --enable-use_lvmpolld was given.
if test ${enable_use_lvmpolld+y}
then :
- enableval=$enable_use_lvmpolld; if test "$enableval" = "yes"
-then :
- DEFAULT_USE_LVMPOLLD=1
+ enableval=$enable_use_lvmpolld; use_lvmpolld=$enableval
else $as_nop
- DEFAULT_USE_LVMPOLLD=0
+ use_lvmpolld="yes"
fi
-else $as_nop
+
+ if test "$use_lvmpolld" = "yes"
+then :
DEFAULT_USE_LVMPOLLD=1
fi
-
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $DEFAULT_USE_LVMPOLLD" >&5
printf "%s\n" "$DEFAULT_USE_LVMPOLLD" >&6; }
@@ -12603,79 +12599,45 @@ fi
printf "%s\n" "#define LVMPOLLD_PIDFILE \"$LVMPOLLD_PIDFILE\"" >>confdefs.h
-else $as_nop
-
- DEFAULT_USE_LVMPOLLD=0
-
fi
printf "%s\n" "#define DEFAULT_USE_LVMPOLLD $DEFAULT_USE_LVMPOLLD" >>confdefs.h
-################################################################################
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to build dmfilemapd" >&5
-printf %s "checking whether to build dmfilemapd... " >&6; }
-# Check whether --enable-dmfilemapd was given.
-if test ${enable_dmfilemapd+y}
-then :
- enableval=$enable_dmfilemapd; BUILD_DMFILEMAPD=$enableval
-else $as_nop
- BUILD_DMFILEMAPD="no"
-fi
-
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $BUILD_DMFILEMAPD" >&5
-printf "%s\n" "$BUILD_DMFILEMAPD" >&6; }
-
-printf "%s\n" "#define DMFILEMAPD \$BUILD_DMFILEMAPD" >>confdefs.h
-
-
-if test "$BUILD_DMFILEMAPD" = "yes"
-then :
-
- ac_fn_c_check_header_compile "$LINENO" "linux/fiemap.h" "ac_cv_header_linux_fiemap_h" "$ac_includes_default"
-if test "x$ac_cv_header_linux_fiemap_h" = xyes
-then :
-
-else $as_nop
- as_fn_error $? "--enable-dmfilemapd requires fiemap.h" "$LINENO" 5
-fi
-
-
-fi
SYSTEMD_MIN_VERSION=0
if test -n "$PKG_CONFIG" && \
- { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"systemd >= 205\""; } >&5
- ($PKG_CONFIG --exists --print-errors "systemd >= 205") 2>&5
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"systemd >= 221\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "systemd >= 221") 2>&5
ac_status=$?
printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- SYSTEMD_MIN_VERSION=205
+ SYSTEMD_MIN_VERSION=221
fi
-
-################################################################################
if test -n "$PKG_CONFIG" && \
- { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"systemd >= 221\""; } >&5
- ($PKG_CONFIG --exists --print-errors "systemd >= 221") 2>&5
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"systemd >= 234\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "systemd >= 234") 2>&5
ac_status=$?
printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- SYSTEMD_MIN_VERSION=221
+ SYSTEMD_MIN_VERSION=234
fi
+
+################################################################################
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to build notifydbus" >&5
printf %s "checking whether to build notifydbus... " >&6; }
# Check whether --enable-notify-dbus was given.
if test ${enable_notify_dbus+y}
then :
- enableval=$enable_notify_dbus; if test "$enableval" = "yes" && test "$SYSTEMD_MIN_VERSION" -lt 221
-then :
- as_fn_error $? "Enabling notify-dbus requires systemd >= 221" "$LINENO" 5
-fi
- NOTIFYDBUS_SUPPORT=$enableval
+ enableval=$enable_notify_dbus; NOTIFYDBUS_SUPPORT=$enableval
else $as_nop
NOTIFYDBUS_SUPPORT="no"
fi
+if test "$NOTIFYDBUS_SUPPORT" = "yes" && test "$SYSTEMD_MIN_VERSION" -lt 221
+then :
+ as_fn_error $? "Enabling notify-dbus requires systemd >= 221" "$LINENO" 5
+fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $NOTIFYDBUS_SUPPORT" >&5
printf "%s\n" "$NOTIFYDBUS_SUPPORT" >&6; }
@@ -12727,14 +12689,10 @@ printf "%s\n" "#define SYSTEMD_JOURNAL_SUPPORT 1" >>confdefs.h
fi
################################################################################
-if test -n "$PKG_CONFIG" && \
- { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"systemd >= 234\""; } >&5
- ($PKG_CONFIG --exists --print-errors "systemd >= 234") 2>&5
- ac_status=$?
- printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
- SYSTEMD_MIN_VERSION=234 APP_MACHINEID_SUPPORT="maybe"
-else
+if test "$SYSTEMD_MIN_VERSION" -ge 234
+then :
+ APP_MACHINEID_SUPPORT="maybe"
+else $as_nop
APP_MACHINEID_SUPPORT="no"
fi
ac_fn_c_check_header_compile "$LINENO" "systemd/sd-id128.h" "ac_cv_header_systemd_sd_id128_h" "$ac_includes_default"
@@ -12775,8 +12733,8 @@ then :
pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for LIBSYSTEMD" >&5
-printf %s "checking for LIBSYSTEMD... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libsystemd" >&5
+printf %s "checking for libsystemd... " >&6; }
if test -n "$LIBSYSTEMD_CFLAGS"; then
pkg_cv_LIBSYSTEMD_CFLAGS="$LIBSYSTEMD_CFLAGS"
@@ -12816,7 +12774,7 @@ fi
if test $pkg_failed = yes; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
printf "%s\n" "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -12825,14 +12783,14 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- LIBSYSTEMD_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libsystemd" 2>&1`
+ LIBSYSTEMD_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libsystemd" 2>&1`
else
- LIBSYSTEMD_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libsystemd" 2>&1`
+ LIBSYSTEMD_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libsystemd" 2>&1`
fi
- # Put the nasty error message in config.log where it belongs
- echo "$LIBSYSTEMD_PKG_ERRORS" >&5
+ # Put the nasty error message in config.log where it belongs
+ echo "$LIBSYSTEMD_PKG_ERRORS" >&5
- as_fn_error $? "Package requirements (libsystemd) were not met:
+ as_fn_error $? "Package requirements (libsystemd) were not met:
$LIBSYSTEMD_PKG_ERRORS
@@ -12843,9 +12801,9 @@ Alternatively, you may set the environment variables LIBSYSTEMD_CFLAGS
and LIBSYSTEMD_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details." "$LINENO" 5
elif test $pkg_failed = untried; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
printf "%s\n" "no" >&6; }
- { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
@@ -12858,8 +12816,8 @@ See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details" "$LINENO" 5; }
else
- LIBSYSTEMD_CFLAGS=$pkg_cv_LIBSYSTEMD_CFLAGS
- LIBSYSTEMD_LIBS=$pkg_cv_LIBSYSTEMD_LIBS
+ LIBSYSTEMD_CFLAGS=$pkg_cv_LIBSYSTEMD_CFLAGS
+ LIBSYSTEMD_LIBS=$pkg_cv_LIBSYSTEMD_LIBS
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
printf "%s\n" "yes" >&6; }
@@ -12877,7 +12835,6 @@ else $as_nop
SYSTEMD_RUN_CMD="autodetect"
fi
-
if test "$SYSTEMD_RUN_CMD" = "autodetect"
then :
if test -n "$ac_tool_prefix"; then
@@ -12988,16 +12945,15 @@ else
SYSTEMD_RUN_CMD="$ac_cv_path_SYSTEMD_RUN_CMD"
fi
- if test -z "$SYSTEMD_RUN_CMD"
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for app running udev background service" >&5
+printf %s "checking for app running udev background service... " >&6; }
+if test -z "$SYSTEMD_RUN_CMD"
then :
SYSTEMD_RUN_CMD="/usr/bin/systemd-run"
fi
-else $as_nop
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for defined systemd-run" >&5
-printf %s "checking for defined systemd-run... " >&6; }
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $SYSTEMD_RUN_CMD" >&5
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $SYSTEMD_RUN_CMD" >&5
printf "%s\n" "$SYSTEMD_RUN_CMD" >&6; }
-fi
################################################################################
@@ -13030,8 +12986,8 @@ then :
pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for BLKID" >&5
-printf %s "checking for BLKID... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for blkid >= 2.24" >&5
+printf %s "checking for blkid >= 2.24... " >&6; }
if test -n "$BLKID_CFLAGS"; then
pkg_cv_BLKID_CFLAGS="$BLKID_CFLAGS"
@@ -13071,7 +13027,7 @@ fi
if test $pkg_failed = yes; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
printf "%s\n" "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -13080,14 +13036,14 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- BLKID_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "blkid >= 2.24" 2>&1`
+ BLKID_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "blkid >= 2.24" 2>&1`
else
- BLKID_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "blkid >= 2.24" 2>&1`
+ BLKID_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "blkid >= 2.24" 2>&1`
fi
- # Put the nasty error message in config.log where it belongs
- echo "$BLKID_PKG_ERRORS" >&5
+ # Put the nasty error message in config.log where it belongs
+ echo "$BLKID_PKG_ERRORS" >&5
- as_fn_error $? "Package requirements (blkid >= 2.24) were not met:
+ as_fn_error $? "Package requirements (blkid >= 2.24) were not met:
$BLKID_PKG_ERRORS
@@ -13098,9 +13054,9 @@ Alternatively, you may set the environment variables BLKID_CFLAGS
and BLKID_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details." "$LINENO" 5
elif test $pkg_failed = untried; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
printf "%s\n" "no" >&6; }
- { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
@@ -13113,8 +13069,8 @@ See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details" "$LINENO" 5; }
else
- BLKID_CFLAGS=$pkg_cv_BLKID_CFLAGS
- BLKID_LIBS=$pkg_cv_BLKID_LIBS
+ BLKID_CFLAGS=$pkg_cv_BLKID_CFLAGS
+ BLKID_LIBS=$pkg_cv_BLKID_LIBS
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
printf "%s\n" "yes" >&6; }
@@ -13218,8 +13174,8 @@ then :
pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for UDEV" >&5
-printf %s "checking for UDEV... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libudev >= 143" >&5
+printf %s "checking for libudev >= 143... " >&6; }
if test -n "$UDEV_CFLAGS"; then
pkg_cv_UDEV_CFLAGS="$UDEV_CFLAGS"
@@ -13259,7 +13215,7 @@ fi
if test $pkg_failed = yes; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
printf "%s\n" "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -13268,14 +13224,14 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- UDEV_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libudev >= 143" 2>&1`
+ UDEV_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libudev >= 143" 2>&1`
else
- UDEV_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libudev >= 143" 2>&1`
+ UDEV_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libudev >= 143" 2>&1`
fi
- # Put the nasty error message in config.log where it belongs
- echo "$UDEV_PKG_ERRORS" >&5
+ # Put the nasty error message in config.log where it belongs
+ echo "$UDEV_PKG_ERRORS" >&5
- as_fn_error $? "Package requirements (libudev >= 143) were not met:
+ as_fn_error $? "Package requirements (libudev >= 143) were not met:
$UDEV_PKG_ERRORS
@@ -13286,9 +13242,9 @@ Alternatively, you may set the environment variables UDEV_CFLAGS
and UDEV_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details." "$LINENO" 5
elif test $pkg_failed = untried; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
printf "%s\n" "no" >&6; }
- { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
@@ -13301,11 +13257,11 @@ See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details" "$LINENO" 5; }
else
- UDEV_CFLAGS=$pkg_cv_UDEV_CFLAGS
- UDEV_LIBS=$pkg_cv_UDEV_LIBS
+ UDEV_CFLAGS=$pkg_cv_UDEV_CFLAGS
+ UDEV_LIBS=$pkg_cv_UDEV_LIBS
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
printf "%s\n" "yes" >&6; }
- UDEV_PC="libudev"
+ UDEV_PC="libudev"
fi
UDEV_STATIC_LIBS=$("$PKG_CONFIG" --static --libs libudev)
@@ -14191,6 +14147,34 @@ fi
printf "%s\n" "#define DMEVENTD 1" >>confdefs.h
+fi
+
+################################################################################
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to build dmfilemapd" >&5
+printf %s "checking whether to build dmfilemapd... " >&6; }
+# Check whether --enable-dmfilemapd was given.
+if test ${enable_dmfilemapd+y}
+then :
+ enableval=$enable_dmfilemapd; BUILD_DMFILEMAPD=$enableval
+else $as_nop
+ BUILD_DMFILEMAPD="no"
+fi
+
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $BUILD_DMFILEMAPD" >&5
+printf "%s\n" "$BUILD_DMFILEMAPD" >&6; }
+
+if test "$BUILD_DMFILEMAPD" = "yes"
+then :
+ ac_fn_c_check_header_compile "$LINENO" "linux/fiemap.h" "ac_cv_header_linux_fiemap_h" "as_fn_error $? "--enable-dmfilemapd requires fiemap.h" "$LINENO" 5
+"
+if test "x$ac_cv_header_linux_fiemap_h" = xyes
+then :
+
+fi
+
+
+printf "%s\n" "#define DMFILEMAPD 1" >>confdefs.h
+
fi
################################################################################
@@ -14497,8 +14481,8 @@ fi
test $ac_status = 0; }; then
pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for SELINUX" >&5
-printf %s "checking for SELINUX... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libselinux" >&5
+printf %s "checking for libselinux... " >&6; }
if test -n "$SELINUX_CFLAGS"; then
pkg_cv_SELINUX_CFLAGS="$SELINUX_CFLAGS"
@@ -14538,7 +14522,7 @@ fi
if test $pkg_failed = yes; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
printf "%s\n" "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -14547,14 +14531,14 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- SELINUX_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libselinux" 2>&1`
+ SELINUX_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libselinux" 2>&1`
else
- SELINUX_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libselinux" 2>&1`
+ SELINUX_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libselinux" 2>&1`
fi
- # Put the nasty error message in config.log where it belongs
- echo "$SELINUX_PKG_ERRORS" >&5
+ # Put the nasty error message in config.log where it belongs
+ echo "$SELINUX_PKG_ERRORS" >&5
- as_fn_error $? "Package requirements (libselinux) were not met:
+ as_fn_error $? "Package requirements (libselinux) were not met:
$SELINUX_PKG_ERRORS
@@ -14565,9 +14549,9 @@ Alternatively, you may set the environment variables SELINUX_CFLAGS
and SELINUX_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details." "$LINENO" 5
elif test $pkg_failed = untried; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
printf "%s\n" "no" >&6; }
- { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
@@ -14580,11 +14564,11 @@ See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details" "$LINENO" 5; }
else
- SELINUX_CFLAGS=$pkg_cv_SELINUX_CFLAGS
- SELINUX_LIBS=$pkg_cv_SELINUX_LIBS
+ SELINUX_CFLAGS=$pkg_cv_SELINUX_CFLAGS
+ SELINUX_LIBS=$pkg_cv_SELINUX_LIBS
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
printf "%s\n" "yes" >&6; }
- SELINUX_STATIC_LIBS=$("$PKG_CONFIG" --static --libs libselinux)
+ SELINUX_STATIC_LIBS=$("$PKG_CONFIG" --static --libs libselinux)
fi
fi
@@ -14863,8 +14847,8 @@ then :
pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for EDITLINE" >&5
-printf %s "checking for EDITLINE... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libedit" >&5
+printf %s "checking for libedit... " >&6; }
if test -n "$EDITLINE_CFLAGS"; then
pkg_cv_EDITLINE_CFLAGS="$EDITLINE_CFLAGS"
@@ -14904,7 +14888,7 @@ fi
if test $pkg_failed = yes; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
printf "%s\n" "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -14913,23 +14897,23 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- EDITLINE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libedit" 2>&1`
+ EDITLINE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libedit" 2>&1`
else
- EDITLINE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libedit" 2>&1`
+ EDITLINE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libedit" 2>&1`
fi
- # Put the nasty error message in config.log where it belongs
- echo "$EDITLINE_PKG_ERRORS" >&5
+ # Put the nasty error message in config.log where it belongs
+ echo "$EDITLINE_PKG_ERRORS" >&5
- as_fn_error $? "libedit could not be found which is required for the --enable-editline option." "$LINENO" 5
+ as_fn_error $? "libedit could not be found which is required for the --enable-editline option." "$LINENO" 5
elif test $pkg_failed = untried; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
printf "%s\n" "no" >&6; }
- as_fn_error $? "libedit could not be found which is required for the --enable-editline option." "$LINENO" 5
+ as_fn_error $? "libedit could not be found which is required for the --enable-editline option." "$LINENO" 5
else
- EDITLINE_CFLAGS=$pkg_cv_EDITLINE_CFLAGS
- EDITLINE_LIBS=$pkg_cv_EDITLINE_LIBS
+ EDITLINE_CFLAGS=$pkg_cv_EDITLINE_CFLAGS
+ EDITLINE_LIBS=$pkg_cv_EDITLINE_LIBS
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
printf "%s\n" "yes" >&6; }
@@ -15377,7 +15361,6 @@ fi
if test -z "$with_systemdsystemunitdir"
then :
-
if test -n "$systemdsystemunitdir"; then
pkg_cv_systemdsystemunitdir="$systemdsystemunitdir"
elif test -n "$PKG_CONFIG"; then
@@ -15399,15 +15382,10 @@ systemdsystemunitdir=$pkg_cv_systemdsystemunitdir
if test "x$systemdsystemunitdir" = x""
then :
-
- systemdsystemunitdir='${exec_prefix}/lib/systemd/system'
-
+ systemdsystemunitdir='${exec_prefix}/lib/systemd/system'
fi
-
else $as_nop
-
- systemdsystemunitdir="$with_systemdsystemunitdir"
-
+ systemdsystemunitdir="$with_systemdsystemunitdir"
fi
@@ -15432,9 +15410,7 @@ systemdutildir=$pkg_cv_systemdutildir
if test "x$systemdutildir" = x""
then :
-
- systemdutildir='${exec_prefix}/lib/systemd'
-
+ systemdutildir='${exec_prefix}/lib/systemd'
fi
################################################################################
@@ -16045,19 +16021,19 @@ DEFAULT_SYS_LOCK_DIR="$RUN_DIR/lock"
test -d "$DEFAULT_SYS_LOCK_DIR" || DEFAULT_SYS_LOCK_DIR="/var/lock"
# Support configurable locking subdir for lvm
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for default lock directory" >&5
+printf %s "checking for default lock directory... " >&6; }
# Check whether --with-default-locking-dir was given.
if test ${with_default_locking_dir+y}
then :
withval=$with_default_locking_dir; DEFAULT_LOCK_DIR=$withval
else $as_nop
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for default lock directory" >&5
-printf %s "checking for default lock directory... " >&6; }
- DEFAULT_LOCK_DIR="$DEFAULT_SYS_LOCK_DIR/lvm"
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $DEFAULT_LOCK_DIR" >&5
-printf "%s\n" "$DEFAULT_LOCK_DIR" >&6; }
+ DEFAULT_LOCK_DIR="$DEFAULT_SYS_LOCK_DIR/lvm"
fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $DEFAULT_LOCK_DIR" >&5
+printf "%s\n" "$DEFAULT_LOCK_DIR" >&6; }
printf "%s\n" "#define DEFAULT_LOCK_DIR \"$DEFAULT_LOCK_DIR\"" >>confdefs.h
^ permalink raw reply related [flat|nested] 12+ messages in thread* main - configure: update
@ 2023-02-23 15:49 Zdenek Kabelac
0 siblings, 0 replies; 12+ messages in thread
From: Zdenek Kabelac @ 2023-02-23 15:49 UTC (permalink / raw)
To: lvm-devel
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=86ac529b99d04cb7feb9b52fae3cbeda6144660c
Commit: 86ac529b99d04cb7feb9b52fae3cbeda6144660c
Parent: 551d27a327bdf504306ae047adb765100a81103d
Author: Zdenek Kabelac <zkabelac@redhat.com>
AuthorDate: Mon Feb 20 21:04:58 2023 +0100
Committer: Zdenek Kabelac <zkabelac@redhat.com>
CommitterDate: Thu Feb 23 16:46:35 2023 +0100
configure: update
---
configure | 398 ++++++++++++++++++++++++++++++++++++++++++++++-------------
make.tmpl.in | 1 +
2 files changed, 315 insertions(+), 84 deletions(-)
diff --git a/configure b/configure
index c2eee6ba7..7f50d6fe3 100755
--- a/configure
+++ b/configure
@@ -651,18 +651,14 @@ ac_default_prefix=/usr
ac_subst_vars='LTLIBOBJS
usrsbindir
usrlibdir
-tmpfilesdir
-udevdir
udev_prefix
+udevdir
+tmpfilesdir
tmpdir
-kernelvsn
missingkernel
+kernelvsn
kerneldir
interface
-CMIRRORD_PIDFILE
-LVMLOCKD_PIDFILE
-LVMPOLLD_PIDFILE
-DMEVENTD_PIDFILE
WRITE_INSTALL
WRITECACHE
VDO_LIB
@@ -670,37 +666,39 @@ VDO_INCLUDE
VDO
VALGRIND_POOL
USRSBINDIR
-SILENT_RULES
USE_TRACKING
-UDEV_HAS_BUILTIN_BLKID
-UDEV_RULE_EXEC_DETECTION
UDEV_SYNC
+UDEV_STATIC_LIBS
+UDEV_RULE_EXEC_DETECTION
UDEV_RULES
UDEV_PC
+UDEV_HAS_BUILTIN_BLKID
THIN
TESTSUITE_DATA
+SYSCONFDIR
STATIC_LINK
+STATIC_LDFLAGS
STATICDIR
SNAPSHOTS
-SYSCONFDIR
+SILENT_RULES
+SELINUX_STATIC_LIBS
SELINUX_PC
-SELINUX_LIBS
SBINDIR
RT_LIBS
PYTHON3DIR
-PYTHON2DIR
PYTHON3
+PYTHON2DIR
PYTHON2
PTHREAD_LIBS
-M_LIBS
PKGCONFIG
ODIRECT
OCFDIR
OCF
+M_LIBS
MIRRORS
MANGLING
-LVMIMPORTVDO_PATH
-LVMIMPORTVDO
+LVRESIZE_FS_HELPER_PATH
+LVM_VERSION
LVM_RELEASE_DATE
LVM_RELEASE
LVM_PATH
@@ -708,23 +706,25 @@ LVM_PATCHLEVEL
LVM_MINOR
LVM_MAJOR
LVM_LIBAPI
-LVM_VERSION
+LVMPOLLD_PIDFILE
+LVMLOCKD_PIDFILE
+LVMIMPORTVDO_PATH
+LVMIMPORTVDO
LIB_SUFFIX
LDDEPS
JOBS
INTL
INTEGRITY
-BLKDEACTIVATE
-LVRESIZE_FS_HELPER_PATH
FSADM_PATH
FSADM
ELDFLAGS
DM_LIB_PATCHLEVEL
+DMEVENTD_PIDFILE
DMEVENTD_PATH
DL_LIBS
DEVMAPPER
-DEFAULT_USE_LVMLOCKD
DEFAULT_USE_LVMPOLLD
+DEFAULT_USE_LVMLOCKD
DEFAULT_USE_DEVICES_FILE
DEFAULT_USE_BLKID_WIPING
DEFAULT_SYS_LOCK_DIR
@@ -743,30 +743,37 @@ DEFAULT_ARCHIVE_SUBDIR
DEBUG
COPTIMISE_FLAG
CONFDIR
+CMIRRORD_PIDFILE
CMDLIB
CLDWHOLEARCHIVE
CLDNOWHOLEARCHIVE
CLDFLAGS
CACHE
-BUILD_DMFILEMAPD
+BUILD_LVMPOLLD
+BUILD_LVMLOCKD
+BUILD_LVMDBUSD
+BUILD_LOCKDSANLOCK
BUILD_LOCKDIDM
BUILD_LOCKDDLM_CONTROL
BUILD_LOCKDDLM
-BUILD_LOCKDSANLOCK
-BUILD_LVMLOCKD
-BUILD_LVMPOLLD
-BUILD_LVMDBUSD
+BUILD_DMFILEMAPD
BUILD_DMEVENTD
BUILD_CMIRRORD
+BLKID_STATIC_LIBS
BLKID_PC
+BLKDEACTIVATE
READLINE_LIBS
READLINE_CFLAGS
+AIO_LIBS
+AIO_CFLAGS
MODPROBE_CMD
systemdutildir
systemdsystemunitdir
MSGFMT
EDITLINE_LIBS
EDITLINE_CFLAGS
+SELINUX_LIBS
+SELINUX_CFLAGS
PYTHON3_CONFIG
pkgpyexecdir
pyexecdir
@@ -806,8 +813,6 @@ CPG_CFLAGS
PKG_CONFIG_LIBDIR
PKG_CONFIG_PATH
PKG_CONFIG
-AIO_LIBS
-AIO_CFLAGS
VDO_FORMAT_CMD
CACHE_RESTORE_CMD
CACHE_REPAIR_CMD
@@ -1020,8 +1025,6 @@ CXX
CXXFLAGS
CCC
CPP
-AIO_CFLAGS
-AIO_LIBS
PKG_CONFIG
PKG_CONFIG_PATH
PKG_CONFIG_LIBDIR
@@ -1044,10 +1047,14 @@ BLKID_LIBS
UDEV_CFLAGS
UDEV_LIBS
PYTHON
+SELINUX_CFLAGS
+SELINUX_LIBS
EDITLINE_CFLAGS
EDITLINE_LIBS
systemdsystemunitdir
systemdutildir
+AIO_CFLAGS
+AIO_LIBS
READLINE_CFLAGS
READLINE_LIBS'
@@ -1831,8 +1838,6 @@ Some influential environment variables:
CXX C++ compiler command
CXXFLAGS C++ compiler flags
CPP C preprocessor
- AIO_CFLAGS C compiler flags for AIO
- AIO_LIBS linker flags for AIO
PKG_CONFIG path to pkg-config utility
PKG_CONFIG_PATH
directories to add to pkg-config's search path
@@ -1869,6 +1874,10 @@ Some influential environment variables:
UDEV_CFLAGS C compiler flags for UDEV, overriding pkg-config
UDEV_LIBS linker flags for UDEV, overriding pkg-config
PYTHON the Python interpreter
+ SELINUX_CFLAGS
+ C compiler flags for SELINUX, overriding pkg-config
+ SELINUX_LIBS
+ linker flags for SELINUX, overriding pkg-config
EDITLINE_CFLAGS
C compiler flags for EDITLINE, overriding pkg-config
EDITLINE_LIBS
@@ -1877,6 +1886,8 @@ Some influential environment variables:
value of systemdsystemunitdir for systemd, overriding pkg-config
systemdutildir
value of systemdutildir for systemd, overriding pkg-config
+ AIO_CFLAGS C compiler flags for AIO
+ AIO_LIBS linker flags for AIO
READLINE_CFLAGS
C compiler flags for readline
READLINE_LIBS
@@ -3707,12 +3718,12 @@ case "$host_os" in #(
# equivalent to -rdynamic
ELDFLAGS="-Wl,--export-dynamic"
+ STATIC_LDFLAGS="-Wl,--no-export-dynamic"
# FIXME Generate list and use --dynamic-list=.dlopen.sym
CLDWHOLEARCHIVE="-Wl,-whole-archive"
CLDNOWHOLEARCHIVE="-Wl,-no-whole-archive"
LIB_SUFFIX="so"
DEVMAPPER="yes"
- BUILD_LVMPOLLD="no"
ODIRECT="yes"
DM_IOCTLS="yes"
SELINUX="yes"
@@ -10917,14 +10928,6 @@ printf "%s\n" "#define INTEGRITY_INTERNAL 1" >>confdefs.h
as_fn_error $? "--with-integrity parameter invalid" "$LINENO" 5 ;;
esac
-################################################################################
-# Allow users to override default location for libaio
-# there seems to be no pkg-config support available
-AIO_CFLAGS=
-AIO_LIBS=${AIO_LIBS:--laio}
-
-
-
################################################################################
# Check whether --enable-readline was given.
if test ${enable_readline+y}
@@ -10986,7 +10989,10 @@ fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for default run directory" >&5
printf %s "checking for default run directory... " >&6; }
RUN_DIR="/run"
-test -d "/run" || RUN_DIR="/var/run"
+if test ! -d "$RUN_DIR"
+then :
+ RUN_DIR="/var/run"
+fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $RUN_DIR" >&5
printf "%s\n" "$RUN_DIR" >&6; }
@@ -11037,15 +11043,13 @@ printf %s "checking whether to build cluster mirror log daemon... " >&6; }
# Check whether --enable-cmirrord was given.
if test ${enable_cmirrord+y}
then :
- enableval=$enable_cmirrord; CMIRRORD=$enableval
+ enableval=$enable_cmirrord; BUILD_CMIRRORD=$enableval
else $as_nop
- CMIRRORD="no"
+ BUILD_CMIRRORD="no"
fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CMIRRORD" >&5
-printf "%s\n" "$CMIRRORD" >&6; }
-
-BUILD_CMIRRORD=$CMIRRORD
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $BUILD_CMIRRORD" >&5
+printf "%s\n" "$BUILD_CMIRRORD" >&6; }
################################################################################
if test "$BUILD_CMIRRORD" = "yes"
@@ -12010,12 +12014,11 @@ printf %s "checking whether to build lvmpolld... " >&6; }
# Check whether --enable-lvmpolld was given.
if test ${enable_lvmpolld+y}
then :
- enableval=$enable_lvmpolld; LVMPOLLD=$enableval
+ enableval=$enable_lvmpolld; BUILD_LVMPOLLD=$enableval
else $as_nop
- LVMPOLLD="no"
+ BUILD_LVMPOLLD="no"
fi
-test -n "$LVMPOLLD" && BUILD_LVMPOLLD=$LVMPOLLD
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $BUILD_LVMPOLLD" >&5
printf "%s\n" "$BUILD_LVMPOLLD" >&6; }
@@ -12097,11 +12100,31 @@ fi
# Put the nasty error message in config.log where it belongs
echo "$LIBSANLOCKCLIENT_PKG_ERRORS" >&5
- $bailout
+ as_fn_error $? "Package requirements (libsanlock_client >= 3.3.0) were not met:
+
+$LIBSANLOCKCLIENT_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+Alternatively, you may set the environment variables LIBSANLOCKCLIENT_CFLAGS
+and LIBSANLOCKCLIENT_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details." "$LINENO" 5
elif test $pkg_failed = untried; then
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
printf "%s\n" "no" >&6; }
- $bailout
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+Alternatively, you may set the environment variables LIBSANLOCKCLIENT_CFLAGS
+and LIBSANLOCKCLIENT_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+See \`config.log' for more details" "$LINENO" 5; }
else
LIBSANLOCKCLIENT_CFLAGS=$pkg_cv_LIBSANLOCKCLIENT_CFLAGS
LIBSANLOCKCLIENT_LIBS=$pkg_cv_LIBSANLOCKCLIENT_LIBS
@@ -12141,12 +12164,12 @@ if test -n "$LIBDLM_CFLAGS"; then
pkg_cv_LIBDLM_CFLAGS="$LIBDLM_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libdlm\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libdlm") 2>&5
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libdlm_lt\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libdlm_lt") 2>&5
ac_status=$?
printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_LIBDLM_CFLAGS=`$PKG_CONFIG --cflags "libdlm" 2>/dev/null`
+ pkg_cv_LIBDLM_CFLAGS=`$PKG_CONFIG --cflags "libdlm_lt" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -12158,12 +12181,12 @@ if test -n "$LIBDLM_LIBS"; then
pkg_cv_LIBDLM_LIBS="$LIBDLM_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libdlm\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libdlm") 2>&5
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libdlm_lt\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libdlm_lt") 2>&5
ac_status=$?
printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_LIBDLM_LIBS=`$PKG_CONFIG --libs "libdlm" 2>/dev/null`
+ pkg_cv_LIBDLM_LIBS=`$PKG_CONFIG --libs "libdlm_lt" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -12184,18 +12207,38 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- LIBDLM_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libdlm" 2>&1`
+ LIBDLM_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libdlm_lt" 2>&1`
else
- LIBDLM_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libdlm" 2>&1`
+ LIBDLM_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libdlm_lt" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$LIBDLM_PKG_ERRORS" >&5
- $bailout
+ as_fn_error $? "Package requirements (libdlm_lt) were not met:
+
+$LIBDLM_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+Alternatively, you may set the environment variables LIBDLM_CFLAGS
+and LIBDLM_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details." "$LINENO" 5
elif test $pkg_failed = untried; then
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
printf "%s\n" "no" >&6; }
- $bailout
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+Alternatively, you may set the environment variables LIBDLM_CFLAGS
+and LIBDLM_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+See \`config.log' for more details" "$LINENO" 5; }
else
LIBDLM_CFLAGS=$pkg_cv_LIBDLM_CFLAGS
LIBDLM_LIBS=$pkg_cv_LIBDLM_LIBS
@@ -12206,6 +12249,15 @@ fi
printf "%s\n" "#define LOCKDDLM_SUPPORT 1" >>confdefs.h
+ case "$LIBDLM_LIBS" in #(
+ *lpthread*) :
+
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: replacing pkg-config --libs libdlm_lt \"$LIBDLM_LIBS\" with... -ldlm_lt" >&5
+printf "%s\n" "replacing pkg-config --libs libdlm_lt \"$LIBDLM_LIBS\" with... -ldlm_lt" >&6; }
+ LIBDLM_LIBS="${LIBDLM_LIBS%%ldlm*}ldlm_lt" ;; #(
+ *) :
+ ;;
+esac
fi
@@ -12285,11 +12337,31 @@ fi
# Put the nasty error message in config.log where it belongs
echo "$LIBDLMCONTROL_PKG_ERRORS" >&5
- $bailout
+ as_fn_error $? "Package requirements (libdlmcontrol >= 3.2) were not met:
+
+$LIBDLMCONTROL_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+Alternatively, you may set the environment variables LIBDLMCONTROL_CFLAGS
+and LIBDLMCONTROL_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details." "$LINENO" 5
elif test $pkg_failed = untried; then
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
printf "%s\n" "no" >&6; }
- $bailout
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+Alternatively, you may set the environment variables LIBDLMCONTROL_CFLAGS
+and LIBDLMCONTROL_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+See \`config.log' for more details" "$LINENO" 5; }
else
LIBDLMCONTROL_CFLAGS=$pkg_cv_LIBDLMCONTROL_CFLAGS
LIBDLMCONTROL_LIBS=$pkg_cv_LIBDLMCONTROL_LIBS
@@ -12386,11 +12458,31 @@ fi
# Put the nasty error message in config.log where it belongs
echo "$LIBSEAGATEILM_PKG_ERRORS" >&5
- $bailout
+ as_fn_error $? "Package requirements (libseagate_ilm >= 0.1.0) were not met:
+
+$LIBSEAGATEILM_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+Alternatively, you may set the environment variables LIBSEAGATEILM_CFLAGS
+and LIBSEAGATEILM_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details." "$LINENO" 5
elif test $pkg_failed = untried; then
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
printf "%s\n" "no" >&6; }
- $bailout
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+Alternatively, you may set the environment variables LIBSEAGATEILM_CFLAGS
+and LIBSEAGATEILM_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+See \`config.log' for more details" "$LINENO" 5; }
else
LIBSEAGATEILM_CFLAGS=$pkg_cv_LIBSEAGATEILM_CFLAGS
LIBSEAGATEILM_LIBS=$pkg_cv_LIBSEAGATEILM_LIBS
@@ -12401,6 +12493,10 @@ fi
printf "%s\n" "#define LOCKDIDM_SUPPORT 1" >>confdefs.h
+ if test -z "$LIBSEAGATEILM_LIBS"
+then :
+ LIBSEAGATEILM_LIBS="-lseagate_ilm"
+fi
else
$bailout
@@ -12736,11 +12832,31 @@ fi
# Put the nasty error message in config.log where it belongs
echo "$LIBSYSTEMD_PKG_ERRORS" >&5
- $bailout
+ as_fn_error $? "Package requirements (libsystemd) were not met:
+
+$LIBSYSTEMD_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+Alternatively, you may set the environment variables LIBSYSTEMD_CFLAGS
+and LIBSYSTEMD_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details." "$LINENO" 5
elif test $pkg_failed = untried; then
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
printf "%s\n" "no" >&6; }
- $bailout
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+Alternatively, you may set the environment variables LIBSYSTEMD_CFLAGS
+and LIBSYSTEMD_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+See \`config.log' for more details" "$LINENO" 5; }
else
LIBSYSTEMD_CFLAGS=$pkg_cv_LIBSYSTEMD_CFLAGS
LIBSYSTEMD_LIBS=$pkg_cv_LIBSYSTEMD_LIBS
@@ -13054,6 +13170,7 @@ then :
BLKID_WIPING="yes"
BLKID_PC="blkid"
DEFAULT_USE_BLKID_WIPING=1
+ BLKID_STATIC_LIBS=$("$PKG_CONFIG" --static --libs blkid)
printf "%s\n" "#define BLKID_WIPING_SUPPORT 1" >>confdefs.h
@@ -13190,6 +13307,7 @@ else
printf "%s\n" "yes" >&6; }
UDEV_PC="libudev"
fi
+ UDEV_STATIC_LIBS=$("$PKG_CONFIG" --static --libs libudev)
printf "%s\n" "#define UDEV_SYNC_SUPPORT 1" >>confdefs.h
@@ -14367,9 +14485,108 @@ then :
printf "%s\n" "#define HAVE_SEPOL 1" >>confdefs.h
- SELINUX_LIBS="-lsepol"
+ SEPOL_LIBS="-lsepol"
+fi
+
+
+ if test -n "$PKG_CONFIG" && \
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libselinux\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libselinux") 2>&5
+ ac_status=$?
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+
+pkg_failed=no
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for SELINUX" >&5
+printf %s "checking for SELINUX... " >&6; }
+
+if test -n "$SELINUX_CFLAGS"; then
+ pkg_cv_SELINUX_CFLAGS="$SELINUX_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libselinux\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libselinux") 2>&5
+ ac_status=$?
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_SELINUX_CFLAGS=`$PKG_CONFIG --cflags "libselinux" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+if test -n "$SELINUX_LIBS"; then
+ pkg_cv_SELINUX_LIBS="$SELINUX_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libselinux\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libselinux") 2>&5
+ ac_status=$?
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_SELINUX_LIBS=`$PKG_CONFIG --libs "libselinux" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
fi
+ if test $_pkg_short_errors_supported = yes; then
+ SELINUX_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libselinux" 2>&1`
+ else
+ SELINUX_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libselinux" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$SELINUX_PKG_ERRORS" >&5
+ as_fn_error $? "Package requirements (libselinux) were not met:
+
+$SELINUX_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+Alternatively, you may set the environment variables SELINUX_CFLAGS
+and SELINUX_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details." "$LINENO" 5
+elif test $pkg_failed = untried; then
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+Alternatively, you may set the environment variables SELINUX_CFLAGS
+and SELINUX_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+See \`config.log' for more details" "$LINENO" 5; }
+else
+ SELINUX_CFLAGS=$pkg_cv_SELINUX_CFLAGS
+ SELINUX_LIBS=$pkg_cv_SELINUX_LIBS
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+ SELINUX_STATIC_LIBS=$("$PKG_CONFIG" --static --libs libselinux)
+fi
+fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for is_selinux_enabled in -lselinux" >&5
printf %s "checking for is_selinux_enabled in -lselinux... " >&6; }
@@ -14431,7 +14648,8 @@ fi
printf "%s\n" "#define HAVE_SELINUX 1" >>confdefs.h
- SELINUX_LIBS="-lselinux $SELINUX_LIBS"
+ SELINUX_LIBS=${SELINUX_LIBS:--lselinux}
+ SELINUX_STATIC_LIBS=${SELINUX_STATIC_LIBS:-$SELINUX_LIBS $SEPOL_LIBS}
SELINUX_PC="libselinux"
HAVE_SELINUX=yes
else $as_nop
@@ -14439,6 +14657,7 @@ else $as_nop
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Disabling selinux" >&5
printf "%s\n" "$as_me: WARNING: Disabling selinux" >&2;}
SELINUX_LIBS=
+ SELINUX_STATIC_LIBS=
SELINUX_PC=
HAVE_SELINUX=no
fi
@@ -15724,9 +15943,6 @@ printf "%s\n" "#define LVRESIZE_FS_HELPER_PATH \"$LVRESIZE_FS_HELPER_PATH\"" >>c
################################################################################
-if test "$BUILD_DMEVENTD" = "yes"
-then :
-
# Check whether --with-dmeventd-pidfile was given.
if test ${with_dmeventd_pidfile+y}
@@ -15737,15 +15953,6 @@ else $as_nop
fi
-printf "%s\n" "#define DMEVENTD_PIDFILE \"$DMEVENTD_PIDFILE\"" >>confdefs.h
-
-
-fi
-
-if test "$BUILD_DMEVENTD" = "yes"
-then :
-
-
# Check whether --with-dmeventd-path was given.
if test ${with_dmeventd_path+y}
then :
@@ -15755,6 +15962,13 @@ else $as_nop
fi
+if test "$BUILD_DMEVENTD" = "yes"
+then :
+
+
+printf "%s\n" "#define DMEVENTD_PIDFILE \"$DMEVENTD_PIDFILE\"" >>confdefs.h
+
+
printf "%s\n" "#define DMEVENTD_PATH \"$DMEVENTD_PATH\"" >>confdefs.h
@@ -15860,7 +16074,10 @@ else $as_nop
interface="ioctl"
fi
-test "$interface" != "ioctl" && as_fn_error $? "--with-interface=ioctl required. fs no longer supported." "$LINENO" 5
+if test "$interface" != "ioctl"
+then :
+ as_fn_error $? "--with-interface=ioctl required. fs no longer supported." "$LINENO" 5
+fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $interface" >&5
printf "%s\n" "$interface" >&6; }
@@ -15870,7 +16087,7 @@ read DM_LIB_VERSION < "$srcdir"/VERSION_DM 2>/dev/null || DM_LIB_VERSION="Unknow
printf "%s\n" "#define DM_LIB_VERSION \"$DM_LIB_VERSION\"" >>confdefs.h
-DM_LIB_PATCHLEVEL=$(cat "$srcdir"/VERSION_DM | $AWK -F '[-. ]' '{printf "%s.%s.%s",$1,$2,$3}')
+DM_LIB_PATCHLEVEL=$($AWK -F '[-. ]' '{printf "%s.%s.%s",$1,$2,$3}' "$srcdir"/VERSION_DM)
read VER < "$srcdir"/VERSION 2>/dev/null || VER=Unknown
@@ -15888,6 +16105,14 @@ LVM_LIBAPI=$(echo "$VER" | $AWK -F '[()]' '{print $2}')
printf "%s\n" "#define LVM_CONFIGURE_LINE \"$CONFIGURE_LINE\"" >>confdefs.h
+################################################################################
+# Allow users to override default location for libaio
+# there seems to be no pkg-config support available
+AIO_CFLAGS=${AIO_CFLAGS:-}
+AIO_LIBS=${AIO_LIBS:--laio}
+
+
+
@@ -16018,6 +16243,11 @@ printf "%s\n" "#define LVM_CONFIGURE_LINE \"$CONFIGURE_LINE\"" >>confdefs.h
+
+
+
+
+
diff --git a/make.tmpl.in b/make.tmpl.in
index 6025c166c..20f8a5245 100644
--- a/make.tmpl.in
+++ b/make.tmpl.in
@@ -65,6 +65,7 @@ DEFS += @DEFS@
CFLAGS ?= @COPTIMISE_FLAG@ @CFLAGS@
CPPFLAGS ?= @CPPFLAGS@
LDFLAGS ?= @LDFLAGS@
+STATIC_LDFLAGS += @STATIC_LDFLAGS@
CLDFLAGS += @CLDFLAGS@
ELDFLAGS += @ELDFLAGS@
LDDEPS += @LDDEPS@
^ permalink raw reply related [flat|nested] 12+ messages in thread* main - configure: update
@ 2023-02-16 23:11 Zdenek Kabelac
0 siblings, 0 replies; 12+ messages in thread
From: Zdenek Kabelac @ 2023-02-16 23:11 UTC (permalink / raw)
To: lvm-devel
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=a861f0425e0688b2feb97b15277bceb3132d5004
Commit: a861f0425e0688b2feb97b15277bceb3132d5004
Parent: 13b216fbdf038dc83d31c43026aa53d281ab3942
Author: Zdenek Kabelac <zkabelac@redhat.com>
AuthorDate: Thu Feb 16 23:26:24 2023 +0100
Committer: Zdenek Kabelac <zkabelac@redhat.com>
CommitterDate: Fri Feb 17 00:08:50 2023 +0100
configure: update
---
configure | 326 +++++++++++++++++++++++++-------------------------------------
1 file changed, 129 insertions(+), 197 deletions(-)
diff --git a/configure b/configure
index 3e09aa265..c2eee6ba7 100755
--- a/configure
+++ b/configure
@@ -686,23 +686,9 @@ SYSCONFDIR
SELINUX_PC
SELINUX_LIBS
SBINDIR
-SALCK_LIBS
-SALCK_CFLAGS
-SACKPT_LIBS
-SACKPT_CFLAGS
-REPLICATORS
RT_LIBS
-QUORUM_LIBS
-QUORUM_CFLAGS
PYTHON3DIR
PYTHON2DIR
-PYTHON3_LIBDIRS
-PYTHON2_LIBDIRS
-PYTHON3_INCDIRS
-PYTHON2_INCDIRS
-PYTHON3_BINDINGS
-PYTHON2_BINDINGS
-PYTHON_BINDINGS
PYTHON3
PYTHON2
PTHREAD_LIBS
@@ -728,11 +714,6 @@ LDDEPS
JOBS
INTL
INTEGRITY
-HAVE_VALGRIND
-HAVE_REALTIME
-HAVE_LIBDL
-HAVE_BLKID_SUBLKS_FSINFO
-HAVE_BLKID
BLKDEACTIVATE
LVRESIZE_FS_HELPER_PATH
FSADM_PATH
@@ -741,8 +722,6 @@ ELDFLAGS
DM_LIB_PATCHLEVEL
DMEVENTD_PATH
DL_LIBS
-DLM_LIBS
-DLM_CFLAGS
DEVMAPPER
DEFAULT_USE_LVMLOCKD
DEFAULT_USE_LVMPOLLD
@@ -764,8 +743,6 @@ DEFAULT_ARCHIVE_SUBDIR
DEBUG
COPTIMISE_FLAG
CONFDIR
-CONFDB_LIBS
-CONFDB_CFLAGS
CMDLIB
CLDWHOLEARCHIVE
CLDNOWHOLEARCHIVE
@@ -806,16 +783,16 @@ UDEV_CFLAGS
BLKID_LIBS
BLKID_CFLAGS
SYSTEMD_RUN_CMD
-SYSTEMD_LIBS
-SYSTEMD_CFLAGS
-LOCKD_IDM_LIBS
-LOCKD_IDM_CFLAGS
-LOCKD_DLM_CONTROL_LIBS
-LOCKD_DLM_CONTROL_CFLAGS
-LOCKD_DLM_LIBS
-LOCKD_DLM_CFLAGS
-LOCKD_SANLOCK_LIBS
-LOCKD_SANLOCK_CFLAGS
+LIBSYSTEMD_LIBS
+LIBSYSTEMD_CFLAGS
+LIBSEAGATEILM_LIBS
+LIBSEAGATEILM_CFLAGS
+LIBDLMCONTROL_LIBS
+LIBDLMCONTROL_CFLAGS
+LIBDLM_LIBS
+LIBDLM_CFLAGS
+LIBSANLOCKCLIENT_LIBS
+LIBSANLOCKCLIENT_CFLAGS
VALGRIND_LIBS
VALGRIND_CFLAGS
GENPNG
@@ -1052,16 +1029,16 @@ CPG_CFLAGS
CPG_LIBS
VALGRIND_CFLAGS
VALGRIND_LIBS
-LOCKD_SANLOCK_CFLAGS
-LOCKD_SANLOCK_LIBS
-LOCKD_DLM_CFLAGS
-LOCKD_DLM_LIBS
-LOCKD_DLM_CONTROL_CFLAGS
-LOCKD_DLM_CONTROL_LIBS
-LOCKD_IDM_CFLAGS
-LOCKD_IDM_LIBS
-SYSTEMD_CFLAGS
-SYSTEMD_LIBS
+LIBSANLOCKCLIENT_CFLAGS
+LIBSANLOCKCLIENT_LIBS
+LIBDLM_CFLAGS
+LIBDLM_LIBS
+LIBDLMCONTROL_CFLAGS
+LIBDLMCONTROL_LIBS
+LIBSEAGATEILM_CFLAGS
+LIBSEAGATEILM_LIBS
+LIBSYSTEMD_CFLAGS
+LIBSYSTEMD_LIBS
BLKID_CFLAGS
BLKID_LIBS
UDEV_CFLAGS
@@ -1867,26 +1844,25 @@ Some influential environment variables:
C compiler flags for VALGRIND, overriding pkg-config
VALGRIND_LIBS
linker flags for VALGRIND, overriding pkg-config
- LOCKD_SANLOCK_CFLAGS
- C compiler flags for LOCKD_SANLOCK, overriding pkg-config
- LOCKD_SANLOCK_LIBS
- linker flags for LOCKD_SANLOCK, overriding pkg-config
- LOCKD_DLM_CFLAGS
- C compiler flags for LOCKD_DLM, overriding pkg-config
- LOCKD_DLM_LIBS
- linker flags for LOCKD_DLM, overriding pkg-config
- LOCKD_DLM_CONTROL_CFLAGS
- C compiler flags for LOCKD_DLM_CONTROL, overriding pkg-config
- LOCKD_DLM_CONTROL_LIBS
- linker flags for LOCKD_DLM_CONTROL, overriding pkg-config
- LOCKD_IDM_CFLAGS
- C compiler flags for LOCKD_IDM, overriding pkg-config
- LOCKD_IDM_LIBS
- linker flags for LOCKD_IDM, overriding pkg-config
- SYSTEMD_CFLAGS
- C compiler flags for SYSTEMD, overriding pkg-config
- SYSTEMD_LIBS
- linker flags for SYSTEMD, overriding pkg-config
+ LIBSANLOCKCLIENT_CFLAGS
+ C compiler flags for LIBSANLOCKCLIENT, overriding pkg-config
+ LIBSANLOCKCLIENT_LIBS
+ linker flags for LIBSANLOCKCLIENT, overriding pkg-config
+ LIBDLM_CFLAGS
+ C compiler flags for LIBDLM, overriding pkg-config
+ LIBDLM_LIBS linker flags for LIBDLM, overriding pkg-config
+ LIBDLMCONTROL_CFLAGS
+ C compiler flags for LIBDLMCONTROL, overriding pkg-config
+ LIBDLMCONTROL_LIBS
+ linker flags for LIBDLMCONTROL, overriding pkg-config
+ LIBSEAGATEILM_CFLAGS
+ C compiler flags for LIBSEAGATEILM, overriding pkg-config
+ LIBSEAGATEILM_LIBS
+ linker flags for LIBSEAGATEILM, overriding pkg-config
+ LIBSYSTEMD_CFLAGS
+ C compiler flags for LIBSYSTEMD, overriding pkg-config
+ LIBSYSTEMD_LIBS
+ linker flags for LIBSYSTEMD, overriding pkg-config
BLKID_CFLAGS
C compiler flags for BLKID, overriding pkg-config
BLKID_LIBS linker flags for BLKID, overriding pkg-config
@@ -12064,11 +12040,11 @@ then :
pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for LOCKD_SANLOCK" >&5
-printf %s "checking for LOCKD_SANLOCK... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for LIBSANLOCKCLIENT" >&5
+printf %s "checking for LIBSANLOCKCLIENT... " >&6; }
-if test -n "$LOCKD_SANLOCK_CFLAGS"; then
- pkg_cv_LOCKD_SANLOCK_CFLAGS="$LOCKD_SANLOCK_CFLAGS"
+if test -n "$LIBSANLOCKCLIENT_CFLAGS"; then
+ pkg_cv_LIBSANLOCKCLIENT_CFLAGS="$LIBSANLOCKCLIENT_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsanlock_client >= 3.3.0\""; } >&5
@@ -12076,7 +12052,7 @@ if test -n "$LOCKD_SANLOCK_CFLAGS"; then
ac_status=$?
printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_LOCKD_SANLOCK_CFLAGS=`$PKG_CONFIG --cflags "libsanlock_client >= 3.3.0" 2>/dev/null`
+ pkg_cv_LIBSANLOCKCLIENT_CFLAGS=`$PKG_CONFIG --cflags "libsanlock_client >= 3.3.0" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -12084,8 +12060,8 @@ fi
else
pkg_failed=untried
fi
-if test -n "$LOCKD_SANLOCK_LIBS"; then
- pkg_cv_LOCKD_SANLOCK_LIBS="$LOCKD_SANLOCK_LIBS"
+if test -n "$LIBSANLOCKCLIENT_LIBS"; then
+ pkg_cv_LIBSANLOCKCLIENT_LIBS="$LIBSANLOCKCLIENT_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsanlock_client >= 3.3.0\""; } >&5
@@ -12093,7 +12069,7 @@ if test -n "$LOCKD_SANLOCK_LIBS"; then
ac_status=$?
printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_LOCKD_SANLOCK_LIBS=`$PKG_CONFIG --libs "libsanlock_client >= 3.3.0" 2>/dev/null`
+ pkg_cv_LIBSANLOCKCLIENT_LIBS=`$PKG_CONFIG --libs "libsanlock_client >= 3.3.0" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -12114,12 +12090,12 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- LOCKD_SANLOCK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libsanlock_client >= 3.3.0" 2>&1`
+ LIBSANLOCKCLIENT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libsanlock_client >= 3.3.0" 2>&1`
else
- LOCKD_SANLOCK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libsanlock_client >= 3.3.0" 2>&1`
+ LIBSANLOCKCLIENT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libsanlock_client >= 3.3.0" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
- echo "$LOCKD_SANLOCK_PKG_ERRORS" >&5
+ echo "$LIBSANLOCKCLIENT_PKG_ERRORS" >&5
$bailout
elif test $pkg_failed = untried; then
@@ -12127,16 +12103,15 @@ elif test $pkg_failed = untried; then
printf "%s\n" "no" >&6; }
$bailout
else
- LOCKD_SANLOCK_CFLAGS=$pkg_cv_LOCKD_SANLOCK_CFLAGS
- LOCKD_SANLOCK_LIBS=$pkg_cv_LOCKD_SANLOCK_LIBS
+ LIBSANLOCKCLIENT_CFLAGS=$pkg_cv_LIBSANLOCKCLIENT_CFLAGS
+ LIBSANLOCKCLIENT_LIBS=$pkg_cv_LIBSANLOCKCLIENT_LIBS
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
printf "%s\n" "yes" >&6; }
- HAVE_LOCKD_SANLOCK="yes"
+ BUILD_LVMLOCKD="yes"
fi
printf "%s\n" "#define LOCKDSANLOCK_SUPPORT 1" >>confdefs.h
- BUILD_LVMLOCKD=yes
fi
@@ -12159,11 +12134,11 @@ then :
pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for LOCKD_DLM" >&5
-printf %s "checking for LOCKD_DLM... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for LIBDLM" >&5
+printf %s "checking for LIBDLM... " >&6; }
-if test -n "$LOCKD_DLM_CFLAGS"; then
- pkg_cv_LOCKD_DLM_CFLAGS="$LOCKD_DLM_CFLAGS"
+if test -n "$LIBDLM_CFLAGS"; then
+ pkg_cv_LIBDLM_CFLAGS="$LIBDLM_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libdlm\""; } >&5
@@ -12171,7 +12146,7 @@ if test -n "$LOCKD_DLM_CFLAGS"; then
ac_status=$?
printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_LOCKD_DLM_CFLAGS=`$PKG_CONFIG --cflags "libdlm" 2>/dev/null`
+ pkg_cv_LIBDLM_CFLAGS=`$PKG_CONFIG --cflags "libdlm" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -12179,8 +12154,8 @@ fi
else
pkg_failed=untried
fi
-if test -n "$LOCKD_DLM_LIBS"; then
- pkg_cv_LOCKD_DLM_LIBS="$LOCKD_DLM_LIBS"
+if test -n "$LIBDLM_LIBS"; then
+ pkg_cv_LIBDLM_LIBS="$LIBDLM_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libdlm\""; } >&5
@@ -12188,7 +12163,7 @@ if test -n "$LOCKD_DLM_LIBS"; then
ac_status=$?
printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_LOCKD_DLM_LIBS=`$PKG_CONFIG --libs "libdlm" 2>/dev/null`
+ pkg_cv_LIBDLM_LIBS=`$PKG_CONFIG --libs "libdlm" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -12209,12 +12184,12 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- LOCKD_DLM_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libdlm" 2>&1`
+ LIBDLM_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libdlm" 2>&1`
else
- LOCKD_DLM_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libdlm" 2>&1`
+ LIBDLM_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libdlm" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
- echo "$LOCKD_DLM_PKG_ERRORS" >&5
+ echo "$LIBDLM_PKG_ERRORS" >&5
$bailout
elif test $pkg_failed = untried; then
@@ -12222,16 +12197,15 @@ elif test $pkg_failed = untried; then
printf "%s\n" "no" >&6; }
$bailout
else
- LOCKD_DLM_CFLAGS=$pkg_cv_LOCKD_DLM_CFLAGS
- LOCKD_DLM_LIBS=$pkg_cv_LOCKD_DLM_LIBS
+ LIBDLM_CFLAGS=$pkg_cv_LIBDLM_CFLAGS
+ LIBDLM_LIBS=$pkg_cv_LIBDLM_LIBS
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
printf "%s\n" "yes" >&6; }
- HAVE_LOCKD_DLM="yes"
+ BUILD_LVMLOCKD="yes"
fi
printf "%s\n" "#define LOCKDDLM_SUPPORT 1" >>confdefs.h
- BUILD_LVMLOCKD=yes
fi
@@ -12254,11 +12228,11 @@ then :
pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for LOCKD_DLM_CONTROL" >&5
-printf %s "checking for LOCKD_DLM_CONTROL... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for LIBDLMCONTROL" >&5
+printf %s "checking for LIBDLMCONTROL... " >&6; }
-if test -n "$LOCKD_DLM_CONTROL_CFLAGS"; then
- pkg_cv_LOCKD_DLM_CONTROL_CFLAGS="$LOCKD_DLM_CONTROL_CFLAGS"
+if test -n "$LIBDLMCONTROL_CFLAGS"; then
+ pkg_cv_LIBDLMCONTROL_CFLAGS="$LIBDLMCONTROL_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libdlmcontrol >= 3.2\""; } >&5
@@ -12266,7 +12240,7 @@ if test -n "$LOCKD_DLM_CONTROL_CFLAGS"; then
ac_status=$?
printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_LOCKD_DLM_CONTROL_CFLAGS=`$PKG_CONFIG --cflags "libdlmcontrol >= 3.2" 2>/dev/null`
+ pkg_cv_LIBDLMCONTROL_CFLAGS=`$PKG_CONFIG --cflags "libdlmcontrol >= 3.2" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -12274,8 +12248,8 @@ fi
else
pkg_failed=untried
fi
-if test -n "$LOCKD_DLM_CONTROL_LIBS"; then
- pkg_cv_LOCKD_DLM_CONTROL_LIBS="$LOCKD_DLM_CONTROL_LIBS"
+if test -n "$LIBDLMCONTROL_LIBS"; then
+ pkg_cv_LIBDLMCONTROL_LIBS="$LIBDLMCONTROL_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libdlmcontrol >= 3.2\""; } >&5
@@ -12283,7 +12257,7 @@ if test -n "$LOCKD_DLM_CONTROL_LIBS"; then
ac_status=$?
printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_LOCKD_DLM_CONTROL_LIBS=`$PKG_CONFIG --libs "libdlmcontrol >= 3.2" 2>/dev/null`
+ pkg_cv_LIBDLMCONTROL_LIBS=`$PKG_CONFIG --libs "libdlmcontrol >= 3.2" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -12304,12 +12278,12 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- LOCKD_DLM_CONTROL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libdlmcontrol >= 3.2" 2>&1`
+ LIBDLMCONTROL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libdlmcontrol >= 3.2" 2>&1`
else
- LOCKD_DLM_CONTROL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libdlmcontrol >= 3.2" 2>&1`
+ LIBDLMCONTROL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libdlmcontrol >= 3.2" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
- echo "$LOCKD_DLM_CONTROL_PKG_ERRORS" >&5
+ echo "$LIBDLMCONTROL_PKG_ERRORS" >&5
$bailout
elif test $pkg_failed = untried; then
@@ -12317,16 +12291,15 @@ elif test $pkg_failed = untried; then
printf "%s\n" "no" >&6; }
$bailout
else
- LOCKD_DLM_CONTROL_CFLAGS=$pkg_cv_LOCKD_DLM_CONTROL_CFLAGS
- LOCKD_DLM_CONTROL_LIBS=$pkg_cv_LOCKD_DLM_CONTROL_LIBS
+ LIBDLMCONTROL_CFLAGS=$pkg_cv_LIBDLMCONTROL_CFLAGS
+ LIBDLMCONTROL_LIBS=$pkg_cv_LIBDLMCONTROL_LIBS
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
printf "%s\n" "yes" >&6; }
- HAVE_LOCKD_DLM_CONTROL=yes
+ BUILD_LVMLOCKD="yes"
fi
printf "%s\n" "#define LOCKDDLM_CONTROL_SUPPORT 1" >>confdefs.h
- BUILD_LVMLOCKD=yes
fi
@@ -12347,13 +12320,20 @@ printf "%s\n" "$BUILD_LOCKDIDM" >&6; }
if test "$BUILD_LOCKDIDM" = "yes"
then :
+ if test -n "$PKG_CONFIG" && \
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"blkid >= 2.24\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "blkid >= 2.24") 2>&5
+ ac_status=$?
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+
pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for LOCKD_IDM" >&5
-printf %s "checking for LOCKD_IDM... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for LIBSEAGATEILM" >&5
+printf %s "checking for LIBSEAGATEILM... " >&6; }
-if test -n "$LOCKD_IDM_CFLAGS"; then
- pkg_cv_LOCKD_IDM_CFLAGS="$LOCKD_IDM_CFLAGS"
+if test -n "$LIBSEAGATEILM_CFLAGS"; then
+ pkg_cv_LIBSEAGATEILM_CFLAGS="$LIBSEAGATEILM_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libseagate_ilm >= 0.1.0\""; } >&5
@@ -12361,7 +12341,7 @@ if test -n "$LOCKD_IDM_CFLAGS"; then
ac_status=$?
printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_LOCKD_IDM_CFLAGS=`$PKG_CONFIG --cflags "libseagate_ilm >= 0.1.0" 2>/dev/null`
+ pkg_cv_LIBSEAGATEILM_CFLAGS=`$PKG_CONFIG --cflags "libseagate_ilm >= 0.1.0" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -12369,8 +12349,8 @@ fi
else
pkg_failed=untried
fi
-if test -n "$LOCKD_IDM_LIBS"; then
- pkg_cv_LOCKD_IDM_LIBS="$LOCKD_IDM_LIBS"
+if test -n "$LIBSEAGATEILM_LIBS"; then
+ pkg_cv_LIBSEAGATEILM_LIBS="$LIBSEAGATEILM_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libseagate_ilm >= 0.1.0\""; } >&5
@@ -12378,7 +12358,7 @@ if test -n "$LOCKD_IDM_LIBS"; then
ac_status=$?
printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_LOCKD_IDM_LIBS=`$PKG_CONFIG --libs "libseagate_ilm >= 0.1.0" 2>/dev/null`
+ pkg_cv_LIBSEAGATEILM_LIBS=`$PKG_CONFIG --libs "libseagate_ilm >= 0.1.0" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -12399,12 +12379,12 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- LOCKD_IDM_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libseagate_ilm >= 0.1.0" 2>&1`
+ LIBSEAGATEILM_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libseagate_ilm >= 0.1.0" 2>&1`
else
- LOCKD_IDM_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libseagate_ilm >= 0.1.0" 2>&1`
+ LIBSEAGATEILM_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libseagate_ilm >= 0.1.0" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
- echo "$LOCKD_IDM_PKG_ERRORS" >&5
+ echo "$LIBSEAGATEILM_PKG_ERRORS" >&5
$bailout
elif test $pkg_failed = untried; then
@@ -12412,26 +12392,19 @@ elif test $pkg_failed = untried; then
printf "%s\n" "no" >&6; }
$bailout
else
- LOCKD_IDM_CFLAGS=$pkg_cv_LOCKD_IDM_CFLAGS
- LOCKD_IDM_LIBS=$pkg_cv_LOCKD_IDM_LIBS
+ LIBSEAGATEILM_CFLAGS=$pkg_cv_LIBSEAGATEILM_CFLAGS
+ LIBSEAGATEILM_LIBS=$pkg_cv_LIBSEAGATEILM_LIBS
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
printf "%s\n" "yes" >&6; }
- HAVE_LOCKD_IDM=yes
-fi
- if test -n "$PKG_CONFIG" && \
- { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"blkid >= 2.24\""; } >&5
- ($PKG_CONFIG --exists --print-errors "blkid >= 2.24") 2>&5
- ac_status=$?
- printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
- HAVE_LOCKD_IDM="yes"
-else
- $bailout
+ BUILD_LVMLOCKD="yes"
fi
printf "%s\n" "#define LOCKDIDM_SUPPORT 1" >>confdefs.h
- BUILD_LVMLOCKD=yes
+
+else
+ $bailout
+fi
fi
@@ -12706,19 +12679,19 @@ then :
pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for SYSTEMD" >&5
-printf %s "checking for SYSTEMD... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for LIBSYSTEMD" >&5
+printf %s "checking for LIBSYSTEMD... " >&6; }
-if test -n "$SYSTEMD_CFLAGS"; then
- pkg_cv_SYSTEMD_CFLAGS="$SYSTEMD_CFLAGS"
+if test -n "$LIBSYSTEMD_CFLAGS"; then
+ pkg_cv_LIBSYSTEMD_CFLAGS="$LIBSYSTEMD_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"systemd\""; } >&5
- ($PKG_CONFIG --exists --print-errors "systemd") 2>&5
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libsystemd") 2>&5
ac_status=$?
printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_SYSTEMD_CFLAGS=`$PKG_CONFIG --cflags "systemd" 2>/dev/null`
+ pkg_cv_LIBSYSTEMD_CFLAGS=`$PKG_CONFIG --cflags "libsystemd" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -12726,16 +12699,16 @@ fi
else
pkg_failed=untried
fi
-if test -n "$SYSTEMD_LIBS"; then
- pkg_cv_SYSTEMD_LIBS="$SYSTEMD_LIBS"
+if test -n "$LIBSYSTEMD_LIBS"; then
+ pkg_cv_LIBSYSTEMD_LIBS="$LIBSYSTEMD_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"systemd\""; } >&5
- ($PKG_CONFIG --exists --print-errors "systemd") 2>&5
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libsystemd") 2>&5
ac_status=$?
printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_SYSTEMD_LIBS=`$PKG_CONFIG --libs "systemd" 2>/dev/null`
+ pkg_cv_LIBSYSTEMD_LIBS=`$PKG_CONFIG --libs "libsystemd" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -12756,12 +12729,12 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- SYSTEMD_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "systemd" 2>&1`
+ LIBSYSTEMD_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libsystemd" 2>&1`
else
- SYSTEMD_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "systemd" 2>&1`
+ LIBSYSTEMD_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libsystemd" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
- echo "$SYSTEMD_PKG_ERRORS" >&5
+ echo "$LIBSYSTEMD_PKG_ERRORS" >&5
$bailout
elif test $pkg_failed = untried; then
@@ -12769,11 +12742,11 @@ elif test $pkg_failed = untried; then
printf "%s\n" "no" >&6; }
$bailout
else
- SYSTEMD_CFLAGS=$pkg_cv_SYSTEMD_CFLAGS
- SYSTEMD_LIBS=$pkg_cv_SYSTEMD_LIBS
+ LIBSYSTEMD_CFLAGS=$pkg_cv_LIBSYSTEMD_CFLAGS
+ LIBSYSTEMD_LIBS=$pkg_cv_LIBSYSTEMD_LIBS
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
printf "%s\n" "yes" >&6; }
- SYSTEMD_LIBS="-lsystemd"
+
fi
fi
@@ -13387,13 +13360,9 @@ printf "%s\n" "$CMDLIB" >&6; }
if test "$CMDLIB" = "yes"
then :
-
- LVM2CMD_LIB="-llvm2cmd"
-
+ LVM2CMD_LIB="-llvm2cmd"
else $as_nop
-
- LVM2CMD_LIB=""
-
+ LVM2CMD_LIB=
fi
################################################################################
@@ -13409,7 +13378,7 @@ fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $BUILD_LVMDBUSD" >&5
printf "%s\n" "$BUILD_LVMDBUSD" >&6; }
-if test "$NOTIFYDBUS_SUPPORT" = "yes" && test "BUILD_LVMDBUSD" = "yes"
+if test "$NOTIFYDBUS_SUPPORT" = "no" && test "$BUILD_LVMDBUSD" = "yes"
then :
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Building D-Bus support without D-Bus notifications." >&5
printf "%s\n" "$as_me: WARNING: Building D-Bus support without D-Bus notifications." >&2;}
@@ -13467,7 +13436,7 @@ then :
printf %s "(cached) " >&6
else $as_nop
- for am_cv_pathless_PYTHON in python3 python2 python python3.9 python3.8 python3.7 python3.6 python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 none; do
+ for am_cv_pathless_PYTHON in python3 python2 python python3.12 python3.11 python3.10 python3.9 python3.8 python3.7 python3.6 python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 none; do
test "$am_cv_pathless_PYTHON" = none && break
prog="import sys
# split strings by '.' and convert to numeric. Append some zeros
@@ -13941,14 +13910,10 @@ then :
as_fn_error $? "python3 headers are required for --enable-python3_bindings or --enable-dbus-service but cannot be found" "$LINENO" 5
fi
- PYTHON3_INCDIRS=`"$PYTHON3_CONFIG" --includes`
- PYTHON3_LIBDIRS=`"$PYTHON3_CONFIG" --libs`
PYTHON3DIR=$pythondir
if test "$PYTHON3_BINDINGS" = "yes"
then :
-
- PYTHON_BINDINGS="yes"
-
+ PYTHON_BINDINGS="yes"
fi
# To get this macro, install autoconf-archive package then run autoreconf
@@ -15926,16 +15891,6 @@ printf "%s\n" "#define LVM_CONFIGURE_LINE \"$CONFIGURE_LINE\"" >>confdefs.h
-
-
-
-
-
-
-
-
-
-
################################################################################
@@ -16048,29 +16003,6 @@ printf "%s\n" "#define LVM_CONFIGURE_LINE \"$CONFIGURE_LINE\"" >>confdefs.h
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
^ permalink raw reply related [flat|nested] 12+ messages in thread* main - configure: update
@ 2023-02-13 13:31 Zdenek Kabelac
0 siblings, 0 replies; 12+ messages in thread
From: Zdenek Kabelac @ 2023-02-13 13:31 UTC (permalink / raw)
To: lvm-devel
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=07cd341bd87a7559f33862a5a7480687b30e5f9c
Commit: 07cd341bd87a7559f33862a5a7480687b30e5f9c
Parent: 1e55e5c60a1b6067d7a46f881d78b2ab7d1431eb
Author: Zdenek Kabelac <zkabelac@redhat.com>
AuthorDate: Fri Feb 10 22:54:33 2023 +0100
Committer: Zdenek Kabelac <zkabelac@redhat.com>
CommitterDate: Mon Feb 13 14:30:47 2023 +0100
configure: update
---
configure | 86 +++++++++++++++++++++++++++++----------------------------------
1 file changed, 39 insertions(+), 47 deletions(-)
diff --git a/configure b/configure
index 7b160639f..3e09aa265 100755
--- a/configure
+++ b/configure
@@ -674,7 +674,6 @@ SILENT_RULES
USE_TRACKING
UDEV_HAS_BUILTIN_BLKID
UDEV_RULE_EXEC_DETECTION
-UDEV_SYSTEMD_BACKGROUND_JOBS
UDEV_SYNC
UDEV_RULES
UDEV_PC
@@ -773,6 +772,7 @@ CLDNOWHOLEARCHIVE
CLDFLAGS
CACHE
BUILD_DMFILEMAPD
+BUILD_LOCKDIDM
BUILD_LOCKDDLM_CONTROL
BUILD_LOCKDDLM
BUILD_LOCKDSANLOCK
@@ -9623,8 +9623,8 @@ fi
if test -z "$THIN_CHECK_CMD"
then :
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: thin_check not found in path $PATH" >&5
-printf "%s\n" "$as_me: WARNING: thin_check not found in path $PATH" >&2;}
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: thin_check not found in path $PATH_SBIN" >&5
+printf "%s\n" "$as_me: WARNING: thin_check not found in path $PATH_SBIN" >&2;}
THIN_CHECK_CMD="/usr/sbin/thin_check"
THIN_CONFIGURE_WARN="y"
@@ -9772,8 +9772,8 @@ fi
if test -z "$THIN_DUMP_CMD"
then :
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: \"thin_dump not found in path $PATH\"" >&5
-printf "%s\n" "$as_me: WARNING: \"thin_dump not found in path $PATH\"" >&2;}
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: \"thin_dump not found in path $PATH_SBIN\"" >&5
+printf "%s\n" "$as_me: WARNING: \"thin_dump not found in path $PATH_SBIN\"" >&2;}
THIN_DUMP_CMD="/usr/sbin/thin_dump"
THIN_CONFIGURE_WARN="y"
@@ -9895,8 +9895,8 @@ fi
if test -z "$THIN_REPAIR_CMD"
then :
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: \"thin_repair not found in path $PATH\"" >&5
-printf "%s\n" "$as_me: WARNING: \"thin_repair not found in path $PATH\"" >&2;}
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: \"thin_repair not found in path $PATH_SBIN\"" >&5
+printf "%s\n" "$as_me: WARNING: \"thin_repair not found in path $PATH_SBIN\"" >&2;}
THIN_REPAIR_CMD="/usr/sbin/thin_repair"
THIN_CONFIGURE_WARN="y"
@@ -10018,8 +10018,8 @@ fi
if test -z "$THIN_RESTORE_CMD"
then :
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: \"thin_restore not found in path $PATH\"" >&5
-printf "%s\n" "$as_me: WARNING: \"thin_restore not found in path $PATH\"" >&2;}
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: \"thin_restore not found in path $PATH_SBIN\"" >&5
+printf "%s\n" "$as_me: WARNING: \"thin_restore not found in path $PATH_SBIN\"" >&2;}
THIN_RESTORE_CMD="/usr/sbin/thin_restore"
THIN_CONFIGURE_WARN="y"
@@ -10252,8 +10252,8 @@ fi
if test -z "$CACHE_CHECK_CMD"
then :
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cache_check not found in path $PATH" >&5
-printf "%s\n" "$as_me: WARNING: cache_check not found in path $PATH" >&2;}
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cache_check not found in path $PATH_SBIN" >&5
+printf "%s\n" "$as_me: WARNING: cache_check not found in path $PATH_SBIN" >&2;}
CACHE_CHECK_CMD="/usr/sbin/cache_check"
CACHE_CONFIGURE_WARN="y"
@@ -10419,8 +10419,8 @@ fi
if test -z "$CACHE_DUMP_CMD"
then :
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: \"cache_dump not found in path $PATH\"" >&5
-printf "%s\n" "$as_me: WARNING: \"cache_dump not found in path $PATH\"" >&2;}
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: \"cache_dump not found in path $PATH_SBIN\"" >&5
+printf "%s\n" "$as_me: WARNING: \"cache_dump not found in path $PATH_SBIN\"" >&2;}
CACHE_DUMP_CMD="/usr/sbin/cache_dump"
CACHE_CONFIGURE_WARN="y"
@@ -10542,8 +10542,8 @@ fi
if test -z "$CACHE_REPAIR_CMD"
then :
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: \"cache_repair not found in path $PATH\"" >&5
-printf "%s\n" "$as_me: WARNING: \"cache_repair not found in path $PATH\"" >&2;}
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: \"cache_repair not found in path $PATH_SBIN\"" >&5
+printf "%s\n" "$as_me: WARNING: \"cache_repair not found in path $PATH_SBIN\"" >&2;}
CACHE_REPAIR_CMD="/usr/sbin/cache_repair"
CACHE_CONFIGURE_WARN="y"
@@ -10665,8 +10665,8 @@ fi
if test -z "$CACHE_RESTORE_CMD"
then :
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: \"cache_restore not found in path $PATH\"" >&5
-printf "%s\n" "$as_me: WARNING: \"cache_restore not found in path $PATH\"" >&2;}
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: \"cache_restore not found in path $PATH_SBIN\"" >&5
+printf "%s\n" "$as_me: WARNING: \"cache_restore not found in path $PATH_SBIN\"" >&2;}
CACHE_RESTORE_CMD="/usr/sbin/cache_restore"
CACHE_CONFIGURE_WARN="y"
@@ -12051,15 +12051,13 @@ printf %s "checking whether to build lvmlockdsanlock... " >&6; }
# Check whether --enable-lvmlockd-sanlock was given.
if test ${enable_lvmlockd_sanlock+y}
then :
- enableval=$enable_lvmlockd_sanlock; LOCKDSANLOCK=$enableval
+ enableval=$enable_lvmlockd_sanlock; BUILD_LOCKDSANLOCK=$enableval
else $as_nop
- LOCKDSANLOCK="no"
+ BUILD_LOCKDSANLOCK="no"
fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LOCKDSANLOCK" >&5
-printf "%s\n" "$LOCKDSANLOCK" >&6; }
-
-BUILD_LOCKDSANLOCK=$LOCKDSANLOCK
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $BUILD_LOCKDSANLOCK" >&5
+printf "%s\n" "$BUILD_LOCKDSANLOCK" >&6; }
if test "$BUILD_LOCKDSANLOCK" = "yes"
then :
@@ -12133,7 +12131,7 @@ else
LOCKD_SANLOCK_LIBS=$pkg_cv_LOCKD_SANLOCK_LIBS
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
printf "%s\n" "yes" >&6; }
- HAVE_LOCKD_SANLOCK=yes
+ HAVE_LOCKD_SANLOCK="yes"
fi
printf "%s\n" "#define LOCKDSANLOCK_SUPPORT 1" >>confdefs.h
@@ -12148,15 +12146,13 @@ printf %s "checking whether to build lvmlockddlm... " >&6; }
# Check whether --enable-lvmlockd-dlm was given.
if test ${enable_lvmlockd_dlm+y}
then :
- enableval=$enable_lvmlockd_dlm; LOCKDDLM=$enableval
+ enableval=$enable_lvmlockd_dlm; BUILD_LOCKDDLM=$enableval
else $as_nop
- LOCKDDLM="no"
+ BUILD_LOCKDDLM="no"
fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LOCKDDLM" >&5
-printf "%s\n" "$LOCKDDLM" >&6; }
-
-BUILD_LOCKDDLM=$LOCKDDLM
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $BUILD_LOCKDDLM" >&5
+printf "%s\n" "$BUILD_LOCKDDLM" >&6; }
if test "$BUILD_LOCKDDLM" = "yes"
then :
@@ -12230,7 +12226,7 @@ else
LOCKD_DLM_LIBS=$pkg_cv_LOCKD_DLM_LIBS
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
printf "%s\n" "yes" >&6; }
- HAVE_LOCKD_DLM=yes
+ HAVE_LOCKD_DLM="yes"
fi
printf "%s\n" "#define LOCKDDLM_SUPPORT 1" >>confdefs.h
@@ -12245,15 +12241,13 @@ printf %s "checking whether to build lvmlockddlmcontrol... " >&6; }
# Check whether --enable-lvmlockd-dlmcontrol was given.
if test ${enable_lvmlockd_dlmcontrol+y}
then :
- enableval=$enable_lvmlockd_dlmcontrol; LOCKDDLM_CONTROL=$enableval
+ enableval=$enable_lvmlockd_dlmcontrol; BUILD_LOCKDDLM_CONTROL=$enableval
else $as_nop
- LOCKDDLM_CONTROL="no"
+ BUILD_LOCKDDLM_CONTROL="no"
fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LOCKDDLM_CONTROL" >&5
-printf "%s\n" "$LOCKDDLM_CONTROL" >&6; }
-
-BUILD_LOCKDDLM_CONTROL=$LOCKDDLM_CONTROL
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $BUILD_LOCKDDLM_CONTROL" >&5
+printf "%s\n" "$BUILD_LOCKDDLM_CONTROL" >&6; }
if test "$BUILD_LOCKDDLM_CONTROL" = "yes"
then :
@@ -12342,15 +12336,13 @@ printf %s "checking whether to build lvmlockdidm... " >&6; }
# Check whether --enable-lvmlockd-idm was given.
if test ${enable_lvmlockd_idm+y}
then :
- enableval=$enable_lvmlockd_idm; LOCKDIDM=$enableval
+ enableval=$enable_lvmlockd_idm; BUILD_LOCKDIDM=$enableval
else $as_nop
- LOCKDIDM="no"
+ BUILD_LOCKDIDM="no"
fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LOCKDIDM" >&5
-printf "%s\n" "$LOCKDIDM" >&6; }
-
-BUILD_LOCKDIDM=$LOCKDIDM
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $BUILD_LOCKDIDM" >&5
+printf "%s\n" "$BUILD_LOCKDIDM" >&6; }
if test "$BUILD_LOCKDIDM" = "yes"
then :
@@ -12672,9 +12664,9 @@ if test -n "$PKG_CONFIG" && \
ac_status=$?
printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- SYSTEMD_MIN_VERSION=234 APP_MACHINEID_SUPPORT=maybe
+ SYSTEMD_MIN_VERSION=234 APP_MACHINEID_SUPPORT="maybe"
else
- APP_MACHINEID_SUPPORT=no
+ APP_MACHINEID_SUPPORT="no"
fi
ac_fn_c_check_header_compile "$LINENO" "systemd/sd-id128.h" "ac_cv_header_systemd_sd_id128_h" "$ac_includes_default"
if test "x$ac_cv_header_systemd_sd_id128_h" = xyes
@@ -12684,7 +12676,7 @@ then :
APP_MACHINEID_SUPPORT="yes"
fi
else $as_nop
- APP_MACHINEID_SUPPORT=no
+ APP_MACHINEID_SUPPORT="no"
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to support systemd appmachineid" >&5
@@ -14885,7 +14877,7 @@ then :
printf "%s\n" "#define READLINE_SUPPORT 1" >>confdefs.h
- READLINE=yes
+ READLINE="yes"
LIBS=$lvm_saved_libs
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for rl_line_buffer in -lreadline" >&5
printf %s "checking for rl_line_buffer in -lreadline... " >&6; }
^ permalink raw reply related [flat|nested] 12+ messages in thread* main - configure: update
@ 2023-02-10 21:33 Zdenek Kabelac
0 siblings, 0 replies; 12+ messages in thread
From: Zdenek Kabelac @ 2023-02-10 21:33 UTC (permalink / raw)
To: lvm-devel
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=615347da20f7ede98c3cc8b1fd0aaaae15603c6e
Commit: 615347da20f7ede98c3cc8b1fd0aaaae15603c6e
Parent: 1416bb383719f5d4dde42a9bfb123e0a7c38a36c
Author: Zdenek Kabelac <zkabelac@redhat.com>
AuthorDate: Fri Feb 10 21:30:57 2023 +0100
Committer: Zdenek Kabelac <zkabelac@redhat.com>
CommitterDate: Fri Feb 10 22:31:43 2023 +0100
configure: update
---
configure | 26 ++++++++++++++++++++------
1 file changed, 20 insertions(+), 6 deletions(-)
diff --git a/configure b/configure
index e84333ec7..7b160639f 100755
--- a/configure
+++ b/configure
@@ -12933,6 +12933,19 @@ fi
# so lvresize can check detected flag here
#
DEFAULT_USE_BLKID_WIPING=0
+if test -n "$PKG_CONFIG" && \
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"blkid >= 2.24\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "blkid >= 2.24") 2>&5
+ ac_status=$?
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ HAVE_BLKID="yes"
+else
+ HAVE_BLKID="no"
+fi
+
+if test "$HAVE_BLKID" = "yes"
+then :
pkg_failed=no
@@ -13024,10 +13037,9 @@ else
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
printf "%s\n" "yes" >&6; }
- HAVE_BLKID=1
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for blkdid.h defines BLKID_SUBLKS_FSINFO." >&5
-printf %s "checking for blkdid.h defines BLKID_SUBLKS_FSINFO.... " >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for blkid.h defines BLKID_SUBLKS_FSINFO." >&5
+printf %s "checking for blkid.h defines BLKID_SUBLKS_FSINFO.... " >&6; }
if test ${ac_cv_have_blkid_sublks_fsinfo+y}
then :
printf %s "(cached) " >&6
@@ -13057,7 +13069,7 @@ fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_blkid_sublks_fsinfo" >&5
printf "%s\n" "$ac_cv_have_blkid_sublks_fsinfo" >&6; }
- if test $ac_cv_have_blkid_sublks_fsinfo = yes
+ if test $ac_cv_have_blkid_sublks_fsinfo = yes
then :
printf "%s\n" "#define HAVE_BLKID_SUBLKS_FSINFO 1" >>confdefs.h
@@ -13066,13 +13078,15 @@ fi
fi
+fi
+
if test "$BLKID_WIPING" != "no"
then :
- if test "$HAVE_BLKID" = 1
+ if test "$HAVE_BLKID" = "yes"
then :
- BLKID_WIPING=yes
+ BLKID_WIPING="yes"
BLKID_PC="blkid"
DEFAULT_USE_BLKID_WIPING=1
^ permalink raw reply related [flat|nested] 12+ messages in thread* main - configure: update
@ 2023-02-10 19:56 Zdenek Kabelac
0 siblings, 0 replies; 12+ messages in thread
From: Zdenek Kabelac @ 2023-02-10 19:56 UTC (permalink / raw)
To: lvm-devel
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=21edfc4a5ea11d888f506b41d36a0ec983dc63c9
Commit: 21edfc4a5ea11d888f506b41d36a0ec983dc63c9
Parent: 391138ff303c85999782e1341a5e1d8a28810486
Author: Zdenek Kabelac <zkabelac@redhat.com>
AuthorDate: Fri Feb 10 19:50:22 2023 +0100
Committer: Zdenek Kabelac <zkabelac@redhat.com>
CommitterDate: Fri Feb 10 20:54:05 2023 +0100
configure: update
---
configure | 164 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 file changed, 147 insertions(+), 17 deletions(-)
diff --git a/configure b/configure
index 2406deddc..e84333ec7 100755
--- a/configure
+++ b/configure
@@ -805,6 +805,7 @@ UDEV_LIBS
UDEV_CFLAGS
BLKID_LIBS
BLKID_CFLAGS
+SYSTEMD_RUN_CMD
SYSTEMD_LIBS
SYSTEMD_CFLAGS
LOCKD_IDM_LIBS
@@ -988,6 +989,7 @@ enable_dmfilemapd
enable_notify_dbus
enable_systemd_journal
enable_app_machineid
+with_systemd_run
enable_blkid_wiping
enable_udev_sync
enable_udev_rules
@@ -1803,6 +1805,7 @@ Optional Packages:
lvmlockd pidfile [PID_DIR/lvmlockd.pid]
--with-lvmpolld-pidfile=PATH
lvmpolld pidfile [PID_DIR/lvmpolld.pid]
+ --with-systemd-run=PATH systemd-run tool: [autodetect]
--with-python-sys-prefix
use Python's sys.prefix and sys.exec_prefix values
--with-python_prefix override the default PYTHON_PREFIX
@@ -12785,6 +12788,138 @@ fi
################################################################################
+# Check whether --with-systemd-run was given.
+if test ${with_systemd_run+y}
+then :
+ withval=$with_systemd_run; SYSTEMD_RUN_CMD=$withval
+else $as_nop
+ SYSTEMD_RUN_CMD="autodetect"
+fi
+
+
+if test "$SYSTEMD_RUN_CMD" = "autodetect"
+then :
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}systemd-run", so it can be a program name with args.
+set dummy ${ac_tool_prefix}systemd-run; ac_word=$2
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path_SYSTEMD_RUN_CMD+y}
+then :
+ printf %s "(cached) " >&6
+else $as_nop
+ case $SYSTEMD_RUN_CMD in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_SYSTEMD_RUN_CMD="$SYSTEMD_RUN_CMD" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ case $as_dir in #(((
+ '') as_dir=./ ;;
+ */) ;;
+ *) as_dir=$as_dir/ ;;
+ esac
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+ ac_cv_path_SYSTEMD_RUN_CMD="$as_dir$ac_word$ac_exec_ext"
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+ ;;
+esac
+fi
+SYSTEMD_RUN_CMD=$ac_cv_path_SYSTEMD_RUN_CMD
+if test -n "$SYSTEMD_RUN_CMD"; then
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $SYSTEMD_RUN_CMD" >&5
+printf "%s\n" "$SYSTEMD_RUN_CMD" >&6; }
+else
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_path_SYSTEMD_RUN_CMD"; then
+ ac_pt_SYSTEMD_RUN_CMD=$SYSTEMD_RUN_CMD
+ # Extract the first word of "systemd-run", so it can be a program name with args.
+set dummy systemd-run; ac_word=$2
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path_ac_pt_SYSTEMD_RUN_CMD+y}
+then :
+ printf %s "(cached) " >&6
+else $as_nop
+ case $ac_pt_SYSTEMD_RUN_CMD in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_ac_pt_SYSTEMD_RUN_CMD="$ac_pt_SYSTEMD_RUN_CMD" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ case $as_dir in #(((
+ '') as_dir=./ ;;
+ */) ;;
+ *) as_dir=$as_dir/ ;;
+ esac
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+ ac_cv_path_ac_pt_SYSTEMD_RUN_CMD="$as_dir$ac_word$ac_exec_ext"
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+ ;;
+esac
+fi
+ac_pt_SYSTEMD_RUN_CMD=$ac_cv_path_ac_pt_SYSTEMD_RUN_CMD
+if test -n "$ac_pt_SYSTEMD_RUN_CMD"; then
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_pt_SYSTEMD_RUN_CMD" >&5
+printf "%s\n" "$ac_pt_SYSTEMD_RUN_CMD" >&6; }
+else
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+fi
+
+ if test "x$ac_pt_SYSTEMD_RUN_CMD" = x; then
+ SYSTEMD_RUN_CMD=""
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+ SYSTEMD_RUN_CMD=$ac_pt_SYSTEMD_RUN_CMD
+ fi
+else
+ SYSTEMD_RUN_CMD="$ac_cv_path_SYSTEMD_RUN_CMD"
+fi
+
+ if test -z "$SYSTEMD_RUN_CMD"
+then :
+ SYSTEMD_RUN_CMD="/usr/bin/systemd-run"
+fi
+else $as_nop
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for defined systemd-run" >&5
+printf %s "checking for defined systemd-run... " >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $SYSTEMD_RUN_CMD" >&5
+printf "%s\n" "$SYSTEMD_RUN_CMD" >&6; }
+fi
+
+################################################################################
+
# Check whether --enable-blkid_wiping was given.
if test ${enable_blkid_wiping+y}
then :
@@ -12798,12 +12933,6 @@ fi
# so lvresize can check detected flag here
#
DEFAULT_USE_BLKID_WIPING=0
-if test "$BLKID_WIPING" != "no"
-then :
- blkdir_version=">= 2.24"
-else $as_nop
- blkid_version=""
-fi
pkg_failed=no
@@ -12814,12 +12943,12 @@ if test -n "$BLKID_CFLAGS"; then
pkg_cv_BLKID_CFLAGS="$BLKID_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"blkid \$blkid_version \""; } >&5
- ($PKG_CONFIG --exists --print-errors "blkid $blkid_version ") 2>&5
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"blkid >= 2.24\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "blkid >= 2.24") 2>&5
ac_status=$?
printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_BLKID_CFLAGS=`$PKG_CONFIG --cflags "blkid $blkid_version " 2>/dev/null`
+ pkg_cv_BLKID_CFLAGS=`$PKG_CONFIG --cflags "blkid >= 2.24" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -12831,12 +12960,12 @@ if test -n "$BLKID_LIBS"; then
pkg_cv_BLKID_LIBS="$BLKID_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"blkid \$blkid_version \""; } >&5
- ($PKG_CONFIG --exists --print-errors "blkid $blkid_version ") 2>&5
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"blkid >= 2.24\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "blkid >= 2.24") 2>&5
ac_status=$?
printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_BLKID_LIBS=`$PKG_CONFIG --libs "blkid $blkid_version " 2>/dev/null`
+ pkg_cv_BLKID_LIBS=`$PKG_CONFIG --libs "blkid >= 2.24" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -12857,14 +12986,14 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- BLKID_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "blkid $blkid_version " 2>&1`
+ BLKID_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "blkid >= 2.24" 2>&1`
else
- BLKID_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "blkid $blkid_version " 2>&1`
+ BLKID_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "blkid >= 2.24" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$BLKID_PKG_ERRORS" >&5
- as_fn_error $? "Package requirements (blkid $blkid_version ) were not met:
+ as_fn_error $? "Package requirements (blkid >= 2.24) were not met:
$BLKID_PKG_ERRORS
@@ -12897,8 +13026,8 @@ printf "%s\n" "yes" >&6; }
HAVE_BLKID=1
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for blkdid.h supports SUBLKS_FSINFO." >&5
-printf %s "checking for blkdid.h supports SUBLKS_FSINFO.... " >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for blkdid.h defines BLKID_SUBLKS_FSINFO." >&5
+printf %s "checking for blkdid.h defines BLKID_SUBLKS_FSINFO.... " >&6; }
if test ${ac_cv_have_blkid_sublks_fsinfo+y}
then :
printf %s "(cached) " >&6
@@ -15954,6 +16083,7 @@ printf "%s\n" "#define LVM_CONFIGURE_LINE \"$CONFIGURE_LINE\"" >>confdefs.h
+
################################################################################
^ permalink raw reply related [flat|nested] 12+ messages in thread* main - configure: update
@ 2023-02-10 16:53 Zdenek Kabelac
0 siblings, 0 replies; 12+ messages in thread
From: Zdenek Kabelac @ 2023-02-10 16:53 UTC (permalink / raw)
To: lvm-devel
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=b681b774dcacd35d08f16d8952ec99d1e85433d6
Commit: b681b774dcacd35d08f16d8952ec99d1e85433d6
Parent: e67ebc5c40948bcbea536fd407535009a76ede00
Author: Zdenek Kabelac <zkabelac@redhat.com>
AuthorDate: Wed Feb 8 16:15:26 2023 +0100
Committer: Zdenek Kabelac <zkabelac@redhat.com>
CommitterDate: Fri Feb 10 17:50:27 2023 +0100
configure: update
---
configure | 1708 +++++++++++++++++++++++++++++++++++++------------------------
1 file changed, 1030 insertions(+), 678 deletions(-)
diff --git a/configure b/configure
index 718f281bc..2406deddc 100755
--- a/configure
+++ b/configure
@@ -652,8 +652,6 @@ ac_subst_vars='LTLIBOBJS
usrsbindir
usrlibdir
tmpfilesdir
-systemdutildir
-systemdsystemunitdir
udevdir
udev_prefix
tmpdir
@@ -734,6 +732,8 @@ INTEGRITY
HAVE_VALGRIND
HAVE_REALTIME
HAVE_LIBDL
+HAVE_BLKID_SUBLKS_FSINFO
+HAVE_BLKID
BLKDEACTIVATE
LVRESIZE_FS_HELPER_PATH
FSADM_PATH
@@ -785,6 +785,8 @@ BLKID_PC
READLINE_LIBS
READLINE_CFLAGS
MODPROBE_CMD
+systemdutildir
+systemdsystemunitdir
MSGFMT
EDITLINE_LIBS
EDITLINE_CFLAGS
@@ -823,8 +825,6 @@ HAVE_WCLOBBERED
HAVE_WJUMP
CPG_LIBS
CPG_CFLAGS
-PKGCONFIGINIT_LIBS
-PKGCONFIGINIT_CFLAGS
PKG_CONFIG_LIBDIR
PKG_CONFIG_PATH
PKG_CONFIG
@@ -989,7 +989,6 @@ enable_notify_dbus
enable_systemd_journal
enable_app_machineid
enable_blkid_wiping
-enable_udev_systemd_background_jobs
enable_udev_sync
enable_udev_rules
enable_udev_rule_exec_detection
@@ -1047,8 +1046,6 @@ AIO_LIBS
PKG_CONFIG
PKG_CONFIG_PATH
PKG_CONFIG_LIBDIR
-PKGCONFIGINIT_CFLAGS
-PKGCONFIGINIT_LIBS
CPG_CFLAGS
CPG_LIBS
VALGRIND_CFLAGS
@@ -1070,6 +1067,8 @@ UDEV_LIBS
PYTHON
EDITLINE_CFLAGS
EDITLINE_LIBS
+systemdsystemunitdir
+systemdutildir
READLINE_CFLAGS
READLINE_LIBS'
@@ -1728,9 +1727,6 @@ Optional Features:
--disable-app-machineid disable LVM system ID using app-specific machine-id
--disable-blkid_wiping disable libblkid detection of signatures when wiping
and use native code instead
- --disable-udev-systemd-background-jobs
- disable udev-systemd protocol to instantiate a
- service for background job
--enable-udev_sync enable synchronisation with udev processing
--enable-udev_rules install rule files needed for udev synchronisation
--enable-udev-rule-exec-detection
@@ -1862,10 +1858,6 @@ Some influential environment variables:
directories to add to pkg-config's search path
PKG_CONFIG_LIBDIR
path overriding pkg-config's built-in search path
- PKGCONFIGINIT_CFLAGS
- C compiler flags for PKGCONFIGINIT, overriding pkg-config
- PKGCONFIGINIT_LIBS
- linker flags for PKGCONFIGINIT, overriding pkg-config
CPG_CFLAGS C compiler flags for CPG, overriding pkg-config
CPG_LIBS linker flags for CPG, overriding pkg-config
VALGRIND_CFLAGS
@@ -1902,6 +1894,10 @@ Some influential environment variables:
C compiler flags for EDITLINE, overriding pkg-config
EDITLINE_LIBS
linker flags for EDITLINE, overriding pkg-config
+ systemdsystemunitdir
+ value of systemdsystemunitdir for systemd, overriding pkg-config
+ systemdutildir
+ value of systemdutildir for systemd, overriding pkg-config
READLINE_CFLAGS
C compiler flags for readline
READLINE_LIBS
@@ -3727,40 +3723,39 @@ if test -z "$CFLAGS"
then :
COPTIMISE_FLAG="-O2"
fi
-case "$host_os" in
- linux*)
+case "$host_os" in #(
+ linux*) :
+
# equivalent to -rdynamic
ELDFLAGS="-Wl,--export-dynamic"
# FIXME Generate list and use --dynamic-list=.dlopen.sym
CLDWHOLEARCHIVE="-Wl,-whole-archive"
CLDNOWHOLEARCHIVE="-Wl,-no-whole-archive"
- LIB_SUFFIX=so
- DEVMAPPER=yes
- BUILD_LVMPOLLD=no
- ODIRECT=yes
- DM_IOCTLS=yes
- SELINUX=yes
- FSADM=yes
- LVMIMPORTVDO=yes
- BLKDEACTIVATE=yes
- ;;
- darwin*)
+ LIB_SUFFIX="so"
+ DEVMAPPER="yes"
+ BUILD_LVMPOLLD="no"
+ ODIRECT="yes"
+ DM_IOCTLS="yes"
+ SELINUX="yes"
+ FSADM="yes"
+ LVMIMPORTVDO="yes"
+ BLKDEACTIVATE="yes" ;; #(
+ darwin*) :
+
CFLAGS="$CFLAGS -no-cpp-precomp -fno-common"
ELDFLAGS=
CLDWHOLEARCHIVE="-all_load"
CLDNOWHOLEARCHIVE=
- LIB_SUFFIX=dylib
- DEVMAPPER=yes
- ODIRECT=no
- DM_IOCTLS=no
- SELINUX=no
- FSADM=no
- LVMIMPORTVDO=no
- BLKDEACTIVATE=no
- ;;
- *)
- CLDFLAGS="${CLDFLAGS-"$LDFLAGS"}"
- ;;
+ LIB_SUFFIX="dylib"
+ DEVMAPPER="yes"
+ ODIRECT="no"
+ DM_IOCTLS="no"
+ SELINUX="no"
+ FSADM="no"
+ LVMIMPORTVDO="no"
+ BLKDEACTIVATE="no" ;; #(
+ *) :
+ CLDFLAGS="${CLDFLAGS-"$LDFLAGS"}" ;;
esac
################################################################################
@@ -7045,9 +7040,9 @@ else $as_nop
fi
done
-case "$host_os" in
- linux*)
- for ac_header in asm/byteorder.h linux/fs.h malloc.h
+case "$host_os" in #(
+ linux*) :
+ for ac_header in asm/byteorder.h linux/fs.h malloc.h
do :
as_ac_Header=`printf "%s\n" "ac_cv_header_$ac_header" | $as_tr_sh`
ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
@@ -7061,9 +7056,9 @@ else $as_nop
as_fn_error $? "bailing out" "$LINENO" 5
fi
-done ;;
- darwin*)
- for ac_header in machine/endian.h sys/disk.h
+done ;; #(
+ darwin*) :
+ for ac_header in machine/endian.h sys/disk.h
do :
as_ac_Header=`printf "%s\n" "ac_cv_header_$ac_header" | $as_tr_sh`
ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
@@ -7077,7 +7072,9 @@ else $as_nop
as_fn_error $? "bailing out" "$LINENO" 5
fi
-done ;;
+done ;; #(
+ *) :
+ ;;
esac
################################################################################
@@ -9031,7 +9028,7 @@ if test ${enable_dependency_tracking+y}
then :
enableval=$enable_dependency_tracking; USE_TRACKING=$enableval
else $as_nop
- USE_TRACKING=yes
+ USE_TRACKING="yes"
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $USE_TRACKING" >&5
@@ -9045,7 +9042,7 @@ if test ${enable_silent_rules+y}
then :
enableval=$enable_silent_rules; SILENT_RULES=$enableval
else $as_nop
- SILENT_RULES=yes
+ SILENT_RULES="yes"
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $SILENT_RULES" >&5
@@ -9060,7 +9057,7 @@ if test ${enable_static_link+y}
then :
enableval=$enable_static_link; STATIC_LINK=$enableval
else $as_nop
- STATIC_LINK=no
+ STATIC_LINK="no"
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $STATIC_LINK" >&5
@@ -9153,11 +9150,11 @@ printf "%s\n" "$ac_cv_flag_HAVE_FULL_RELRO" >&6; }
################################################################################
-test "$exec_prefix" = NONE -a "$prefix" = NONE && exec_prefix=""
+test "$exec_prefix" = "NONE" && test "$prefix" = "NONE" && exec_prefix=""
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
+test "$prefix" = "NONE" && prefix=$ac_default_prefix
# Let make expand exec_prefix.
-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
+test "$exec_prefix" = "NONE" && exec_prefix='${prefix}'
################################################################################
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking file owner" >&5
@@ -9255,10 +9252,13 @@ else $as_nop
ADD_NODE=resume
fi
-case "$ADD_NODE" in
- resume) add_on=DM_ADD_NODE_ON_RESUME;;
- create) add_on=DM_ADD_NODE_ON_CREATE;;
- *) as_fn_error $? "--with-device-nodes-on parameter invalid" "$LINENO" 5;;
+case "$ADD_NODE" in #(
+ resume) :
+ add_on=DM_ADD_NODE_ON_RESUME ;; #(
+ create) :
+ add_on=DM_ADD_NODE_ON_CREATE ;; #(
+ *) :
+ as_fn_error $? "--with-device-nodes-on parameter invalid" "$LINENO" 5 ;;
esac
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: on $ADD_NODE" >&5
printf "%s\n" "on $ADD_NODE" >&6; }
@@ -9278,9 +9278,11 @@ else $as_nop
DEFAULT_USE_DEVICES_FILE=0
fi
-case "$DEFAULT_USE_DEVICES_FILE" in
- 0|1);;
- *) as_fn_error $? "--with-default-use-devices-file parameter invalid" "$LINENO" 5;;
+case "$DEFAULT_USE_DEVICES_FILE" in #(
+ 0|1) :
+ ;; #(
+ *) :
+ as_fn_error $? "--with-default-use-devices-file parameter invalid" "$LINENO" 5 ;;
esac
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $DEFAULT_USE_DEVICES_FILE" >&5
printf "%s\n" "$DEFAULT_USE_DEVICES_FILE" >&6; }
@@ -9299,11 +9301,15 @@ else $as_nop
MANGLING=auto
fi
-case "$MANGLING" in
- auto) mangling=DM_STRING_MANGLING_AUTO;;
- no|none|disabled) mangling=DM_STRING_MANGLING_NONE;;
- hex) mangling=DM_STRING_MANGLING_HEX;;
- *) as_fn_error $? "--with-default-name-mangling parameter invalid" "$LINENO" 5;;
+case "$MANGLING" in #(
+ auto) :
+ mangling=DM_STRING_MANGLING_AUTO ;; #(
+ no|none|disabled) :
+ mangling=DM_STRING_MANGLING_NONE ;; #(
+ hex) :
+ mangling=DM_STRING_MANGLING_HEX ;; #(
+ *) :
+ as_fn_error $? "--with-default-name-mangling parameter invalid" "$LINENO" 5 ;;
esac
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MANGLING" >&5
printf "%s\n" "$MANGLING" >&6; }
@@ -9326,12 +9332,16 @@ fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $SNAPSHOTS" >&5
printf "%s\n" "$SNAPSHOTS" >&6; }
-case "$SNAPSHOTS" in
- no|none|shared) ;;
- internal)
+case "$SNAPSHOTS" in #(
+ no|none|shared) :
+ ;; #(
+ internal) :
+
+
printf "%s\n" "#define SNAPSHOT_INTERNAL 1" >>confdefs.h
- ;;
- *) as_fn_error $? "--with-snapshots parameter invalid" "$LINENO" 5 ;;
+ ;; #(
+ *) :
+ as_fn_error $? "--with-snapshots parameter invalid" "$LINENO" 5 ;;
esac
################################################################################
@@ -9349,12 +9359,16 @@ fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MIRRORS" >&5
printf "%s\n" "$MIRRORS" >&6; }
-case "$MIRRORS" in
- no|none|shared) ;;
- internal)
+case "$MIRRORS" in #(
+ no|none|shared) :
+ ;; #(
+ internal) :
+
+
printf "%s\n" "#define MIRRORED_INTERNAL 1" >>confdefs.h
- ;;
- *) as_fn_error $? "--with-mirrors parameter invalid" "$LINENO" 5 ;;
+ ;; #(
+ *) :
+ as_fn_error $? "--with-mirrors parameter invalid" "$LINENO" 5 ;;
esac
################################################################################
@@ -9394,10 +9408,14 @@ printf "%s\n" "#define DEFAULT_RAID10_SEGTYPE \"$DEFAULT_RAID10_SEGTYPE\"" >>con
# Check whether --with-default-sparse-segtype was given.
if test ${with_default_sparse_segtype+y}
then :
- withval=$with_default_sparse_segtype; case "$withval" in
- thin|snapshot) DEFAULT_SPARSE_SEGTYPE=$withval ;;
- *) as_fn_error $? "--with-default-sparse-segtype parameter invalid" "$LINENO" 5 ;;
- esac
+ withval=$with_default_sparse_segtype;
+ case "$withval" in #(
+ thin|snapshot) :
+ DEFAULT_SPARSE_SEGTYPE=$withval ;; #(
+ *) :
+ as_fn_error $? "--with-default-sparse-segtype parameter invalid" "$LINENO" 5 ;;
+esac
+
else $as_nop
DEFAULT_SPARSE_SEGTYPE="thin"
fi
@@ -9455,13 +9473,18 @@ fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $THIN" >&5
printf "%s\n" "$THIN" >&6; }
-case "$THIN" in
- no|none) test "$DEFAULT_SPARSE_SEGTYPE" = "thin" && DEFAULT_SPARSE_SEGTYPE="snapshot" ;;
- shared) ;;
- internal)
+case "$THIN" in #(
+ no|none) :
+ test "$DEFAULT_SPARSE_SEGTYPE" = "thin" && DEFAULT_SPARSE_SEGTYPE="snapshot" ;; #(
+ shared) :
+ ;; #(
+ internal) :
+
+
printf "%s\n" "#define THIN_INTERNAL 1" >>confdefs.h
- ;;
- *) as_fn_error $? "--with-thin parameter invalid ($THIN)" "$LINENO" 5 ;;
+ ;; #(
+ *) :
+ as_fn_error $? "--with-thin parameter invalid ($THIN)" "$LINENO" 5 ;;
esac
@@ -9473,16 +9496,19 @@ if test ${enable_thin_check_needs_check+y}
then :
enableval=$enable_thin_check_needs_check; THIN_CHECK_NEEDS_CHECK=$enableval
else $as_nop
- THIN_CHECK_NEEDS_CHECK=yes
+ THIN_CHECK_NEEDS_CHECK="yes"
fi
# Test if necessary thin tools are available
# if not - use plain defaults and warn user
-case "$THIN" in
- internal|shared)
+case "$THIN" in #(
+ internal|shared) :
+
# Empty means a config way to ignore thin checking
- if test "$THIN_CHECK_CMD" = "autodetect"; then
+ if test "$THIN_CHECK_CMD" = "autodetect"
+then :
+
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}thin_check", so it can be a program name with args.
set dummy ${ac_tool_prefix}thin_check; ac_word=$2
@@ -9591,32 +9617,47 @@ else
THIN_CHECK_CMD="$ac_cv_path_THIN_CHECK_CMD"
fi
- if test -z "$THIN_CHECK_CMD"; then
+ if test -z "$THIN_CHECK_CMD"
+then :
+
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: thin_check not found in path $PATH" >&5
printf "%s\n" "$as_me: WARNING: thin_check not found in path $PATH" >&2;}
- THIN_CHECK_CMD=/usr/sbin/thin_check
- THIN_CONFIGURE_WARN=y
- fi
- fi
- if test "$THIN_CHECK_NEEDS_CHECK" = yes && test "$THIN_CONFIGURE_WARN" != y ; then
- THIN_CHECK_VSN=`"$THIN_CHECK_CMD" -V 2>/dev/null`
- THIN_CHECK_VSN_MAJOR=`echo "$THIN_CHECK_VSN" | $AWK -F '.' '{print $1}'`
- THIN_CHECK_VSN_MINOR=`echo "$THIN_CHECK_VSN" | $AWK -F '.' '{print $2}'`
+ THIN_CHECK_CMD="/usr/sbin/thin_check"
+ THIN_CONFIGURE_WARN="y"
+
+fi
+
+fi
+ if test "$THIN_CHECK_NEEDS_CHECK" = "yes" && test "$THIN_CONFIGURE_WARN" != "y"
+then :
+
+ THIN_CHECK_VSN=$("$THIN_CHECK_CMD" -V 2>/dev/null)
+ THIN_CHECK_VSN_MAJOR=$(echo "$THIN_CHECK_VSN" | $AWK -F '.' '{print $1}')
+ THIN_CHECK_VSN_MINOR=$(echo "$THIN_CHECK_VSN" | $AWK -F '.' '{print $2}')
+
+ if test -z "$THIN_CHECK_VSN_MAJOR" || test -z "$THIN_CHECK_VSN_MINOR"
+then :
- if test -z "$THIN_CHECK_VSN_MAJOR" -o -z "$THIN_CHECK_VSN_MINOR"; then
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $THIN_CHECK_CMD: Bad version \"$THIN_CHECK_VSN\" found" >&5
printf "%s\n" "$as_me: WARNING: $THIN_CHECK_CMD: Bad version \"$THIN_CHECK_VSN\" found" >&2;}
- THIN_CHECK_VERSION_WARN=y
- THIN_CHECK_NEEDS_CHECK=no
- elif test "$THIN_CHECK_VSN_MAJOR" -eq 0 -a "$THIN_CHECK_VSN_MINOR" -lt 3; then
+ THIN_CHECK_VERSION_WARN="y"
+ THIN_CHECK_NEEDS_CHECK="no"
+
+elif test "$THIN_CHECK_VSN_MAJOR" -eq 0 && test "$THIN_CHECK_VSN_MINOR" -lt 3
+then :
+
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $THIN_CHECK_CMD: Old version \"$THIN_CHECK_VSN\" found" >&5
printf "%s\n" "$as_me: WARNING: $THIN_CHECK_CMD: Old version \"$THIN_CHECK_VSN\" found" >&2;}
- THIN_CHECK_VERSION_WARN=y
- THIN_CHECK_NEEDS_CHECK=no
- fi
- fi
+ THIN_CHECK_VERSION_WARN="y"
+ THIN_CHECK_NEEDS_CHECK="no"
+
+fi
+
+fi
# Empty means a config way to ignore thin dumping
- if test "$THIN_DUMP_CMD" = "autodetect"; then
+ if test "$THIN_DUMP_CMD" = "autodetect"
+then :
+
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}thin_dump", so it can be a program name with args.
set dummy ${ac_tool_prefix}thin_dump; ac_word=$2
@@ -9725,15 +9766,21 @@ else
THIN_DUMP_CMD="$ac_cv_path_THIN_DUMP_CMD"
fi
- test -z "$THIN_DUMP_CMD" && {
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: thin_dump not found in path $PATH" >&5
-printf "%s\n" "$as_me: WARNING: thin_dump not found in path $PATH" >&2;}
- THIN_DUMP_CMD=/usr/sbin/thin_dump
- THIN_CONFIGURE_WARN=y
- }
- fi
+ if test -z "$THIN_DUMP_CMD"
+then :
+
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: \"thin_dump not found in path $PATH\"" >&5
+printf "%s\n" "$as_me: WARNING: \"thin_dump not found in path $PATH\"" >&2;}
+ THIN_DUMP_CMD="/usr/sbin/thin_dump"
+ THIN_CONFIGURE_WARN="y"
+
+fi
+
+fi
# Empty means a config way to ignore thin repairing
- if test "$THIN_REPAIR_CMD" = "autodetect"; then
+ if test "$THIN_REPAIR_CMD" = "autodetect"
+then :
+
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}thin_repair", so it can be a program name with args.
set dummy ${ac_tool_prefix}thin_repair; ac_word=$2
@@ -9842,15 +9889,21 @@ else
THIN_REPAIR_CMD="$ac_cv_path_THIN_REPAIR_CMD"
fi
- test -z "$THIN_REPAIR_CMD" && {
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: thin_repair not found in path $PATH" >&5
-printf "%s\n" "$as_me: WARNING: thin_repair not found in path $PATH" >&2;}
- THIN_REPAIR_CMD=/usr/sbin/thin_repair
- THIN_CONFIGURE_WARN=y
- }
- fi
+ if test -z "$THIN_REPAIR_CMD"
+then :
+
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: \"thin_repair not found in path $PATH\"" >&5
+printf "%s\n" "$as_me: WARNING: \"thin_repair not found in path $PATH\"" >&2;}
+ THIN_REPAIR_CMD="/usr/sbin/thin_repair"
+ THIN_CONFIGURE_WARN="y"
+
+fi
+
+fi
# Empty means a config way to ignore thin restoring
- if test "$THIN_RESTORE_CMD" = "autodetect"; then
+ if test "$THIN_RESTORE_CMD" = "autodetect"
+then :
+
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}thin_restore", so it can be a program name with args.
set dummy ${ac_tool_prefix}thin_restore; ac_word=$2
@@ -9959,24 +10012,33 @@ else
THIN_RESTORE_CMD="$ac_cv_path_THIN_RESTORE_CMD"
fi
- test -z "$THIN_RESTORE_CMD" && {
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: thin_restore not found in path $PATH" >&5
-printf "%s\n" "$as_me: WARNING: thin_restore not found in path $PATH" >&2;}
- THIN_RESTORE_CMD=/usr/sbin/thin_restore
- THIN_CONFIGURE_WARN=y
- }
- fi
+ if test -z "$THIN_RESTORE_CMD"
+then :
+
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: \"thin_restore not found in path $PATH\"" >&5
+printf "%s\n" "$as_me: WARNING: \"thin_restore not found in path $PATH\"" >&2;}
+ THIN_RESTORE_CMD="/usr/sbin/thin_restore"
+ THIN_CONFIGURE_WARN="y"
+
+fi
+
+fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether thin_check supports the needs-check flag" >&5
printf %s "checking whether thin_check supports the needs-check flag... " >&6; }
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $THIN_CHECK_NEEDS_CHECK" >&5
printf "%s\n" "$THIN_CHECK_NEEDS_CHECK" >&6; }
- if test "$THIN_CHECK_NEEDS_CHECK" = yes; then
+ if test "$THIN_CHECK_NEEDS_CHECK" = "yes"
+then :
+
printf "%s\n" "#define THIN_CHECK_NEEDS_CHECK 1" >>confdefs.h
- fi
- ;;
+
+fi
+ ;; #(
+ *) :
+ ;;
esac
@@ -10046,12 +10108,16 @@ fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CACHE" >&5
printf "%s\n" "$CACHE" >&6; }
-case "$CACHE" in
- no|none|shared) ;;
- internal)
+case "$CACHE" in #(
+ no|none|shared) :
+ ;; #(
+ internal) :
+
+
printf "%s\n" "#define CACHE_INTERNAL 1" >>confdefs.h
- ;;
- *) as_fn_error $? "--with-cache parameter invalid" "$LINENO" 5 ;;
+ ;; #(
+ *) :
+ as_fn_error $? "--with-cache parameter invalid" "$LINENO" 5 ;;
esac
# Check whether --enable-cache_check_needs_check was given.
@@ -10059,16 +10125,19 @@ if test ${enable_cache_check_needs_check+y}
then :
enableval=$enable_cache_check_needs_check; CACHE_CHECK_NEEDS_CHECK=$enableval
else $as_nop
- CACHE_CHECK_NEEDS_CHECK=yes
+ CACHE_CHECK_NEEDS_CHECK="yes"
fi
# Test if necessary cache tools are available
# if not - use plain defaults and warn user
-case "$CACHE" in
- internal|shared)
+case "$CACHE" in #(
+ internal|shared) :
+
# Empty means a config way to ignore cache checking
- if test "$CACHE_CHECK_CMD" = "autodetect"; then
+ if test "$CACHE_CHECK_CMD" = "autodetect"
+then :
+
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}cache_check", so it can be a program name with args.
set dummy ${ac_tool_prefix}cache_check; ac_word=$2
@@ -10177,14 +10246,20 @@ else
CACHE_CHECK_CMD="$ac_cv_path_CACHE_CHECK_CMD"
fi
- if test -z "$CACHE_CHECK_CMD"; then
+ if test -z "$CACHE_CHECK_CMD"
+then :
+
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cache_check not found in path $PATH" >&5
printf "%s\n" "$as_me: WARNING: cache_check not found in path $PATH" >&2;}
- CACHE_CHECK_CMD=/usr/sbin/cache_check
- CACHE_CONFIGURE_WARN=y
- fi
- fi
- if test "$CACHE_CHECK_NEEDS_CHECK" = yes && test "$CACHE_CONFIGURE_WARN" != y ; then
+ CACHE_CHECK_CMD="/usr/sbin/cache_check"
+ CACHE_CONFIGURE_WARN="y"
+
+fi
+
+fi
+ if test "$CACHE_CHECK_NEEDS_CHECK" = "yes" && test "$CACHE_CONFIGURE_WARN" != "y"
+then :
+
$CACHE_CHECK_CMD -V 2>/dev/null >conftest.tmp
read -r CACHE_CHECK_VSN < conftest.tmp
IFS=.- read -r CACHE_CHECK_VSN_MAJOR CACHE_CHECK_VSN_MINOR CACHE_CHECK_VSN_PATCH LEFTOVER < conftest.tmp
@@ -10193,28 +10268,43 @@ printf "%s\n" "$as_me: WARNING: cache_check not found in path $PATH" >&2;}
# Require version >= 0.5.4 for --clear-needs-check-flag
if test -z "$CACHE_CHECK_VSN_MAJOR" \
|| test -z "$CACHE_CHECK_VSN_MINOR" \
- || test -z "$CACHE_CHECK_VSN_PATCH"; then
+ || test -z "$CACHE_CHECK_VSN_PATCH"
+then :
+
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $CACHE_CHECK_CMD: Bad version \"$CACHE_CHECK_VSN\" found" >&5
printf "%s\n" "$as_me: WARNING: $CACHE_CHECK_CMD: Bad version \"$CACHE_CHECK_VSN\" found" >&2;}
- CACHE_CHECK_VERSION_WARN=y
- CACHE_CHECK_NEEDS_CHECK=no
- elif test "$CACHE_CHECK_VSN_MAJOR" -eq 0 ; then
+ CACHE_CHECK_VERSION_WARN="y"
+ CACHE_CHECK_NEEDS_CHECK="no"
+
+elif test "$CACHE_CHECK_VSN_MAJOR" -eq 0
+then :
+
if test "$CACHE_CHECK_VSN_MINOR" -lt 5 \
- || test "$CACHE_CHECK_VSN_MINOR" -eq 5 -a "$CACHE_CHECK_VSN_PATCH" -lt 4; then
+ || ( test "$CACHE_CHECK_VSN_MINOR" -eq 5 && test "$CACHE_CHECK_VSN_PATCH" -lt 4 )
+then :
+
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $CACHE_CHECK_CMD: Old version \"$CACHE_CHECK_VSN\" found" >&5
printf "%s\n" "$as_me: WARNING: $CACHE_CHECK_CMD: Old version \"$CACHE_CHECK_VSN\" found" >&2;}
- CACHE_CHECK_VERSION_WARN=y
- CACHE_CHECK_NEEDS_CHECK=no
- fi
- if test "$CACHE_CHECK_VSN_MINOR" -lt 7 ; then
+ CACHE_CHECK_VERSION_WARN="y"
+ CACHE_CHECK_NEEDS_CHECK="no"
+
+fi
+ if test "$CACHE_CHECK_VSN_MINOR" -lt 7
+then :
+
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $CACHE_CHECK_CMD: Old version \"$CACHE_CHECK_VSN\" does not support new cache format V2" >&5
printf "%s\n" "$as_me: WARNING: $CACHE_CHECK_CMD: Old version \"$CACHE_CHECK_VSN\" does not support new cache format V2" >&2;}
CACHE_CHECK_VERSION_WARN=y
- fi
- fi
- fi
+
+fi
+
+fi
+
+fi
# Empty means a config way to ignore cache dumping
- if test "$CACHE_DUMP_CMD" = "autodetect"; then
+ if test "$CACHE_DUMP_CMD" = "autodetect"
+then :
+
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}cache_dump", so it can be a program name with args.
set dummy ${ac_tool_prefix}cache_dump; ac_word=$2
@@ -10323,15 +10413,21 @@ else
CACHE_DUMP_CMD="$ac_cv_path_CACHE_DUMP_CMD"
fi
- test -z "$CACHE_DUMP_CMD" && {
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cache_dump not found in path $PATH" >&5
-printf "%s\n" "$as_me: WARNING: cache_dump not found in path $PATH" >&2;}
- CACHE_DUMP_CMD=/usr/sbin/cache_dump
- CACHE_CONFIGURE_WARN=y
- }
- fi
+ if test -z "$CACHE_DUMP_CMD"
+then :
+
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: \"cache_dump not found in path $PATH\"" >&5
+printf "%s\n" "$as_me: WARNING: \"cache_dump not found in path $PATH\"" >&2;}
+ CACHE_DUMP_CMD="/usr/sbin/cache_dump"
+ CACHE_CONFIGURE_WARN="y"
+
+fi
+
+fi
# Empty means a config way to ignore cache repairing
- if test "$CACHE_REPAIR_CMD" = "autodetect"; then
+ if test "$CACHE_REPAIR_CMD" = "autodetect"
+then :
+
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}cache_repair", so it can be a program name with args.
set dummy ${ac_tool_prefix}cache_repair; ac_word=$2
@@ -10440,15 +10536,21 @@ else
CACHE_REPAIR_CMD="$ac_cv_path_CACHE_REPAIR_CMD"
fi
- test -z "$CACHE_REPAIR_CMD" && {
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cache_repair not found in path $PATH" >&5
-printf "%s\n" "$as_me: WARNING: cache_repair not found in path $PATH" >&2;}
- CACHE_REPAIR_CMD=/usr/sbin/cache_repair
- CACHE_CONFIGURE_WARN=y
- }
- fi
+ if test -z "$CACHE_REPAIR_CMD"
+then :
+
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: \"cache_repair not found in path $PATH\"" >&5
+printf "%s\n" "$as_me: WARNING: \"cache_repair not found in path $PATH\"" >&2;}
+ CACHE_REPAIR_CMD="/usr/sbin/cache_repair"
+ CACHE_CONFIGURE_WARN="y"
+
+fi
+
+fi
# Empty means a config way to ignore cache restoring
- if test "$CACHE_RESTORE_CMD" = "autodetect"; then
+ if test "$CACHE_RESTORE_CMD" = "autodetect"
+then :
+
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}cache_restore", so it can be a program name with args.
set dummy ${ac_tool_prefix}cache_restore; ac_word=$2
@@ -10557,24 +10659,33 @@ else
CACHE_RESTORE_CMD="$ac_cv_path_CACHE_RESTORE_CMD"
fi
- test -z "$CACHE_RESTORE_CMD" && {
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cache_restore not found in path $PATH" >&5
-printf "%s\n" "$as_me: WARNING: cache_restore not found in path $PATH" >&2;}
- CACHE_RESTORE_CMD=/usr/sbin/cache_restore
- CACHE_CONFIGURE_WARN=y
- }
- fi
+ if test -z "$CACHE_RESTORE_CMD"
+then :
+
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: \"cache_restore not found in path $PATH\"" >&5
+printf "%s\n" "$as_me: WARNING: \"cache_restore not found in path $PATH\"" >&2;}
+ CACHE_RESTORE_CMD="/usr/sbin/cache_restore"
+ CACHE_CONFIGURE_WARN="y"
+
+fi
+
+fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether cache_check supports the needs-check flag" >&5
printf %s "checking whether cache_check supports the needs-check flag... " >&6; }
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CACHE_CHECK_NEEDS_CHECK" >&5
printf "%s\n" "$CACHE_CHECK_NEEDS_CHECK" >&6; }
- if test "$CACHE_CHECK_NEEDS_CHECK" = yes; then
+ if test "$CACHE_CHECK_NEEDS_CHECK" = "yes"
+then :
+
printf "%s\n" "#define CACHE_CHECK_NEEDS_CHECK 1" >>confdefs.h
- fi
- ;;
+
+fi
+ ;; #(
+ *) :
+ ;;
esac
@@ -10618,14 +10729,18 @@ else $as_nop
VDO_FORMAT_CMD="autodetect"
fi
-case "$VDO" in
- no|none) ;;
- internal)
+case "$VDO" in #(
+ no|none) :
+ ;; #(
+ internal) :
+
printf "%s\n" "#define VDO_INTERNAL 1" >>confdefs.h
- if test "$VDO_FORMAT_CMD" = "autodetect"; then
- if test -n "$ac_tool_prefix"; then
+ if test "$VDO_FORMAT_CMD" = "autodetect"
+then :
+
+ if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}vdoformat", so it can be a program name with args.
set dummy ${ac_tool_prefix}vdoformat; ac_word=$2
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
@@ -10733,15 +10848,19 @@ else
VDO_FORMAT_CMD="$ac_cv_path_VDO_FORMAT_CMD"
fi
- if test -z "$VDO_FORMAT_CMD"; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: vdoformat not found in path $PATH" >&5
+ if test -z "$VDO_FORMAT_CMD"
+then :
+
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: vdoformat not found in path $PATH" >&5
printf "%s\n" "$as_me: WARNING: vdoformat not found in path $PATH" >&2;}
- VDO_FORMAT_CMD=/usr/bin/vdoformat
- VDO_CONFIGURE_WARN=y
- fi
- fi
- ;;
- *) as_fn_error $? "--with-vdo parameter invalid" "$LINENO" 5 ;;
+ VDO_FORMAT_CMD="/usr/bin/vdoformat"
+ VDO_CONFIGURE_WARN=y
+
+fi
+
+fi ;; #(
+ *) :
+ as_fn_error $? "--with-vdo parameter invalid" "$LINENO" 5 ;;
esac
@@ -10755,13 +10874,13 @@ printf "%s\n" "#define VDO_FORMAT_CMD \"$VDO_FORMAT_CMD\"" >>confdefs.h
# AS_HELP_STRING([--with-vdo-include=PATH],
# [vdo support: Path to utils headers: [/usr/include/vdo/utils]]),
# VDO_INCLUDE=$withval, VDO_INCLUDE="/usr/include/vdo/utils")
-#AC_MSG_RESULT($VDO_INCLUDE)
+#AC_MSG_RESULT([$VDO_INCLUDE])
#
#AC_ARG_WITH(vdo-lib,
# AS_HELP_STRING([--with-vdo-lib=PATH],
# [vdo support: Path to utils lib: [/usr/lib]]),
# VDO_LIB=$withval, VDO_LIB="/usr/lib")
-#AC_MSG_RESULT($VDO_LIB)
+#AC_MSG_RESULT([$VDO_LIB])
################################################################################
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to include writecache" >&5
@@ -10779,14 +10898,16 @@ fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $WRITECACHE" >&5
printf "%s\n" "$WRITECACHE" >&6; }
-case "$WRITECACHE" in
- no|none) ;;
- internal)
+case "$WRITECACHE" in #(
+ no|none) :
+ ;; #(
+ internal) :
-printf "%s\n" "#define WRITECACHE_INTERNAL 1" >>confdefs.h
- ;;
- *) as_fn_error $? "--with-writecache parameter invalid" "$LINENO" 5 ;;
+printf "%s\n" "#define WRITECACHE_INTERNAL 1" >>confdefs.h
+ ;; #(
+ *) :
+ as_fn_error $? "--with-writecache parameter invalid" "$LINENO" 5 ;;
esac
################################################################################
@@ -10805,14 +10926,16 @@ fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $INTEGRITY" >&5
printf "%s\n" "$INTEGRITY" >&6; }
-case "$INTEGRITY" in
- no|none) ;;
- internal)
+case "$INTEGRITY" in #(
+ no|none) :
+ ;; #(
+ internal) :
-printf "%s\n" "#define INTEGRITY_INTERNAL 1" >>confdefs.h
- ;;
- *) as_fn_error $? "--with-integrity parameter invalid" "$LINENO" 5 ;;
+printf "%s\n" "#define INTEGRITY_INTERNAL 1" >>confdefs.h
+ ;; #(
+ *) :
+ as_fn_error $? "--with-integrity parameter invalid" "$LINENO" 5 ;;
esac
################################################################################
@@ -10829,7 +10952,7 @@ if test ${enable_readline+y}
then :
enableval=$enable_readline; READLINE=$enableval
else $as_nop
- READLINE=maybe
+ READLINE="maybe"
fi
@@ -10839,7 +10962,7 @@ if test ${enable_editline+y}
then :
enableval=$enable_editline; EDITLINE=$enableval
else $as_nop
- EDITLINE=no
+ EDITLINE="no"
fi
@@ -10851,7 +10974,7 @@ if test ${enable_realtime+y}
then :
enableval=$enable_realtime; REALTIME=$enableval
else $as_nop
- REALTIME=yes
+ REALTIME="yes"
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $REALTIME" >&5
@@ -10865,7 +10988,7 @@ if test ${enable_ocf+y}
then :
enableval=$enable_ocf; OCF=$enableval
else $as_nop
- OCF=no
+ OCF="no"
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $OCF" >&5
@@ -10881,71 +11004,153 @@ fi
################################################################################
-pkg_config_init() {
- if test "$PKGCONFIG_INIT" != 1; then
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for default run directory" >&5
+printf %s "checking for default run directory... " >&6; }
+RUN_DIR="/run"
+test -d "/run" || RUN_DIR="/var/run"
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $RUN_DIR" >&5
+printf "%s\n" "$RUN_DIR" >&6; }
+# Check whether --with-default-pid-dir was given.
+if test ${with_default_pid_dir+y}
+then :
+ withval=$with_default_pid_dir; DEFAULT_PID_DIR="$withval"
+else $as_nop
+ DEFAULT_PID_DIR=$RUN_DIR
+fi
+
+printf "%s\n" "#define DEFAULT_PID_DIR \"$DEFAULT_PID_DIR\"" >>confdefs.h
-if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
-set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_path_PKG_CONFIG+y}
+# Check whether --with-default-dm-run-dir was given.
+if test ${with_default_dm_run_dir+y}
then :
- printf %s "(cached) " >&6
+ withval=$with_default_dm_run_dir; DEFAULT_DM_RUN_DIR="$withval"
else $as_nop
- case $PKG_CONFIG in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- case $as_dir in #(((
- '') as_dir=./ ;;
- */) ;;
- *) as_dir=$as_dir/ ;;
- esac
- for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
- ac_cv_path_PKG_CONFIG="$as_dir$ac_word$ac_exec_ext"
- printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
- ;;
-esac
-fi
-PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-if test -n "$PKG_CONFIG"; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
-printf "%s\n" "$PKG_CONFIG" >&6; }
-else
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+ DEFAULT_DM_RUN_DIR=$RUN_DIR
fi
-fi
-if test -z "$ac_cv_path_PKG_CONFIG"; then
- ac_pt_PKG_CONFIG=$PKG_CONFIG
- # Extract the first word of "pkg-config", so it can be a program name with args.
-set dummy pkg-config; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_path_ac_pt_PKG_CONFIG+y}
-then :
+printf "%s\n" "#define DEFAULT_DM_RUN_DIR \"$DEFAULT_DM_RUN_DIR\"" >>confdefs.h
+
+
+
+
+# Check whether --with-default-run-dir was given.
+if test ${with_default_run_dir+y}
+then :
+ withval=$with_default_run_dir; DEFAULT_RUN_DIR="$withval"
+else $as_nop
+ DEFAULT_RUN_DIR="$RUN_DIR/lvm"
+fi
+
+
+printf "%s\n" "#define DEFAULT_RUN_DIR \"$DEFAULT_RUN_DIR\"" >>confdefs.h
+
+
+################################################################################
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to build cluster mirror log daemon" >&5
+printf %s "checking whether to build cluster mirror log daemon... " >&6; }
+# Check whether --enable-cmirrord was given.
+if test ${enable_cmirrord+y}
+then :
+ enableval=$enable_cmirrord; CMIRRORD=$enableval
+else $as_nop
+ CMIRRORD="no"
+fi
+
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CMIRRORD" >&5
+printf "%s\n" "$CMIRRORD" >&6; }
+
+BUILD_CMIRRORD=$CMIRRORD
+
+################################################################################
+if test "$BUILD_CMIRRORD" = "yes"
+then :
+
+
+# Check whether --with-cmirrord-pidfile was given.
+if test ${with_cmirrord_pidfile+y}
+then :
+ withval=$with_cmirrord_pidfile; CMIRRORD_PIDFILE=$withval
+else $as_nop
+ CMIRRORD_PIDFILE="$DEFAULT_PID_DIR/cmirrord.pid"
+fi
+
+
+printf "%s\n" "#define CMIRRORD_PIDFILE \"$CMIRRORD_PIDFILE\"" >>confdefs.h
+
+
+fi
+
+################################################################################
+
+
+
+
+
+
+
+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
+set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path_PKG_CONFIG+y}
+then :
+ printf %s "(cached) " >&6
+else $as_nop
+ case $PKG_CONFIG in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ case $as_dir in #(((
+ '') as_dir=./ ;;
+ */) ;;
+ *) as_dir=$as_dir/ ;;
+ esac
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+ ac_cv_path_PKG_CONFIG="$as_dir$ac_word$ac_exec_ext"
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+ ;;
+esac
+fi
+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+if test -n "$PKG_CONFIG"; then
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+printf "%s\n" "$PKG_CONFIG" >&6; }
+else
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_path_PKG_CONFIG"; then
+ ac_pt_PKG_CONFIG=$PKG_CONFIG
+ # Extract the first word of "pkg-config", so it can be a program name with args.
+set dummy pkg-config; ac_word=$2
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path_ac_pt_PKG_CONFIG+y}
+then :
printf %s "(cached) " >&6
else $as_nop
case $ac_pt_PKG_CONFIG in
@@ -11013,170 +11218,10 @@ printf "%s\n" "no" >&6; }
PKG_CONFIG=""
fi
fi
-
-pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for PKGCONFIGINIT" >&5
-printf %s "checking for PKGCONFIGINIT... " >&6; }
-
-if test -n "$PKGCONFIGINIT_CFLAGS"; then
- pkg_cv_PKGCONFIGINIT_CFLAGS="$PKGCONFIGINIT_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
- { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"pkgconfiginit\""; } >&5
- ($PKG_CONFIG --exists --print-errors "pkgconfiginit") 2>&5
- ac_status=$?
- printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
- pkg_cv_PKGCONFIGINIT_CFLAGS=`$PKG_CONFIG --cflags "pkgconfiginit" 2>/dev/null`
- test "x$?" != "x0" && pkg_failed=yes
-else
- pkg_failed=yes
-fi
- else
- pkg_failed=untried
-fi
-if test -n "$PKGCONFIGINIT_LIBS"; then
- pkg_cv_PKGCONFIGINIT_LIBS="$PKGCONFIGINIT_LIBS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
- { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"pkgconfiginit\""; } >&5
- ($PKG_CONFIG --exists --print-errors "pkgconfiginit") 2>&5
- ac_status=$?
- printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
- pkg_cv_PKGCONFIGINIT_LIBS=`$PKG_CONFIG --libs "pkgconfiginit" 2>/dev/null`
- test "x$?" != "x0" && pkg_failed=yes
-else
- pkg_failed=yes
-fi
- else
- pkg_failed=untried
-fi
-
-
-
-if test $pkg_failed = yes; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
- _pkg_short_errors_supported=yes
-else
- _pkg_short_errors_supported=no
-fi
- if test $_pkg_short_errors_supported = yes; then
- PKGCONFIGINIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "pkgconfiginit" 2>&1`
- else
- PKGCONFIGINIT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "pkgconfiginit" 2>&1`
- fi
- # Put the nasty error message in config.log where it belongs
- echo "$PKGCONFIGINIT_PKG_ERRORS" >&5
-
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: pkg-config initialized" >&5
-printf "%s\n" "pkg-config initialized" >&6; }
-elif test $pkg_failed = untried; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: pkg-config initialized" >&5
-printf "%s\n" "pkg-config initialized" >&6; }
-else
- PKGCONFIGINIT_CFLAGS=$pkg_cv_PKGCONFIGINIT_CFLAGS
- PKGCONFIGINIT_LIBS=$pkg_cv_PKGCONFIGINIT_LIBS
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
-
-fi
- PKGCONFIG_INIT=1
- fi
-}
-
-################################################################################
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for default run directory" >&5
-printf %s "checking for default run directory... " >&6; }
-RUN_DIR="/run"
-test -d "/run" || RUN_DIR="/var/run"
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $RUN_DIR" >&5
-printf "%s\n" "$RUN_DIR" >&6; }
-
-
-# Check whether --with-default-pid-dir was given.
-if test ${with_default_pid_dir+y}
-then :
- withval=$with_default_pid_dir; DEFAULT_PID_DIR="$withval"
-else $as_nop
- DEFAULT_PID_DIR=$RUN_DIR
-fi
-
-
-printf "%s\n" "#define DEFAULT_PID_DIR \"$DEFAULT_PID_DIR\"" >>confdefs.h
-
-
-
-
-# Check whether --with-default-dm-run-dir was given.
-if test ${with_default_dm_run_dir+y}
+if test "$BUILD_CMIRRORD" = "yes" && test "$HAVE_CPG" != "yes"
then :
- withval=$with_default_dm_run_dir; DEFAULT_DM_RUN_DIR="$withval"
-else $as_nop
- DEFAULT_DM_RUN_DIR=$RUN_DIR
-fi
-
-
-printf "%s\n" "#define DEFAULT_DM_RUN_DIR \"$DEFAULT_DM_RUN_DIR\"" >>confdefs.h
-
-
-# Check whether --with-default-run-dir was given.
-if test ${with_default_run_dir+y}
-then :
- withval=$with_default_run_dir; DEFAULT_RUN_DIR="$withval"
-else $as_nop
- DEFAULT_RUN_DIR="$RUN_DIR/lvm"
-fi
-
-
-printf "%s\n" "#define DEFAULT_RUN_DIR \"$DEFAULT_RUN_DIR\"" >>confdefs.h
-
-
-################################################################################
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to build cluster mirror log daemon" >&5
-printf %s "checking whether to build cluster mirror log daemon... " >&6; }
-# Check whether --enable-cmirrord was given.
-if test ${enable_cmirrord+y}
-then :
- enableval=$enable_cmirrord; CMIRRORD=$enableval
-else $as_nop
- CMIRRORD=no
-fi
-
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CMIRRORD" >&5
-printf "%s\n" "$CMIRRORD" >&6; }
-
-BUILD_CMIRRORD=$CMIRRORD
-
-################################################################################
-if test "$BUILD_CMIRRORD" = yes; then
-
-# Check whether --with-cmirrord-pidfile was given.
-if test ${with_cmirrord_pidfile+y}
-then :
- withval=$with_cmirrord_pidfile; CMIRRORD_PIDFILE=$withval
-else $as_nop
- CMIRRORD_PIDFILE="$DEFAULT_PID_DIR/cmirrord.pid"
-fi
-
-
-printf "%s\n" "#define CMIRRORD_PIDFILE \"$CMIRRORD_PIDFILE\"" >>confdefs.h
-
-fi
-
-################################################################################
-if [ "$BUILD_CMIRRORD" = yes ]; then
- pkg_config_init
-
- if test "$HAVE_CPG" != yes; then
-
pkg_failed=no
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for CPG" >&5
printf %s "checking for CPG... " >&6; }
@@ -11267,7 +11312,7 @@ else
printf "%s\n" "yes" >&6; }
fi
- fi
+
fi
################################################################################
@@ -11278,16 +11323,17 @@ if test ${enable_debug+y}
then :
enableval=$enable_debug; DEBUG=$enableval
else $as_nop
- DEBUG=no
+ DEBUG="no"
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $DEBUG" >&5
printf "%s\n" "$DEBUG" >&6; }
-if test "$DEBUG" = yes; then
- COPTIMISE_FLAG=
-else
- CSCOPE_CMD=
+if test "$DEBUG" = "yes"
+then :
+ COPTIMISE_FLAG=""
+else $as_nop
+ CSCOPE_CMD=""
fi
@@ -11431,27 +11477,35 @@ printf %s "checking whether to use symbol versioning... " >&6; }
# Check whether --with-symvers was given.
if test ${with_symvers+y}
then :
- withval=$with_symvers; case "$withval" in
- gnu|no) symvers=$withval ;;
- *) as_fn_error $? "--with-symvers parameter invalid" "$LINENO" 5 ;;
- esac
+ withval=$with_symvers;
+ case "$withval" in #(
+ gnu|no) :
+ symvers=$withval ;; #(
+ *) :
+ as_fn_error $? "--with-symvers parameter invalid" "$LINENO" 5 ;;
+esac
else $as_nop
- symvers=gnu
+ symvers="gnu"
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $symvers" >&5
printf "%s\n" "$symvers" >&6; }
-if test "$GCC" = "yes" && test "$symvers" = "gnu" ; then
+if test "$GCC" = "yes" && test "$symvers" = "gnu"
+then :
+
printf "%s\n" "#define GNU_SYMVER 1" >>confdefs.h
- case "$host_os" in
- linux*)
+ case "$host_os" in #(
+ linux*) :
+
CLDFLAGS="${CLDFLAGS-"$LDFLAGS"} -Wl,--version-script,.export.sym"
- LDDEPS="$LDDEPS .export.sym"
- ;;
- esac
+ LDDEPS="$LDDEPS .export.sym" ;; #(
+ *) :
+ ;;
+esac
+
fi
################################################################################
@@ -11462,13 +11516,15 @@ if test ${enable_profiling+y}
then :
enableval=$enable_profiling; PROFILING=$enableval
else $as_nop
- PROFILING=no
+ PROFILING="no"
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PROFILING" >&5
printf "%s\n" "$PROFILING" >&6; }
-if test "$PROFILING" = yes; then
+if test "$PROFILING" = "yes"
+then :
+
COPTIMISE_FLAG="$COPTIMISE_FLAG -fprofile-arcs -ftest-coverage"
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}lcov", so it can be a program name with args.
@@ -11686,7 +11742,12 @@ else
GENHTML="$ac_cv_path_GENHTML"
fi
- test -z "$LCOV" -o -z "$GENHTML" && as_fn_error $? "lcov and genhtml are required for profiling" "$LINENO" 5
+ if test -z "$LCOV" || test -z "$GENHTML"
+then :
+
+ as_fn_error $? "lcov and genhtml are required for profiling" "$LINENO" 5
+
+fi
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}genpng", so it can be a program name with args.
set dummy ${ac_tool_prefix}genpng; ac_word=$2
@@ -11795,21 +11856,30 @@ else
GENPNG="$ac_cv_path_GENPNG"
fi
- if test -n "$GENPNG"; then
+ if test -n "$GENPNG"
+then :
+
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $GENPNG has all required modules" >&5
printf %s "checking whether $GENPNG has all required modules... " >&6; }
- if "$GENPNG" --help > /dev/null 2>&1 ; then
+ if "$GENPNG" --help > /dev/null 2>&1
+then :
+
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ok" >&5
printf "%s\n" "ok" >&6; }
GENHTML="$GENHTML --frames"
- else
+
+else $as_nop
+
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not supported" >&5
printf "%s\n" "not supported" >&6; }
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: GD.pm perl module is not installed" >&5
printf "%s\n" "$as_me: WARNING: GD.pm perl module is not installed" >&2;}
GENPNG=
- fi
- fi
+
+fi
+
+fi
+
fi
################################################################################
@@ -11827,13 +11897,12 @@ if test ${enable_valgrind_pool+y}
then :
enableval=$enable_valgrind_pool; VALGRIND_POOL=$enableval
else $as_nop
- VALGRIND_POOL=no
+ VALGRIND_POOL="no"
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $VALGRIND_POOL" >&5
printf "%s\n" "$VALGRIND_POOL" >&6; }
-pkg_config_init
pkg_failed=no
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for VALGRIND" >&5
@@ -11893,30 +11962,46 @@ fi
# Put the nasty error message in config.log where it belongs
echo "$VALGRIND_PKG_ERRORS" >&5
- if test x$VALGRIND_POOL = xyes; then as_fn_error $? "bailing out" "$LINENO" 5; fi
+
+ if test "$VALGRIND_POOL" = "yes"
+then :
+ as_fn_error $? "bailing out" "$LINENO" 5
+fi
+
elif test $pkg_failed = untried; then
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
printf "%s\n" "no" >&6; }
- if test x$VALGRIND_POOL = xyes; then as_fn_error $? "bailing out" "$LINENO" 5; fi
+
+ if test "$VALGRIND_POOL" = "yes"
+then :
+ as_fn_error $? "bailing out" "$LINENO" 5
+fi
+
else
VALGRIND_CFLAGS=$pkg_cv_VALGRIND_CFLAGS
VALGRIND_LIBS=$pkg_cv_VALGRIND_LIBS
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
printf "%s\n" "yes" >&6; }
- HAVE_VALGRIND=yes
+ HAVE_VALGRIND="yes"
fi
-if test x$HAVE_VALGRIND = xyes; then
+if test "$HAVE_VALGRIND" = "yes"
+then :
+
printf "%s\n" "#define HAVE_VALGRIND 1" >>confdefs.h
+
fi
-if test x$VALGRIND_POOL = xyes; then
+if test "$VALGRIND_POOL" = "yes"
+then :
+
printf "%s\n" "#define VALGRIND_POOL 1" >>confdefs.h
+
fi
################################################################################
@@ -11931,10 +12016,13 @@ fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $DEVMAPPER" >&5
printf "%s\n" "$DEVMAPPER" >&6; }
-if test "$DEVMAPPER" = yes; then
+if test "$DEVMAPPER" = "yes"
+then :
+
printf "%s\n" "#define DEVMAPPER_SUPPORT 1" >>confdefs.h
+
fi
################################################################################
@@ -11945,7 +12033,7 @@ if test ${enable_lvmpolld+y}
then :
enableval=$enable_lvmpolld; LVMPOLLD=$enableval
else $as_nop
- LVMPOLLD=no
+ LVMPOLLD="no"
fi
test -n "$LVMPOLLD" && BUILD_LVMPOLLD=$LVMPOLLD
@@ -11962,7 +12050,7 @@ if test ${enable_lvmlockd_sanlock+y}
then :
enableval=$enable_lvmlockd_sanlock; LOCKDSANLOCK=$enableval
else $as_nop
- LOCKDSANLOCK=no
+ LOCKDSANLOCK="no"
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LOCKDSANLOCK" >&5
@@ -11970,7 +12058,9 @@ printf "%s\n" "$LOCKDSANLOCK" >&6; }
BUILD_LOCKDSANLOCK=$LOCKDSANLOCK
-if test "$BUILD_LOCKDSANLOCK" = yes; then
+if test "$BUILD_LOCKDSANLOCK" = "yes"
+then :
+
pkg_failed=no
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for LOCKD_SANLOCK" >&5
@@ -12046,6 +12136,7 @@ fi
printf "%s\n" "#define LOCKDSANLOCK_SUPPORT 1" >>confdefs.h
BUILD_LVMLOCKD=yes
+
fi
################################################################################
@@ -12056,7 +12147,7 @@ if test ${enable_lvmlockd_dlm+y}
then :
enableval=$enable_lvmlockd_dlm; LOCKDDLM=$enableval
else $as_nop
- LOCKDDLM=no
+ LOCKDDLM="no"
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LOCKDDLM" >&5
@@ -12064,7 +12155,9 @@ printf "%s\n" "$LOCKDDLM" >&6; }
BUILD_LOCKDDLM=$LOCKDDLM
-if test "$BUILD_LOCKDDLM" = yes; then
+if test "$BUILD_LOCKDDLM" = "yes"
+then :
+
pkg_failed=no
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for LOCKD_DLM" >&5
@@ -12140,6 +12233,7 @@ fi
printf "%s\n" "#define LOCKDDLM_SUPPORT 1" >>confdefs.h
BUILD_LVMLOCKD=yes
+
fi
################################################################################
@@ -12150,7 +12244,7 @@ if test ${enable_lvmlockd_dlmcontrol+y}
then :
enableval=$enable_lvmlockd_dlmcontrol; LOCKDDLM_CONTROL=$enableval
else $as_nop
- LOCKDDLM_CONTROL=no
+ LOCKDDLM_CONTROL="no"
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LOCKDDLM_CONTROL" >&5
@@ -12158,7 +12252,9 @@ printf "%s\n" "$LOCKDDLM_CONTROL" >&6; }
BUILD_LOCKDDLM_CONTROL=$LOCKDDLM_CONTROL
-if test "$BUILD_LOCKDDLM_CONTROL" = yes; then
+if test "$BUILD_LOCKDDLM_CONTROL" = "yes"
+then :
+
pkg_failed=no
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for LOCKD_DLM_CONTROL" >&5
@@ -12234,6 +12330,7 @@ fi
printf "%s\n" "#define LOCKDDLM_CONTROL_SUPPORT 1" >>confdefs.h
BUILD_LVMLOCKD=yes
+
fi
################################################################################
@@ -12244,7 +12341,7 @@ if test ${enable_lvmlockd_idm+y}
then :
enableval=$enable_lvmlockd_idm; LOCKDIDM=$enableval
else $as_nop
- LOCKDIDM=no
+ LOCKDIDM="no"
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LOCKDIDM" >&5
@@ -12252,7 +12349,9 @@ printf "%s\n" "$LOCKDIDM" >&6; }
BUILD_LOCKDIDM=$LOCKDIDM
-if test "$BUILD_LOCKDIDM" = yes; then
+if test "$BUILD_LOCKDIDM" = "yes"
+then :
+
pkg_failed=no
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for LOCKD_IDM" >&5
@@ -12330,7 +12429,7 @@ fi
ac_status=$?
printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- HAVE_LOCKD_IDM=yes
+ HAVE_LOCKD_IDM="yes"
else
$bailout
fi
@@ -12338,6 +12437,7 @@ fi
printf "%s\n" "#define LOCKDIDM_SUPPORT 1" >>confdefs.h
BUILD_LVMLOCKD=yes
+
fi
################################################################################
@@ -12346,12 +12446,14 @@ printf %s "checking whether to build lvmlockd... " >&6; }
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $BUILD_LVMLOCKD" >&5
printf "%s\n" "$BUILD_LVMLOCKD" >&6; }
-if test "$BUILD_LVMLOCKD" = yes; then
- if test "$LVMPOLLD" = no
+if test "$BUILD_LVMLOCKD" = "yes"
+then :
+
+ if test "$LVMPOLLD" = "no"
then :
as_fn_error $? "cannot build lvmlockd with --disable-lvmpolld." "$LINENO" 5
fi
- if test "$BUILD_LVMPOLLD" = no
+ if test "$BUILD_LVMPOLLD" = "no"
then :
BUILD_LVMPOLLD=yes; { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Enabling lvmpolld - required by lvmlockd." >&5
printf "%s\n" "$as_me: WARNING: Enabling lvmpolld - required by lvmlockd." >&2;}
@@ -12361,10 +12463,12 @@ printf %s "checking defaults for use_lvmlockd... " >&6; }
# Check whether --enable-use_lvmlockd was given.
if test ${enable_use_lvmlockd+y}
then :
- enableval=$enable_use_lvmlockd; case ${enableval} in
- yes) DEFAULT_USE_LVMLOCKD=1 ;;
- *) DEFAULT_USE_LVMLOCKD=0 ;;
- esac
+ enableval=$enable_use_lvmlockd; if test "$enableval" = "yes"
+then :
+ DEFAULT_USE_LVMLOCKD=1
+else $as_nop
+ DEFAULT_USE_LVMLOCKD=0
+fi
else $as_nop
DEFAULT_USE_LVMLOCKD=1
fi
@@ -12387,24 +12491,31 @@ fi
printf "%s\n" "#define LVMLOCKD_PIDFILE \"$LVMLOCKD_PIDFILE\"" >>confdefs.h
-else
+
+else $as_nop
+
DEFAULT_USE_LVMLOCKD=0
+
fi
printf "%s\n" "#define DEFAULT_USE_LVMLOCKD $DEFAULT_USE_LVMLOCKD" >>confdefs.h
################################################################################
-if test "$BUILD_LVMPOLLD" = yes; then
+if test "$BUILD_LVMPOLLD" = "yes"
+then :
+
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking defaults for use_lvmpolld" >&5
printf %s "checking defaults for use_lvmpolld... " >&6; }
# Check whether --enable-use_lvmpolld was given.
if test ${enable_use_lvmpolld+y}
then :
- enableval=$enable_use_lvmpolld; case ${enableval} in
- yes) DEFAULT_USE_LVMPOLLD=1 ;;
- *) DEFAULT_USE_LVMPOLLD=0 ;;
- esac
+ enableval=$enable_use_lvmpolld; if test "$enableval" = "yes"
+then :
+ DEFAULT_USE_LVMPOLLD=1
+else $as_nop
+ DEFAULT_USE_LVMPOLLD=0
+fi
else $as_nop
DEFAULT_USE_LVMPOLLD=1
fi
@@ -12427,8 +12538,11 @@ fi
printf "%s\n" "#define LVMPOLLD_PIDFILE \"$LVMPOLLD_PIDFILE\"" >>confdefs.h
-else
+
+else $as_nop
+
DEFAULT_USE_LVMPOLLD=0
+
fi
printf "%s\n" "#define DEFAULT_USE_LVMPOLLD $DEFAULT_USE_LVMPOLLD" >>confdefs.h
@@ -12442,7 +12556,7 @@ if test ${enable_dmfilemapd+y}
then :
enableval=$enable_dmfilemapd; BUILD_DMFILEMAPD=$enableval
else $as_nop
- BUILD_DMFILEMAPD=no
+ BUILD_DMFILEMAPD="no"
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $BUILD_DMFILEMAPD" >&5
@@ -12451,7 +12565,9 @@ printf "%s\n" "$BUILD_DMFILEMAPD" >&6; }
printf "%s\n" "#define DMFILEMAPD \$BUILD_DMFILEMAPD" >>confdefs.h
-if test "$BUILD_DMFILEMAPD" = yes; then
+if test "$BUILD_DMFILEMAPD" = "yes"
+then :
+
ac_fn_c_check_header_compile "$LINENO" "linux/fiemap.h" "ac_cv_header_linux_fiemap_h" "$ac_includes_default"
if test "x$ac_cv_header_linux_fiemap_h" = xyes
then :
@@ -12460,10 +12576,10 @@ else $as_nop
as_fn_error $? "--enable-dmfilemapd requires fiemap.h" "$LINENO" 5
fi
+
fi
SYSTEMD_MIN_VERSION=0
-pkg_config_init
if test -n "$PKG_CONFIG" && \
{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"systemd >= 205\""; } >&5
($PKG_CONFIG --exists --print-errors "systemd >= 205") 2>&5
@@ -12487,19 +12603,19 @@ printf %s "checking whether to build notifydbus... " >&6; }
# Check whether --enable-notify-dbus was given.
if test ${enable_notify_dbus+y}
then :
- enableval=$enable_notify_dbus; if test "$enableval" = yes && test "$SYSTEMD_MIN_VERSION" -lt 221
+ enableval=$enable_notify_dbus; if test "$enableval" = "yes" && test "$SYSTEMD_MIN_VERSION" -lt 221
then :
as_fn_error $? "Enabling notify-dbus requires systemd >= 221" "$LINENO" 5
fi
NOTIFYDBUS_SUPPORT=$enableval
else $as_nop
- NOTIFYDBUS_SUPPORT=no
+ NOTIFYDBUS_SUPPORT="no"
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $NOTIFYDBUS_SUPPORT" >&5
printf "%s\n" "$NOTIFYDBUS_SUPPORT" >&6; }
-if test "$NOTIFYDBUS_SUPPORT" = yes
+if test "$NOTIFYDBUS_SUPPORT" = "yes"
then :
printf "%s\n" "#define NOTIFYDBUS_SUPPORT 1" >>confdefs.h
@@ -12509,19 +12625,19 @@ fi
################################################################################
if test "$SYSTEMD_MIN_VERSION" -ge 221
then :
- SYSTEMD_JOURNAL_SUPPORT=maybe
+ SYSTEMD_JOURNAL_SUPPORT="maybe"
else $as_nop
- SYSTEMD_JOURNAL_SUPPORT=no
+ SYSTEMD_JOURNAL_SUPPORT="no"
fi
ac_fn_c_check_header_compile "$LINENO" "systemd/sd-journal.h" "ac_cv_header_systemd_sd_journal_h" "$ac_includes_default"
if test "x$ac_cv_header_systemd_sd_journal_h" = xyes
then :
- if test "$SYSTEMD_JOURNAL_SUPPORT" != no
+ if test "$SYSTEMD_JOURNAL_SUPPORT" != "no"
then :
- SYSTEMD_JOURNAL_SUPPORT=yes
+ SYSTEMD_JOURNAL_SUPPORT="yes"
fi
else $as_nop
- SYSTEMD_JOURNAL_SUPPORT=no
+ SYSTEMD_JOURNAL_SUPPORT="no"
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to log to systemd journal" >&5
@@ -12529,7 +12645,7 @@ printf %s "checking whether to log to systemd journal... " >&6; }
# Check whether --enable-systemd-journal was given.
if test ${enable_systemd_journal+y}
then :
- enableval=$enable_systemd_journal; if test "$enableval" = yes && test "$SYSTEMD_JOURNAL_SUPPORT" = no
+ enableval=$enable_systemd_journal; if test "$enableval" = "yes" && test "$SYSTEMD_JOURNAL_SUPPORT" = "no"
then :
as_fn_error $? "Enabling systemd journal requires systemd/sd-journal.h and systemd >= 221." "$LINENO" 5
fi
@@ -12539,7 +12655,7 @@ fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $SYSTEMD_JOURNAL_SUPPORT" >&5
printf "%s\n" "$SYSTEMD_JOURNAL_SUPPORT" >&6; }
-if test "$SYSTEMD_JOURNAL_SUPPORT" = yes
+if test "$SYSTEMD_JOURNAL_SUPPORT" = "yes"
then :
printf "%s\n" "#define SYSTEMD_JOURNAL_SUPPORT 1" >>confdefs.h
@@ -12560,9 +12676,9 @@ fi
ac_fn_c_check_header_compile "$LINENO" "systemd/sd-id128.h" "ac_cv_header_systemd_sd_id128_h" "$ac_includes_default"
if test "x$ac_cv_header_systemd_sd_id128_h" = xyes
then :
- if test "$APP_MACHINEID_SUPPORT" != no
+ if test "$APP_MACHINEID_SUPPORT" != "no"
then :
- APP_MACHINEID_SUPPORT=yes
+ APP_MACHINEID_SUPPORT="yes"
fi
else $as_nop
APP_MACHINEID_SUPPORT=no
@@ -12573,7 +12689,7 @@ printf %s "checking whether to support systemd appmachineid... " >&6; }
# Check whether --enable-app-machineid was given.
if test ${enable_app_machineid+y}
then :
- enableval=$enable_app_machineid; if test "$enableval" = yes && test "$APP_MACHINEID_SUPPORT" = no
+ enableval=$enable_app_machineid; if test "$enableval" = "yes" && test "$APP_MACHINEID_SUPPORT" = "no"
then :
as_fn_error $? "Enabling app machineid requires systemd/sd-id128.h and systemd >= 234." "$LINENO" 5
fi
@@ -12583,17 +12699,16 @@ fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $APP_MACHINEID_SUPPORT" >&5
printf "%s\n" "$APP_MACHINEID_SUPPORT" >&6; }
-if test "$APP_MACHINEID_SUPPORT" = yes
+if test "$APP_MACHINEID_SUPPORT" = "yes"
then :
printf "%s\n" "#define APP_MACHINEID_SUPPORT 1" >>confdefs.h
fi
-if test "$NOTIFYDBUS_SUPPORT" = yes || test "$SYSTEMD_JOURNAL_SUPPORT" = yes || test "$APP_MACHINEID_SUPPORT" = yes
+if test "$NOTIFYDBUS_SUPPORT" = "yes" || test "$SYSTEMD_JOURNAL_SUPPORT" = "yes" || test "$APP_MACHINEID_SUPPORT" = "yes"
then :
- pkg_config_init
pkg_failed=no
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for SYSTEMD" >&5
@@ -12665,6 +12780,7 @@ else
printf "%s\n" "yes" >&6; }
SYSTEMD_LIBS="-lsystemd"
fi
+
fi
################################################################################
@@ -12674,13 +12790,21 @@ if test ${enable_blkid_wiping+y}
then :
enableval=$enable_blkid_wiping; BLKID_WIPING=$enableval
else $as_nop
- BLKID_WIPING=maybe
+ BLKID_WIPING="maybe"
fi
+# TODO: possibly detect right version of blkid with BLKID_SUBLKS_FSINFO support
+# so lvresize can check detected flag here
+#
DEFAULT_USE_BLKID_WIPING=0
-if test "$BLKID_WIPING" != no; then
- pkg_config_init
+if test "$BLKID_WIPING" != "no"
+then :
+ blkdir_version=">= 2.24"
+else $as_nop
+ blkid_version=""
+fi
+
pkg_failed=no
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for BLKID" >&5
@@ -12690,12 +12814,12 @@ if test -n "$BLKID_CFLAGS"; then
pkg_cv_BLKID_CFLAGS="$BLKID_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"blkid >= 2.24\""; } >&5
- ($PKG_CONFIG --exists --print-errors "blkid >= 2.24") 2>&5
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"blkid \$blkid_version \""; } >&5
+ ($PKG_CONFIG --exists --print-errors "blkid $blkid_version ") 2>&5
ac_status=$?
printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_BLKID_CFLAGS=`$PKG_CONFIG --cflags "blkid >= 2.24" 2>/dev/null`
+ pkg_cv_BLKID_CFLAGS=`$PKG_CONFIG --cflags "blkid $blkid_version " 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -12707,12 +12831,12 @@ if test -n "$BLKID_LIBS"; then
pkg_cv_BLKID_LIBS="$BLKID_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"blkid >= 2.24\""; } >&5
- ($PKG_CONFIG --exists --print-errors "blkid >= 2.24") 2>&5
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"blkid \$blkid_version \""; } >&5
+ ($PKG_CONFIG --exists --print-errors "blkid $blkid_version ") 2>&5
ac_status=$?
printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_BLKID_LIBS=`$PKG_CONFIG --libs "blkid >= 2.24" 2>/dev/null`
+ pkg_cv_BLKID_LIBS=`$PKG_CONFIG --libs "blkid $blkid_version " 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -12732,77 +12856,123 @@ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
else
_pkg_short_errors_supported=no
fi
- if test $_pkg_short_errors_supported = yes; then
- BLKID_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "blkid >= 2.24" 2>&1`
- else
- BLKID_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "blkid >= 2.24" 2>&1`
- fi
- # Put the nasty error message in config.log where it belongs
- echo "$BLKID_PKG_ERRORS" >&5
-
- if test "$BLKID_WIPING" = maybe; then
- BLKID_WIPING=no
- else
- as_fn_error $? "bailing out... blkid library >= 2.24 is required" "$LINENO" 5
- fi
-elif test $pkg_failed = untried; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
- if test "$BLKID_WIPING" = maybe; then
- BLKID_WIPING=no
- else
- as_fn_error $? "bailing out... blkid library >= 2.24 is required" "$LINENO" 5
- fi
-else
- BLKID_CFLAGS=$pkg_cv_BLKID_CFLAGS
- BLKID_LIBS=$pkg_cv_BLKID_LIBS
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
- BLKID_WIPING=yes
- BLKID_PC="blkid"
- DEFAULT_USE_BLKID_WIPING=1
+ if test $_pkg_short_errors_supported = yes; then
+ BLKID_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "blkid $blkid_version " 2>&1`
+ else
+ BLKID_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "blkid $blkid_version " 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$BLKID_PKG_ERRORS" >&5
+
+ as_fn_error $? "Package requirements (blkid $blkid_version ) were not met:
+
+$BLKID_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+Alternatively, you may set the environment variables BLKID_CFLAGS
+and BLKID_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details." "$LINENO" 5
+elif test $pkg_failed = untried; then
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+Alternatively, you may set the environment variables BLKID_CFLAGS
+and BLKID_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+See \`config.log' for more details" "$LINENO" 5; }
+else
+ BLKID_CFLAGS=$pkg_cv_BLKID_CFLAGS
+ BLKID_LIBS=$pkg_cv_BLKID_LIBS
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+
+ HAVE_BLKID=1
+
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for blkdid.h supports SUBLKS_FSINFO." >&5
+printf %s "checking for blkdid.h supports SUBLKS_FSINFO.... " >&6; }
+if test ${ac_cv_have_blkid_sublks_fsinfo+y}
+then :
+ printf %s "(cached) " >&6
+else $as_nop
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <blkid/blkid.h>
+#ifndef BLKID_SUBLKS_FSINFO
+#error BLKID_SUBLKS_FSINFO is missing
+#endif
+int
+main (void)
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+ ac_cv_have_blkid_sublks_fsinfo="yes"
+else $as_nop
+ ac_cv_have_blkid_sublks_fsinfo="no"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_blkid_sublks_fsinfo" >&5
+printf "%s\n" "$ac_cv_have_blkid_sublks_fsinfo" >&6; }
-printf "%s\n" "#define BLKID_WIPING_SUPPORT 1" >>confdefs.h
+ if test $ac_cv_have_blkid_sublks_fsinfo = yes
+then :
+printf "%s\n" "#define HAVE_BLKID_SUBLKS_FSINFO 1" >>confdefs.h
fi
-fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable libblkid detection of signatures when wiping" >&5
-printf %s "checking whether to enable libblkid detection of signatures when wiping... " >&6; }
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $BLKID_WIPING" >&5
-printf "%s\n" "$BLKID_WIPING" >&6; }
-printf "%s\n" "#define DEFAULT_USE_BLKID_WIPING $DEFAULT_USE_BLKID_WIPING" >>confdefs.h
+fi
+if test "$BLKID_WIPING" != "no"
+then :
-################################################################################
-# Check whether --enable-udev-systemd-background-jobs was given.
-if test ${enable_udev_systemd_background_jobs+y}
+ if test "$HAVE_BLKID" = 1
then :
- enableval=$enable_udev_systemd_background_jobs; UDEV_SYSTEMD_BACKGROUND_JOBS=$enableval
-else $as_nop
- UDEV_SYSTEMD_BACKGROUND_JOBS=maybe
-fi
+
+ BLKID_WIPING=yes
+ BLKID_PC="blkid"
+ DEFAULT_USE_BLKID_WIPING=1
+
+printf "%s\n" "#define BLKID_WIPING_SUPPORT 1" >>confdefs.h
-if test "$UDEV_SYSTEMD_BACKGROUND_JOBS" != no; then
- if test "$SYSTEMD_MIN_VERSION" -ge 205
-then :
- UDEV_SYSTEMD_BACKGROUND_JOBS=yes
else $as_nop
- if test "$UDEV_SYSTEMD_BACKGROUND_JOBS" = maybe
+
+ if test "$BLKID_WIPING" = "maybe"
then :
- UDEV_SYSTEMD_BACKGROUND_JOBS=no
+
+ BLKID_WIPING=no
+
else $as_nop
- as_fn_error $? "bailing out... systemd >= 205 is required" "$LINENO" 5
+
+ as_fn_error $? "bailing out... blkid library >= 2.24 is required" "$LINENO" 5
+
fi
+
fi
+
fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable libblkid detection of signatures when wiping" >&5
+printf %s "checking whether to enable libblkid detection of signatures when wiping... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $BLKID_WIPING" >&5
+printf "%s\n" "$BLKID_WIPING" >&6; }
+
+printf "%s\n" "#define DEFAULT_USE_BLKID_WIPING $DEFAULT_USE_BLKID_WIPING" >>confdefs.h
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to use udev-systemd protocol for jobs in background" >&5
-printf %s "checking whether to use udev-systemd protocol for jobs in background... " >&6; }
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $UDEV_SYSTEMD_BACKGROUND_JOBS" >&5
-printf "%s\n" "$UDEV_SYSTEMD_BACKGROUND_JOBS" >&6; }
################################################################################
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable synchronisation with udev processing" >&5
@@ -12812,14 +12982,15 @@ if test ${enable_udev_sync+y}
then :
enableval=$enable_udev_sync; UDEV_SYNC=$enableval
else $as_nop
- UDEV_SYNC=no
+ UDEV_SYNC="no"
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $UDEV_SYNC" >&5
printf "%s\n" "$UDEV_SYNC" >&6; }
-if test "$UDEV_SYNC" = yes; then
- pkg_config_init
+if test "$UDEV_SYNC" = "yes"
+then :
+
pkg_failed=no
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for UDEV" >&5
@@ -12958,6 +13129,7 @@ printf "%s\n" "#define HAVE_LIBUDEV_UDEV_DEVICE_GET_IS_INITIALIZED 1" >>confdefs
fi
LIBS=$ac_check_lib_save_LIBS
+
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable installation of udev rules required for synchronisation" >&5
@@ -12980,23 +13152,34 @@ if test ${enable_udev_rule_exec_detection+y}
then :
enableval=$enable_udev_rule_exec_detection; UDEV_RULE_EXEC_DETECTION=$enableval
else $as_nop
- UDEV_RULE_EXEC_DETECTION=no
+ UDEV_RULE_EXEC_DETECTION="no"
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $UDEV_RULE_EXEC_DETECTION" >&5
printf "%s\n" "$UDEV_RULE_EXEC_DETECTION" >&6; }
-if test "$UDEV_RULE" != no ; then
+if test "$UDEV_RULE" != "no"
+then :
+
+ if test -n "$PKG_CONFIG" && \
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libudev >= 176\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libudev >= 176") 2>&5
+ ac_status=$?
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+
+ UDEV_HAS_BUILTIN_BLKID="yes"
+
+else
+
+ UDEV_HAS_BUILTIN_BLKID="no"
+
+fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether udev supports built-in blkid" >&5
printf %s "checking whether udev supports built-in blkid... " >&6; }
- pkg_config_init
- if $("$PKG_CONFIG" --atleast-version=176 libudev); then
- UDEV_HAS_BUILTIN_BLKID=yes
- else
- UDEV_HAS_BUILTIN_BLKID=no
- fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $UDEV_HAS_BUILTIN_BLKID" >&5
printf "%s\n" "$UDEV_HAS_BUILTIN_BLKID" >&6; }
+
fi
################################################################################
@@ -13005,14 +13188,17 @@ if test ${enable_units_compat+y}
then :
enableval=$enable_units_compat; UNITS_COMPAT=$enableval
else $as_nop
- UNITS_COMPAT=no
+ UNITS_COMPAT="no"
fi
-if test "$UNITS_COMPAT" = yes; then
+if test "$UNITS_COMPAT" = "yes"
+then :
+
printf "%s\n" "#define DEFAULT_SI_UNIT_CONSISTENCY 0" >>confdefs.h
+
fi
################################################################################
@@ -13022,7 +13208,7 @@ then :
enableval=$enable_ioctl; DM_IOCTLS=$enableval
fi
-if test "$DM_IOCTLS" = yes
+if test "$DM_IOCTLS" = "yes"
then :
printf "%s\n" "#define DM_IOCTLS 1" >>confdefs.h
@@ -13041,10 +13227,13 @@ fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ODIRECT" >&5
printf "%s\n" "$ODIRECT" >&6; }
-if test "$ODIRECT" = yes; then
+if test "$ODIRECT" = "yes"
+then :
+
printf "%s\n" "#define O_DIRECT_SUPPORT 1" >>confdefs.h
+
fi
################################################################################
@@ -13055,15 +13244,22 @@ if test ${enable_cmdlib+y}
then :
enableval=$enable_cmdlib; CMDLIB=$enableval
else $as_nop
- CMDLIB=no
+ CMDLIB="no"
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CMDLIB" >&5
printf "%s\n" "$CMDLIB" >&6; }
-test "$CMDLIB" = yes \
- && LVM2CMD_LIB=-llvm2cmd \
- || LVM2CMD_LIB=
+if test "$CMDLIB" = "yes"
+then :
+
+ LVM2CMD_LIB="-llvm2cmd"
+
+else $as_nop
+
+ LVM2CMD_LIB=""
+
+fi
################################################################################
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to include Python D-Bus support" >&5
@@ -13073,12 +13269,12 @@ if test ${enable_dbus_service+y}
then :
enableval=$enable_dbus_service; BUILD_LVMDBUSD=$enableval
else $as_nop
- BUILD_LVMDBUSD=no
+ BUILD_LVMDBUSD="no"
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $BUILD_LVMDBUSD" >&5
printf "%s\n" "$BUILD_LVMDBUSD" >&6; }
-if test "$NOTIFYDBUS_SUPPORT" = yes && test "BUILD_LVMDBUSD" = yes
+if test "$NOTIFYDBUS_SUPPORT" = "yes" && test "BUILD_LVMDBUSD" = "yes"
then :
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Building D-Bus support without D-Bus notifications." >&5
printf "%s\n" "$as_me: WARNING: Building D-Bus support without D-Bus notifications." >&2;}
@@ -13086,7 +13282,9 @@ fi
################################################################################
-if test "$BUILD_LVMDBUSD" = yes; then
+if test "$BUILD_LVMDBUSD" = "yes"
+then :
+
unset am_cv_pathless_PYTHON ac_cv_path_PYTHON am_cv_python_platform
unset am_cv_python_pythondir am_cv_python_version am_cv_python_pyexecdir
unset ac_cv_path_PYTHON_CONFIG ac_cv_path_ac_pt_PYTHON_CONFIG
@@ -13488,7 +13686,12 @@ printf "%s\n" "$am_cv_python_pyexecdir" >&6; }
fi
PYTHON3=$PYTHON
- test -z "$PYTHON3" && as_fn_error $? "python3 is required for --enable-python3_bindings or --enable-dbus-service but cannot be found" "$LINENO" 5
+ if test -z "$PYTHON3"
+then :
+
+ as_fn_error $? "python3 is required for --enable-python3_bindings or --enable-dbus-service but cannot be found" "$LINENO" 5
+
+fi
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}python3-config", so it can be a program name with args.
set dummy ${ac_tool_prefix}python3-config; ac_word=$2
@@ -13597,11 +13800,21 @@ else
PYTHON3_CONFIG="$ac_cv_path_PYTHON3_CONFIG"
fi
- test -z "$PYTHON3_CONFIG" && as_fn_error $? "python3 headers are required for --enable-python3_bindings or --enable-dbus-service but cannot be found" "$LINENO" 5
+ if test -z "$PYTHON3_CONFIG"
+then :
+
+ as_fn_error $? "python3 headers are required for --enable-python3_bindings or --enable-dbus-service but cannot be found" "$LINENO" 5
+
+fi
PYTHON3_INCDIRS=`"$PYTHON3_CONFIG" --includes`
PYTHON3_LIBDIRS=`"$PYTHON3_CONFIG" --libs`
PYTHON3DIR=$pythondir
- test "$PYTHON3_BINDINGS" = yes && PYTHON_BINDINGS=yes
+ if test "$PYTHON3_BINDINGS" = "yes"
+then :
+
+ PYTHON_BINDINGS="yes"
+
+fi
# To get this macro, install autoconf-archive package then run autoreconf
@@ -13666,6 +13879,7 @@ printf "%s\n" "no" >&6; }
fi
fi
+
fi
################################################################################
@@ -13674,7 +13888,7 @@ if test ${enable_pkgconfig+y}
then :
enableval=$enable_pkgconfig; PKGCONFIG=$enableval
else $as_nop
- PKGCONFIG=no
+ PKGCONFIG="no"
fi
@@ -13684,7 +13898,7 @@ if test ${enable_write_install+y}
then :
enableval=$enable_write_install; WRITE_INSTALL=$enableval
else $as_nop
- WRITE_INSTALL=no
+ WRITE_INSTALL="no"
fi
@@ -13733,23 +13947,32 @@ if test ${enable_dmeventd+y}
then :
enableval=$enable_dmeventd; BUILD_DMEVENTD=$enableval
else $as_nop
- BUILD_DMEVENTD=no
+ BUILD_DMEVENTD="no"
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $BUILD_DMEVENTD" >&5
printf "%s\n" "$BUILD_DMEVENTD" >&6; }
-if test "$BUILD_DMEVENTD" = yes; then
- if test "$MIRRORS" != internal; then
+if test "$BUILD_DMEVENTD" = "yes"
+then :
+
+ if test "$MIRRORS" != "internal"
+then :
+
as_fn_error $? "--enable-dmeventd currently requires --with-mirrors=internal" "$LINENO" 5
- fi
- if test "$CMDLIB" = no; then
+
+fi
+ if test "$CMDLIB" = "no"
+then :
+
as_fn_error $? "--enable-dmeventd requires --enable-cmdlib to be used as well" "$LINENO" 5
- fi
+
+fi
printf "%s\n" "#define DMEVENTD 1" >>confdefs.h
+
fi
################################################################################
@@ -13884,17 +14107,19 @@ then :
printf "%s\n" "#define HAVE_LIBDL 1" >>confdefs.h
DL_LIBS="-ldl"
- HAVE_LIBDL=yes
+ HAVE_LIBDL="yes"
else $as_nop
DL_LIBS=
- HAVE_LIBDL=no
+ HAVE_LIBDL="no"
fi
################################################################################
-if [ \( "$LVM1" = shared -o "$POOL" = shared \
- \) -a "$STATIC_LINK" = yes ]; then
+if ( test "$LVM1" = "shared" || test "$POOL" = "shared" ) && test "$STATIC_LINK" = "yes"
+then :
+
as_fn_error $? "Features cannot be 'shared' when building statically" "$LINENO" 5
+
fi
################################################################################
@@ -13998,7 +14223,9 @@ fi
printf "%s\n" "$SELINUX" >&6; }
################################################################################
-if test "$SELINUX" = yes; then
+if test "$SELINUX" = "yes"
+then :
+
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sepol_check_context in -lsepol" >&5
printf %s "checking for sepol_check_context in -lsepol... " >&6; }
if test ${ac_cv_lib_sepol_sepol_check_context+y}
@@ -14116,6 +14343,7 @@ printf "%s\n" "$as_me: WARNING: Disabling selinux" >&2;}
HAVE_SELINUX=no
fi
+
fi
################################################################################
@@ -14142,9 +14370,9 @@ main (void)
_ACEOF
if ac_fn_c_try_compile "$LINENO"
then :
- ac_cv_have_blkzeroout=yes
+ ac_cv_have_blkzeroout="yes"
else $as_nop
- ac_cv_have_blkzeroout=no
+ ac_cv_have_blkzeroout="no"
fi
rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
@@ -14157,21 +14385,24 @@ if test ${enable_blkzeroout+y}
then :
enableval=$enable_blkzeroout; BLKZEROOUT=$enableval
else $as_nop
- BLKZEROOUT=yes
+ BLKZEROOUT="yes"
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to use BLKZEROOUT for device zeroing" >&5
printf %s "checking whether to use BLKZEROOUT for device zeroing... " >&6; }
-if test "$BLKZEROOUT" = yes; then
+if test "$BLKZEROOUT" = "yes"
+then :
+
if test $ac_cv_have_blkzeroout = yes
then :
printf "%s\n" "#define HAVE_BLKZEROOUT 1" >>confdefs.h
else $as_nop
- BLKZEROOUT=no
+ BLKZEROOUT="no"
fi
+
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $BLKZEROOUT" >&5
printf "%s\n" "$BLKZEROOUT" >&6; }
@@ -14180,7 +14411,9 @@ printf "%s\n" "$BLKZEROOUT" >&6; }
################################################################################
RT_LIBS=
HAVE_REALTIME=no
-if test "$REALTIME" = yes; then
+if test "$REALTIME" = "yes"
+then :
+
for ac_func in clock_gettime
do :
@@ -14193,7 +14426,7 @@ fi
done
- if test "$HAVE_REALTIME" != yes
+ if test "$HAVE_REALTIME" != "yes"
then :
# try again with -lrt
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for clock_gettime in -lrt" >&5
@@ -14238,14 +14471,20 @@ fi
fi
- if test "$HAVE_REALTIME" = yes; then
+ if test "$HAVE_REALTIME" = "yes"
+then :
+
printf "%s\n" "#define HAVE_REALTIME 1" >>confdefs.h
- else
+
+else $as_nop
+
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Disabling realtime clock" >&5
printf "%s\n" "$as_me: WARNING: Disabling realtime clock" >&2;}
- fi
+
+fi
+
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for struct stat has st_ctim." >&5
@@ -14300,7 +14539,9 @@ fi
done
################################################################################
-if test "$EDITLINE" == yes; then
+if test "$EDITLINE" = "yes"
+then :
+
pkg_failed=no
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for EDITLINE" >&5
@@ -14377,10 +14618,13 @@ printf "%s\n" "yes" >&6; }
printf "%s\n" "#define EDITLINE_SUPPORT 1" >>confdefs.h
fi
+
fi
################################################################################
-if test "$READLINE" != no; then
+if test "$READLINE" != "no"
+then :
+
lvm_saved_libs=$LIBS
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing tgetent" >&5
printf %s "checking for library containing tgetent... " >&6; }
@@ -14441,7 +14685,9 @@ then :
READLINE_LIBS=$ac_cv_search_tgetent
else $as_nop
- if test "$READLINE" = yes; then
+ if test "$READLINE" = "yes"
+then :
+
as_fn_error $? "termcap could not be found which is required for the
--enable-readline option (which is enabled by default). Either disable readline
support with --disable-readline or download and install termcap from:
@@ -14450,7 +14696,9 @@ Note: if you are using precompiled packages you will also need the development
package as well (which may be called termcap-devel or something similar).
Note: (n)curses also seems to work as a substitute for termcap. This was
not found either - but you could try installing that as well." "$LINENO" 5
- fi
+
+fi
+
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for readline in -lreadline" >&5
@@ -14545,14 +14793,18 @@ fi
else $as_nop
READLINE_LIBS=
- if test "$READLINE" = yes; then
+ if test "$READLINE" = "yes"
+then :
+
as_fn_error $? "GNU Readline could not be found which is required for the
--enable-readline option (which is enabled by default). Either disable readline
support with --disable-readline or download and install readline from:
ftp.gnu.org/gnu/readline
Note: if you are using precompiled packages you will also need the development
package as well (which may be called readline-devel or something similar)." "$LINENO" 5
- fi
+
+fi
+
fi
LIBS="$READLINE_LIBS $lvm_saved_libs"
@@ -14564,6 +14816,7 @@ then :
fi
LIBS=$lvm_saved_libs
+
fi
################################################################################
@@ -14574,13 +14827,15 @@ if test ${enable_nls+y}
then :
enableval=$enable_nls; INTL=$enableval
else $as_nop
- INTL=no
+ INTL="no"
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $INTL" >&5
printf "%s\n" "$INTL" >&6; }
-if test "$INTL" = yes; then
+if test "$INTL" = "yes"
+then :
+
# FIXME - Move this - can be device-mapper too
INTL_PACKAGE="lvm2"
if test -n "$ac_tool_prefix"; then
@@ -14713,6 +14968,7 @@ printf "%s\n" "#define INTL_PACKAGE \"$INTL_PACKAGE\"" >>confdefs.h
printf "%s\n" "#define LOCALEDIR \"$(eval echo $(eval echo $localedir))\"" >>confdefs.h
+
fi
################################################################################
@@ -14795,18 +15051,72 @@ fi
# Check whether --with-systemdsystemunitdir was given.
if test ${with_systemdsystemunitdir+y}
then :
- withval=$with_systemdsystemunitdir; systemdsystemunitdir=$withval
+ withval=$with_systemdsystemunitdir;
+fi
+
+
+if test -z "$with_systemdsystemunitdir"
+then :
+
+
+if test -n "$systemdsystemunitdir"; then
+ pkg_cv_systemdsystemunitdir="$systemdsystemunitdir"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"systemd\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "systemd") 2>&5
+ ac_status=$?
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_systemdsystemunitdir=`$PKG_CONFIG --variable="systemdsystemunitdir" "systemd" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+systemdsystemunitdir=$pkg_cv_systemdsystemunitdir
+
+if test "x$systemdsystemunitdir" = x""
+then :
+
+ systemdsystemunitdir='${exec_prefix}/lib/systemd/system'
+
+fi
+
else $as_nop
- pkg_config_init
- pkg_systemdsystemunitdir=$("$PKG_CONFIG" --variable=systemdsystemunitdir systemd)
+
+ systemdsystemunitdir="$with_systemdsystemunitdir"
+
+fi
+
+
+if test -n "$systemdutildir"; then
+ pkg_cv_systemdutildir="$systemdutildir"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"systemd\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "systemd") 2>&5
+ ac_status=$?
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_systemdutildir=`$PKG_CONFIG --variable="systemdutildir" "systemd" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
+else
+ pkg_failed=yes
fi
+ else
+ pkg_failed=untried
+fi
+systemdutildir=$pkg_cv_systemdutildir
+if test "x$systemdutildir" = x""
+then :
-test -n "$pkg_systemdsystemunitdir" && systemdsystemunitdir=$pkg_systemdsystemunitdir
-test -z "$systemdsystemunitdir" && systemdsystemunitdir='${exec_prefix}/lib/systemd/system';
+ systemdutildir='${exec_prefix}/lib/systemd'
-systemdutildir=$("$PKG_CONFIG" --variable=systemdutildir systemd)
-test -z "$systemdutildir" && systemdutildir='${exec_prefix}/lib/systemd';
+fi
################################################################################
@@ -14819,7 +15129,9 @@ else $as_nop
fi
################################################################################
-if test "$READLINE" = yes; then
+if test "$READLINE" = "yes"
+then :
+
for ac_header in readline/readline.h readline/history.h
do :
as_ac_Header=`printf "%s\n" "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -14835,13 +15147,16 @@ else $as_nop
fi
done
+
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable readline" >&5
printf %s "checking whether to enable readline... " >&6; }
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $READLINE" >&5
printf "%s\n" "$READLINE" >&6; }
-if test "$EDITLINE" = yes; then
+if test "$EDITLINE" = "yes"
+then :
+
for ac_header in editline/readline.h
do :
ac_fn_c_check_header_compile "$LINENO" "editline/readline.h" "ac_cv_header_editline_readline_h" "$ac_includes_default"
@@ -14854,13 +15169,16 @@ else $as_nop
fi
done
+
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable editline" >&5
printf %s "checking whether to enable editline... " >&6; }
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $EDITLINE" >&5
printf "%s\n" "$EDITLINE" >&6; }
-if test "$BUILD_CMIRRORD" = yes; then
+if test "$BUILD_CMIRRORD" = "yes"
+then :
+
for ac_func in atexit
do :
@@ -14874,12 +15192,16 @@ else $as_nop
fi
done
+
fi
-if test "$BUILD_LVMLOCKD" = yes; then
- if test "$HAVE_REALTIME" != yes
+if test "$BUILD_LVMLOCKD" = "yes"
+then :
+
+ if test "$HAVE_REALTIME" != "yes"
then :
- as_fn_error $? "Realtime clock support is mandatory for lvmlockd." "$LINENO" 5
+
+ as_fn_error $? "Realtime clock support is mandatory for lvmlockd." "$LINENO" 5
fi
for ac_func in strtoull
@@ -14894,23 +15216,10 @@ else $as_nop
fi
done
-fi
-
-if test "$BUILD_LVMPOLLD" = yes; then
-
- for ac_func in strpbrk
-do :
- ac_fn_c_check_func "$LINENO" "strpbrk" "ac_cv_func_strpbrk"
-if test "x$ac_cv_func_strpbrk" = xyes
-then :
- printf "%s\n" "#define HAVE_STRPBRK 1" >>confdefs.h
-else $as_nop
- hard_bailout
fi
-done
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC options needed to detect all undeclared functions" >&5
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC options needed to detect all undeclared functions" >&5
printf %s "checking for $CC options needed to detect all undeclared functions... " >&6; }
if test ${ac_cv_c_undeclared_builtin_options+y}
then :
@@ -14999,6 +15308,22 @@ else $as_nop
fi
printf "%s\n" "#define HAVE_DECL_STRERROR_R $ac_have_decl" >>confdefs.h
+if test "$BUILD_LVMPOLLD" = "yes"
+then :
+
+
+ for ac_func in strpbrk
+do :
+ ac_fn_c_check_func "$LINENO" "strpbrk" "ac_cv_func_strpbrk"
+if test "x$ac_cv_func_strpbrk" = xyes
+then :
+ printf "%s\n" "#define HAVE_STRPBRK 1" >>confdefs.h
+
+else $as_nop
+ hard_bailout
+fi
+
+done
if test $ac_cv_have_decl_strerror_r = yes; then
# For backward compatibility's sake, define HAVE_STRERROR_R.
@@ -15051,9 +15376,12 @@ printf "%s\n" "#define STRERROR_R_CHAR_P 1" >>confdefs.h
fi
+
fi
-if test "$BUILD_DMEVENTD" = yes; then
+if test "$BUILD_DMEVENTD" = "yes"
+then :
+
for ac_header in arpa/inet.h
do :
ac_fn_c_check_header_compile "$LINENO" "arpa/inet.h" "ac_cv_header_arpa_inet_h" "$ac_includes_default"
@@ -15066,9 +15394,12 @@ else $as_nop
fi
done
+
fi
-if test "$HAVE_LIBDL" = yes; then
+if test "$HAVE_LIBDL" = "yes"
+then :
+
for ac_header in dlfcn.h
do :
ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default"
@@ -15081,9 +15412,12 @@ else $as_nop
fi
done
+
fi
-if test "$INTL" = yes; then
+if test "$INTL" = "yes"
+then :
+
for ac_header in libintl.h
do :
ac_fn_c_check_header_compile "$LINENO" "libintl.h" "ac_cv_header_libintl_h" "$ac_includes_default"
@@ -15096,9 +15430,12 @@ else $as_nop
fi
done
+
fi
-if test "$UDEV_SYNC" = yes; then
+if test "$UDEV_SYNC" = "yes"
+then :
+
for ac_header in sys/ipc.h sys/sem.h
do :
as_ac_Header=`printf "%s\n" "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -15114,9 +15451,12 @@ else $as_nop
fi
done
+
fi
-if test "$BUILD_DMFILEMAPD" = yes; then
+if test "$BUILD_DMFILEMAPD" = "yes"
+then :
+
for ac_header in sys/inotify.h
do :
ac_fn_c_check_header_compile "$LINENO" "sys/inotify.h" "ac_cv_header_sys_inotify_h" "$ac_includes_default"
@@ -15129,6 +15469,7 @@ else $as_nop
fi
done
+
fi
################################################################################
@@ -15241,10 +15582,13 @@ else
fi
-if test -n "$MODPROBE_CMD"; then
+if test -n "$MODPROBE_CMD"
+then :
+
printf "%s\n" "#define MODPROBE_CMD \"$MODPROBE_CMD\"" >>confdefs.h
+
fi
SYSCONFDIR="$(eval echo $(eval echo $sysconfdir))"
@@ -15280,7 +15624,9 @@ printf "%s\n" "#define LVRESIZE_FS_HELPER_PATH \"$LVRESIZE_FS_HELPER_PATH\"" >>c
################################################################################
-if test "$BUILD_DMEVENTD" = yes; then
+if test "$BUILD_DMEVENTD" = "yes"
+then :
+
# Check whether --with-dmeventd-pidfile was given.
if test ${with_dmeventd_pidfile+y}
@@ -15293,9 +15639,12 @@ fi
printf "%s\n" "#define DMEVENTD_PIDFILE \"$DMEVENTD_PIDFILE\"" >>confdefs.h
+
fi
-if test "$BUILD_DMEVENTD" = yes; then
+if test "$BUILD_DMEVENTD" = "yes"
+then :
+
# Check whether --with-dmeventd-path was given.
if test ${with_dmeventd_path+y}
@@ -15308,6 +15657,7 @@ fi
printf "%s\n" "#define DMEVENTD_PATH \"$DMEVENTD_PATH\"" >>confdefs.h
+
fi
################################################################################
@@ -15330,7 +15680,7 @@ if test ${with_default_profile_subdir+y}
then :
withval=$with_default_profile_subdir; DEFAULT_PROFILE_SUBDIR=$withval
else $as_nop
- DEFAULT_PROFILE_SUBDIR=profile
+ DEFAULT_PROFILE_SUBDIR="profile"
fi
@@ -15343,7 +15693,7 @@ if test ${with_default_archive_subdir+y}
then :
withval=$with_default_archive_subdir; DEFAULT_ARCHIVE_SUBDIR=$withval
else $as_nop
- DEFAULT_ARCHIVE_SUBDIR=archive
+ DEFAULT_ARCHIVE_SUBDIR="archive"
fi
@@ -15356,7 +15706,7 @@ if test ${with_default_backup_subdir+y}
then :
withval=$with_default_backup_subdir; DEFAULT_BACKUP_SUBDIR=$withval
else $as_nop
- DEFAULT_BACKUP_SUBDIR=backup
+ DEFAULT_BACKUP_SUBDIR="backup"
fi
@@ -15369,7 +15719,7 @@ if test ${with_default_cache_subdir+y}
then :
withval=$with_default_cache_subdir; DEFAULT_CACHE_SUBDIR=$withval
else $as_nop
- DEFAULT_CACHE_SUBDIR=cache
+ DEFAULT_CACHE_SUBDIR="cache"
fi
@@ -15407,32 +15757,32 @@ if test ${with_interface+y}
then :
withval=$with_interface; interface=$withval
else $as_nop
- interface=ioctl
+ interface="ioctl"
fi
-test "$interface" != ioctl && as_fn_error $? "--with-interface=ioctl required. fs no longer supported." "$LINENO" 5
+test "$interface" != "ioctl" && as_fn_error $? "--with-interface=ioctl required. fs no longer supported." "$LINENO" 5
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $interface" >&5
printf "%s\n" "$interface" >&6; }
################################################################################
-read DM_LIB_VERSION < "$srcdir"/VERSION_DM 2>/dev/null || DM_LIB_VERSION=Unknown
+read DM_LIB_VERSION < "$srcdir"/VERSION_DM 2>/dev/null || DM_LIB_VERSION="Unknown"
printf "%s\n" "#define DM_LIB_VERSION \"$DM_LIB_VERSION\"" >>confdefs.h
-DM_LIB_PATCHLEVEL=`cat "$srcdir"/VERSION_DM | $AWK -F '[-. ]' '{printf "%s.%s.%s",$1,$2,$3}'`
+DM_LIB_PATCHLEVEL=$(cat "$srcdir"/VERSION_DM | $AWK -F '[-. ]' '{printf "%s.%s.%s",$1,$2,$3}')
read VER < "$srcdir"/VERSION 2>/dev/null || VER=Unknown
LVM_VERSION=\"$VER\"
-LVM_RELEASE_DATE="\"`echo $VER | $SED 's/.* (//;s/).*//'`\""
-VER=`echo "$VER" | $AWK '{print $1}'`
-LVM_RELEASE="\"`echo "$VER" | $AWK -F '-' '{print $2}'`\""
-VER=`echo "$VER" | $AWK -F '-' '{print $1}'`
-LVM_MAJOR=`echo "$VER" | $AWK -F '.' '{print $1}'`
-LVM_MINOR=`echo "$VER" | $AWK -F '.' '{print $2}'`
-LVM_PATCHLEVEL=`echo "$VER" | $AWK -F '[(.]' '{print $3}'`
-LVM_LIBAPI=`echo "$VER" | $AWK -F '[()]' '{print $2}'`
+LVM_RELEASE_DATE="\"$(echo $VER | $SED 's/.* (//;s/).*//')\""
+VER=$(echo "$VER" | $AWK '{print $1}')
+LVM_RELEASE="\"$(echo "$VER" | $AWK -F '-' '{print $2}')\""
+VER=$(echo "$VER" | $AWK -F '-' '{print $1}')
+LVM_MAJOR=$(echo "$VER" | $AWK -F '.' '{print $1}')
+LVM_MINOR=$(echo "$VER" | $AWK -F '.' '{print $2}')
+LVM_PATCHLEVEL=$(echo "$VER" | $AWK -F '[(.]' '{print $3}')
+LVM_LIBAPI=$(echo "$VER" | $AWK -F '[()]' '{print $2}')
printf "%s\n" "#define LVM_CONFIGURE_LINE \"$CONFIGURE_LINE\"" >>confdefs.h
@@ -15601,6 +15951,8 @@ printf "%s\n" "#define LVM_CONFIGURE_LINE \"$CONFIGURE_LINE\"" >>confdefs.h
+
+
@@ -16984,7 +17336,7 @@ then :
printf "%s\n" "$as_me: WARNING: Only libdm part can be build without libaio: make [install_]device-mapper" >&2;}
fi
-if test "$ODIRECT" != yes
+if test "$ODIRECT" != "yes"
then :
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: O_DIRECT disabled: low-memory pvmove may lock up" >&5
printf "%s\n" "$as_me: WARNING: O_DIRECT disabled: low-memory pvmove may lock up" >&2;}
^ permalink raw reply related [flat|nested] 12+ messages in thread* main - configure: update
@ 2022-11-25 15:43 Zdenek Kabelac
0 siblings, 0 replies; 12+ messages in thread
From: Zdenek Kabelac @ 2022-11-25 15:43 UTC (permalink / raw)
To: lvm-devel
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=ae916f77c92c1765c76fbb849a2eaeb5e0724768
Commit: ae916f77c92c1765c76fbb849a2eaeb5e0724768
Parent: fdd8feb60e7a7757aaa12d9df357cadeb1c31044
Author: Zdenek Kabelac <zkabelac@redhat.com>
AuthorDate: Wed Nov 23 13:18:07 2022 +0100
Committer: Zdenek Kabelac <zkabelac@redhat.com>
CommitterDate: Fri Nov 25 15:55:56 2022 +0100
configure: update
---
configure | 111 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 file changed, 107 insertions(+), 4 deletions(-)
diff --git a/configure b/configure
index ccd5a5938..718f281bc 100755
--- a/configure
+++ b/configure
@@ -850,6 +850,7 @@ CHMOD
CSCOPE_CMD
CFLOW_CMD
AR
+READELF
RANLIB
MKDIR_P
SET_MAKE
@@ -5162,11 +5163,11 @@ if test x$ac_prog_cxx_stdcxx = xno
then :
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++11 features" >&5
printf %s "checking for $CXX option to enable C++11 features... " >&6; }
-if test ${ac_cv_prog_cxx_11+y}
+if test ${ac_cv_prog_cxx_cxx11+y}
then :
printf %s "(cached) " >&6
else $as_nop
- ac_cv_prog_cxx_11=no
+ ac_cv_prog_cxx_cxx11=no
ac_save_CXX=$CXX
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -5208,11 +5209,11 @@ if test x$ac_prog_cxx_stdcxx = xno
then :
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++98 features" >&5
printf %s "checking for $CXX option to enable C++98 features... " >&6; }
-if test ${ac_cv_prog_cxx_98+y}
+if test ${ac_cv_prog_cxx_cxx98+y}
then :
printf %s "(cached) " >&6
else $as_nop
- ac_cv_prog_cxx_98=no
+ ac_cv_prog_cxx_cxx98=no
ac_save_CXX=$CXX
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -5874,6 +5875,108 @@ else
RANLIB="$ac_cv_prog_RANLIB"
fi
+if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}readelf", so it can be a program name with args.
+set dummy ${ac_tool_prefix}readelf; ac_word=$2
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_READELF+y}
+then :
+ printf %s "(cached) " >&6
+else $as_nop
+ if test -n "$READELF"; then
+ ac_cv_prog_READELF="$READELF" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ case $as_dir in #(((
+ '') as_dir=./ ;;
+ */) ;;
+ *) as_dir=$as_dir/ ;;
+ esac
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+ ac_cv_prog_READELF="${ac_tool_prefix}readelf"
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+READELF=$ac_cv_prog_READELF
+if test -n "$READELF"; then
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $READELF" >&5
+printf "%s\n" "$READELF" >&6; }
+else
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_READELF"; then
+ ac_ct_READELF=$READELF
+ # Extract the first word of "readelf", so it can be a program name with args.
+set dummy readelf; ac_word=$2
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_ac_ct_READELF+y}
+then :
+ printf %s "(cached) " >&6
+else $as_nop
+ if test -n "$ac_ct_READELF"; then
+ ac_cv_prog_ac_ct_READELF="$ac_ct_READELF" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ case $as_dir in #(((
+ '') as_dir=./ ;;
+ */) ;;
+ *) as_dir=$as_dir/ ;;
+ esac
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+ ac_cv_prog_ac_ct_READELF="readelf"
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_READELF=$ac_cv_prog_ac_ct_READELF
+if test -n "$ac_ct_READELF"; then
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_READELF" >&5
+printf "%s\n" "$ac_ct_READELF" >&6; }
+else
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+fi
+
+ if test "x$ac_ct_READELF" = x; then
+ READELF=""
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+ READELF=$ac_ct_READELF
+ fi
+else
+ READELF="$ac_cv_prog_READELF"
+fi
+
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
set dummy ${ac_tool_prefix}ar; ac_word=$2
^ permalink raw reply related [flat|nested] 12+ messages in thread* main - configure: update
@ 2021-10-15 8:12 Zdenek Kabelac
0 siblings, 0 replies; 12+ messages in thread
From: Zdenek Kabelac @ 2021-10-15 8:12 UTC (permalink / raw)
To: lvm-devel
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=bf87b8354d07dbddc520e8b61543128e2b2f1924
Commit: bf87b8354d07dbddc520e8b61543128e2b2f1924
Parent: 9d87549f8096759a70ce91119ebc71e8fdde0294
Author: Zdenek Kabelac <zkabelac@redhat.com>
AuthorDate: Fri Oct 15 10:08:26 2021 +0200
Committer: Zdenek Kabelac <zkabelac@redhat.com>
CommitterDate: Fri Oct 15 10:11:34 2021 +0200
configure: update
---
configure | 161 ++++++++++++++++++++++++--------------------------------------
1 file changed, 63 insertions(+), 98 deletions(-)
diff --git a/configure b/configure
index 808029a79..642cb4f6b 100755
--- a/configure
+++ b/configure
@@ -8780,7 +8780,7 @@ $as_echo "$as_me: WARNING: thin_check not found in path $PATH" >&2;}
THIN_CONFIGURE_WARN=y
fi
fi
- if test "$THIN_CHECK_NEEDS_CHECK" = yes; then
+ if test "$THIN_CHECK_NEEDS_CHECK" = yes && test "$THIN_CONFIGURE_WARN" != y ; then
THIN_CHECK_VSN=`"$THIN_CHECK_CMD" -V 2>/dev/null`
THIN_CHECK_VSN_MAJOR=`echo "$THIN_CHECK_VSN" | $AWK -F '.' '{print $1}'`
THIN_CHECK_VSN_MINOR=`echo "$THIN_CHECK_VSN" | $AWK -F '.' '{print $2}'`
@@ -9328,7 +9328,7 @@ $as_echo "$as_me: WARNING: cache_check not found in path $PATH" >&2;}
CACHE_CONFIGURE_WARN=y
fi
fi
- if test "$CACHE_CHECK_NEEDS_CHECK" = yes; then
+ if test "$CACHE_CHECK_NEEDS_CHECK" = yes && test "$CACHE_CONFIGURE_WARN" != y ; then
$CACHE_CHECK_CMD -V 2>/dev/null >conftest.tmp
read -r CACHE_CHECK_VSN < conftest.tmp
IFS=.- read -r CACHE_CHECK_VSN_MAJOR CACHE_CHECK_VSN_MINOR CACHE_CHECK_VSN_PATCH LEFTOVER < conftest.tmp
@@ -11567,13 +11567,34 @@ fi
fi
-SYSTEMD_MIN_VERSION=
+SYSTEMD_MIN_VERSION=0
+pkg_config_init
+if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"systemd >= 205\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "systemd >= 205") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ SYSTEMD_MIN_VERSION=205
+fi
+
################################################################################
+if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"systemd >= 221\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "systemd >= 221") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ SYSTEMD_MIN_VERSION=221
+fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build notifydbus" >&5
$as_echo_n "checking whether to build notifydbus... " >&6; }
# Check whether --enable-notify-dbus was given.
if test "${enable_notify_dbus+set}" = set; then :
- enableval=$enable_notify_dbus; NOTIFYDBUS_SUPPORT=$enableval
+ enableval=$enable_notify_dbus; if test "$enableval" = yes && test "$SYSTEMD_MIN_VERSION" -lt 221; then :
+ as_fn_error $? "Enabling notify-dbus requires systemd >= 221" "$LINENO" 5
+fi
+ NOTIFYDBUS_SUPPORT=$enableval
else
NOTIFYDBUS_SUPPORT=no
fi
@@ -11585,13 +11606,19 @@ if test "$NOTIFYDBUS_SUPPORT" = yes; then :
$as_echo "#define NOTIFYDBUS_SUPPORT 1" >>confdefs.h
- SYSTEMD_MIN_VERSION=221
fi
################################################################################
+if test "$SYSTEMD_MIN_VERSION" -ge 221; then :
+ SYSTEMD_JOURNAL_SUPPORT=maybe
+else
+ SYSTEMD_JOURNAL_SUPPORT=no
+fi
ac_fn_c_check_header_mongrel "$LINENO" "systemd/sd-journal.h" "ac_cv_header_systemd_sd_journal_h" "$ac_includes_default"
if test "x$ac_cv_header_systemd_sd_journal_h" = xyes; then :
+ if test "$SYSTEMD_JOURNAL_SUPPORT" != no; then :
SYSTEMD_JOURNAL_SUPPORT=yes
+fi
else
SYSTEMD_JOURNAL_SUPPORT=no
fi
@@ -11602,7 +11629,7 @@ $as_echo_n "checking whether to log to systemd journal... " >&6; }
# Check whether --enable-systemd-journal was given.
if test "${enable_systemd_journal+set}" = set; then :
enableval=$enable_systemd_journal; if test "$enableval" = yes && test "$SYSTEMD_JOURNAL_SUPPORT" = no; then :
- as_fn_error $? "Enabling systemd journaling requires systemd/sd-journal.h." "$LINENO" 5
+ as_fn_error $? "Enabling systemd journal requires systemd/sd-journal.h and systemd >= 221." "$LINENO" 5
fi
SYSTEMD_JOURNAL_SUPPORT=$enableval
fi
@@ -11614,24 +11641,35 @@ if test "$SYSTEMD_JOURNAL_SUPPORT" = yes; then :
$as_echo "#define SYSTEMD_JOURNAL_SUPPORT 1" >>confdefs.h
- SYSTEMD_MIN_VERSION=221
fi
################################################################################
+if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"systemd >= 234\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "systemd >= 234") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ SYSTEMD_MIN_VERSION=234 APP_MACHINEID_SUPPORT=maybe
+else
+ APP_MACHINEID_SUPPORT=no
+fi
ac_fn_c_check_header_mongrel "$LINENO" "systemd/sd-id128.h" "ac_cv_header_systemd_sd_id128_h" "$ac_includes_default"
if test "x$ac_cv_header_systemd_sd_id128_h" = xyes; then :
+ if test "$APP_MACHINEID_SUPPORT" != no; then :
APP_MACHINEID_SUPPORT=yes
+fi
else
APP_MACHINEID_SUPPORT=no
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build appmachineid" >&5
-$as_echo_n "checking whether to build appmachineid... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to support systemd appmachineid" >&5
+$as_echo_n "checking whether to support systemd appmachineid... " >&6; }
# Check whether --enable-app-machineid was given.
if test "${enable_app_machineid+set}" = set; then :
enableval=$enable_app_machineid; if test "$enableval" = yes && test "$APP_MACHINEID_SUPPORT" = no; then :
- as_fn_error $? "Enabling app machineid requires systemd/sd-id128.h." "$LINENO" 5
+ as_fn_error $? "Enabling app machineid requires systemd/sd-id128.h and systemd >= 234." "$LINENO" 5
fi
APP_MACHINEID_SUPPORT=$enableval
fi
@@ -11643,10 +11681,9 @@ if test "$APP_MACHINEID_SUPPORT" = yes; then :
$as_echo "#define APP_MACHINEID_SUPPORT 1" >>confdefs.h
- SYSTEMD_MIN_VERSION=234
fi
-if test -n "$SYSTEMD_MIN_VERSION"; then :
+if test "$NOTIFYDBUS_SUPPORT" = yes || test "$SYSTEMD_JOURNAL_SUPPORT" = yes || test "$APP_MACHINEID_SUPPORT" = yes ; then :
pkg_config_init
@@ -11658,12 +11695,12 @@ if test -n "$SYSTEMD_CFLAGS"; then
pkg_cv_SYSTEMD_CFLAGS="$SYSTEMD_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"systemd >= \"\$SYSTEMD_MIN_VERSION\"\""; } >&5
- ($PKG_CONFIG --exists --print-errors "systemd >= "$SYSTEMD_MIN_VERSION"") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"systemd\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "systemd") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_SYSTEMD_CFLAGS=`$PKG_CONFIG --cflags "systemd >= "$SYSTEMD_MIN_VERSION"" 2>/dev/null`
+ pkg_cv_SYSTEMD_CFLAGS=`$PKG_CONFIG --cflags "systemd" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -11675,12 +11712,12 @@ if test -n "$SYSTEMD_LIBS"; then
pkg_cv_SYSTEMD_LIBS="$SYSTEMD_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"systemd >= \"\$SYSTEMD_MIN_VERSION\"\""; } >&5
- ($PKG_CONFIG --exists --print-errors "systemd >= "$SYSTEMD_MIN_VERSION"") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"systemd\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "systemd") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_SYSTEMD_LIBS=`$PKG_CONFIG --libs "systemd >= "$SYSTEMD_MIN_VERSION"" 2>/dev/null`
+ pkg_cv_SYSTEMD_LIBS=`$PKG_CONFIG --libs "systemd" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -11701,9 +11738,9 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- SYSTEMD_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "systemd >= "$SYSTEMD_MIN_VERSION"" 2>&1`
+ SYSTEMD_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "systemd" 2>&1`
else
- SYSTEMD_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "systemd >= "$SYSTEMD_MIN_VERSION"" 2>&1`
+ SYSTEMD_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "systemd" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$SYSTEMD_PKG_ERRORS" >&5
@@ -11718,9 +11755,8 @@ else
SYSTEMD_LIBS=$pkg_cv_SYSTEMD_LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
-
+ SYSTEMD_LIBS="-lsystemd"
fi
- SYSTEMD_LIBS="-lsystemd"
fi
################################################################################
@@ -11842,85 +11878,14 @@ fi
if test "$UDEV_SYSTEMD_BACKGROUND_JOBS" != no; then
- pkg_config_init
-
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SYSTEMD" >&5
-$as_echo_n "checking for SYSTEMD... " >&6; }
-
-if test -n "$SYSTEMD_CFLAGS"; then
- pkg_cv_SYSTEMD_CFLAGS="$SYSTEMD_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"systemd >= 205\""; } >&5
- ($PKG_CONFIG --exists --print-errors "systemd >= 205") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
- pkg_cv_SYSTEMD_CFLAGS=`$PKG_CONFIG --cflags "systemd >= 205" 2>/dev/null`
- test "x$?" != "x0" && pkg_failed=yes
-else
- pkg_failed=yes
-fi
- else
- pkg_failed=untried
-fi
-if test -n "$SYSTEMD_LIBS"; then
- pkg_cv_SYSTEMD_LIBS="$SYSTEMD_LIBS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"systemd >= 205\""; } >&5
- ($PKG_CONFIG --exists --print-errors "systemd >= 205") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
- pkg_cv_SYSTEMD_LIBS=`$PKG_CONFIG --libs "systemd >= 205" 2>/dev/null`
- test "x$?" != "x0" && pkg_failed=yes
+ if test "$SYSTEMD_MIN_VERSION" -ge 205; then :
+ UDEV_SYSTEMD_BACKGROUND_JOBS=yes
else
- pkg_failed=yes
-fi
- else
- pkg_failed=untried
-fi
-
-
-
-if test $pkg_failed = yes; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
- _pkg_short_errors_supported=yes
+ if test "$UDEV_SYSTEMD_BACKGROUND_JOBS" = maybe; then :
+ UDEV_SYSTEMD_BACKGROUND_JOBS=no
else
- _pkg_short_errors_supported=no
+ as_fn_error $? "bailing out... systemd >= 205 is required" "$LINENO" 5
fi
- if test $_pkg_short_errors_supported = yes; then
- SYSTEMD_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "systemd >= 205" 2>&1`
- else
- SYSTEMD_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "systemd >= 205" 2>&1`
- fi
- # Put the nasty error message in config.log where it belongs
- echo "$SYSTEMD_PKG_ERRORS" >&5
-
- if test "$UDEV_SYSTEMD_BACKGROUND_JOBS" = maybe; then
- UDEV_SYSTEMD_BACKGROUND_JOBS=no
- else
- as_fn_error $? "bailing out... systemd >= 205 is required" "$LINENO" 5
- fi
-elif test $pkg_failed = untried; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- if test "$UDEV_SYSTEMD_BACKGROUND_JOBS" = maybe; then
- UDEV_SYSTEMD_BACKGROUND_JOBS=no
- else
- as_fn_error $? "bailing out... systemd >= 205 is required" "$LINENO" 5
- fi
-else
- SYSTEMD_CFLAGS=$pkg_cv_SYSTEMD_CFLAGS
- SYSTEMD_LIBS=$pkg_cv_SYSTEMD_LIBS
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
- UDEV_SYSTEMD_BACKGROUND_JOBS=yes
fi
fi
^ permalink raw reply related [flat|nested] 12+ messages in thread* main - configure: update
@ 2021-10-07 17:43 David Teigland
0 siblings, 0 replies; 12+ messages in thread
From: David Teigland @ 2021-10-07 17:43 UTC (permalink / raw)
To: lvm-devel
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=5ac4b662df525039eda6a5fc461da60c6ea42c2a
Commit: 5ac4b662df525039eda6a5fc461da60c6ea42c2a
Parent: 67722b312390cdab29c076c912e14bd739c5c0f6
Author: Marian Csontos <mcsontos@redhat.com>
AuthorDate: Mon Apr 26 14:27:05 2021 +0200
Committer: David Teigland <teigland@redhat.com>
CommitterDate: Thu Oct 7 12:42:43 2021 -0500
configure: update
---
configure | 112 +++++++++++++++++++++++++++++++++++++++++++++++++
include/configure.h.in | 3 ++
2 files changed, 115 insertions(+)
diff --git a/configure b/configure
index 8a267d0f1..1f333a6f2 100755
--- a/configure
+++ b/configure
@@ -774,6 +774,10 @@ UDEV_LIBS
UDEV_CFLAGS
SYSTEMD_LIBS
SYSTEMD_CFLAGS
+BLKID_LIBS
+BLKID_CFLAGS
+APP_MACHINEID_LIBS
+APP_MACHINEID_CFLAGS
NOTIFY_DBUS_LIBS
NOTIFY_DBUS_CFLAGS
BLKID_LIBS
@@ -957,6 +961,7 @@ enable_use_lvmpolld
with_lvmpolld_pidfile
enable_dmfilemapd
enable_notify_dbus
+enable_app_machineid
enable_blkid_wiping
enable_udev_systemd_background_jobs
enable_udev_sync
@@ -1027,6 +1032,10 @@ LOCKD_DLM_CONTROL_CFLAGS
LOCKD_DLM_CONTROL_LIBS
LOCKD_IDM_CFLAGS
LOCKD_IDM_LIBS
+NOTIFY_DBUS_CFLAGS
+NOTIFY_DBUS_LIBS
+APP_MACHINEID_CFLAGS
+APP_MACHINEID_LIBS
BLKID_CFLAGS
BLKID_LIBS
NOTIFY_DBUS_CFLAGS
@@ -1691,6 +1700,7 @@ Optional Features:
--disable-use-lvmpolld disable usage of LVM Poll Daemon
--enable-dmfilemapd enable the dmstats filemap daemon
--enable-notify-dbus enable LVM notification using dbus
+ --enable-app-machineid enable LVM system ID using app-specific machine-id
--disable-blkid_wiping disable libblkid detection of signatures when wiping
and use native code instead
--disable-udev-systemd-background-jobs
@@ -1853,6 +1863,13 @@ Some influential environment variables:
C compiler flags for NOTIFY_DBUS, overriding pkg-config
NOTIFY_DBUS_LIBS
linker flags for NOTIFY_DBUS, overriding pkg-config
+ APP_MACHINEID_CFLAGS
+ C compiler flags for APP_MACHINEID, overriding pkg-config
+ APP_MACHINEID_LIBS
+ linker flags for APP_MACHINEID, overriding pkg-config
+ BLKID_CFLAGS
+ C compiler flags for BLKID, overriding pkg-config
+ BLKID_LIBS linker flags for BLKID, overriding pkg-config
SYSTEMD_CFLAGS
C compiler flags for SYSTEMD, overriding pkg-config
SYSTEMD_LIBS
@@ -11637,6 +11654,101 @@ $as_echo "yes" >&6; }
fi
fi
+################################################################################
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build appmachineid" >&5
+$as_echo_n "checking whether to build appmachineid... " >&6; }
+# Check whether --enable-app-machineid was given.
+if test "${enable_app_machineid+set}" = set; then :
+ enableval=$enable_app_machineid; APP_MACHINEID_SUPPORT=$enableval
+else
+ APP_MACHINEID_SUPPORT=no
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $APP_MACHINEID_SUPPORT" >&5
+$as_echo "$APP_MACHINEID_SUPPORT" >&6; }
+
+if test "$APP_MACHINEID_SUPPORT" = yes; then
+
+$as_echo "#define APP_MACHINEID_SUPPORT 1" >>confdefs.h
+
+ SYSTEMD_LIBS="-lsystemd"
+fi
+
+################################################################################
+if test "$APP_MACHINEID_SUPPORT" = yes; then
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for APP_MACHINEID" >&5
+$as_echo_n "checking for APP_MACHINEID... " >&6; }
+
+if test -n "$APP_MACHINEID_CFLAGS"; then
+ pkg_cv_APP_MACHINEID_CFLAGS="$APP_MACHINEID_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"systemd >= 234\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "systemd >= 234") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_APP_MACHINEID_CFLAGS=`$PKG_CONFIG --cflags "systemd >= 234" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+if test -n "$APP_MACHINEID_LIBS"; then
+ pkg_cv_APP_MACHINEID_LIBS="$APP_MACHINEID_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"systemd >= 234\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "systemd >= 234") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_APP_MACHINEID_LIBS=`$PKG_CONFIG --libs "systemd >= 234" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
+fi
+ if test $_pkg_short_errors_supported = yes; then
+ APP_MACHINEID_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "systemd >= 234" 2>&1`
+ else
+ APP_MACHINEID_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "systemd >= 234" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$APP_MACHINEID_PKG_ERRORS" >&5
+
+ $bailout
+elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ $bailout
+else
+ APP_MACHINEID_CFLAGS=$pkg_cv_APP_MACHINEID_CFLAGS
+ APP_MACHINEID_LIBS=$pkg_cv_APP_MACHINEID_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+ HAVE_APP_MACHINEID=yes
+fi
+fi
+
################################################################################
# Check whether --enable-blkid_wiping was given.
diff --git a/include/configure.h.in b/include/configure.h.in
index 637bfc341..703ac0432 100644
--- a/include/configure.h.in
+++ b/include/configure.h.in
@@ -1,5 +1,8 @@
/* include/configure.h.in. Generated from configure.ac by autoheader. */
+/* Define to 1 to include code that uses libsystemd machine-id apis. */
+#undef APP_MACHINEID_SUPPORT
+
/* Define to 1 to use libblkid detection of signatures when wiping. */
#undef BLKID_WIPING_SUPPORT
^ permalink raw reply related [flat|nested] 12+ messages in thread* main - configure: update
@ 2020-12-11 11:16 Marian Csontos
0 siblings, 0 replies; 12+ messages in thread
From: Marian Csontos @ 2020-12-11 11:16 UTC (permalink / raw)
To: lvm-devel
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=23ef67776210ad6c55f4dd7475b806337140c513
Commit: 23ef67776210ad6c55f4dd7475b806337140c513
Parent: 5dbe2fdd9dd783c2911a5375d6fdec86118af280
Author: Marian Csontos <mcsontos@redhat.com>
AuthorDate: Fri Dec 11 12:16:16 2020 +0100
Committer: Marian Csontos <mcsontos@redhat.com>
CommitterDate: Fri Dec 11 12:16:16 2020 +0100
configure: update
---
aclocal.m4 | 10 ++++++----
configure | 2 +-
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/aclocal.m4 b/aclocal.m4
index 3e0fbd38d..7524c8313 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -496,12 +496,14 @@ AC_DEFUN([AM_PATH_PYTHON],
m4_default([$3], [AC_MSG_ERROR([no suitable Python interpreter found])])
else
- dnl Query Python for its version number. Getting [:3] seems to be
- dnl the best way to do this; it's what "site.py" does in the standard
- dnl library.
+ dnl Query Python for its version number. Although site.py simply uses
+ dnl sys.version[:3], printing that failed with Python 3.10, since the
+ dnl trailing zero was eliminated. So now we output just the major
+ dnl and minor version numbers, as numbers. Apparently the tertiary
+ dnl version is not of interest.
AC_CACHE_CHECK([for $am_display_PYTHON version], [am_cv_python_version],
- [am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[[:3]])"`])
+ [am_cv_python_version=`$PYTHON -c "import sys; print('%u.%u' % sys.version_info[[:2]])"`])
AC_SUBST([PYTHON_VERSION], [$am_cv_python_version])
dnl Use the values of $prefix and $exec_prefix for the corresponding
diff --git a/configure b/configure
index 29d19f249..4c38cbebb 100755
--- a/configure
+++ b/configure
@@ -11962,7 +11962,7 @@ $as_echo_n "checking for $am_display_PYTHON version... " >&6; }
if ${am_cv_python_version+:} false; then :
$as_echo_n "(cached) " >&6
else
- am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:3])"`
+ am_cv_python_version=`$PYTHON -c "import sys; print('%u.%u' % sys.version_info[:2])"`
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_version" >&5
$as_echo "$am_cv_python_version" >&6; }
^ permalink raw reply related [flat|nested] 12+ messages in thread
end of thread, other threads:[~2023-04-06 11:47 UTC | newest]
Thread overview: 12+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-10-18 17:19 main - configure: update Zdenek Kabelac
-- strict thread matches above, loose matches on Subject: below --
2023-04-06 11:47 Zdenek Kabelac
2023-02-23 15:49 Zdenek Kabelac
2023-02-16 23:11 Zdenek Kabelac
2023-02-13 13:31 Zdenek Kabelac
2023-02-10 21:33 Zdenek Kabelac
2023-02-10 19:56 Zdenek Kabelac
2023-02-10 16:53 Zdenek Kabelac
2022-11-25 15:43 Zdenek Kabelac
2021-10-15 8:12 Zdenek Kabelac
2021-10-07 17:43 David Teigland
2020-12-11 11:16 Marian Csontos
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.