Return-Path: Delivered-To: apmail-httpd-apreq-cvs-archive@www.apache.org Received: (qmail 24742 invoked from network); 14 Jul 2004 23:11:17 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur-2.apache.org with SMTP; 14 Jul 2004 23:11:17 -0000 Received: (qmail 99537 invoked by uid 500); 14 Jul 2004 23:11:17 -0000 Delivered-To: apmail-httpd-apreq-cvs-archive@httpd.apache.org Received: (qmail 99505 invoked by uid 500); 14 Jul 2004 23:11:16 -0000 Mailing-List: contact apreq-cvs-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: apreq-dev@httpd.apache.org List-Post: List-Help: List-Unsubscribe: List-Subscribe: Delivered-To: mailing list apreq-cvs@httpd.apache.org Received: (qmail 99448 invoked by uid 500); 14 Jul 2004 23:11:15 -0000 Delivered-To: apmail-httpd-apreq-2-cvs@apache.org Received: (qmail 99413 invoked by uid 99); 14 Jul 2004 23:11:15 -0000 X-ASF-Spam-Status: No, hits=0.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.27.1) with SMTP; Wed, 14 Jul 2004 16:11:15 -0700 Received: (qmail 24663 invoked by uid 1462); 14 Jul 2004 23:11:13 -0000 Date: 14 Jul 2004 23:11:13 -0000 Message-ID: <20040714231113.24662.qmail@minotaur.apache.org> From: geoff@apache.org To: httpd-apreq-2-cvs@apache.org Subject: cvs commit: httpd-apreq-2 acinclude.m4 X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N geoff 2004/07/14 16:11:13 Modified: . acinclude.m4 Log: query apr-config for -D_LARGEFILE64_SOURCE and other interesting flags Reviewed by: joe Revision Changes Path 1.25 +20 -2 httpd-apreq-2/acinclude.m4 Index: acinclude.m4 =================================================================== RCS file: /home/cvs/httpd-apreq-2/acinclude.m4,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- acinclude.m4 14 Jul 2004 17:19:36 -0000 1.24 +++ acinclude.m4 14 Jul 2004 23:11:13 -0000 1.25 @@ -97,8 +97,6 @@ APR_LDLIBS=`$APR_CONFIG --link-ld --ldflags --libs` APU_LDLIBS=`$APU_CONFIG --link-ld --ldflags --libs` - CPPFLAGS="$CPPFLAGS `$APR_CONFIG --cppflags`" - dnl Absolute source/build directory abs_srcdir=`(cd $srcdir && pwd)` abs_builddir=`pwd` @@ -110,6 +108,26 @@ if test "x$USE_MAINTAINER_MODE" != "xno"; then CPPFLAGS="$CPPFLAGS -Wall -Wmissing-prototypes -Wstrict-prototypes -Wmissing-declarations -Werror" + fi + + if test "x$CPPFLAGS" = "x"; then + echo " setting CPPFLAGS to \"`$APR_CONFIG --cppflags`\"" + CPPFLAGS="`$APR_CONFIG --cppflags`" + else + apr_addto_bugger="`$APR_CONFIG --cppflags`" + for i in $apr_addto_bugger; do + apr_addto_duplicate="0" + for j in $CPPFLAGS; do + if test "x$i" = "x$j"; then + apr_addto_duplicate="1" + break + fi + done + if test $apr_addto_duplicate = "0"; then + echo " adding \"$i\" to CPPFLAGS" + CPPFLAGS="$CPPFLAGS $i" + fi + done fi get_version="$abs_srcdir/build/get-version.sh"