From 9dc9a14d41d5c91892bc03024cc80c742827baa3 Mon Sep 17 00:00:00 2001 From: Marian Csontos Date: Mon, 26 Apr 2021 14:27:05 +0200 Subject: [PATCH 07/11] configure: update --- configure | 112 +++++++++++++++++++++++++++++++++++++++++++++++++ include/configure.h.in | 3 ++ 2 files changed, 115 insertions(+) diff --git a/configure b/configure index c2d2cff..0147902 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 @@ -11589,6 +11606,101 @@ 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. if test "${enable_blkid_wiping+set}" = set; then : diff --git a/include/configure.h.in b/include/configure.h.in index 55d18bd..f3060bc 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 -- 1.8.3.1