Author: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
Extra cygwin-specific changes Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Makefile | 23 +++++++++++++++++++++++ cgit.h | 6 ------
diff --git a/Makefile b/Makefile index 21076103395d07bcbe9f0419b8b7a190238d2cee..dc98072572cdbc3a7f3b00269a93e11de23f8008 100644 --- a/Makefile +++ b/Makefile @@ -12,6 +12,26 @@ # Let the user override the above settings. # -include cgit.conf +# Define NO_STRCASESTR if you don't have strcasestr. +# +# Define NEEDS_LIBICONV if linking with libc is not enough (eg. Darwin). +# + +#-include config.mak + +# +# Platform specific tweaks +# + +uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not') +uname_O := $(shell sh -c 'uname -o 2>/dev/null || echo not') +uname_R := $(shell sh -c 'uname -r 2>/dev/null || echo not') + +ifeq ($(uname_O),Cygwin) + NO_STRCASESTR = YesPlease + NEEDS_LIBICONV = YesPlease +endif + # # Define a way to invoke make in subdirs quietly, shamelessly ripped # from git.git @@ -95,6 +115,9 @@ CFLAGS += -DCGIT_CACHE_ROOT='"$(CACHE_ROOT)"' ifdef NO_ICONV CFLAGS += -DNO_ICONV +endif +ifdef NO_STRCASESTR + CFLAGS += -DNO_STRCASESTR endif cgit: $(OBJECTS) libgit diff --git a/cgit.h b/cgit.h index 91db98aa900061046fa342935f78bd82a89b665b..92f0c5a27b12e6c5e41dea00872a83f20e635bac 100644 --- a/cgit.h +++ b/cgit.h @@ -233,11 +233,5 @@ extern const char *cgit_repobasename(const char *reponame); extern int cgit_parse_snapshots_mask(const char *str); -/* libgit.a either links against or compiles its own implementation of - * strcasestr(), and we'd like to reuse it. Simply re-declaring it - * seems to do the trick. - */ -extern char *strcasestr(const char *haystack, const char *needle); - #endif /* CGIT_H */