From dev-return-20526-apmail-apr-dev-archive=apr.apache.org@apr.apache.org Sun Jun 15 22:46:54 2008 Return-Path: Delivered-To: apmail-apr-dev-archive@www.apache.org Received: (qmail 75055 invoked from network); 15 Jun 2008 22:46:54 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 15 Jun 2008 22:46:54 -0000 Received: (qmail 41469 invoked by uid 500); 15 Jun 2008 22:46:55 -0000 Delivered-To: apmail-apr-dev-archive@apr.apache.org Received: (qmail 41422 invoked by uid 500); 15 Jun 2008 22:46:55 -0000 Mailing-List: contact dev-help@apr.apache.org; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Id: Delivered-To: mailing list dev@apr.apache.org Received: (qmail 41411 invoked by uid 99); 15 Jun 2008 22:46:55 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 15 Jun 2008 15:46:55 -0700 X-ASF-Spam-Status: No, hits=-0.0 required=10.0 tests=SPF_HELO_PASS,SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (athena.apache.org: domain of bojan@rexursive.com designates 203.171.74.242 as permitted sender) Received: from [203.171.74.242] (HELO beauty.rexursive.com) (203.171.74.242) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 15 Jun 2008 22:46:06 +0000 Received: from [10.1.120.24] (shrek.rexursive.com [10.1.120.24]) by beauty.rexursive.com (Postfix) with ESMTP id 09ADF40330; Mon, 16 Jun 2008 08:46:23 +1000 (EST) Subject: Re: [vote] Release apr[-util] 1.3.1 From: Bojan Smojver To: "William A. Rowe, Jr." Cc: Ruediger Pluem , APR Developer List In-Reply-To: <1213567339.2734.7.camel@shrek.rexursive.com> References: <4854993F.9060100@rowe-clan.net> <4854F837.5000505@apache.org> <48550E76.6050002@apache.org> <485553D9.3060402@rowe-clan.net> <1213567339.2734.7.camel@shrek.rexursive.com> Content-Type: multipart/mixed; boundary="=-PMEON2aAOfTtNNpjT6iS" Date: Mon, 16 Jun 2008 08:46:22 +1000 Message-Id: <1213569982.2734.9.camel@shrek.rexursive.com> Mime-Version: 1.0 X-Mailer: Evolution 2.22.2 (2.22.2-2.fc9) X-Virus-Checked: Checked by ClamAV on apache.org --=-PMEON2aAOfTtNNpjT6iS Content-Type: text/plain Content-Transfer-Encoding: 7bit On Mon, 2008-06-16 at 08:02 +1000, Bojan Smojver wrote: > The AC_CACHE_VAL should be changed to AC_CACHE_CHECK, which then > provides pretty printing of messages for non-nested version of checks. Could you check if this works on Solaris? -- Bojan --=-PMEON2aAOfTtNNpjT6iS Content-Disposition: attachment; filename=apr-nested-cflags.patch Content-Type: text/x-patch; name=apr-nested-cflags.patch; charset=utf-8 Content-Transfer-Encoding: 7bit Index: build/apr_network.m4 =================================================================== --- build/apr_network.m4 (revision 668012) +++ build/apr_network.m4 (working copy) @@ -315,60 +315,68 @@ (struct servent **) 0); /* use tmp to suppress the warning */ tmp=0; -], ac_cv_getservbyname_r_style=glibc2, [ +], ac_cv_getservbyname_r_style=glibc2, ac_cv_getservbyname_r_style=none)) -dnl Try and compile a Solaris getservbyname_r piece of code, and set the -dnl style of the routines to solaris on success -AC_CACHE_VAL(ac_cv_getservbyname_r_style, -APR_TRY_COMPILE_NO_WARNING([ -#ifdef HAVE_SYS_TYPES_H -#include -#endif -#ifdef HAVE_NETINET_IN_H -#include -#endif -#ifdef HAVE_ARPA_INET_H -#include -#endif -#ifdef HAVE_NETDB_H -#include -#endif -#ifdef HAVE_STDLIB_H -#include -#endif -],[ -struct servent tmp = getservbyname_r((const char *) 0, (const char *) 0, - (struct servent *) 0, (char *) 0, 0); -/* use tmp to suppress the warning */ -tmp=NULL; -], ac_cv_getservbyname_r_style=solaris, [ +if test "$ac_cv_getservbyname_r_style" = "none"; then + unset ac_cv_getservbyname_r_style -dnl Try and compile a OSF/1 getservbyname_r piece of code, and set the -dnl style of the routines to osf1 on success -AC_CACHE_VAL( ac_cv_getservbyname_r_style, -APR_TRY_COMPILE_NO_WARNING([ -#ifdef HAVE_SYS_TYPES_H -#include -#endif -#ifdef HAVE_NETINET_IN_H -#include -#endif -#ifdef HAVE_ARPA_INET_H -#include -#endif -#ifdef HAVE_NETDB_H -#include -#endif -#ifdef HAVE_STDLIB_H -#include -#endif -],[ -int tmp = getservbyname_r((const char *) 0, (const char *) 0, - (struct servent *) 0, (struct servent_data *) 0); -/* use tmp to suppress the warning */ -tmp=0; -], ac_cv_getservbyname_r_style=osf1, ac_cv_getservbyname_r_style=none))]))])) + dnl Try and compile a Solaris getservbyname_r piece of code, and set the + dnl style of the routines to solaris on success + AC_CACHE_CHECK([style of getservbyname_r routine], ac_cv_getservbyname_r_style, + APR_TRY_COMPILE_NO_WARNING([ + #ifdef HAVE_SYS_TYPES_H + #include + #endif + #ifdef HAVE_NETINET_IN_H + #include + #endif + #ifdef HAVE_ARPA_INET_H + #include + #endif + #ifdef HAVE_NETDB_H + #include + #endif + #ifdef HAVE_STDLIB_H + #include + #endif + ],[ + struct servent tmp = getservbyname_r((const char *) 0, (const char *) 0, + (struct servent *) 0, (char *) 0, 0); + /* use tmp to suppress the warning */ + tmp=NULL; + ], ac_cv_getservbyname_r_style=solaris, ac_cv_getservbyname_r_style=none)) +fi +if test "$ac_cv_getservbyname_r_style" = "none"; then + unset ac_cv_getservbyname_r_style + + dnl Try and compile a OSF/1 getservbyname_r piece of code, and set the + dnl style of the routines to osf1 on success + AC_CACHE_CHECK([style of getservbyname_r routine], ac_cv_getservbyname_r_style, + APR_TRY_COMPILE_NO_WARNING([ + #ifdef HAVE_SYS_TYPES_H + #include + #endif + #ifdef HAVE_NETINET_IN_H + #include + #endif + #ifdef HAVE_ARPA_INET_H + #include + #endif + #ifdef HAVE_NETDB_H + #include + #endif + #ifdef HAVE_STDLIB_H + #include + #endif + ],[ + int tmp = getservbyname_r((const char *) 0, (const char *) 0, + (struct servent *) 0, (struct servent_data *) 0); + /* use tmp to suppress the warning */ + tmp=0; + ], ac_cv_getservbyname_r_style=osf1, ac_cv_getservbyname_r_style=none)) +fi + if test "$ac_cv_getservbyname_r_style" = "glibc2"; then AC_DEFINE(GETSERVBYNAME_R_GLIBC2, 1, [Define if getservbyname_r has the glibc style]) elif test "$ac_cv_getservbyname_r_style" = "solaris"; then --=-PMEON2aAOfTtNNpjT6iS--