1
0
mirror of git://sourceware.org/git/lvm2.git synced 2025-01-04 09:18:36 +03:00

avoid link failure when configuring without --enable-cmdlib

* configure.in (LVM2CMD_LIB): Define if --enable-cmdlib.
* dmeventd/mirror/Makefile.in (CLDFLAGS): Use $(LVM2CMD_LIB) rather
than hard-coding -llvm2cmd.
* dmeventd/snapshot/Makefile.in (CLDFLAGS): Likewise.
This commit is contained in:
Jim Meyering 2008-06-23 09:25:08 +00:00
parent 2c189a57f4
commit aa4d1e3106
7 changed files with 12 additions and 11 deletions

View File

@ -1,5 +1,6 @@
Version 2.02.39 - Version 2.02.39 -
================================ ================================
Avoid link failure when configuring without --enable-cmdlib.
Avoid link failure when configuring without --enable-readline. Avoid link failure when configuring without --enable-readline.
Make clvmd return immediately if other nodes are down in an openais cluster. Make clvmd return immediately if other nodes are down in an openais cluster.
Make clvmd return immediately if other nodes are down in a gulm cluster. Make clvmd return immediately if other nodes are down in a gulm cluster.

View File

@ -350,6 +350,10 @@ AC_MSG_CHECKING(whether to compile liblvm2cmd.so)
AC_ARG_ENABLE(cmdlib, [ --enable-cmdlib Build shared command library], AC_ARG_ENABLE(cmdlib, [ --enable-cmdlib Build shared command library],
CMDLIB=$enableval, CMDLIB=no) CMDLIB=$enableval, CMDLIB=no)
AC_MSG_RESULT($CMDLIB) AC_MSG_RESULT($CMDLIB)
AC_SUBST([LVM2CMD_LIB])
test $CMDLIB=yes \
&& LVM2CMD_LIB=-llvm2cmd \
|| LVM2CMD_LIB=
################################################################################ ################################################################################
dnl -- Enable fsadm dnl -- Enable fsadm

View File

@ -1,6 +1,6 @@
# #
# Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. # Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved.
# Copyright (C) 2004-2005 Red Hat, Inc. All rights reserved. # Copyright (C) 2004-2005, 2008 Red Hat, Inc. All rights reserved.
# #
# This file is part of LVM2. # This file is part of LVM2.
# #
@ -17,7 +17,7 @@ top_srcdir = @top_srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
INCLUDES += -I${top_srcdir}/tools INCLUDES += -I${top_srcdir}/tools
CLDFLAGS += -L${top_srcdir}/tools -ldevmapper -llvm2cmd CLDFLAGS += -L${top_srcdir}/tools -ldevmapper $(LVM2CMD_LIB)
SOURCES = dmeventd_mirror.c SOURCES = dmeventd_mirror.c
@ -33,4 +33,3 @@ install: libdevmapper-event-lvm2mirror.$(LIB_SUFFIX)
$(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \ $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
$(libdir)/$<.$(LIB_VERSION) $(libdir)/$<.$(LIB_VERSION)
$(LN_S) -f $<.$(LIB_VERSION) $(libdir)/$< $(LN_S) -f $<.$(LIB_VERSION) $(libdir)/$<

View File

@ -17,7 +17,7 @@ top_srcdir = @top_srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
INCLUDES += -I${top_srcdir}/tools INCLUDES += -I${top_srcdir}/tools
CLDFLAGS += -L${top_srcdir}/tools -ldevmapper -llvm2cmd CLDFLAGS += -L${top_srcdir}/tools -ldevmapper $(LVM2CMD_LIB)
SOURCES = dmeventd_snapshot.c SOURCES = dmeventd_snapshot.c
@ -33,4 +33,3 @@ install: libdevmapper-event-lvm2snapshot.$(LIB_SUFFIX)
$(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \ $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
$(libdir)/$<.$(LIB_VERSION) $(libdir)/$<.$(LIB_VERSION)
$(LN_S) -f $<.$(LIB_VERSION) $(libdir)/$< $(LN_S) -f $<.$(LIB_VERSION) $(libdir)/$<

View File

@ -1,6 +1,6 @@
# #
# Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. # Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved.
# Copyright (C) 2004-2005 Red Hat, Inc. All rights reserved. # Copyright (C) 2004-2005, 2008 Red Hat, Inc. All rights reserved.
# #
# This file is part of LVM2. # This file is part of LVM2.
# #
@ -17,7 +17,7 @@ top_srcdir = @top_srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
INCLUDES += -I${top_srcdir}/tools INCLUDES += -I${top_srcdir}/tools
CLDFLAGS += -L${top_srcdir}/tools -ldevmapper -llvm2cmd CLDFLAGS += -L${top_srcdir}/tools -ldevmapper $(LVM2CMD_LIB)
SOURCES = dmeventd_mirror.c SOURCES = dmeventd_mirror.c
@ -33,4 +33,3 @@ install: libdevmapper-event-lvm2mirror.$(LIB_SUFFIX)
$(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \ $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
$(libdir)/$<.$(LIB_VERSION) $(libdir)/$<.$(LIB_VERSION)
$(LN_S) -f $<.$(LIB_VERSION) $(libdir)/$< $(LN_S) -f $<.$(LIB_VERSION) $(libdir)/$<

View File

@ -17,7 +17,7 @@ top_srcdir = @top_srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
INCLUDES += -I${top_srcdir}/tools INCLUDES += -I${top_srcdir}/tools
CLDFLAGS += -L${top_srcdir}/tools -ldevmapper -llvm2cmd CLDFLAGS += -L${top_srcdir}/tools -ldevmapper $(LVM2CMD_LIB)
SOURCES = dmeventd_snapshot.c SOURCES = dmeventd_snapshot.c
@ -33,4 +33,3 @@ install: libdevmapper-event-lvm2snapshot.$(LIB_SUFFIX)
$(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \ $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
$(libdir)/$<.$(LIB_VERSION) $(libdir)/$<.$(LIB_VERSION)
$(LN_S) -f $<.$(LIB_VERSION) $(libdir)/$< $(LN_S) -f $<.$(LIB_VERSION) $(libdir)/$<

View File

@ -1,7 +1,7 @@
# @configure_input@ # @configure_input@
# #
# Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. # Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved.
# Copyright (C) 2004 Red Hat, Inc. All rights reserved. # Copyright (C) 2004, 2008 Red Hat, Inc. All rights reserved.
# #
# This file is part of LVM2. # This file is part of LVM2.
# #