SUBDIRS += po
endif
-SUBDIRS += lib tools daemons libdm liblvm
+SUBDIRS += lib tools daemons libdm
+
+ifeq ("@APPLIB@", "yes")
+ SUBDIRS += liblvm
+endif
ifeq ($(MAKECMDGOALS),distclean)
SUBDIRS += daemons/clvmd \
lib: libdm
liblvm: lib
daemons: lib tools
-tools: lib device-mapper liblvm
+tools: lib device-mapper
po: tools daemons
libdm.device-mapper: include.device-mapper
-2.02.46-cvs (2009-05-21)
+2.02.47-cvs (2009-05-22)
-Version 2.02.47 - 21st May 2009
+Version 2.02.47 - 22nd May 2009
===============================
+ Rename liblvm.so to liblvm2app.so and use configure --enable-applib.
Reinstate version in liblvm2cmd.so soname. (2.02.44)
Version 2.02.46 - 21st May 2009
CLDNOWHOLEARCHIVE
CLDFLAGS
BUILD_DMEVENTD
+APPLIB
MODPROBE_CMD
MSGFMT
LVM2CMD_LIB
+LVM2APP_LIB
GENHTML
LCOV
CPG_LIBS
enable_compat
enable_ioctl
enable_o_direct
+enable_applib
enable_cmdlib
enable_pkgconfig
enable_fsadm
--enable-compat Enable support for old device-mapper versions
--disable-driver Disable calls to device-mapper in the kernel
--disable-o_direct Disable O_DIRECT
+ --enable-applib Build application library
--enable-cmdlib Build shared command library
--enable-pkgconfig Install pkgconfig support
--enable-fsadm Enable fsadm
fi
+################################################################################
+{ $as_echo "$as_me:$LINENO: checking whether to build liblvm2app.so application library" >&5
+$as_echo_n "checking whether to build liblvm2app.so application library... " >&6; }
+# Check whether --enable-applib was given.
+if test "${enable_applib+set}" = set; then
+ enableval=$enable_applib; APPLIB=$enableval
+else
+ APPLIB=no
+fi
+
+{ $as_echo "$as_me:$LINENO: result: $APPLIB" >&5
+$as_echo "$APPLIB" >&6; }
+
+test x$APPLIB = xyes \
+ && LVM2APP_LIB=-llvm2app \
+ || LVM2APP_LIB=
+
################################################################################
{ $as_echo "$as_me:$LINENO: checking whether to compile liblvm2cmd.so" >&5
$as_echo_n "checking whether to compile liblvm2cmd.so... " >&6; }
+
################################################################################
AC_DEFINE([O_DIRECT_SUPPORT], 1, [Define to 1 to enable O_DIRECT support.])
fi
+################################################################################
+dnl -- Enable liblvm2app.so
+AC_MSG_CHECKING(whether to build liblvm2app.so application library)
+AC_ARG_ENABLE(applib,
+ [ --enable-applib Build application library],
+ APPLIB=$enableval, APPLIB=no)
+AC_MSG_RESULT($APPLIB)
+AC_SUBST([LVM2APP_LIB])
+test x$APPLIB = xyes \
+ && LVM2APP_LIB=-llvm2app \
+ || LVM2APP_LIB=
+
################################################################################
dnl -- Enable cmdlib
AC_MSG_CHECKING(whether to compile liblvm2cmd.so)
LVM_PATCHLEVEL=`echo "$VER" | $AWK -F '.' '{print $3}'`
################################################################################
+AC_SUBST(APPLIB)
AC_SUBST(BUILD_DMEVENTD)
AC_SUBST(CFLAGS)
AC_SUBST(CFLOW_CMD)
SOURCES =\
lvm_base.c
-LIB_NAME = liblvm
+LIB_NAME = liblvm2app
LIB_VERSION = $(LIB_VERSION_LVM)
VERSIONED_SHLIB = $(LIB_NAME).$(LIB_SUFFIX).$(LIB_VERSION_LVM)
TARGETS = test
-LVMLIBS = -llvm -ldevmapper
+LVMLIBS = @LVM2APP_LIB@ -ldevmapper
DEFS += -D_REENTRANT
CFLAGS += -fno-strict-aliasing
LDFLAGS = -L$(top_srcdir)/libdm -L$(top_srcdir)/liblvm
CLDFLAGS = -L$(top_srcdir)/libdm -L$(top_srcdir)/liblvm
-test: $(OBJECTS) $(top_srcdir)/liblvm/liblvm.so $(top_srcdir)/libdm/libdevmapper.so
+test: $(OBJECTS) $(top_srcdir)/liblvm/liblvm2app.so $(top_srcdir)/libdm/libdevmapper.so
$(CC) -o test $(OBJECTS) $(CFLAGS) $(LDFLAGS) $(LVMLIBS) $(LIBS)