|
 |
9db2f0 |
From 9dc9a14d41d5c91892bc03024cc80c742827baa3 Mon Sep 17 00:00:00 2001
|
|
|
9db2f0 |
From: Marian Csontos <mcsontos@redhat.com>
|
|
|
9db2f0 |
Date: Mon, 26 Apr 2021 14:27:05 +0200
|
|
|
9db2f0 |
Subject: [PATCH 07/11] configure: update
|
|
|
9db2f0 |
|
|
|
9db2f0 |
---
|
|
|
9db2f0 |
configure | 112 +++++++++++++++++++++++++++++++++++++++++++++++++
|
|
|
9db2f0 |
include/configure.h.in | 3 ++
|
|
|
9db2f0 |
2 files changed, 115 insertions(+)
|
|
|
9db2f0 |
|
|
|
9db2f0 |
diff --git a/configure b/configure
|
|
|
9db2f0 |
index c2d2cff..0147902 100755
|
|
|
9db2f0 |
--- a/configure
|
|
|
9db2f0 |
+++ b/configure
|
|
|
9db2f0 |
@@ -774,6 +774,10 @@ UDEV_LIBS
|
|
|
9db2f0 |
UDEV_CFLAGS
|
|
|
9db2f0 |
SYSTEMD_LIBS
|
|
|
9db2f0 |
SYSTEMD_CFLAGS
|
|
|
9db2f0 |
+BLKID_LIBS
|
|
|
9db2f0 |
+BLKID_CFLAGS
|
|
|
9db2f0 |
+APP_MACHINEID_LIBS
|
|
|
9db2f0 |
+APP_MACHINEID_CFLAGS
|
|
|
9db2f0 |
NOTIFY_DBUS_LIBS
|
|
|
9db2f0 |
NOTIFY_DBUS_CFLAGS
|
|
|
9db2f0 |
BLKID_LIBS
|
|
|
9db2f0 |
@@ -957,6 +961,7 @@ enable_use_lvmpolld
|
|
|
9db2f0 |
with_lvmpolld_pidfile
|
|
|
9db2f0 |
enable_dmfilemapd
|
|
|
9db2f0 |
enable_notify_dbus
|
|
|
9db2f0 |
+enable_app_machineid
|
|
|
9db2f0 |
enable_blkid_wiping
|
|
|
9db2f0 |
enable_udev_systemd_background_jobs
|
|
|
9db2f0 |
enable_udev_sync
|
|
|
9db2f0 |
@@ -1027,6 +1032,10 @@ LOCKD_DLM_CONTROL_CFLAGS
|
|
|
9db2f0 |
LOCKD_DLM_CONTROL_LIBS
|
|
|
9db2f0 |
LOCKD_IDM_CFLAGS
|
|
|
9db2f0 |
LOCKD_IDM_LIBS
|
|
|
9db2f0 |
+NOTIFY_DBUS_CFLAGS
|
|
|
9db2f0 |
+NOTIFY_DBUS_LIBS
|
|
|
9db2f0 |
+APP_MACHINEID_CFLAGS
|
|
|
9db2f0 |
+APP_MACHINEID_LIBS
|
|
|
9db2f0 |
BLKID_CFLAGS
|
|
|
9db2f0 |
BLKID_LIBS
|
|
|
9db2f0 |
NOTIFY_DBUS_CFLAGS
|
|
|
9db2f0 |
@@ -1691,6 +1700,7 @@ Optional Features:
|
|
|
9db2f0 |
--disable-use-lvmpolld disable usage of LVM Poll Daemon
|
|
|
9db2f0 |
--enable-dmfilemapd enable the dmstats filemap daemon
|
|
|
9db2f0 |
--enable-notify-dbus enable LVM notification using dbus
|
|
|
9db2f0 |
+ --enable-app-machineid enable LVM system ID using app-specific machine-id
|
|
|
9db2f0 |
--disable-blkid_wiping disable libblkid detection of signatures when wiping
|
|
|
9db2f0 |
and use native code instead
|
|
|
9db2f0 |
--disable-udev-systemd-background-jobs
|
|
|
9db2f0 |
@@ -1853,6 +1863,13 @@ Some influential environment variables:
|
|
|
9db2f0 |
C compiler flags for NOTIFY_DBUS, overriding pkg-config
|
|
|
9db2f0 |
NOTIFY_DBUS_LIBS
|
|
|
9db2f0 |
linker flags for NOTIFY_DBUS, overriding pkg-config
|
|
|
9db2f0 |
+ APP_MACHINEID_CFLAGS
|
|
|
9db2f0 |
+ C compiler flags for APP_MACHINEID, overriding pkg-config
|
|
|
9db2f0 |
+ APP_MACHINEID_LIBS
|
|
|
9db2f0 |
+ linker flags for APP_MACHINEID, overriding pkg-config
|
|
|
9db2f0 |
+ BLKID_CFLAGS
|
|
|
9db2f0 |
+ C compiler flags for BLKID, overriding pkg-config
|
|
|
9db2f0 |
+ BLKID_LIBS linker flags for BLKID, overriding pkg-config
|
|
|
9db2f0 |
SYSTEMD_CFLAGS
|
|
|
9db2f0 |
C compiler flags for SYSTEMD, overriding pkg-config
|
|
|
9db2f0 |
SYSTEMD_LIBS
|
|
|
9db2f0 |
@@ -11589,6 +11606,101 @@ fi
|
|
|
9db2f0 |
fi
|
|
|
9db2f0 |
|
|
|
9db2f0 |
################################################################################
|
|
|
9db2f0 |
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build appmachineid" >&5
|
|
|
9db2f0 |
+$as_echo_n "checking whether to build appmachineid... " >&6; }
|
|
|
9db2f0 |
+# Check whether --enable-app-machineid was given.
|
|
|
9db2f0 |
+if test "${enable_app_machineid+set}" = set; then :
|
|
|
9db2f0 |
+ enableval=$enable_app_machineid; APP_MACHINEID_SUPPORT=$enableval
|
|
|
9db2f0 |
+else
|
|
|
9db2f0 |
+ APP_MACHINEID_SUPPORT=no
|
|
|
9db2f0 |
+fi
|
|
|
9db2f0 |
+
|
|
|
9db2f0 |
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $APP_MACHINEID_SUPPORT" >&5
|
|
|
9db2f0 |
+$as_echo "$APP_MACHINEID_SUPPORT" >&6; }
|
|
|
9db2f0 |
+
|
|
|
9db2f0 |
+if test "$APP_MACHINEID_SUPPORT" = yes; then
|
|
|
9db2f0 |
+
|
|
|
9db2f0 |
+$as_echo "#define APP_MACHINEID_SUPPORT 1" >>confdefs.h
|
|
|
9db2f0 |
+
|
|
|
9db2f0 |
+ SYSTEMD_LIBS="-lsystemd"
|
|
|
9db2f0 |
+fi
|
|
|
9db2f0 |
+
|
|
|
9db2f0 |
+################################################################################
|
|
|
9db2f0 |
+if test "$APP_MACHINEID_SUPPORT" = yes; then
|
|
|
9db2f0 |
+
|
|
|
9db2f0 |
+pkg_failed=no
|
|
|
9db2f0 |
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for APP_MACHINEID" >&5
|
|
|
9db2f0 |
+$as_echo_n "checking for APP_MACHINEID... " >&6; }
|
|
|
9db2f0 |
+
|
|
|
9db2f0 |
+if test -n "$APP_MACHINEID_CFLAGS"; then
|
|
|
9db2f0 |
+ pkg_cv_APP_MACHINEID_CFLAGS="$APP_MACHINEID_CFLAGS"
|
|
|
9db2f0 |
+ elif test -n "$PKG_CONFIG"; then
|
|
|
9db2f0 |
+ if test -n "$PKG_CONFIG" && \
|
|
|
9db2f0 |
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"systemd >= 234\""; } >&5
|
|
|
9db2f0 |
+ ($PKG_CONFIG --exists --print-errors "systemd >= 234") 2>&5
|
|
|
9db2f0 |
+ ac_status=$?
|
|
|
9db2f0 |
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
|
|
9db2f0 |
+ test $ac_status = 0; }; then
|
|
|
9db2f0 |
+ pkg_cv_APP_MACHINEID_CFLAGS=`$PKG_CONFIG --cflags "systemd >= 234" 2>/dev/null`
|
|
|
9db2f0 |
+ test "x$?" != "x0" && pkg_failed=yes
|
|
|
9db2f0 |
+else
|
|
|
9db2f0 |
+ pkg_failed=yes
|
|
|
9db2f0 |
+fi
|
|
|
9db2f0 |
+ else
|
|
|
9db2f0 |
+ pkg_failed=untried
|
|
|
9db2f0 |
+fi
|
|
|
9db2f0 |
+if test -n "$APP_MACHINEID_LIBS"; then
|
|
|
9db2f0 |
+ pkg_cv_APP_MACHINEID_LIBS="$APP_MACHINEID_LIBS"
|
|
|
9db2f0 |
+ elif test -n "$PKG_CONFIG"; then
|
|
|
9db2f0 |
+ if test -n "$PKG_CONFIG" && \
|
|
|
9db2f0 |
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"systemd >= 234\""; } >&5
|
|
|
9db2f0 |
+ ($PKG_CONFIG --exists --print-errors "systemd >= 234") 2>&5
|
|
|
9db2f0 |
+ ac_status=$?
|
|
|
9db2f0 |
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
|
|
9db2f0 |
+ test $ac_status = 0; }; then
|
|
|
9db2f0 |
+ pkg_cv_APP_MACHINEID_LIBS=`$PKG_CONFIG --libs "systemd >= 234" 2>/dev/null`
|
|
|
9db2f0 |
+ test "x$?" != "x0" && pkg_failed=yes
|
|
|
9db2f0 |
+else
|
|
|
9db2f0 |
+ pkg_failed=yes
|
|
|
9db2f0 |
+fi
|
|
|
9db2f0 |
+ else
|
|
|
9db2f0 |
+ pkg_failed=untried
|
|
|
9db2f0 |
+fi
|
|
|
9db2f0 |
+
|
|
|
9db2f0 |
+
|
|
|
9db2f0 |
+
|
|
|
9db2f0 |
+if test $pkg_failed = yes; then
|
|
|
9db2f0 |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
|
9db2f0 |
+$as_echo "no" >&6; }
|
|
|
9db2f0 |
+
|
|
|
9db2f0 |
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
|
|
|
9db2f0 |
+ _pkg_short_errors_supported=yes
|
|
|
9db2f0 |
+else
|
|
|
9db2f0 |
+ _pkg_short_errors_supported=no
|
|
|
9db2f0 |
+fi
|
|
|
9db2f0 |
+ if test $_pkg_short_errors_supported = yes; then
|
|
|
9db2f0 |
+ APP_MACHINEID_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "systemd >= 234" 2>&1`
|
|
|
9db2f0 |
+ else
|
|
|
9db2f0 |
+ APP_MACHINEID_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "systemd >= 234" 2>&1`
|
|
|
9db2f0 |
+ fi
|
|
|
9db2f0 |
+ # Put the nasty error message in config.log where it belongs
|
|
|
9db2f0 |
+ echo "$APP_MACHINEID_PKG_ERRORS" >&5
|
|
|
9db2f0 |
+
|
|
|
9db2f0 |
+ $bailout
|
|
|
9db2f0 |
+elif test $pkg_failed = untried; then
|
|
|
9db2f0 |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
|
9db2f0 |
+$as_echo "no" >&6; }
|
|
|
9db2f0 |
+ $bailout
|
|
|
9db2f0 |
+else
|
|
|
9db2f0 |
+ APP_MACHINEID_CFLAGS=$pkg_cv_APP_MACHINEID_CFLAGS
|
|
|
9db2f0 |
+ APP_MACHINEID_LIBS=$pkg_cv_APP_MACHINEID_LIBS
|
|
|
9db2f0 |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
|
|
9db2f0 |
+$as_echo "yes" >&6; }
|
|
|
9db2f0 |
+ HAVE_APP_MACHINEID=yes
|
|
|
9db2f0 |
+fi
|
|
|
9db2f0 |
+fi
|
|
|
9db2f0 |
+
|
|
|
9db2f0 |
+################################################################################
|
|
|
9db2f0 |
|
|
|
9db2f0 |
# Check whether --enable-blkid_wiping was given.
|
|
|
9db2f0 |
if test "${enable_blkid_wiping+set}" = set; then :
|
|
|
9db2f0 |
diff --git a/include/configure.h.in b/include/configure.h.in
|
|
|
9db2f0 |
index 55d18bd..f3060bc 100644
|
|
|
9db2f0 |
--- a/include/configure.h.in
|
|
|
9db2f0 |
+++ b/include/configure.h.in
|
|
|
9db2f0 |
@@ -1,5 +1,8 @@
|
|
|
9db2f0 |
/* include/configure.h.in. Generated from configure.ac by autoheader. */
|
|
|
9db2f0 |
|
|
|
9db2f0 |
+/* Define to 1 to include code that uses libsystemd machine-id apis. */
|
|
|
9db2f0 |
+#undef APP_MACHINEID_SUPPORT
|
|
|
9db2f0 |
+
|
|
|
9db2f0 |
/* Define to 1 to use libblkid detection of signatures when wiping. */
|
|
|
9db2f0 |
#undef BLKID_WIPING_SUPPORT
|
|
|
9db2f0 |
|
|
|
9db2f0 |
--
|
|
|
9db2f0 |
1.8.3.1
|
|
|
9db2f0 |
|