diff options
| author | Marcel Moolenaar <marcel@FreeBSD.org> | 2012-05-19 02:30:10 +0000 |
|---|---|---|
| committer | Marcel Moolenaar <marcel@FreeBSD.org> | 2012-05-19 02:30:10 +0000 |
| commit | aaa975e19dcbe311678cf4069ca7ae9f6b5336d3 (patch) | |
| tree | 567361d6b6fcb0b4cd40b8e90964d2cb6c23bb1e /lib | |
| parent | 727d8c8134c3aeef1ad7d99df498e25f66bf8ae0 (diff) | |
| download | src-aaa975e19dcbe311678cf4069ca7ae9f6b5336d3.tar.gz src-aaa975e19dcbe311678cf4069ca7ae9f6b5336d3.zip | |
Don't depend on getline being on the build machine. That's
not the case for FreeBSD 7.x machines.
Notes
Notes:
svn path=/head/; revision=235638
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libmagic/Makefile | 5 | ||||
| -rw-r--r-- | lib/libmagic/config.h | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/lib/libmagic/Makefile b/lib/libmagic/Makefile index 59573060afb1..fbf71efac83b 100644 --- a/lib/libmagic/Makefile +++ b/lib/libmagic/Makefile @@ -39,8 +39,9 @@ magic.mgc: mkmagic magic CLEANFILES+= mkmagic build-tools: mkmagic -mkmagic: apprentice.c funcs.c magic.c print.c - ${CC} ${CFLAGS} -DCOMPILE_ONLY ${LDFLAGS} -o ${.TARGET} ${.ALLSRC} +mkmagic: apprentice.c funcs.c getline.c magic.c print.c + ${CC} ${CFLAGS} -DCOMPILE_ONLY -DHOSTPROG ${LDFLAGS} \ + -o ${.TARGET} ${.ALLSRC} FILEVER!= awk '$$1 == "\#define" && $$2 == "VERSION" { print $$3; exit }' \ ${.CURDIR}/config.h diff --git a/lib/libmagic/config.h b/lib/libmagic/config.h index c7e38ec761a1..c17883f76151 100644 --- a/lib/libmagic/config.h +++ b/lib/libmagic/config.h @@ -39,7 +39,9 @@ #define HAVE_FSEEKO 1 /* Define to 1 if you have the `getline' function. */ +#ifndef HOSTPROG #define HAVE_GETLINE 1 +#endif /* Define to 1 if you have the <getopt.h> header file. */ #define HAVE_GETOPT_H 1 |