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

configure: Look for valgrind.h independently of VALGRIND_POOLS.

Browse Source
This commit is contained in:
Petr Rockai 2014-10-01 08:16:27 +02:00
parent 5d833fd458
commit d571eab3b2
4 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
configure.in
View File

@ -1023,12 +1023,18 @@ AC_ARG_ENABLE(valgrind_pool,
VALGRIND_POOL=$enableval, VALGRIND_POOL=no) VALGRIND_POOL=$enableval, VALGRIND_POOL=no)
AC_MSG_RESULT($VALGRIND_POOL) AC_MSG_RESULT($VALGRIND_POOL)
if test "$VALGRIND_POOL" = yes; then pkg_config_init
pkg_config_init PKG_CHECK_MODULES(VALGRIND, valgrind, [HAVE_VALGRIND=yes], [if test x$VALGRIND_POOL = xyes; then AC_MSG_ERROR(bailing out); fi])
PKG_CHECK_MODULES(VALGRIND, valgrind, [], [AC_MSG_ERROR(bailing out)]) AC_SUBST(VALGRIND_CFLAGS)
if test x$HAVE_VALGRIND = xyes; then
AC_DEFINE([HAVE_VALGRIND], 1, [valgrind.h found])
AC_SUBST(HAVE_VALGRIND)
fi
if test x$VALGRIND_POOL = xyes; then
AC_DEFINE([VALGRIND_POOL], 1, [Enable a valgrind aware build of pool]) AC_DEFINE([VALGRIND_POOL], 1, [Enable a valgrind aware build of pool])
AC_SUBST(VALGRIND_POOL) AC_SUBST(VALGRIND_POOL)
AC_SUBST(VALGRIND_CFLAGS)
fi fi
################################################################################ ################################################################################

2
lib/Makefile.in
View File

@ -222,7 +222,7 @@ CFLOW_LIST_TARGET = $(LIB_NAME).cflow
include $(top_builddir)/make.tmpl include $(top_builddir)/make.tmpl
CFLAGS += $(BLKID_CFLAGS) $(UDEV_CFLAGS) CFLAGS += $(BLKID_CFLAGS) $(UDEV_CFLAGS) $(VALGRIND_CFLAGS)
$(SUBDIRS): $(LIB_STATIC) $(SUBDIRS): $(LIB_STATIC)

5
libdm/Makefile.in
View File

@ -34,10 +34,7 @@ SOURCES =\
$(interface)/libdm-iface.c $(interface)/libdm-iface.c
INCLUDES = -I$(srcdir)/$(interface) -I$(srcdir) INCLUDES = -I$(srcdir)/$(interface) -I$(srcdir)
ifeq ("@VALGRIND_POOL@", "yes") CFLAGS += $(UDEV_CFLAGS) $(VALGRIND_CFLAGS)
INCLUDES += @VALGRIND_CFLAGS@
endif
CFLAGS += $(UDEV_CFLAGS)
ifeq ("@STATIC_LINK@", "yes") ifeq ("@STATIC_LINK@", "yes")
LIB_STATIC = $(interface)/libdevmapper.a LIB_STATIC = $(interface)/libdevmapper.a

1
make.tmpl.in
View File

@ -61,6 +61,7 @@ UDEV_CFLAGS = @UDEV_CFLAGS@
UDEV_LIBS = @UDEV_LIBS@ UDEV_LIBS = @UDEV_LIBS@
BLKID_CFLAGS = @BLKID_CFLAGS@ BLKID_CFLAGS = @BLKID_CFLAGS@
BLKID_LIBS = @BLKID_LIBS@ BLKID_LIBS = @BLKID_LIBS@
VALGRIND_CFLAGS = @VALGRIND_CFLAGS@
TESTING = @TESTING@ TESTING = @TESTING@
# Setup directory variables # Setup directory variables