mirror of
git://sourceware.org/git/lvm2.git
synced 2024-12-21 13:34:40 +03:00
Fix dmeventd regression where mirror and snapshot monitoring libraries
failed to link against liblvm2cmd. Dmeventd DSOs *require* lvm2cmd to be linked in. For the future: 1) AC_SUBST does not create Makefile variables, only @foo@-style substitutions 2) When using `test', whitespace around `=' is essential: test a=b is true, as is test a=a
This commit is contained in:
parent
f4fa433eff
commit
2a9a80c9bb
@ -1,5 +1,7 @@
|
||||
Version 2.02.40 -
|
||||
================================
|
||||
Fix dmeventd regression where mirror and snapshot monitoring libraries
|
||||
failed to link against liblvm2cmd.
|
||||
|
||||
Version 2.02.39 - 27th June 2008
|
||||
================================
|
||||
|
22
configure
vendored
22
configure
vendored
@ -8726,10 +8726,11 @@ fi
|
||||
{ echo "$as_me:$LINENO: result: $CMDLIB" >&5
|
||||
echo "${ECHO_T}$CMDLIB" >&6; }
|
||||
|
||||
test $CMDLIB=yes \
|
||||
test x$CMDLIB = xyes \
|
||||
&& LVM2CMD_LIB=-llvm2cmd \
|
||||
|| LVM2CMD_LIB=
|
||||
|
||||
|
||||
################################################################################
|
||||
{ echo "$as_me:$LINENO: checking whether to install fsadm" >&5
|
||||
echo $ECHO_N "checking whether to install fsadm... $ECHO_C" >&6; }
|
||||
@ -8752,12 +8753,21 @@ fi
|
||||
{ echo "$as_me:$LINENO: result: $DMEVENTD" >&5
|
||||
echo "${ECHO_T}$DMEVENTD" >&6; }
|
||||
|
||||
if test x$DMEVENTD = xyes && test x$MIRRORS != xinternal; then
|
||||
{ { echo "$as_me:$LINENO: error: --enable-dmeventd currently requires --with-mirrors=internal
|
||||
" >&5
|
||||
if test x$DMEVENTD = xyes; then
|
||||
if test x$MIRRORS != xinternal; then
|
||||
{ { echo "$as_me:$LINENO: error: --enable-dmeventd currently requires --with-mirrors=internal
|
||||
" >&5
|
||||
echo "$as_me: error: --enable-dmeventd currently requires --with-mirrors=internal
|
||||
" >&2;}
|
||||
" >&2;}
|
||||
{ (exit 1); exit 1; }; }
|
||||
fi
|
||||
if test x$CMDLIB = xno; then
|
||||
{ { echo "$as_me:$LINENO: error: --enable-dmeventd requires --enable-cmdlib to be used as well
|
||||
" >&5
|
||||
echo "$as_me: error: --enable-dmeventd requires --enable-cmdlib to be used as well
|
||||
" >&2;}
|
||||
{ (exit 1); exit 1; }; }
|
||||
fi
|
||||
fi
|
||||
|
||||
if test x$DMEVENTD = xyes; then
|
||||
@ -10260,7 +10270,7 @@ if test "$ac_res" != no; then
|
||||
ac_cv_func_getmntent=yes
|
||||
|
||||
cat >>confdefs.h <<\_ACEOF
|
||||
#define HAVE_GETMNTENT
|
||||
#define HAVE_GETMNTENT 1
|
||||
_ACEOF
|
||||
|
||||
else
|
||||
|
18
configure.in
18
configure.in
@ -366,10 +366,11 @@ AC_ARG_ENABLE(cmdlib, [ --enable-cmdlib Build shared command library],
|
||||
CMDLIB=$enableval, CMDLIB=no)
|
||||
AC_MSG_RESULT($CMDLIB)
|
||||
AC_SUBST([LVM2CMD_LIB])
|
||||
test $CMDLIB=yes \
|
||||
test x$CMDLIB = xyes \
|
||||
&& LVM2CMD_LIB=-llvm2cmd \
|
||||
|| LVM2CMD_LIB=
|
||||
|
||||
|
||||
################################################################################
|
||||
dnl -- Enable fsadm
|
||||
AC_MSG_CHECKING(whether to install fsadm)
|
||||
@ -385,10 +386,17 @@ DMEVENTD=$enableval)
|
||||
AC_MSG_RESULT($DMEVENTD)
|
||||
|
||||
dnl -- dmeventd currently requires internal mirror support
|
||||
if test x$DMEVENTD = xyes && test x$MIRRORS != xinternal; then
|
||||
AC_MSG_ERROR(
|
||||
--enable-dmeventd currently requires --with-mirrors=internal
|
||||
)
|
||||
if test x$DMEVENTD = xyes; then
|
||||
if test x$MIRRORS != xinternal; then
|
||||
AC_MSG_ERROR(
|
||||
--enable-dmeventd currently requires --with-mirrors=internal
|
||||
)
|
||||
fi
|
||||
if test x$CMDLIB = xno; then
|
||||
AC_MSG_ERROR(
|
||||
--enable-dmeventd requires --enable-cmdlib to be used as well
|
||||
)
|
||||
fi
|
||||
fi
|
||||
|
||||
if test x$DMEVENTD = xyes; then
|
||||
|
@ -17,7 +17,7 @@ top_srcdir = @top_srcdir@
|
||||
VPATH = @srcdir@
|
||||
|
||||
INCLUDES += -I${top_srcdir}/tools
|
||||
CLDFLAGS += -L${top_srcdir}/tools -ldevmapper $(LVM2CMD_LIB)
|
||||
CLDFLAGS += -L${top_srcdir}/tools -ldevmapper @LVM2CMD_LIB@
|
||||
|
||||
SOURCES = dmeventd_mirror.c
|
||||
|
||||
|
@ -17,7 +17,7 @@ top_srcdir = @top_srcdir@
|
||||
VPATH = @srcdir@
|
||||
|
||||
INCLUDES += -I${top_srcdir}/tools
|
||||
CLDFLAGS += -L${top_srcdir}/tools -ldevmapper $(LVM2CMD_LIB)
|
||||
CLDFLAGS += -L${top_srcdir}/tools -ldevmapper @LVM2CMD_LIB@
|
||||
|
||||
SOURCES = dmeventd_snapshot.c
|
||||
|
||||
|
@ -17,7 +17,7 @@ top_srcdir = @top_srcdir@
|
||||
VPATH = @srcdir@
|
||||
|
||||
INCLUDES += -I${top_srcdir}/tools
|
||||
CLDFLAGS += -L${top_srcdir}/tools -ldevmapper $(LVM2CMD_LIB)
|
||||
CLDFLAGS += -L${top_srcdir}/tools -ldevmapper @LVM2CMD_LIB@
|
||||
|
||||
SOURCES = dmeventd_mirror.c
|
||||
|
||||
|
@ -17,7 +17,7 @@ top_srcdir = @top_srcdir@
|
||||
VPATH = @srcdir@
|
||||
|
||||
INCLUDES += -I${top_srcdir}/tools
|
||||
CLDFLAGS += -L${top_srcdir}/tools -ldevmapper $(LVM2CMD_LIB)
|
||||
CLDFLAGS += -L${top_srcdir}/tools -ldevmapper @LVM2CMD_LIB@
|
||||
|
||||
SOURCES = dmeventd_snapshot.c
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user