From owner-p4-projects@FreeBSD.ORG  Thu Jun 19 11:52:26 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 07B7910656B3; Thu, 19 Jun 2008 11:52:26 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id BBF0210656AD
	for <perforce@FreeBSD.org>; Thu, 19 Jun 2008 11:52:25 +0000 (UTC)
	(envelope-from strauss@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id A60E68FC15
	for <perforce@FreeBSD.org>; Thu, 19 Jun 2008 11:52:25 +0000 (UTC)
	(envelope-from strauss@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m5JBqPPY079456
	for <perforce@FreeBSD.org>; Thu, 19 Jun 2008 11:52:25 GMT
	(envelope-from strauss@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5JBqPju079452
	for perforce@freebsd.org; Thu, 19 Jun 2008 11:52:25 GMT
	(envelope-from strauss@FreeBSD.org)
Date: Thu, 19 Jun 2008 11:52:25 GMT
Message-Id: <200806191152.m5JBqPju079452@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	strauss@FreeBSD.org using -f
From: Anselm Strauss <strauss@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 143760 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 19 Jun 2008 11:52:26 -0000

http://perforce.freebsd.org/chv.cgi?CH=143760

Change 143760 by strauss@strauss_marvelman on 2008/06/19 11:51:27

	Build fixes:
		- autogen.sh can just use 'autoreconf -i'
		- include <config.h> instead of "../config.h" for build outside source directory

Affected files ...

.. //depot/projects/soc2008/strauss_libarchive/autogen.sh#5 edit
.. //depot/projects/soc2008/strauss_libarchive/libarchive/archive_platform.h#8 edit

Differences ...

==== //depot/projects/soc2008/strauss_libarchive/autogen.sh#5 (text+kox) ====

@@ -1,9 +1,3 @@
 #!/bin/sh
 
-set -xe
-mkdir -p config.aux
-aclocal
-autoheader
-autoconf
-libtoolize --automake -c
-automake -a -c
+autoreconf -i

==== //depot/projects/soc2008/strauss_libarchive/libarchive/archive_platform.h#8 (ktext) ====

@@ -22,7 +22,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id$ $Change: 143014 $ $DateTime$ $Author$
+ * $Id$ $Change: 143760 $ $DateTime$ $Author$
  */
 
 /*
@@ -47,7 +47,7 @@
 #include PLATFORM_CONFIG_H
 #elif defined(HAVE_CONFIG_H)
 /* Most POSIX platforms use the 'configure' script to build config.h */
-#include "../config.h"
+#include <config.h>
 #else
 /* Warn if the library hasn't been (automatically or manually) configured. */
 #error Oops: No config.h and no pre-built configuration in archive_platform.h.