From owner-svn-src-user@FreeBSD.ORG  Mon Oct 12 16:56:07 2009
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 5035E106568D;
	Mon, 12 Oct 2009 16:56:07 +0000 (UTC) (envelope-from des@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 4117A8FC08;
	Mon, 12 Oct 2009 16:56:07 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n9CGu7MG077766;
	Mon, 12 Oct 2009 16:56:07 GMT (envelope-from des@svn.freebsd.org)
Received: (from des@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n9CGu7uS077764;
	Mon, 12 Oct 2009 16:56:07 GMT (envelope-from des@svn.freebsd.org)
Message-Id: <200910121656.n9CGu7uS077764@svn.freebsd.org>
From: Dag-Erling Smorgrav <des@FreeBSD.org>
Date: Mon, 12 Oct 2009 16:56:07 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r197991 - user/des/svnsup
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 12 Oct 2009 16:56:07 -0000

Author: des
Date: Mon Oct 12 16:56:06 2009
New Revision: 197991
URL: http://svn.freebsd.org/changeset/base/197991

Log:
  Don't discard user-provided CPPFLAGS.

Modified:
  user/des/svnsup/configure.ac

Modified: user/des/svnsup/configure.ac
==============================================================================
--- user/des/svnsup/configure.ac	Mon Oct 12 16:55:19 2009	(r197990)
+++ user/des/svnsup/configure.ac	Mon Oct 12 16:56:06 2009	(r197991)
@@ -66,7 +66,7 @@ PKG_CHECK_MODULES([APR_1], [apr-1])
 # Subersion remote access library
 #
 saved_CPPFLAGS="${CPPFLAGS}"
-CPPFLAGS="${APR_1_CFLAGS}"
+CPPFLAGS="${CPPFLAGS} ${APR_1_CFLAGS}"
 AC_CHECK_HEADER([subversion-1/svn_ra.h], [], [
 	AC_MSG_ERROR([cannot proceed without <subversion-1/svn_ra.h>])
 ])
@@ -84,7 +84,7 @@ AC_SUBST([SVN_RA_1_LIBS])
 # Subversion delta library
 #
 saved_CPPFLAGS="${CPPFLAGS}"
-CPPFLAGS="${APR_1_CFLAGS}"
+CPPFLAGS="${CPPFLAGS} ${APR_1_CFLAGS}"
 AC_CHECK_HEADER([subversion-1/svn_delta.h], [], [
 	AC_MSG_ERROR([cannot proceed without <subversion-1/svn_delta.h>])
 ])
@@ -101,7 +101,7 @@ AC_SUBST([SVN_DELTA_1_LIBS])
 # Subversion client library
 #
 saved_CPPFLAGS="${CPPFLAGS}"
-CPPFLAGS="${APR_1_CFLAGS}"
+CPPFLAGS="${CPPFLAGS} ${APR_1_CFLAGS}"
 AC_CHECK_HEADER([subversion-1/svn_client.h], [], [
 	AC_MSG_ERROR([cannot proceed without <subversion-1/svn_client.h>])
 ])