diff options
Diffstat (limited to 'lib/libmagic')
| -rw-r--r-- | lib/libmagic/Makefile | 3 | ||||
| -rw-r--r-- | lib/libmagic/config.h | 37 |
2 files changed, 35 insertions, 5 deletions
diff --git a/lib/libmagic/Makefile b/lib/libmagic/Makefile index 14f1702..2add1d3 100644 --- a/lib/libmagic/Makefile +++ b/lib/libmagic/Makefile @@ -7,8 +7,7 @@ CONTRDIR= ${.CURDIR}/../../contrib/file LIB= magic SHLIB_MAJOR= 4 -DPADD= ${LIBZ} -LDADD= -lz +LIBADD= z MAN= libmagic.3 magic.5 SRCS= apprentice.c apptype.c ascmagic.c cdf.c cdf_time.c compress.c \ diff --git a/lib/libmagic/config.h b/lib/libmagic/config.h index d80926d..47f3347 100644 --- a/lib/libmagic/config.h +++ b/lib/libmagic/config.h @@ -1,5 +1,13 @@ /* $FreeBSD$ */ +/* Get __FreeBSD_version. */ +#include <osreldate.h> + +/* Only specific versions of FreeBSD support xlocale */ +#if __FreeBSD_version >= 1000002 || (__FreeBSD_version < 1000000 && __FreeBSD_version >= 900506) +#define FREEBSD_XLOCALE_SUPPORT 1 +#endif + /* config.h. Generated from config.h.in by configure. */ /* config.h.in. Generated from configure.ac by autoheader. */ @@ -47,6 +55,11 @@ /* Define to 1 if you have the `fork' function. */ #define HAVE_FORK 1 +/* Define to 1 if you have the `freelocale' function. */ +#ifdef FREEBSD_XLOCALE_SUPPORT +#define HAVE_FREELOCALE 1 +#endif + /* Define to 1 if fseeko (and presumably ftello) exists and is declared. */ #define HAVE_FSEEKO 1 @@ -98,9 +111,17 @@ /* Define to 1 if you have a working `mmap' system call. */ #define HAVE_MMAP 1 +/* Define to 1 if you have the `newlocale' function. */ +#ifdef FREEBSD_XLOCALE_SUPPORT +#define HAVE_NEWLOCALE 1 +#endif + /* Define to 1 if you have the `pread' function. */ #define HAVE_PREAD 1 +/* Define to 1 if you have the `setlocale' function. */ +#define HAVE_SETLOCALE 1 + /* Define to 1 if you have the <stddef.h> header file. */ #define HAVE_STDDEF_H 1 @@ -185,6 +206,11 @@ /* Define to 1 if you have the <unistd.h> header file. */ #define HAVE_UNISTD_H 1 +/* Define to 1 if you have the `uselocale' function. */ +#ifdef FREEBSD_XLOCALE_SUPPORT +#define HAVE_USELOCALE 1 +#endif + /* Define to 1 if you have the `utime' function. */ #define HAVE_UTIME 1 @@ -222,6 +248,11 @@ /* Define to 1 if `vfork' works. */ #define HAVE_WORKING_VFORK 1 +/* Define to 1 if you have the <xlocale.h> header file. */ +#ifdef FREEBSD_XLOCALE_SUPPORT +#define HAVE_XLOCALE_H 1 +#endif + /* Define to 1 if you have the <zlib.h> header file. */ #define HAVE_ZLIB_H 1 @@ -247,7 +278,7 @@ #define PACKAGE_NAME "file" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "file 5.19" +#define PACKAGE_STRING "file 5.22" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "file" @@ -256,7 +287,7 @@ #define PACKAGE_URL "" /* Define to the version of this package. */ -#define PACKAGE_VERSION "5.19" +#define PACKAGE_VERSION "5.22" /* Define to 1 if you have the ANSI C header files. */ #define STDC_HEADERS 1 @@ -287,7 +318,7 @@ /* Version number of package */ -#define VERSION "5.19" +#define VERSION "5.22" /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most significant byte first (like Motorola and SPARC, unlike Intel). */ |
