diff options
| author | Petr Rockai <prockai@redhat.com> | 2014-10-01 08:16:27 +0200 |
|---|---|---|
| committer | Petr Rockai <prockai@redhat.com> | 2014-11-20 12:36:47 +0100 |
| commit | 6d112dc0b51791e394eeb60472bcc7ab8f6a627e (patch) | |
| tree | 95674b5a24b3596f82a88621a404acd24a412426 | |
| parent | 64fe4a29c1aafad2b7a9c61de0d51321d1930af2 (diff) | |
| download | lvm2-6d112dc0b51791e394eeb60472bcc7ab8f6a627e.tar.gz | |
configure: Look for valgrind.h independently of VALGRIND_POOLS.
| -rw-r--r-- | configure.in | 14 | ||||
| -rw-r--r-- | lib/Makefile.in | 2 | ||||
| -rw-r--r-- | libdm/Makefile.in | 5 | ||||
| -rw-r--r-- | make.tmpl.in | 1 |
4 files changed, 13 insertions, 9 deletions
diff --git a/configure.in b/configure.in index 381c7f410..d9e349a01 100644 --- a/configure.in +++ b/configure.in @@ -1026,12 +1026,18 @@ AC_ARG_ENABLE(valgrind_pool, VALGRIND_POOL=$enableval, VALGRIND_POOL=no) AC_MSG_RESULT($VALGRIND_POOL) -if test "$VALGRIND_POOL" = yes; then - pkg_config_init - PKG_CHECK_MODULES(VALGRIND, valgrind, [], [AC_MSG_ERROR(bailing out)]) +pkg_config_init +PKG_CHECK_MODULES(VALGRIND, valgrind, [HAVE_VALGRIND=yes], [if test x$VALGRIND_POOL = xyes; then AC_MSG_ERROR(bailing out); fi]) +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_SUBST(VALGRIND_POOL) - AC_SUBST(VALGRIND_CFLAGS) fi ################################################################################ diff --git a/lib/Makefile.in b/lib/Makefile.in index bad5d8cd3..2d8b9b219 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -220,7 +220,7 @@ CFLOW_LIST_TARGET = $(LIB_NAME).cflow include $(top_builddir)/make.tmpl -CFLAGS += $(BLKID_CFLAGS) $(UDEV_CFLAGS) +CFLAGS += $(BLKID_CFLAGS) $(UDEV_CFLAGS) $(VALGRIND_CFLAGS) $(SUBDIRS): $(LIB_STATIC) diff --git a/libdm/Makefile.in b/libdm/Makefile.in index e50b174af..8e057c385 100644 --- a/libdm/Makefile.in +++ b/libdm/Makefile.in @@ -34,10 +34,7 @@ SOURCES =\ $(interface)/libdm-iface.c INCLUDES = -I$(srcdir)/$(interface) -I$(srcdir) -ifeq ("@VALGRIND_POOL@", "yes") -INCLUDES += @VALGRIND_CFLAGS@ -endif -CFLAGS += $(UDEV_CFLAGS) +CFLAGS += $(UDEV_CFLAGS) $(VALGRIND_CFLAGS) ifeq ("@STATIC_LINK@", "yes") LIB_STATIC = $(interface)/libdevmapper.a diff --git a/make.tmpl.in b/make.tmpl.in index 3a827318e..cfa065cfc 100644 --- a/make.tmpl.in +++ b/make.tmpl.in @@ -61,6 +61,7 @@ UDEV_CFLAGS = @UDEV_CFLAGS@ UDEV_LIBS = @UDEV_LIBS@ BLKID_CFLAGS = @BLKID_CFLAGS@ BLKID_LIBS = @BLKID_LIBS@ +VALGRIND_CFLAGS = @VALGRIND_CFLAGS@ TESTING = @TESTING@ # Setup directory variables |