shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-01-02 01:18:26 +03:00
Code Releases Activity

configure: Fix notify-dbus and dmfilemapd options.

Browse Source
This commit is contained in:
Alasdair G Kergon 2017-04-18 20:37:53 +01:00
parent 2d9097e9ca
commit 658d524d26
5 changed files with 43 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
WHATS_NEW
View File

@ -1,6 +1,7 @@
Version 2.02.171 - Version 2.02.171 -
================================== ==================================
Change configure option names from enable-lockd to enable-lvmlockd. Fix configure --enable-notify-dbus status message.
Change configure option name prefix from --enable-lockd to --enable-lvmlockd.
lvcreate - raise mirror/raid default regionsize to 2MiB lvcreate - raise mirror/raid default regionsize to 2MiB
Add missing configurable prefix to configuration file installation directory. Add missing configurable prefix to configuration file installation directory.

1
WHATS_NEW_DM
View File

@ -1,5 +1,6 @@
Version 1.02.140 - Version 1.02.140 -
================================== ==================================
Add missing configure --enable-dmfilemapd status message and fix --disable.
Version 1.02.139 - 13th April 2017 Version 1.02.139 - 13th April 2017
================================== ==================================

62
configure vendored
View File

@ -703,7 +703,6 @@ FSADM_PATH
FSADM FSADM
ELDFLAGS ELDFLAGS
DM_LIB_PATCHLEVEL DM_LIB_PATCHLEVEL
DMFILEMAPD
DMEVENTD_PATH DMEVENTD_PATH
DMEVENTD DMEVENTD
DL_LIBS DL_LIBS
@ -738,7 +737,6 @@ CLDWHOLEARCHIVE
CLDNOWHOLEARCHIVE CLDNOWHOLEARCHIVE
CLDFLAGS CLDFLAGS
CACHE CACHE
BUILD_NOTIFYDBUS
BUILD_DMFILEMAPD BUILD_DMFILEMAPD
BUILD_LOCKDDLM BUILD_LOCKDDLM
BUILD_LOCKDSANLOCK BUILD_LOCKDSANLOCK
@ -955,8 +953,8 @@ enable_valgrind_pool
enable_devmapper enable_devmapper
enable_lvmetad enable_lvmetad
enable_lvmpolld enable_lvmpolld
enable_lockd_sanlock enable_lvmlockd_sanlock
enable_lockd_dlm enable_lvmlockd_dlm
enable_use_lvmlockd enable_use_lvmlockd
with_lvmlockd_pidfile with_lvmlockd_pidfile
enable_use_lvmetad enable_use_lvmetad
@ -1693,8 +1691,9 @@ Optional Features:
--disable-devmapper disable LVM2 device-mapper interaction --disable-devmapper disable LVM2 device-mapper interaction
--enable-lvmetad enable the LVM Metadata Daemon --enable-lvmetad enable the LVM Metadata Daemon
--enable-lvmpolld enable the LVM Polling Daemon --enable-lvmpolld enable the LVM Polling Daemon
--enable-lockd-sanlock enable the LVM lock daemon using sanlock --enable-lvmlockd-sanlock
--enable-lockd-dlm enable the LVM lock daemon using dlm enable the LVM lock daemon using sanlock
--enable-lvmlockd-dlm enable the LVM lock daemon using dlm
--disable-use-lvmlockd disable usage of LVM lock daemon --disable-use-lvmlockd disable usage of LVM lock daemon
--disable-use-lvmetad disable usage of LVM Metadata Daemon --disable-use-lvmetad disable usage of LVM Metadata Daemon
--disable-use-lvmpolld disable usage of LVM Poll Daemon --disable-use-lvmpolld disable usage of LVM Poll Daemon
@ -11774,11 +11773,11 @@ $as_echo "$BUILD_LVMPOLLD" >&6; }
################################################################################ ################################################################################
BUILD_LVMLOCKD=no BUILD_LVMLOCKD=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build lockdsanlock" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build lvmlockdsanlock" >&5
$as_echo_n "checking whether to build lockdsanlock... " >&6; } $as_echo_n "checking whether to build lvmlockdsanlock... " >&6; }
# Check whether --enable-lockd-sanlock was given. # Check whether --enable-lvmlockd-sanlock was given.
if test "${enable_lockd_sanlock+set}" = set; then : if test "${enable_lvmlockd_sanlock+set}" = set; then :
enableval=$enable_lockd_sanlock; LOCKDSANLOCK=$enableval enableval=$enable_lvmlockd_sanlock; LOCKDSANLOCK=$enableval
fi fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $LOCKDSANLOCK" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LOCKDSANLOCK" >&5
@ -11865,11 +11864,11 @@ $as_echo "#define LOCKDSANLOCK_SUPPORT 1" >>confdefs.h
fi fi
################################################################################ ################################################################################
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build lockddlm" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build lvmlockddlm" >&5
$as_echo_n "checking whether to build lockddlm... " >&6; } $as_echo_n "checking whether to build lvmlockddlm... " >&6; }
# Check whether --enable-lockd-dlm was given. # Check whether --enable-lvmlockd-dlm was given.
if test "${enable_lockd_dlm+set}" = set; then : if test "${enable_lvmlockd_dlm+set}" = set; then :
enableval=$enable_lockd_dlm; LOCKDDLM=$enableval enableval=$enable_lvmlockd_dlm; LOCKDDLM=$enableval
fi fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $LOCKDDLM" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LOCKDDLM" >&5
@ -12105,17 +12104,18 @@ _ACEOF
$as_echo_n "checking whether to build dmfilemapd... " >&6; } $as_echo_n "checking whether to build dmfilemapd... " >&6; }
# Check whether --enable-dmfilemapd was given. # Check whether --enable-dmfilemapd was given.
if test "${enable_dmfilemapd+set}" = set; then : if test "${enable_dmfilemapd+set}" = set; then :
enableval=$enable_dmfilemapd; DMFILEMAPD=$enableval enableval=$enable_dmfilemapd; BUILD_DMFILEMAPD=$enableval
else
BUILD_DMFILEMAPD=no
fi fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $DMFILEMAPD" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BUILD_DMFILEMAPD" >&5
$as_echo "$DMFILEMAPD" >&6; } $as_echo "$BUILD_DMFILEMAPD" >&6; }
BUILD_DMFILEMAPD=$DMFILEMAPD
$as_echo "#define DMFILEMAPD 1" >>confdefs.h $as_echo "#define DMFILEMAPD \$BUILD_DMFILEMAPD" >>confdefs.h
if test "$DMFILEMAPD" = yes; then if test "$BUILD_DMFILEMAPD" = yes; then
ac_fn_c_check_header_mongrel "$LINENO" "linux/fiemap.h" "ac_cv_header_linux_fiemap_h" "$ac_includes_default" ac_fn_c_check_header_mongrel "$LINENO" "linux/fiemap.h" "ac_cv_header_linux_fiemap_h" "$ac_includes_default"
if test "x$ac_cv_header_linux_fiemap_h" = xyes; then : if test "x$ac_cv_header_linux_fiemap_h" = xyes; then :
@ -12131,15 +12131,15 @@ fi
$as_echo_n "checking whether to build notifydbus... " >&6; } $as_echo_n "checking whether to build notifydbus... " >&6; }
# Check whether --enable-notify-dbus was given. # Check whether --enable-notify-dbus was given.
if test "${enable_notify_dbus+set}" = set; then : if test "${enable_notify_dbus+set}" = set; then :
enableval=$enable_notify_dbus; NOTIFYDBUS=$enableval enableval=$enable_notify_dbus; NOTIFYDBUS_SUPPORT=$enableval
else
NOTIFYDBUS_SUPPORT=no
fi fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $NOTIFYDBUS" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NOTIFYDBUS_SUPPORT" >&5
$as_echo "$NOTIFYDBUS" >&6; } $as_echo "$NOTIFYDBUS_SUPPORT" >&6; }
BUILD_NOTIFYDBUS=$NOTIFYDBUS if test "$NOTIFYDBUS_SUPPORT" = yes; then
if test "$BUILD_NOTIFYDBUS" = yes; then
$as_echo "#define NOTIFYDBUS_SUPPORT 1" >>confdefs.h $as_echo "#define NOTIFYDBUS_SUPPORT 1" >>confdefs.h
@ -12147,7 +12147,7 @@ $as_echo "#define NOTIFYDBUS_SUPPORT 1" >>confdefs.h
fi fi
################################################################################ ################################################################################
if test "$BUILD_NOTIFYDBUS" = yes; then if test "$NOTIFYDBUS_SUPPORT" = yes; then
pkg_failed=no pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for NOTIFY_DBUS" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for NOTIFY_DBUS" >&5
@ -15175,7 +15175,7 @@ done
fi fi
if test "$DMFILEMAPD" = yes; then if test "$BUILD_DMFILEMAPD" = yes; then
for ac_header in sys/inotify.h for ac_header in sys/inotify.h
do : do :
ac_fn_c_check_header_mongrel "$LINENO" "sys/inotify.h" "ac_cv_header_sys_inotify_h" "$ac_includes_default" ac_fn_c_check_header_mongrel "$LINENO" "sys/inotify.h" "ac_cv_header_sys_inotify_h" "$ac_includes_default"
@ -15666,8 +15666,6 @@ _ACEOF

23
configure.in
View File

@ -1278,13 +1278,12 @@ dnl -- Check dmfilemapd
AC_MSG_CHECKING(whether to build dmfilemapd) AC_MSG_CHECKING(whether to build dmfilemapd)
AC_ARG_ENABLE(dmfilemapd, AC_HELP_STRING([--enable-dmfilemapd], AC_ARG_ENABLE(dmfilemapd, AC_HELP_STRING([--enable-dmfilemapd],
[enable the dmstats filemap daemon]), [enable the dmstats filemap daemon]),
DMFILEMAPD=$enableval) BUILD_DMFILEMAPD=$enableval, BUILD_DMFILEMAPD=no)
AC_MSG_RESULT($DMFILEMAPD) AC_MSG_RESULT($BUILD_DMFILEMAPD)
BUILD_DMFILEMAPD=$DMFILEMAPD AC_DEFINE([DMFILEMAPD], $BUILD_DMFILEMAPD, [Define to 1 to enable the device-mapper filemap daemon.])
AC_DEFINE([DMFILEMAPD], 1, [Define to 1 to enable the device-mapper filemap daemon.])
dnl -- dmfilemapd requires FIEMAP dnl -- dmfilemapd requires FIEMAP
if test "$DMFILEMAPD" = yes; then if test "$BUILD_DMFILEMAPD" = yes; then
AC_CHECK_HEADER([linux/fiemap.h], , [AC_MSG_ERROR(--enable-dmfilemapd requires fiemap.h)]) AC_CHECK_HEADER([linux/fiemap.h], , [AC_MSG_ERROR(--enable-dmfilemapd requires fiemap.h)])
fi fi
@ -1294,19 +1293,17 @@ AC_MSG_CHECKING(whether to build notifydbus)
AC_ARG_ENABLE(notify-dbus, AC_ARG_ENABLE(notify-dbus,
AC_HELP_STRING([--enable-notify-dbus], AC_HELP_STRING([--enable-notify-dbus],
[enable LVM notification using dbus]), [enable LVM notification using dbus]),
NOTIFYDBUS=$enableval) NOTIFYDBUS_SUPPORT=$enableval, NOTIFYDBUS_SUPPORT=no)
AC_MSG_RESULT($NOTIFYDBUS) AC_MSG_RESULT($NOTIFYDBUS_SUPPORT)
BUILD_NOTIFYDBUS=$NOTIFYDBUS if test "$NOTIFYDBUS_SUPPORT" = yes; then
if test "$BUILD_NOTIFYDBUS" = yes; then
AC_DEFINE([NOTIFYDBUS_SUPPORT], 1, [Define to 1 to include code that uses dbus notification.]) AC_DEFINE([NOTIFYDBUS_SUPPORT], 1, [Define to 1 to include code that uses dbus notification.])
LIBS="-lsystemd $LIBS" LIBS="-lsystemd $LIBS"
fi fi
################################################################################ ################################################################################
dnl -- Look for dbus libraries dnl -- Look for dbus libraries
if test "$BUILD_NOTIFYDBUS" = yes; then if test "$NOTIFYDBUS_SUPPORT" = yes; then
PKG_CHECK_MODULES(NOTIFY_DBUS, systemd >= 221, [HAVE_NOTIFY_DBUS=yes], $bailout) PKG_CHECK_MODULES(NOTIFY_DBUS, systemd >= 221, [HAVE_NOTIFY_DBUS=yes], $bailout)
fi fi
@ -1872,7 +1869,7 @@ if test "$UDEV_SYNC" = yes; then
AC_CHECK_HEADERS(sys/ipc.h sys/sem.h,,hard_bailout) AC_CHECK_HEADERS(sys/ipc.h sys/sem.h,,hard_bailout)
fi fi
if test "$DMFILEMAPD" = yes; then if test "$BUILD_DMFILEMAPD" = yes; then
AC_CHECK_HEADERS([sys/inotify.h],,hard_bailout) AC_CHECK_HEADERS([sys/inotify.h],,hard_bailout)
fi fi
@ -2022,7 +2019,6 @@ AC_SUBST(BUILD_LVMLOCKD)
AC_SUBST(BUILD_LOCKDSANLOCK) AC_SUBST(BUILD_LOCKDSANLOCK)
AC_SUBST(BUILD_LOCKDDLM) AC_SUBST(BUILD_LOCKDDLM)
AC_SUBST(BUILD_DMFILEMAPD) AC_SUBST(BUILD_DMFILEMAPD)
AC_SUBST(BUILD_NOTIFYDBUS)
AC_SUBST(CACHE) AC_SUBST(CACHE)
AC_SUBST(CFLAGS) AC_SUBST(CFLAGS)
AC_SUBST(CFLOW_CMD) AC_SUBST(CFLOW_CMD)
@ -2071,7 +2067,6 @@ AC_SUBST(DLM_LIBS)
AC_SUBST(DL_LIBS) AC_SUBST(DL_LIBS)
AC_SUBST(DMEVENTD) AC_SUBST(DMEVENTD)
AC_SUBST(DMEVENTD_PATH) AC_SUBST(DMEVENTD_PATH)
AC_SUBST(DMFILEMAPD)
AC_SUBST(DM_LIB_PATCHLEVEL) AC_SUBST(DM_LIB_PATCHLEVEL)
AC_SUBST(ELDFLAGS) AC_SUBST(ELDFLAGS)
AC_SUBST(FSADM) AC_SUBST(FSADM)

2
man/Makefile.in
View File

@ -89,7 +89,7 @@ else
MAN8DM+=$(DMEVENTDMAN) MAN8DM+=$(DMEVENTDMAN)
endif endif
ifeq ("@DMFILEMAPD@", "yes") ifeq ("@BUILD_DMFILEMAPD@", "yes")
MAN8DM+=$(DMFILEMAPDMAN) MAN8DM+=$(DMFILEMAPDMAN)
endif endif