diff mbox

[libdrm] configure: Add flag to disable valgrind support.

Message ID 1434992193-9439-1-git-send-email-mattst88@gmail.com (mailing list archive)
State New, archived
Headers show

Commit Message

Matt Turner June 22, 2015, 4:56 p.m. UTC 
---
 configure.ac | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

Comments

Emil Velikov June 22, 2015, 5:07 p.m. UTC | #1 
On 22 June 2015 at 16:56, Matt Turner <mattst88@gmail.com> wrote:
> ---
>  configure.ac | 10 +++++++++-
>  1 file changed, 9 insertions(+), 1 deletion(-)
>
> diff --git a/configure.ac b/configure.ac
> index 78a0010..dd6c0ab 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -403,7 +403,15 @@ else
>  fi
>  AM_CONDITIONAL([HAVE_MANPAGES_STYLESHEET], [test "x$HAVE_MANPAGES_STYLESHEET" = "xyes"])
>
> -PKG_CHECK_MODULES(VALGRIND, [valgrind], [have_valgrind=yes], [have_valgrind=no])
> +AC_ARG_ENABLE(valgrind,
> +              AS_HELP_STRING([--disable-valgrind],
> +                             [Disable valgrind support]),
> +                             [use_valgrind=$enableval], [use_valgrind=yes])
> +
> +if test "x$use_valgrind" = "xyes"; then
> +       PKG_CHECK_MODULES(VALGRIND, [valgrind], [have_valgrind=yes], [have_valgrind=no])
> +fi
> +
Any objections if we move this to "auto" rather than enabled by
default (like we do with cairo) ? If you're ok I'll amend the patch
before pushing.

-Emil
Matt Turner June 22, 2015, 5:38 p.m. UTC | #2 
On Mon, Jun 22, 2015 at 10:07 AM, Emil Velikov <emil.l.velikov@gmail.com> wrote:
> On 22 June 2015 at 16:56, Matt Turner <mattst88@gmail.com> wrote:
>> ---
>>  configure.ac | 10 +++++++++-
>>  1 file changed, 9 insertions(+), 1 deletion(-)
>>
>> diff --git a/configure.ac b/configure.ac
>> index 78a0010..dd6c0ab 100644
>> --- a/configure.ac
>> +++ b/configure.ac
>> @@ -403,7 +403,15 @@ else
>>  fi
>>  AM_CONDITIONAL([HAVE_MANPAGES_STYLESHEET], [test "x$HAVE_MANPAGES_STYLESHEET" = "xyes"])
>>
>> -PKG_CHECK_MODULES(VALGRIND, [valgrind], [have_valgrind=yes], [have_valgrind=no])
>> +AC_ARG_ENABLE(valgrind,
>> +              AS_HELP_STRING([--disable-valgrind],
>> +                             [Disable valgrind support]),
>> +                             [use_valgrind=$enableval], [use_valgrind=yes])
>> +
>> +if test "x$use_valgrind" = "xyes"; then
>> +       PKG_CHECK_MODULES(VALGRIND, [valgrind], [have_valgrind=yes], [have_valgrind=no])
>> +fi
>> +
> Any objections if we move this to "auto" rather than enabled by
> default (like we do with cairo) ? If you're ok I'll amend the patch
> before pushing.
>
> -Emil

Fine by me!

Thanks Emil.
diff mbox

Patch

diff --git a/configure.ac b/configure.ac
index 78a0010..dd6c0ab 100644
--- a/configure.ac
+++ b/configure.ac
@@ -403,7 +403,15 @@  else
 fi
 AM_CONDITIONAL([HAVE_MANPAGES_STYLESHEET], [test "x$HAVE_MANPAGES_STYLESHEET" = "xyes"])
 
-PKG_CHECK_MODULES(VALGRIND, [valgrind], [have_valgrind=yes], [have_valgrind=no])
+AC_ARG_ENABLE(valgrind,
+              AS_HELP_STRING([--disable-valgrind],
+                             [Disable valgrind support]),
+                             [use_valgrind=$enableval], [use_valgrind=yes])
+
+if test "x$use_valgrind" = "xyes"; then
+	PKG_CHECK_MODULES(VALGRIND, [valgrind], [have_valgrind=yes], [have_valgrind=no])
+fi
+
 if test "x$have_valgrind" = "xyes"; then
 	AC_DEFINE([HAVE_VALGRIND], 1, [Use valgrind intrinsics to suppress false warnings])
 fi