diff options
| author | kientzle <kientzle@FreeBSD.org> | 2007-04-12 04:44:21 +0000 |
|---|---|---|
| committer | kientzle <kientzle@FreeBSD.org> | 2007-04-12 04:44:21 +0000 |
| commit | 7d72f414792a760bf03f1890056c7f96a1bc1ddf (patch) | |
| tree | b5524bd39af474e5bb7846f2704bf6920f69673b /lib/libarchive | |
| parent | 074fb0c77f6e4db4231d4f0e526a9419ed3686f5 (diff) | |
| download | FreeBSD-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')
| -rw-r--r-- | lib/libarchive/Makefile | 3 | ||||
| -rw-r--r-- | lib/libarchive/archive_platform.h | 11 |
2 files changed, 6 insertions, 8 deletions
diff --git a/lib/libarchive/Makefile b/lib/libarchive/Makefile index 0fd956d..83fbe5c 100644 --- a/lib/libarchive/Makefile +++ b/lib/libarchive/Makefile @@ -9,7 +9,7 @@ LDADD= -lbz2 -lz # Major: Bumped ONLY when API/ABI breakage happens (see SHLIB_MAJOR) # Minor: Bumped when significant new features are added # Revision: Bumped on any notable change -VERSION= 2.0.27 +VERSION= 2.0.28 ARCHIVE_API_MAJOR!= echo ${VERSION} | sed -e 's/[^0-9]/./g' -e 's/\..*//' ARCHIVE_API_MINOR!= echo ${VERSION} | sed -e 's/[^0-9]/./g' -e 's/[0-9]*\.//' -e 's/\..*//' @@ -20,6 +20,7 @@ SHLIB_MAJOR= 4 CFLAGS+= -DPACKAGE_NAME=\"lib${LIB}\" CFLAGS+= -DPACKAGE_VERSION=\"${VERSION}\" +CFLAGS+= -DPLATFORM_CONFIG_H=\"config_freebsd.h\" CFLAGS+= -I${.OBJDIR} WARNS?= 6 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. |
