From: Junio C Hamano <junkio@cox.net>
Date: Fri, 17 Feb 2006 10:12:19 +0000 (-0800)
Subject: Merge branch 'jc/pack-reuse'
X-Git-Tag: v1.3.0-rc1~54^2~66
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/07e8ab9be913bd50595707f21a896ac15c4f5a89?hp=-c

Merge branch 'jc/pack-reuse'

* jc/pack-reuse:
git-repack: allow passing a couple of flags to pack-objects.
pack-objects: finishing touches.
pack-objects: reuse data from existing packs.
Add contrib/gitview from Aneesh.
git-svn: ensure fetch always works chronologically.
git-svn: fix revision order when XML::Simple is not loaded
Introducing contrib/git-svn.
Allow building Git in systems without iconv
---

07e8ab9be913bd50595707f21a896ac15c4f5a89
diff --combined Makefile
index 80d7f28ce1,317be3c373..ccb896e812
--- a/Makefile
+++ b/Makefile
@@@ -53,6 -53,8 +53,8 @@@ all
  # Define NO_SOCKADDR_STORAGE if your platform does not have struct
  # sockaddr_storage.
  #
+ # Define NO_ICONV if your libc does not properly support iconv.
+ #
  # Define COLLISION_CHECK below if you believe that SHA1's
  # 1461501637330902918203684832716283019655932542976 hashes do not give you
  # sufficient guarantee that no collisions between objects will ever happen.
@@@ -151,7 -153,7 +153,7 @@@ PROGRAMS = 
  	git-upload-pack$X git-verify-pack$X git-write-tree$X \
  	git-update-ref$X git-symbolic-ref$X git-check-ref-format$X \
  	git-name-rev$X git-pack-redundant$X git-repo-config$X git-var$X \
 -	git-describe$X
 +	git-describe$X git-merge-tree$X
  
  # what 'all' will build and 'install' will install, in gitexecdir
  ALL_PROGRAMS = $(PROGRAMS) $(SIMPLE_PROGRAMS) $(SCRIPTS)
@@@ -380,6 -382,10 +382,10 @@@ els
  endif
  endif
  
+ ifdef NO_ICONV
+ 	ALL_CFLAGS += -DNO_ICONV
+ endif
+ 
  ifdef PPC_SHA1
  	SHA1_HEADER = "ppc/sha1.h"
  	LIB_OBJS += ppc/sha1.o ppc/sha1ppc.o