Merge branch 'fixes'

diff --git a/Makefile b/Makefile
index 60763c4a6ea8bb2f987b17fcdfac76af9dc71be9..747b06447accee7f277346cc058429ad30d57892 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -246,7 +246,7 @@ ifdef NEEDS_NSL
        SIMPLE_LIB += -lnsl
 endif
 ifdef NO_STRCASESTR
-       DEFINES += -Dstrcasestr=gitstrcasestr
+       DEFINES += -Dstrcasestr=gitstrcasestr -DNO_STRCASESTR=1
        LIB_OBJS += compat/strcasestr.o
 endif