From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 6 Jul 2009 16:38:08 +0000 (-0700)
Subject: Merge branch 'jk/use-our-regexp'
X-Git-Tag: v1.6.4-rc0~16
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/e5266920660ba61985ea6ef30da0d77197992075?ds=inline;hp=-c

Merge branch 'jk/use-our-regexp'

* jk/use-our-regexp:
Makefile: Solaris needs HAVE_ALLOCA_H for alloca()
Makefile: use compat regex on Solaris
Makefile: refactor regex compat support
---

e5266920660ba61985ea6ef30da0d77197992075
diff --combined Makefile
index cdc40d05ca,bbc26e8bd0..78cc11382a
--- a/Makefile
+++ b/Makefile
@@@ -194,6 -194,8 +194,8 @@@ all:
  #
  # Define USE_NED_ALLOCATOR if you want to replace the platforms default
  # memory allocators with the nedmalloc allocator written by Niall Douglas.
+ #
+ # Define NO_REGEX if you have no or inferior regex support in your C library.
  
  GIT-VERSION-FILE: .FORCE-GIT-VERSION-FILE
  	@$(SHELL_PATH) ./GIT-VERSION-GEN
@@@ -723,6 -725,7 +725,7 @@@ ifeq ($(uname_S),SunOS
  	NO_MEMMEM = YesPlease
  	NO_MKDTEMP = YesPlease
  	NO_MKSTEMPS = YesPlease
+ 	NO_REGEX = YesPlease
  	ifeq ($(uname_R),5.7)
  		NEEDS_RESOLV = YesPlease
  		NO_IPV6 = YesPlease
@@@ -750,7 -753,7 +753,7 @@@
  	endif
  	INSTALL = /usr/ucb/install
  	TAR = gtar
- 	BASIC_CFLAGS += -D__EXTENSIONS__ -D__sun__
+ 	BASIC_CFLAGS += -D__EXTENSIONS__ -D__sun__ -DHAVE_ALLOCA_H
  endif
  ifeq ($(uname_O),Cygwin)
  	NO_D_TYPE_IN_DIRENT = YesPlease
@@@ -884,9 -887,10 +887,10 @@@ ifneq (,$(findstring MINGW,$(uname_S))
  	USE_NED_ALLOCATOR = YesPlease
  	UNRELIABLE_FSTAT = UnfortunatelyYes
  	OBJECT_CREATION_USES_RENAMES = UnfortunatelyNeedsTo
- 	COMPAT_CFLAGS += -D__USE_MINGW_ACCESS -DNOGDI -Icompat -Icompat/regex -Icompat/fnmatch
+ 	NO_REGEX = YesPlease
+ 	COMPAT_CFLAGS += -D__USE_MINGW_ACCESS -DNOGDI -Icompat -Icompat/fnmatch
  	COMPAT_CFLAGS += -DSTRIP_EXTENSION=\".exe\"
- 	COMPAT_OBJS += compat/mingw.o compat/fnmatch/fnmatch.o compat/regex/regex.o compat/winansi.o
+ 	COMPAT_OBJS += compat/mingw.o compat/fnmatch/fnmatch.o compat/winansi.o
  	EXTLIBS += -lws2_32
  	X = .exe
  ifneq (,$(wildcard ../THIS_IS_MSYSGIT))
@@@ -1200,6 -1204,10 +1204,10 @@@ endi
  ifdef UNRELIABLE_FSTAT
  	BASIC_CFLAGS += -DUNRELIABLE_FSTAT
  endif
+ ifdef NO_REGEX
+ 	COMPAT_CFLAGS += -Icompat/regex
+ 	COMPAT_OBJS += compat/regex/regex.o
+ endif
  
  ifdef USE_NED_ALLOCATOR
         COMPAT_CFLAGS += -DUSE_NED_ALLOCATOR -DOVERRIDE_STRDUP -DNDEBUG -DREPLACE_SYSTEM_ALLOCATOR -Icompat/nedmalloc
@@@ -1464,7 -1472,7 +1472,7 @@@ git-http-push$X: revision.o http.o http
  		$(LIBS) $(CURL_LIBCURL) $(EXPAT_LIBEXPAT)
  
  $(LIB_OBJS) $(BUILTIN_OBJS): $(LIB_H)
 -$(patsubst git-%$X,%.o,$(PROGRAMS)): $(LIB_H) $(wildcard */*.h)
 +$(patsubst git-%$X,%.o,$(PROGRAMS)) git.o: $(LIB_H) $(wildcard */*.h)
  builtin-revert.o wt-status.o: wt-status.h
  
  $(LIB_FILE): $(LIB_OBJS)