[PATCH] runtime/staprun/configure.ac: support --without-nss for staprun

[PATCH] runtime/staprun/configure.ac: support --without-nss for staprun

[Andreas Müller]

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 runtime/staprun/configure.ac |   20 +++++++++++++++-----
 1 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/runtime/staprun/configure.ac b/runtime/staprun/configure.ac
index 8fd1b42..7b05f73 100644
--- a/runtime/staprun/configure.ac
+++ b/runtime/staprun/configure.ac
@@ -67,11 +67,21 @@ AS_IF([test "x$enable_sdt_probes" != xno], [
             [Define to 1 to enable process.mark probes in staprun, stapio.])
 ])
 
-PKG_CHECK_MODULES([nss], [nss >= 3], [have_nss=yes], [have_nss=no])
-AM_CONDITIONAL([HAVE_NSS], [test $have_nss = yes])
-AS_IF([test $have_nss = yes], [
-  AC_DEFINE([HAVE_NSS], [1], [Define to 1 if you have the nss libraries.])
-])
+dnl See if we have the nss/nspr headers and libraries
+AC_ARG_WITH([nss],
+  AS_HELP_STRING([--without-nss],
+    [Do not use NSS even if present]))
+
+AS_IF([test "x$with_nss" != "xno"], [
+  PKG_CHECK_MODULES([nss], [nss >= 3],
+    [have_nss=yes
+     AC_DEFINE([HAVE_NSS], [1], [Define to 1 if you have the nss libraries.])
+    ], [have_nss=no])
+], [have_nss=no])
+
+AM_CONDITIONAL([HAVE_NSS], [test "${have_nss}" = "yes"])
+
+
 AC_ARG_ENABLE([nls], [AS_HELP_STRING([--enable-nls], [enable translating program messages])])
 AS_IF([test "x$enable_nls" != xno], [
 AC_DEFINE([ENABLE_NLS], [1], [Define to 1 if program messages should be translated.])
-- 
1.7.6.5

Re: [PATCH] runtime/staprun/configure.ac: support --without-nss for staprun

[Josh Stone]

On 06/05/2012 01:43 AM, Andreas Müller wrote:
> 
> Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
> ---
>  runtime/staprun/configure.ac |   20 +++++++++++++++-----
>  1 files changed, 15 insertions(+), 5 deletions(-)

Looks like you copied the exact logic from the root configure script,
which is fine.  Committed and pushed, thanks!

That duplication of configure logic is something that I intend to
address in PR14179, where I'm consolidating them into one.  But some of
the other changes I'm making there are more invasive, and I'm holding
them until after our next release.  So your patch is still helpful to
get into this coming release.

Thanks,
Josh

Re: [PATCH] runtime/staprun/configure.ac: support --without-nss for staprun

[Dave Brolley]

Thanks Josh --- you beat me to it.

Dave

On 06/05/2012 02:51 PM, Josh Stone wrote:
> On 06/05/2012 01:43 AM, Andreas Müller wrote:
>> Signed-off-by: Andreas Müller<schnitzeltony@googlemail.com>
>> ---
>>   runtime/staprun/configure.ac |   20 +++++++++++++++-----
>>   1 files changed, 15 insertions(+), 5 deletions(-)
> Looks like you copied the exact logic from the root configure script,
> which is fine.  Committed and pushed, thanks!
>
> That duplication of configure logic is something that I intend to
> address in PR14179, where I'm consolidating them into one.  But some of
> the other changes I'm making there are more invasive, and I'm holding
> them until after our next release.  So your patch is still helpful to
> get into this coming release.
>
> Thanks,
> Josh