Merge branch 'jc/pack'

diff --git a/Makefile b/Makefile
index 61053aed5633e7cf7fbee739593bfaed2a1b78ce..78cdaa155ba424475fe091cd19cf212e32fcfc2f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -442,6 +442,7 @@ ifeq ($(uname_O),Cygwin)
 endif
 ifeq ($(uname_S),FreeBSD)
        NEEDS_LIBICONV = YesPlease
+       NO_MEMMEM = YesPlease
        BASIC_CFLAGS += -I/usr/local/include
        BASIC_LDFLAGS += -L/usr/local/lib
 endif