From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 27 Aug 2008 00:08:22 +0000 (-0700)
Subject: Merge branch 'jc/no-slim-shell'
X-Git-Tag: v1.6.1-rc1~303
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/c7f72248e3da96299d925aece0f00a46f5f86334?hp=-c

Merge branch 'jc/no-slim-shell'

* jc/no-slim-shell:
Revert "Build-in "git-shell""
---

c7f72248e3da96299d925aece0f00a46f5f86334
diff --combined Makefile
index 7a6cbb6f03,71339e1098..4c627fde13
--- a/Makefile
+++ b/Makefile
@@@ -124,9 -124,6 +124,9 @@@ all:
  # Define USE_STDEV below if you want git to care about the underlying device
  # change being considered an inode change from the update-index perspective.
  #
 +# Define NO_ST_BLOCKS_IN_STRUCT_STAT if your platform does not have st_blocks
 +# field that counts the on-disk footprint in 512-byte blocks.
 +#
  # Define ASCIIDOC8 if you want to format documentation with AsciiDoc 8
  #
  # Define DOCBOOK_XSL_172 if you want to format man pages with DocBook XSL v1.72.
@@@ -549,7 -546,6 +549,6 @@@ BUILTIN_OBJS += builtin-rev-parse.
  BUILTIN_OBJS += builtin-revert.o
  BUILTIN_OBJS += builtin-rm.o
  BUILTIN_OBJS += builtin-send-pack.o
- BUILTIN_OBJS += builtin-shell.o
  BUILTIN_OBJS += builtin-shortlog.o
  BUILTIN_OBJS += builtin-show-branch.o
  BUILTIN_OBJS += builtin-show-ref.o
@@@ -578,11 -574,9 +577,11 @@@ EXTLIBS 
  
  ifeq ($(uname_S),Linux)
  	NO_STRLCPY = YesPlease
 +	THREADED_DELTA_SEARCH = YesPlease
  endif
  ifeq ($(uname_S),GNU/kFreeBSD)
  	NO_STRLCPY = YesPlease
 +	THREADED_DELTA_SEARCH = YesPlease
  endif
  ifeq ($(uname_S),UnixWare)
  	CC = cc
@@@ -680,7 -674,6 +679,7 @@@ ifeq ($(uname_S),FreeBSD
  	BASIC_CFLAGS += -I/usr/local/include
  	BASIC_LDFLAGS += -L/usr/local/lib
  	DIR_HAS_BSD_GROUP_SEMANTICS = YesPlease
 +	THREADED_DELTA_SEARCH = YesPlease
  endif
  ifeq ($(uname_S),OpenBSD)
  	NO_STRCASESTR = YesPlease
@@@ -688,7 -681,6 +687,7 @@@
  	NEEDS_LIBICONV = YesPlease
  	BASIC_CFLAGS += -I/usr/local/include
  	BASIC_LDFLAGS += -L/usr/local/lib
 +	THREADED_DELTA_SEARCH = YesPlease
  endif
  ifeq ($(uname_S),NetBSD)
  	ifeq ($(shell expr "$(uname_R)" : '[01]\.'),2)
@@@ -697,7 -689,6 +696,7 @@@
  	BASIC_CFLAGS += -I/usr/pkg/include
  	BASIC_LDFLAGS += -L/usr/pkg/lib
  	ALL_LDFLAGS += -Wl,-rpath,/usr/pkg/lib
 +	THREADED_DELTA_SEARCH = YesPlease
  endif
  ifeq ($(uname_S),AIX)
  	NO_STRCASESTR=YesPlease
@@@ -735,7 -726,6 +734,7 @@@ ifeq ($(uname_S),HP-UX
  	NO_UNSETENV = YesPlease
  	NO_HSTRERROR = YesPlease
  	NO_SYS_SELECT_H = YesPlease
 +	SNPRINTF_RETURNS_BOGUS = YesPlease
  endif
  ifneq (,$(findstring MINGW,$(uname_S)))
  	NO_MMAP = YesPlease
@@@ -758,7 -748,6 +757,7 @@@
  	NO_SVN_TESTS = YesPlease
  	NO_PERL_MAKEMAKER = YesPlease
  	NO_POSIX_ONLY_PROGRAMS = YesPlease
 +	NO_ST_BLOCKS_IN_STRUCT_STAT = YesPlease
  	COMPAT_CFLAGS += -D__USE_MINGW_ACCESS -DNOGDI -Icompat
  	COMPAT_CFLAGS += -DSNPRINTF_SIZE_CORR=1
  	COMPAT_CFLAGS += -DSTRIP_EXTENSION=\".exe\"
@@@ -832,6 -821,7 +831,7 @@@ EXTLIBS += -l
  ifndef NO_POSIX_ONLY_PROGRAMS
  	PROGRAMS += git-daemon$X
  	PROGRAMS += git-imap-send$X
+ 	PROGRAMS += git-shell$X
  endif
  ifndef NO_OPENSSL
  	OPENSSL_LIBSSL = -lssl
@@@ -872,9 -862,6 +872,9 @@@ endi
  ifdef NO_D_INO_IN_DIRENT
  	BASIC_CFLAGS += -DNO_D_INO_IN_DIRENT
  endif
 +ifdef NO_ST_BLOCKS_IN_STRUCT_STAT
 +	BASIC_CFLAGS += -DNO_ST_BLOCKS_IN_STRUCT_STAT
 +endif
  ifdef NO_C99_FORMAT
  	BASIC_CFLAGS += -DNO_C99_FORMAT
  endif
@@@ -1227,9 -1214,7 +1227,9 @@@ endi
  git-%$X: %.o $(GITLIBS)
  	$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) $(LIBS)
  
 -git-imap-send$X: imap-send.o $(LIB_FILE)
 +git-imap-send$X: imap-send.o $(GITLIBS)
 +	$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \
 +		$(LIBS) $(OPENSSL_LINK) $(OPENSSL_LIBSSL)
  
  http.o http-walker.o http-push.o transport.o: http.h
  
@@@ -1359,7 -1344,7 +1359,7 @@@ install: al
  	$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(bindir_SQ)'
  	$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
  	$(INSTALL) $(ALL_PROGRAMS) '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
 -	$(INSTALL) git$X git-upload-pack$X git-receive-pack$X git-upload-archive$X '$(DESTDIR_SQ)$(bindir_SQ)'
 +	$(INSTALL) git$X git-upload-pack$X git-receive-pack$X git-upload-archive$X git-shell$X '$(DESTDIR_SQ)$(bindir_SQ)'
  	$(MAKE) -C templates DESTDIR='$(DESTDIR_SQ)' install
  	$(MAKE) -C perl prefix='$(prefix_SQ)' DESTDIR='$(DESTDIR_SQ)' install
  ifndef NO_TCLTK