aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-09-03 09:43:45 -0700
committerJunio C Hamano <gitster@pobox.com>2010-09-03 09:43:45 -0700
commitcd1547d2049f32a5c13ba1828fcd1a553b844e97 (patch)
tree2e5442dda4e239b74473bb86acf7e55950375a8f /Makefile
parentc6babe5762f2f4e0d57e08c1362e05053348919a (diff)
parentce518bbd6c891f1b9e172b8cb9212c05d731c18e (diff)
downloadgit-cd1547d2049f32a5c13ba1828fcd1a553b844e97.tar.gz
git-cd1547d2049f32a5c13ba1828fcd1a553b844e97.tar.xz
Merge branch 'ab/compat-regex'
* ab/compat-regex: Fix compat/regex ANSIfication on MinGW autoconf: regex library detection typofix autoconf: don't use platform regex if it lacks REG_STARTEND t/t7008-grep-binary.sh: un-TODO a test that needs REG_STARTEND compat/regex: get rid of old-style definition compat/regex: define out variables only used under RE_ENABLE_I18N Change regerror() declaration from K&R style to ANSI C (C89) compat/regex: get the gawk regex engine to compile within git compat/regex: use the regex engine from gawk for compat Conflicts: compat/regex/regex.c
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 4 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 32e3eb385..40fbcaee9 100644
--- a/Makefile
+++ b/Makefile
@@ -1900,6 +1900,10 @@ ifdef NO_EXPAT
http-walker.s http-walker.o: EXTRA_CPPFLAGS = -DNO_EXPAT
endif
+ifdef NO_REGEX
+compat/regex/regex.o: EXTRA_CPPFLAGS = -DGAWK -DNO_MBSUPPORT
+endif
+
git-%$X: %.o $(GITLIBS)
$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) $(LIBS)