Merge branch 'rj/buildtweaks' into stable

4 files changed, 31 insertions, 6 deletions

diff --git a/Makefile b/Makefileindex 2107610..2e51c31 100644--- a/Makefile+++ b/Makefile@@ -7,6 +7,26 @@ SHA1_HEADER = <openssl/sha.h> GIT_VER = 1.6.0.3 GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2 +# 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+ # # Let the user override the above settings. #@@ -96,6 +116,9 @@ CFLAGS += -DCGIT_CACHE_ROOT='"$(CACHE_ROOT)"' ifdef NO_ICONV 	CFLAGS += -DNO_ICONV endif+ifdef NO_STRCASESTR+	CFLAGS += -DNO_STRCASESTR+endif  cgit: $(OBJECTS) libgit 	$(QUIET_CC)$(CC) $(CFLAGS) $(LDFLAGS) -o cgit $(OBJECTS) $(EXTLIBS)
diff --git a/Makefile b/Makefile
index 2107610..2e51c31 100644
--- a/Makefile
+++ b/Makefile
@@ -7,6 +7,26 @@ SHA1_HEADER = <openssl/sha.h>
 GIT_VER = 1.6.0.3
 GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2
 
+# 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
+
 #
 # Let the user override the above settings.
 #
@@ -96,6 +116,9 @@ CFLAGS += -DCGIT_CACHE_ROOT='"$(CACHE_ROOT)"'
 ifdef NO_ICONV
 	CFLAGS += -DNO_ICONV
 endif
+ifdef NO_STRCASESTR
+	CFLAGS += -DNO_STRCASESTR
+endif
 
 cgit: $(OBJECTS) libgit
 	$(QUIET_CC)$(CC) $(CFLAGS) $(LDFLAGS) -o cgit $(OBJECTS) $(EXTLIBS)
diff --git a/cgit.h b/cgit.hindex 91db98a..92f0c5a 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 */
diff --git a/cgit.h b/cgit.h
index 91db98a..92f0c5a 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 */
diff --git a/parsing.c b/parsing.cindex c8f3048..f3f3b15 100644--- a/parsing.c+++ b/parsing.c@@ -96,6 +96,9 @@ char *parse_user(char *t, char **name, char **email, unsigned long *date) 	return p; } +#ifdef NO_ICONV+#define reencode(a, b, c)+#else const char *reencode(char **txt, const char *src_enc, const char *dst_enc) { 	char *tmp;@@ -110,6 +113,7 @@ const char *reencode(char **txt, const char *src_enc, const char *dst_enc) 	} 	return *txt; }+#endif  struct commitinfo *cgit_parse_commit(struct commit *commit) {
diff --git a/parsing.c b/parsing.c
index c8f3048..f3f3b15 100644
--- a/parsing.c
+++ b/parsing.c
@@ -96,6 +96,9 @@ char *parse_user(char *t, char **name, char **email, unsigned long *date)
 	return p;
 }
 
+#ifdef NO_ICONV
+#define reencode(a, b, c)
+#else
 const char *reencode(char **txt, const char *src_enc, const char *dst_enc)
 {
 	char *tmp;
@@ -110,6 +113,7 @@ const char *reencode(char **txt, const char *src_enc, const char *dst_enc)
 	}
 	return *txt;
 }
+#endif
 
 struct commitinfo *cgit_parse_commit(struct commit *commit)
 {
diff --git a/ui-repolist.c b/ui-repolist.cindex c23232c..2324273 100644--- a/ui-repolist.c+++ b/ui-repolist.c@@ -6,6 +6,10 @@  *   (see COPYING for full license text)  */ +/* This is needed for strcasestr to be defined by <string.h> */+#define _GNU_SOURCE 1+#include <string.h>+ #include <time.h>  #include "cgit.h"
diff --git a/ui-repolist.c b/ui-repolist.c
index c23232c..2324273 100644
--- a/ui-repolist.c
+++ b/ui-repolist.c
@@ -6,6 +6,10 @@
  *   (see COPYING for full license text)
  */
 
+/* This is needed for strcasestr to be defined by <string.h> */
+#define _GNU_SOURCE 1
+#include <string.h>
+
 #include <time.h>
 
 #include "cgit.h"