diff options
| author | kientzle <kientzle@FreeBSD.org> | 2009-03-06 05:04:15 +0000 |
|---|---|---|
| committer | kientzle <kientzle@FreeBSD.org> | 2009-03-06 05:04:15 +0000 |
| commit | 1f629263d5cce063ef4f8458a107909f4b44fac7 (patch) | |
| tree | 7c291ee15bd4612703b84bb53107b6c2ca5bf45c /lib | |
| parent | 0e3959e0048adeb8162dda94e7d22719dc53d19d (diff) | |
| download | FreeBSD-src-1f629263d5cce063ef4f8458a107909f4b44fac7.zip FreeBSD-src-1f629263d5cce063ef4f8458a107909f4b44fac7.tar.gz | |
Merge r435,r443 from libarchive.googlecode.com: Read config files from
include path; this makes it easier to support multiple build frameworks.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libarchive/archive_platform.h | 2 | ||||
| -rw-r--r-- | lib/libarchive/test/test.h | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/libarchive/archive_platform.h b/lib/libarchive/archive_platform.h index 4905faf..7367f8e 100644 --- a/lib/libarchive/archive_platform.h +++ b/lib/libarchive/archive_platform.h @@ -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. diff --git a/lib/libarchive/test/test.h b/lib/libarchive/test/test.h index 2876909..34ee9f2 100644 --- a/lib/libarchive/test/test.h +++ b/lib/libarchive/test/test.h @@ -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. |
