From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 9052 invoked by alias); 5 Jun 2012 08:44:07 -0000 Received: (qmail 9032 invoked by uid 22791); 5 Jun 2012 08:44:04 -0000 X-SWARE-Spam-Status: No, hits=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,KHOP_RCVD_TRUST,RCVD_IN_DNSWL_LOW,RCVD_IN_HOSTKARMA_YE X-Spam-Check-By: sourceware.org Received: from mail-bk0-f41.google.com (HELO mail-bk0-f41.google.com) (209.85.214.41) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Tue, 05 Jun 2012 08:43:51 +0000 Received: by bkcjm19 with SMTP id jm19so5303458bkc.0 for ; Tue, 05 Jun 2012 01:43:50 -0700 (PDT) Received: by 10.204.149.208 with SMTP id u16mr8795431bkv.81.1338885830251; Tue, 05 Jun 2012 01:43:50 -0700 (PDT) Received: from localhost.localdomain (ip-178-202-232-153.unitymediagroup.de. [178.202.232.153]) by mx.google.com with ESMTPS id fu14sm947076bkc.13.2012.06.05.01.43.48 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 05 Jun 2012 01:43:49 -0700 (PDT) From: =?UTF-8?q?Andreas=20M=C3=BCller?= To: systemtap@sourceware.org Subject: [PATCH] runtime/staprun/configure.ac: support --without-nss for staprun Date: Tue, 05 Jun 2012 08:44:00 -0000 Message-Id: <1338885817-15072-1-git-send-email-schnitzeltony@googlemail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-IsSubscribed: yes Mailing-List: contact systemtap-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: systemtap-owner@sourceware.org X-SW-Source: 2012-q2/txt/msg00202.txt.bz2 Signed-off-by: Andreas Müller --- 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