summaryrefslogtreecommitdiffstats
path: root/lib/libarchive/archive_platform.h
diff options
context:
space:
mode:
authorkientzle <kientzle@FreeBSD.org>2007-04-12 04:44:21 +0000
committerkientzle <kientzle@FreeBSD.org>2007-04-12 04:44:21 +0000
commit7d72f414792a760bf03f1890056c7f96a1bc1ddf (patch)
treeb5524bd39af474e5bb7846f2704bf6920f69673b /lib/libarchive/archive_platform.h
parent074fb0c77f6e4db4231d4f0e526a9419ed3686f5 (diff)
downloadFreeBSD-src-7d72f414792a760bf03f1890056c7f96a1bc1ddf.zip
FreeBSD-src-7d72f414792a760bf03f1890056c7f96a1bc1ddf.tar.gz
Now that libarchive is being built in more environments,
factor out the platform-specific configuration header a bit more cleanly. Suggested by: Joerg Sonnenberger
Diffstat (limited to 'lib/libarchive/archive_platform.h')
-rw-r--r--lib/libarchive/archive_platform.h11
1 files changed, 4 insertions, 7 deletions
diff --git a/lib/libarchive/archive_platform.h b/lib/libarchive/archive_platform.h
index bf446f6..f775a69 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.
OpenPOWER on IntegriCloud