shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2024-12-21 13:34:40 +03:00
Code Releases Activity

Use UDEV_LIBS, and link -ludev only when needed.

Browse Source
This commit is contained in:
Zdenek Kabelac 2010-03-04 12:12:34 +00:00
parent 19a2c6e0a7
commit db724a449b
6 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
WHATS_NEW
View File

@ -1,5 +1,6 @@
Version 2.02.62 - Version 2.02.62 -
==================================== ====================================
Define and use internal makefile variable UDEV_LIBS.
Define and use internal makefile variable DL_LIBS. Define and use internal makefile variable DL_LIBS.
Update check for selinux libraries and link them only when needed. Update check for selinux libraries and link them only when needed.
Define and use internal makefile variable SELINUX_LIBS and STATIC_LIBS. Define and use internal makefile variable SELINUX_LIBS and STATIC_LIBS.

5
configure vendored
View File

@ -648,6 +648,7 @@ kerneldir
interface interface
UDEV_SYNC UDEV_SYNC
UDEV_RULES UDEV_RULES
UDEV_LIBS
STATIC_LINK STATIC_LINK
STATICDIR STATICDIR
SNAPSHOTS SNAPSHOTS
@ -12307,8 +12308,9 @@ cat >>confdefs.h <<\_ACEOF
#define HAVE_UDEV_QUEUE_GET_UDEV_IS_ACTIVE 1 #define HAVE_UDEV_QUEUE_GET_UDEV_IS_ACTIVE 1
_ACEOF _ACEOF
LIBS="-ludev $LIBS" UDEV_LIBS="-ludev"
else else
UDEV_LIBS=
{ $as_echo "$as_me:$LINENO: WARNING: It won't be possible to get udev state. We will assume that udev is not running." >&5 { $as_echo "$as_me:$LINENO: WARNING: It won't be possible to get udev state. We will assume that udev is not running." >&5
$as_echo "$as_me: WARNING: It won't be possible to get udev state. We will assume that udev is not running." >&2;} $as_echo "$as_me: WARNING: It won't be possible to get udev state. We will assume that udev is not running." >&2;}
fi fi
@ -15559,6 +15561,7 @@ LVM_LIBAPI=`echo "$VER" | $AWK -F '[()]' '{print $2}'`
################################################################################ ################################################################################

4
configure.in
View File

@ -668,8 +668,9 @@ if test x$UDEV_SYNC = xyes; then
if test x$HAVE_UDEV_QUEUE_GET_UDEV_IS_ACTIVE = xyes; then if test x$HAVE_UDEV_QUEUE_GET_UDEV_IS_ACTIVE = xyes; then
AC_DEFINE([HAVE_UDEV_QUEUE_GET_UDEV_IS_ACTIVE], 1, AC_DEFINE([HAVE_UDEV_QUEUE_GET_UDEV_IS_ACTIVE], 1,
[Define to 1 if libudev's udev_queue_get_udev_is_active function is available.]) [Define to 1 if libudev's udev_queue_get_udev_is_active function is available.])
LIBS="-ludev $LIBS" UDEV_LIBS="-ludev"
else else
UDEV_LIBS=
AC_MSG_WARN(It won't be possible to get udev state. We will assume that udev is not running.) AC_MSG_WARN(It won't be possible to get udev state. We will assume that udev is not running.)
fi fi
fi fi
@ -1120,6 +1121,7 @@ AC_SUBST(SELINUX_LIBS)
AC_SUBST(SNAPSHOTS) AC_SUBST(SNAPSHOTS)
AC_SUBST(STATICDIR) AC_SUBST(STATICDIR)
AC_SUBST(STATIC_LINK) AC_SUBST(STATIC_LINK)
AC_SUBST(UDEV_LIBS)
AC_SUBST(UDEV_RULES) AC_SUBST(UDEV_RULES)
AC_SUBST(UDEV_SYNC) AC_SUBST(UDEV_SYNC)
AC_SUBST(interface) AC_SUBST(interface)

2
libdm/Makefile.in
View File

@ -52,7 +52,7 @@ include $(top_builddir)/make.tmpl
DEFS += -DDM_DEVICE_UID=@DM_DEVICE_UID@ -DDM_DEVICE_GID=@DM_DEVICE_GID@ \ DEFS += -DDM_DEVICE_UID=@DM_DEVICE_UID@ -DDM_DEVICE_GID=@DM_DEVICE_GID@ \
-DDM_DEVICE_MODE=@DM_DEVICE_MODE@ -DDM_DEVICE_MODE=@DM_DEVICE_MODE@
LIBS += $(SELINUX_LIBS) LIBS += $(SELINUX_LIBS) $(UDEV_LIBS)
device-mapper: all device-mapper: all

3
make.tmpl.in
View File

@ -31,7 +31,7 @@ CFLOW_CMD = @CFLOW_CMD@
LIBS = @LIBS@ LIBS = @LIBS@
# Extra libraries always linked with static binaries # Extra libraries always linked with static binaries
STATIC_LIBS = $(SELINUX_LIBS) STATIC_LIBS = $(SELINUX_LIBS) $(UDEV_LIBS)
DEFS += @DEFS@ DEFS += @DEFS@
CFLAGS += @CFLAGS@ CFLAGS += @CFLAGS@
CLDFLAGS += @CLDFLAGS@ CLDFLAGS += @CLDFLAGS@
@ -43,6 +43,7 @@ DL_LIBS = @DL_LIBS@
PTHREAD_LIBS = @PTHREAD_LIBS@ PTHREAD_LIBS = @PTHREAD_LIBS@
READLINE_LIBS = @READLINE_LIBS@ READLINE_LIBS = @READLINE_LIBS@
SELINUX_LIBS = @SELINUX_LIBS@ SELINUX_LIBS = @SELINUX_LIBS@
UDEV_LIBS = @UDEV_LIBS@
# Setup directory variables # Setup directory variables
prefix = @prefix@ prefix = @prefix@

2
tools/Makefile.in
View File

@ -107,6 +107,8 @@ DEFS += -DLVM_SHARED_PATH=\"$(exec_prefix)/sbin/lvm\"
include $(top_builddir)/make.tmpl include $(top_builddir)/make.tmpl
LIBS += $(UDEV_LIBS)
device-mapper: $(TARGETS_DM) device-mapper: $(TARGETS_DM)
dmsetup: dmsetup.o $(top_builddir)/libdm/libdevmapper.$(LIB_SUFFIX) dmsetup: dmsetup.o $(top_builddir)/libdm/libdevmapper.$(LIB_SUFFIX)