Date: Fri, 6 Mar 2009 05:04:15 +0000 (UTC) From: Tim Kientzle <kientzle@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r189432 - in head/lib/libarchive: . test Message-ID: <200903060504.n2654FGK008731@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kientzle Date: Fri Mar 6 05:04:15 2009 New Revision: 189432 URL: http://svn.freebsd.org/changeset/base/189432 Log: Merge r435,r443 from libarchive.googlecode.com: Read config files from include path; this makes it easier to support multiple build frameworks. Modified: head/lib/libarchive/archive_platform.h head/lib/libarchive/test/test.h Modified: head/lib/libarchive/archive_platform.h ============================================================================== --- head/lib/libarchive/archive_platform.h Fri Mar 6 04:55:51 2009 (r189431) +++ head/lib/libarchive/archive_platform.h Fri Mar 6 05:04:15 2009 (r189432) @@ -44,7 +44,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. Modified: head/lib/libarchive/test/test.h ============================================================================== --- head/lib/libarchive/test/test.h Fri Mar 6 04:55:51 2009 (r189431) +++ head/lib/libarchive/test/test.h Fri Mar 6 05:04:15 2009 (r189432) @@ -33,13 +33,13 @@ */ #if defined(HAVE_CONFIG_H) /* Most POSIX platforms use the 'configure' script to build config.h */ -#include "../../config.h" +#include "config.h" #elif defined(__FreeBSD__) /* Building as part of FreeBSD system requires a pre-built config.h. */ -#include "../config_freebsd.h" +#include "config_freebsd.h" #elif defined(_WIN32) /* Win32 can't run the 'configure' script. */ -#include "../config_windows.h" +#include "config_windows.h" #else /* Warn if the library hasn't been (automatically or manually) configured. */ #error Oops: No config.h and no pre-built configuration in test.h.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200903060504.n2654FGK008731>