diff options
| author | Tim Kientzle <kientzle@FreeBSD.org> | 2007-04-12 04:44:21 +0000 |
|---|---|---|
| committer | Tim Kientzle <kientzle@FreeBSD.org> | 2007-04-12 04:44:21 +0000 |
| commit | da7bcba2e8f4457909ca3d5707714ff018ad1ffd (patch) | |
| tree | b5524bd39af474e5bb7846f2704bf6920f69673b /lib/libarchive/archive_platform.h | |
| parent | 782a032689d1a196890cbb9717db4465029a5144 (diff) | |
| download | src-da7bcba2e8f4457909ca3d5707714ff018ad1ffd.tar.gz src-da7bcba2e8f4457909ca3d5707714ff018ad1ffd.zip | |
Now that libarchive is being built in more environments,
factor out the platform-specific configuration header a bit
more cleanly.
Suggested by: Joerg Sonnenberger
Notes
Notes:
svn path=/head/; revision=168648
Diffstat (limited to 'lib/libarchive/archive_platform.h')
| -rw-r--r-- | lib/libarchive/archive_platform.h | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/lib/libarchive/archive_platform.h b/lib/libarchive/archive_platform.h index bf446f68bb5e..f775a6989286 100644 --- a/lib/libarchive/archive_platform.h +++ b/lib/libarchive/archive_platform.h @@ -36,15 +36,12 @@ #ifndef ARCHIVE_PLATFORM_H_INCLUDED #define ARCHIVE_PLATFORM_H_INCLUDED -#if defined(HAVE_CONFIG_H) +#if defined(PLATFORM_CONFIG_H) +/* Use hand-built config.h in environments that need it. */ +#include PLATFORM_CONFIG_H +#elif defined(HAVE_CONFIG_H) /* Most POSIX platforms use the 'configure' script to build config.h */ #include "../config.h" -#elif defined(__FreeBSD__) -/* Building as part of FreeBSD system requires a pre-built config.h. */ -#include "config_freebsd.h" -#elif defined(_WIN32) -/* Win32 can't run the 'configure' script. */ -#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 archive_platform.h. |