1 diff -NrU5 wvstreams-4.5.orig/configure.ac wvstreams-4.5/configure.ac
2 --- wvstreams-4.5.orig/configure.ac 2008-12-07 18:38:13.000000000 +0100
3 +++ wvstreams-4.5/configure.ac 2008-12-07 21:15:08.000000000 +0100
5 AC_ARG_WITH(openssl, AC_HELP_STRING([--with-openssl], [OpenSSL >= 0.9.7 (required)]))
6 AC_ARG_WITH(pam, AC_HELP_STRING([--with-pam], [PAM]))
7 AC_ARG_WITH(tcl, AC_HELP_STRING([--with-tcl], [Tcl]))
8 AC_ARG_WITH(qt, AC_HELP_STRING([--with-qt], [Qt]))
9 AC_ARG_WITH(zlib, AC_HELP_STRING([--with-zlib], [zlib (required)]))
10 +AC_ARG_WITH(valgrind, AC_HELP_STRING([--with-valgrind], [Valgrind]))
12 AC_ARG_VAR(MOC, [Qt meta object compiler])
13 AC_ARG_VAR(WEAVER_BUILD_INFO, [Extra version info])
15 # avoid autoconf's default values, but keep those the user might have given
18 AC_PATH_PROG(MOC, moc, [moc not found], $with_qt/bin)
22 -AC_CHECK_PROG(VALGRIND, valgrind, valgrind)
23 -AC_CHECK_HEADERS(valgrind/memcheck.h)
24 +if test "$with_valgrind" != "no"; then
25 + AC_CHECK_PROG(VALGRIND, valgrind, valgrind)
26 + AC_CHECK_HEADERS(valgrind/memcheck.h)
30 if test "$with_zlib" != "no"; then
31 AC_CHECK_HEADERS(zlib.h,, [with_zlib=no])
32 AC_CHECK_LIB(z, compress,, [with_zlib=no])