From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 13 Jul 2011 21:31:36 +0000 (-0700)
Subject: Merge branch 'md/interix-update'
X-Git-Tag: v1.7.7-rc0~104
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/bc50897b90177f03c74e53467d1b62aec74789c5?hp=-c

Merge branch 'md/interix-update'

* md/interix-update:
Update the Interix default build configuration.
---

bc50897b90177f03c74e53467d1b62aec74789c5
diff --combined Makefile
index f8c72e10a0,c47cd4e303..8d8f61e4f0
--- a/Makefile
+++ b/Makefile
@@@ -24,12 -24,6 +24,12 @@@ all:
  # Define NO_OPENSSL environment variable if you do not have OpenSSL.
  # This also implies BLK_SHA1.
  #
 +# Define USE_LIBPCRE if you have and want to use libpcre. git-grep will be
 +# able to use Perl-compatible regular expressions.
 +#
 +# Define LIBPCREDIR=/foo/bar if your libpcre header and library files are in
 +# /foo/bar/include and /foo/bar/lib directories.
 +#
  # Define NO_CURL if you do not have libcurl installed.  git-http-pull and
  # git-http-push are not built, and you cannot use http:// and https://
  # transports.
@@@ -76,9 -70,6 +76,9 @@@
  # Define NO_FNMATCH_CASEFOLD if your fnmatch function doesn't have the
  # FNM_CASEFOLD GNU extension.
  #
 +# Define NO_GECOS_IN_PWENT if you don't have pw_gecos in struct passwd
 +# in the C library.
 +#
  # Define NO_LIBGEN_H if you don't have libgen.h.
  #
  # Define NEEDS_LIBGEN if your libgen needs -lgen when linking
@@@ -551,12 -542,10 +551,12 @@@ LIB_H += rerere.
  LIB_H += resolve-undo.h
  LIB_H += revision.h
  LIB_H += run-command.h
 +LIB_H += sha1-array.h
  LIB_H += sha1-lookup.h
  LIB_H += sideband.h
  LIB_H += sigchain.h
  LIB_H += strbuf.h
 +LIB_H += streaming.h
  LIB_H += string-list.h
  LIB_H += submodule.h
  LIB_H += tag.h
@@@ -655,7 -644,6 +655,7 @@@ LIB_OBJS += revision.
  LIB_OBJS += run-command.o
  LIB_OBJS += server-info.o
  LIB_OBJS += setup.o
 +LIB_OBJS += sha1-array.o
  LIB_OBJS += sha1-lookup.o
  LIB_OBJS += sha1_file.o
  LIB_OBJS += sha1_name.o
@@@ -663,7 -651,6 +663,7 @@@ LIB_OBJS += shallow.
  LIB_OBJS += sideband.o
  LIB_OBJS += sigchain.o
  LIB_OBJS += strbuf.o
 +LIB_OBJS += streaming.o
  LIB_OBJS += string-list.o
  LIB_OBJS += submodule.o
  LIB_OBJS += symlinks.o
@@@ -1126,8 -1113,6 +1126,6 @@@ endi
  	X = .exe
  endif
  ifeq ($(uname_S),Interix)
- 	NO_SYS_POLL_H = YesPlease
- 	NO_INTTYPES_H = YesPlease
  	NO_INITGROUPS = YesPlease
  	NO_IPV6 = YesPlease
  	NO_MEMMEM = YesPlease
@@@ -1138,10 -1123,14 +1136,14 @@@
  	ifeq ($(uname_R),3.5)
  		NO_INET_NTOP = YesPlease
  		NO_INET_PTON = YesPlease
+ 		NO_SOCKADDR_STORAGE = YesPlease
+ 		NO_FNMATCH_CASEFOLD = YesPlease
  	endif
  	ifeq ($(uname_R),5.2)
  		NO_INET_NTOP = YesPlease
  		NO_INET_PTON = YesPlease
+ 		NO_SOCKADDR_STORAGE = YesPlease
+ 		NO_FNMATCH_CASEFOLD = YesPlease
  	endif
  endif
  ifneq (,$(findstring MINGW,$(uname_S)))
@@@ -1266,15 -1255,6 +1268,15 @@@ ifdef NO_LIBGEN_
  	COMPAT_OBJS += compat/basename.o
  endif
  
 +ifdef USE_LIBPCRE
 +	BASIC_CFLAGS += -DUSE_LIBPCRE
 +	ifdef LIBPCREDIR
 +		BASIC_CFLAGS += -I$(LIBPCREDIR)/include
 +		EXTLIBS += -L$(LIBPCREDIR)/$(lib) $(CC_LD_DYNPATH)$(LIBPCREDIR)/$(lib)
 +	endif
 +	EXTLIBS += -lpcre
 +endif
 +
  ifdef NO_CURL
  	BASIC_CFLAGS += -DNO_CURL
  	REMOTE_CURL_PRIMARY =
@@@ -2106,7 -2086,6 +2108,7 @@@ GIT-BUILD-OPTIONS: FORC
  	@echo PYTHON_PATH=\''$(subst ','\'',$(PYTHON_PATH_SQ))'\' >>$@
  	@echo TAR=\''$(subst ','\'',$(subst ','\'',$(TAR)))'\' >>$@
  	@echo NO_CURL=\''$(subst ','\'',$(subst ','\'',$(NO_CURL)))'\' >>$@
 +	@echo USE_LIBPCRE=\''$(subst ','\'',$(subst ','\'',$(USE_LIBPCRE)))'\' >>$@
  	@echo NO_PERL=\''$(subst ','\'',$(subst ','\'',$(NO_PERL)))'\' >>$@
  	@echo NO_PYTHON=\''$(subst ','\'',$(subst ','\'',$(NO_PYTHON)))'\' >>$@
  ifdef GIT_TEST_CMP