diff options
| author | Zdenek Kabelac <zkabelac@redhat.com> | 2023-02-16 23:28:08 +0100 |
|---|---|---|
| committer | Zdenek Kabelac <zkabelac@redhat.com> | 2023-02-17 00:00:12 +0100 |
| commit | c23d09bbcea15d5c639b8347bdf30106dee12660 (patch) | |
| tree | 23a924bee30705ffc15836bf81ebe1d38a54d1a2 /configure.ac | |
| parent | d106ac04ab340d170dc5460e023df73e63bb98ab (diff) | |
| download | lvm2-c23d09bbcea15d5c639b8347bdf30106dee12660.tar.gz | |
configure.ac: use standardized LIBS and CFLAGS
Convert lvmlockd to use configure _LIBS and _CFLAGS for
discovered libraries.
TODO: ATM we ignore discovered libdlm and use libdlm_lt instead.
Also libseagate_ilm is hard to find unicorn for testing.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/configure.ac b/configure.ac index 17d90bc85..78663b5bf 100644 --- a/configure.ac +++ b/configure.ac @@ -913,9 +913,8 @@ AC_MSG_RESULT([$BUILD_LOCKDSANLOCK]) dnl -- Look for sanlock libraries AS_IF([test "$BUILD_LOCKDSANLOCK" = "yes"], [ - PKG_CHECK_MODULES(LOCKD_SANLOCK, libsanlock_client >= 3.3.0, [HAVE_LOCKD_SANLOCK="yes"], $bailout) + PKG_CHECK_MODULES(LIBSANLOCKCLIENT, libsanlock_client >= 3.3.0, [BUILD_LVMLOCKD="yes"], $bailout) AC_DEFINE([LOCKDSANLOCK_SUPPORT], 1, [Define to 1 to include code that uses lvmlockd sanlock option.]) - BUILD_LVMLOCKD=yes ]) ################################################################################ @@ -929,9 +928,8 @@ AC_MSG_RESULT([$BUILD_LOCKDDLM]) dnl -- Look for dlm libraries AS_IF([test "$BUILD_LOCKDDLM" = "yes"], [ - PKG_CHECK_MODULES(LOCKD_DLM, libdlm, [HAVE_LOCKD_DLM="yes"], $bailout) + PKG_CHECK_MODULES(LIBDLM, libdlm, [BUILD_LVMLOCKD="yes"], $bailout) AC_DEFINE([LOCKDDLM_SUPPORT], 1, [Define to 1 to include code that uses lvmlockd dlm option.]) - BUILD_LVMLOCKD=yes ]) ################################################################################ @@ -945,9 +943,8 @@ AC_MSG_RESULT([$BUILD_LOCKDDLM_CONTROL]) dnl -- Look for libdlmcontrol libraries AS_IF([test "$BUILD_LOCKDDLM_CONTROL" = "yes"], [ - PKG_CHECK_MODULES(LOCKD_DLM_CONTROL, libdlmcontrol >= 3.2, [HAVE_LOCKD_DLM_CONTROL=yes], $bailout) + PKG_CHECK_MODULES(LIBDLMCONTROL, [libdlmcontrol >= 3.2], [BUILD_LVMLOCKD="yes"], $bailout) AC_DEFINE([LOCKDDLM_CONTROL_SUPPORT], 1, [Define to 1 to include code that uses lvmlockd dlm control option.]) - BUILD_LVMLOCKD=yes ]) ################################################################################ @@ -961,10 +958,10 @@ AC_MSG_RESULT([$BUILD_LOCKDIDM]) dnl -- Look for Seagate IDM libraries AS_IF([test "$BUILD_LOCKDIDM" = "yes"], [ - PKG_CHECK_MODULES(LOCKD_IDM, libseagate_ilm >= 0.1.0, [HAVE_LOCKD_IDM=yes], $bailout) - PKG_CHECK_EXISTS(blkid >= 2.24, [HAVE_LOCKD_IDM="yes"], $bailout) - AC_DEFINE([LOCKDIDM_SUPPORT], 1, [Define to 1 to include code that uses lvmlockd IDM option.]) - BUILD_LVMLOCKD=yes + PKG_CHECK_EXISTS(blkid >= 2.24, [ + PKG_CHECK_MODULES(LIBSEAGATEILM, [libseagate_ilm >= 0.1.0], [BUILD_LVMLOCKD="yes"], $bailout) + AC_DEFINE([LOCKDIDM_SUPPORT], 1, [Define to 1 to include code that uses lvmlockd IDM option.]) + ], $bailout) ]) ################################################################################ |