From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 29867 invoked by alias); 4 Feb 2010 14:43:38 -0000 Received: (qmail 29852 invoked by uid 22791); 4 Feb 2010 14:43:36 -0000 X-SWARE-Spam-Status: No, hits=-2.0 required=5.0 tests=BAYES_00,SARE_MSGID_LONG40 X-Spam-Check-By: sourceware.org Received: from mail-bw0-f221.google.com (HELO mail-bw0-f221.google.com) (209.85.218.221) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Thu, 04 Feb 2010 14:43:32 +0000 Received: by bwz21 with SMTP id 21so2163338bwz.4 for ; Thu, 04 Feb 2010 06:43:29 -0800 (PST) Received: by 10.204.148.86 with SMTP id o22mr732229bkv.95.1265294609574; Thu, 04 Feb 2010 06:43:29 -0800 (PST) Received: from debian ([194.29.168.208]) by mx.google.com with ESMTPS id 15sm94382bwz.12.2010.02.04.06.43.27 (version=TLSv1/SSLv3 cipher=RC4-MD5); Thu, 04 Feb 2010 06:43:28 -0800 (PST) Mail-From: 52a562178072bd6178e9db8b3dc902edf691b712 Mon Sep 17 00:00:00 2001 Message-Id: <52a562178072bd6178e9db8b3dc902edf691b712.1265293859.git.przemyslaw@pawelczyk.it> From: Przemyslaw Pawelczyk Date: Thu, 04 Feb 2010 14:43:00 -0000 Subject: [PATCH 1/2] Do not check stuff required by server if disabled. To: systemtap@sourceware.org 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: 2010-q1/txt/msg00330.txt.bz2 Building systemtap package using dpkg-buildpackage under scratchbox yields following error during configure: checking for /usr/include/nss3... configure: error: cannot check for file existence when cross compiling even if --disable-server is provided. Fix it. * configure.ac: Check for server-related stuff iff enable_server != no. --- configure.ac | 60 +++++++++++++++++++++++++++++---------------------------- 1 files changed, 31 insertions(+), 29 deletions(-) diff --git a/configure.ac b/configure.ac index 2ec625d..8a828de 100644 --- a/configure.ac +++ b/configure.ac @@ -287,38 +287,40 @@ AC_ARG_ENABLE([server], [enable building of stap-server/client (default on if nss etc. found).]), [enable_server=$enableval], [enable_server="check"]) +if test "$enable_server" != "no"; then dnl Find the location of nss and nspr headers and certutil -AC_CHECK_PROG(have_certutil, certutil, [yes], [no]) -AC_CHECK_FILE([/usr/include/nss3], nssdir=nss3, [ - AC_CHECK_FILE([/usr/include/nss], nssdir=nss) -]) -AC_CHECK_FILE([/usr/include/nspr4], nsprdir=nspr4, [ - AC_CHECK_FILE([/usr/include/nspr], nsprdir=nspr) -]) -if test "x$nssdir" != "x" -a "x$nsprdir" != "x"; then -nss_CFLAGS="-I/usr/include/$nssdir" -nspr_CFLAGS="-I/usr/include/$nsprdir" -AC_SUBST(nss_CFLAGS) -AC_SUBST(nspr_CFLAGS) -save_CPPFLAGS="$CPPFLAGS" -CPPFLAGS="$CFLAGS $nss_CFLAGS $nspr_CFLAGS" -have_nss_includes=yes -AC_CHECK_HEADERS(["$nsprdir/nspr.h" "$nsprdir/plgetopt.h" "$nsprdir/prerror.h" "$nssdir/ssl.h" "$nssdir/nss.h" "$nssdir/pk11func.h" "$nssdir/secerr.h"], [], have_nss_includes=no) -CPPFLAGS="$save_CPPFLAGS" -have_nss_libs=no -AC_CHECK_LIB(nspr4, PR_Connect, [ - AC_CHECK_LIB(ssl3, SSL_ReHandshake, have_nss_libs=yes) -]) -fi -if test "x${have_nss_includes}${have_nss_libs}${have_certutil}" != "xyesyesyes"; then - if test "$enable_server" == "yes"; then - AC_MSG_ERROR([cannot find all libraries or tools for stap-server]) + AC_CHECK_PROG(have_certutil, certutil, [yes], [no]) + AC_CHECK_FILE([/usr/include/nss3], nssdir=nss3, [ + AC_CHECK_FILE([/usr/include/nss], nssdir=nss) + ]) + AC_CHECK_FILE([/usr/include/nspr4], nsprdir=nspr4, [ + AC_CHECK_FILE([/usr/include/nspr], nsprdir=nspr) + ]) + if test "x$nssdir" != "x" -a "x$nsprdir" != "x"; then + nss_CFLAGS="-I/usr/include/$nssdir" + nspr_CFLAGS="-I/usr/include/$nsprdir" + AC_SUBST(nss_CFLAGS) + AC_SUBST(nspr_CFLAGS) + save_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$CFLAGS $nss_CFLAGS $nspr_CFLAGS" + have_nss_includes=yes + AC_CHECK_HEADERS(["$nsprdir/nspr.h" "$nsprdir/plgetopt.h" "$nsprdir/prerror.h" "$nssdir/ssl.h" "$nssdir/nss.h" "$nssdir/pk11func.h" "$nssdir/secerr.h"], [], have_nss_includes=no) + CPPFLAGS="$save_CPPFLAGS" + have_nss_libs=no + AC_CHECK_LIB(nspr4, PR_Connect, [ + AC_CHECK_LIB(ssl3, SSL_ReHandshake, have_nss_libs=yes) + ]) fi - if test "$enable_server" == "check"; then - AC_MSG_WARN([will not build stap-server, cannot find all libraries or tools]) + if test "x${have_nss_includes}${have_nss_libs}${have_certutil}" != "xyesyesyes"; then + if test "$enable_server" == "yes"; then + AC_MSG_ERROR([cannot find all libraries or tools for stap-server]) + fi + if test "$enable_server" == "check"; then + AC_MSG_WARN([will not build stap-server, cannot find all libraries or tools]) + fi + else + AC_DEFINE([HAVE_NSS], [1], [Define to 1 if you have the nss libraries.]) fi -else - AC_DEFINE([HAVE_NSS], [1], [Define to 1 if you have the nss libraries.]) fi AM_CONDITIONAL([BUILD_SERVER], [test "x${have_nss_includes}${have_nss_libs}${have_certutil}" == "xyesyesyes" -a "$enable_server" != "no"]) AM_CONDITIONAL([HAVE_NSS], [test "x${have_nss_includes}${have_nss_libs}${have_certutil}" == "xyesyesyes"]) -- 1.6.3.3