diff options
| author | Volker Lendecke <vl@samba.org> | 2010-10-03 11:56:35 +0200 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2010-10-03 12:03:36 +0200 |
| commit | 48dccbf2b52163643b5bbc0d73b65e12b8c92c12 (patch) | |
| tree | d7f47189554ba25e03934174c6c14d190dcb425d | |
| parent | d05ae9451aacd36d9c7ce7c313f95137aa5e8941 (diff) | |
| download | samba-48dccbf2b52163643b5bbc0d73b65e12b8c92c12.tar.gz samba-48dccbf2b52163643b5bbc0d73b65e12b8c92c12.tar.bz2 samba-48dccbf2b52163643b5bbc0d73b65e12b8c92c12.zip | |
s3: Move #define VALGRIND to config.h
This fixes the valgrind overrun in the tdb jenkins hash
| -rw-r--r-- | source3/configure.in | 7 | ||||
| -rw-r--r-- | source3/include/includes.h | 10 |
2 files changed, 7 insertions, 10 deletions
diff --git a/source3/configure.in b/source3/configure.in index 630c8541ee..2db1b39cab 100644 --- a/source3/configure.in +++ b/source3/configure.in @@ -759,6 +759,13 @@ CPPFLAGS="$old_CPPFLAGS" # subdirectory of headers. AC_CHECK_HEADERS(valgrind.h valgrind/valgrind.h valgrind/memcheck.h) +if test x"$enable_developer" = x"yes" ; then + if test x"$ac_cv_header_valgrind_h" = xyes -o \ + x"$ac_cv_header_valgrind_valgrind_h" = xyes ; then + AC_DEFINE(VALGRIND,1,[Whether we have valgrind headers]) + fi +fi + # # HPUX has a bug in that including shadow.h causes a re-definition of MAXINT. # This causes configure to fail to detect it. Check for shadow separately on HPUX. diff --git a/source3/include/includes.h b/source3/include/includes.h index a17e014ca9..11066e25ad 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -251,16 +251,6 @@ typedef int ber_int_t; #include <valgrind.h> #endif -/* If we have --enable-developer and the valgrind header is present, - * then we're OK to use it. Set a macro so this logic can be done only - * once. */ -#if defined(DEVELOPER) -#if (HAVE_VALGRIND_H || HAVE_VALGRIND_VALGRIND_H) -#define VALGRIND -#endif -#endif - - /* we support ADS if we want it and have krb5 and ldap libs */ #if defined(WITH_ADS) && defined(HAVE_KRB5) && defined(HAVE_LDAP) #define HAVE_ADS |