From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 14 Feb 2012 07:26:25 +0000 (-0800)
Subject: Merge branch 'mp/make-cleanse-x-for-exe' into maint
X-Git-Tag: v1.7.9.1~3
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/1dcfa8de7c2f630081c9d39ce46f150bbb0af5cb?ds=inline;hp=-c

Merge branch 'mp/make-cleanse-x-for-exe' into maint

* mp/make-cleanse-x-for-exe:
Explicitly set X to avoid potential build breakage
---

1dcfa8de7c2f630081c9d39ce46f150bbb0af5cb
diff --combined Makefile
index b5530cbaae,6e70a6d44c..4ff3faa472
--- a/Makefile
+++ b/Makefile
@@@ -43,22 -43,6 +43,22 @@@ all:
  # Define EXPATDIR=/foo/bar if your expat header and library files are in
  # /foo/bar/include and /foo/bar/lib directories.
  #
 +# Define NO_GETTEXT if you don't want Git output to be translated.
 +# A translated Git requires GNU libintl or another gettext implementation,
 +# plus libintl-perl at runtime.
 +#
 +# Define HAVE_LIBCHARSET_H if you haven't set NO_GETTEXT and you can't
 +# trust the langinfo.h's nl_langinfo(CODESET) function to return the
 +# current character set. GNU and Solaris have a nl_langinfo(CODESET),
 +# FreeBSD can use either, but MinGW and some others need to use
 +# libcharset.h's locale_charset() instead.
 +#
 +# Define LIBC_CONTAINS_LIBINTL if your gettext implementation doesn't
 +# need -lintl when linking.
 +#
 +# Define NO_MSGFMT_EXTENDED_OPTIONS if your implementation of msgfmt
 +# doesn't support GNU extensions like --check and --statistics
 +#
  # Define HAVE_PATHS_H if you have paths.h and want to use the default PATH
  # it specifies.
  #
@@@ -159,8 -143,6 +159,8 @@@
  #
  # Define NO_IPV6 if you lack IPv6 support and getaddrinfo().
  #
 +# Define NO_UNIX_SOCKETS if your system does not offer unix sockets.
 +#
  # Define NO_SOCKADDR_STORAGE if your platform does not have struct
  # sockaddr_storage.
  #
@@@ -245,9 -227,6 +245,9 @@@
  #
  # Define NO_REGEX if you have no or inferior regex support in your C library.
  #
 +# Define HAVE_DEV_TTY if your system can open /dev/tty to interact with the
 +# user.
 +#
  # Define GETTEXT_POISON if you are debugging the choice of strings marked
  # for translation.  In a GETTEXT_POISON build, you can turn all strings marked
  # for translation into gibberish by setting the GIT_GETTEXT_POISON variable
@@@ -328,7 -307,6 +328,7 @@@ gitexecdir = libexec/git-cor
  mergetoolsdir = $(gitexecdir)/mergetools
  sharedir = $(prefix)/share
  gitwebdir = $(sharedir)/gitweb
 +localedir = $(sharedir)/locale
  template_dir = share/git-core/templates
  htmldir = share/doc/git-doc
  ETC_GITCONFIG = $(sysconfdir)/gitconfig
@@@ -337,9 -315,9 +337,9 @@@ lib = li
  # DESTDIR=
  pathsep = :
  
 -export prefix bindir sharedir sysconfdir gitwebdir
 +export prefix bindir sharedir sysconfdir gitwebdir localedir
  
 -CC = gcc
 +CC = cc
  AR = ar
  RM = rm -f
  DIFF = diff
@@@ -350,7 -328,6 +350,7 @@@ RPMBUILD = rpmbuil
  TCL_PATH = tclsh
  TCLTK_PATH = wish
  XGETTEXT = xgettext
 +MSGFMT = msgfmt
  PTHREAD_LIBS = -lpthread
  PTHREAD_CFLAGS =
  GCOV = gcov
@@@ -450,17 -427,17 +450,20 @@@ PROGRAM_OBJS += show-index.
  PROGRAM_OBJS += upload-pack.o
  PROGRAM_OBJS += http-backend.o
  PROGRAM_OBJS += sh-i18n--envsubst.o
 +PROGRAM_OBJS += credential-store.o
  
+ # Binary suffix, set to .exe for Windows builds
+ X =
+ 
  PROGRAMS += $(patsubst %.o,git-%$X,$(PROGRAM_OBJS))
  
  TEST_PROGRAMS_NEED_X += test-chmtime
 +TEST_PROGRAMS_NEED_X += test-credential
  TEST_PROGRAMS_NEED_X += test-ctype
  TEST_PROGRAMS_NEED_X += test-date
  TEST_PROGRAMS_NEED_X += test-delta
  TEST_PROGRAMS_NEED_X += test-dump-cache-tree
 +TEST_PROGRAMS_NEED_X += test-scrap-cache-tree
  TEST_PROGRAMS_NEED_X += test-genrandom
  TEST_PROGRAMS_NEED_X += test-index-version
  TEST_PROGRAMS_NEED_X += test-line-buffer
@@@ -537,7 -514,6 +540,7 @@@ LIB_H += argv-array.
  LIB_H += attr.h
  LIB_H += blob.h
  LIB_H += builtin.h
 +LIB_H += bulk-checkin.h
  LIB_H += cache.h
  LIB_H += cache-tree.h
  LIB_H += color.h
@@@ -546,14 -522,12 +549,14 @@@ LIB_H += compat/bswap.
  LIB_H += compat/cygwin.h
  LIB_H += compat/mingw.h
  LIB_H += compat/obstack.h
 +LIB_H += compat/terminal.h
  LIB_H += compat/win32/pthread.h
  LIB_H += compat/win32/syslog.h
  LIB_H += compat/win32/poll.h
  LIB_H += compat/win32/dirent.h
  LIB_H += connected.h
  LIB_H += convert.h
 +LIB_H += credential.h
  LIB_H += csum-file.h
  LIB_H += decorate.h
  LIB_H += delta.h
@@@ -561,11 -535,9 +564,11 @@@ LIB_H += diffcore.
  LIB_H += diff.h
  LIB_H += dir.h
  LIB_H += exec_cmd.h
 +LIB_H += fmt-merge-msg.h
  LIB_H += fsck.h
  LIB_H += gettext.h
  LIB_H += git-compat-util.h
 +LIB_H += gpg-interface.h
  LIB_H += graph.h
  LIB_H += grep.h
  LIB_H += hash.h
@@@ -589,7 -561,6 +592,7 @@@ LIB_H += parse-options.
  LIB_H += patch-ids.h
  LIB_H += pkt-line.h
  LIB_H += progress.h
 +LIB_H += prompt.h
  LIB_H += quote.h
  LIB_H += reflog-walk.h
  LIB_H += refs.h
@@@ -630,20 -601,17 +633,20 @@@ LIB_OBJS += base85.
  LIB_OBJS += bisect.o
  LIB_OBJS += blob.o
  LIB_OBJS += branch.o
 +LIB_OBJS += bulk-checkin.o
  LIB_OBJS += bundle.o
  LIB_OBJS += cache-tree.o
  LIB_OBJS += color.o
  LIB_OBJS += combine-diff.o
  LIB_OBJS += commit.o
  LIB_OBJS += compat/obstack.o
 +LIB_OBJS += compat/terminal.o
  LIB_OBJS += config.o
  LIB_OBJS += connect.o
  LIB_OBJS += connected.o
  LIB_OBJS += convert.o
  LIB_OBJS += copy.o
 +LIB_OBJS += credential.o
  LIB_OBJS += csum-file.o
  LIB_OBJS += ctype.o
  LIB_OBJS += date.o
@@@ -663,8 -631,6 +666,8 @@@ LIB_OBJS += entry.
  LIB_OBJS += environment.o
  LIB_OBJS += exec_cmd.o
  LIB_OBJS += fsck.o
 +LIB_OBJS += gpg-interface.o
 +LIB_OBJS += gettext.o
  LIB_OBJS += graph.o
  LIB_OBJS += grep.o
  LIB_OBJS += hash.o
@@@ -700,7 -666,6 +703,7 @@@ LIB_OBJS += pkt-line.
  LIB_OBJS += preload-index.o
  LIB_OBJS += pretty.o
  LIB_OBJS += progress.o
 +LIB_OBJS += prompt.o
  LIB_OBJS += quote.o
  LIB_OBJS += reachable.o
  LIB_OBJS += read-cache.o
@@@ -862,15 -827,12 +865,15 @@@ ifeq ($(uname_S),Linux
  	NO_STRLCPY = YesPlease
  	NO_MKSTEMPS = YesPlease
  	HAVE_PATHS_H = YesPlease
 +	LIBC_CONTAINS_LIBINTL = YesPlease
 +	HAVE_DEV_TTY = YesPlease
  endif
  ifeq ($(uname_S),GNU/kFreeBSD)
  	NO_STRLCPY = YesPlease
  	NO_MKSTEMPS = YesPlease
  	HAVE_PATHS_H = YesPlease
  	DIR_HAS_BSD_GROUP_SEMANTICS = YesPlease
 +	LIBC_CONTAINS_LIBINTL = YesPlease
  endif
  ifeq ($(uname_S),UnixWare)
  	CC = cc
@@@ -925,7 -887,6 +928,7 @@@ ifeq ($(uname_S),Darwin
  	endif
  	NO_MEMMEM = YesPlease
  	USE_ST_TIMESPEC = YesPlease
 +	HAVE_DEV_TTY = YesPlease
  endif
  ifeq ($(uname_S),SunOS)
  	NEEDS_SOCKET = YesPlease
@@@ -938,7 -899,6 +941,7 @@@
  	NO_MKSTEMPS = YesPlease
  	NO_REGEX = YesPlease
  	NO_FNMATCH_CASEFOLD = YesPlease
 +	NO_MSGFMT_EXTENDED_OPTIONS = YesPlease
  	ifeq ($(uname_R),5.6)
  		SOCKLEN_T = int
  		NO_HSTRERROR = YesPlease
@@@ -1062,7 -1022,6 +1065,7 @@@ ifeq ($(uname_S),GNU
  	NO_STRLCPY=YesPlease
  	NO_MKSTEMPS = YesPlease
  	HAVE_PATHS_H = YesPlease
 +	LIBC_CONTAINS_LIBINTL = YesPlease
  endif
  ifeq ($(uname_S),IRIX)
  	NO_SETENV = YesPlease
@@@ -1142,7 -1101,6 +1145,7 @@@ ifeq ($(uname_S),Windows
  	NO_SYS_POLL_H = YesPlease
  	NO_SYMLINK_HEAD = YesPlease
  	NO_IPV6 = YesPlease
 +	NO_UNIX_SOCKETS = YesPlease
  	NO_SETENV = YesPlease
  	NO_UNSETENV = YesPlease
  	NO_STRCASESTR = YesPlease
@@@ -1236,7 -1194,6 +1239,7 @@@ ifneq (,$(findstring MINGW,$(uname_S))
  	NO_LIBGEN_H = YesPlease
  	NO_SYS_POLL_H = YesPlease
  	NO_SYMLINK_HEAD = YesPlease
 +	NO_UNIX_SOCKETS = YesPlease
  	NO_SETENV = YesPlease
  	NO_UNSETENV = YesPlease
  	NO_STRCASESTR = YesPlease
@@@ -1281,7 -1238,6 +1284,7 @@@ ifneq (,$(wildcard ../THIS_IS_MSYSGIT)
  	EXTLIBS += /mingw/lib/libz.a
  	NO_R_TO_GCC_LINKER = YesPlease
  	INTERNAL_QSORT = YesPlease
 +	HAVE_LIBCHARSET_H = YesPlease
  else
  	NO_CURL = YesPlease
  endif
@@@ -1470,11 -1426,6 +1473,11 @@@ endi
  ifdef NEEDS_LIBGEN
  	EXTLIBS += -lgen
  endif
 +ifndef NO_GETTEXT
 +ifndef LIBC_CONTAINS_LIBINTL
 +	EXTLIBS += -lintl
 +endif
 +endif
  ifdef NEEDS_SOCKET
  	EXTLIBS += -lsocket
  endif
@@@ -1517,11 -1468,9 +1520,11 @@@ ifdef NO_SYMLINK_HEA
  	BASIC_CFLAGS += -DNO_SYMLINK_HEAD
  endif
  ifdef GETTEXT_POISON
 -	LIB_OBJS += gettext.o
  	BASIC_CFLAGS += -DGETTEXT_POISON
  endif
 +ifdef NO_GETTEXT
 +	BASIC_CFLAGS += -DNO_GETTEXT
 +endif
  ifdef NO_STRCASESTR
  	COMPAT_CFLAGS += -DNO_STRCASESTR
  	COMPAT_OBJS += compat/strcasestr.o
@@@ -1622,12 -1571,6 +1625,12 @@@ ifdef NO_INET_PTO
  	LIB_OBJS += compat/inet_pton.o
  	BASIC_CFLAGS += -DNO_INET_PTON
  endif
 +ifndef NO_UNIX_SOCKETS
 +	LIB_OBJS += unix-socket.o
 +	LIB_H += unix-socket.h
 +	PROGRAM_OBJS += credential-cache.o
 +	PROGRAM_OBJS += credential-cache--daemon.o
 +endif
  
  ifdef NO_ICONV
  	BASIC_CFLAGS += -DNO_ICONV
@@@ -1690,14 -1633,6 +1693,14 @@@ ifdef HAVE_PATHS_
  	BASIC_CFLAGS += -DHAVE_PATHS_H
  endif
  
 +ifdef HAVE_LIBCHARSET_H
 +	BASIC_CFLAGS += -DHAVE_LIBCHARSET_H
 +endif
 +
 +ifdef HAVE_DEV_TTY
 +	BASIC_CFLAGS += -DHAVE_DEV_TTY
 +endif
 +
  ifdef DIR_HAS_BSD_GROUP_SEMANTICS
  	COMPAT_CFLAGS += -DDIR_HAS_BSD_GROUP_SEMANTICS
  endif
@@@ -1718,10 -1653,6 +1721,10 @@@ ifdef GIT_TEST_CMP_USE_COPIED_CONTEX
  	export GIT_TEST_CMP_USE_COPIED_CONTEXT
  endif
  
 +ifndef NO_MSGFMT_EXTENDED_OPTIONS
 +	MSGFMT += --check --statistics
 +endif
 +
  ifeq ($(TCLTK_PATH),)
  NO_TCLTK=NoThanks
  endif
@@@ -1752,7 -1683,6 +1755,7 @@@ ifndef 
  	QUIET_GEN      = @echo '   ' GEN $@;
  	QUIET_LNCP     = @echo '   ' LN/CP $@;
  	QUIET_XGETTEXT = @echo '   ' XGETTEXT $@;
 +	QUIET_MSGFMT   = @echo '   ' MSGFMT $@;
  	QUIET_GCOV     = @echo '   ' GCOV $@;
  	QUIET_SP       = @echo '   ' SP $<;
  	QUIET_SUBDIR0  = +@subdir=
@@@ -1779,7 -1709,6 +1782,7 @@@ bindir_SQ = $(subst ','\'',$(bindir)
  bindir_relative_SQ = $(subst ','\'',$(bindir_relative))
  mandir_SQ = $(subst ','\'',$(mandir))
  infodir_SQ = $(subst ','\'',$(infodir))
 +localedir_SQ = $(subst ','\'',$(localedir))
  gitexecdir_SQ = $(subst ','\'',$(gitexecdir))
  template_dir_SQ = $(subst ','\'',$(template_dir))
  htmldir_SQ = $(subst ','\'',$(htmldir))
@@@ -1835,7 -1764,7 +1838,7 @@@ ifndef NO_TCLT
  	$(QUIET_SUBDIR0)gitk-git $(QUIET_SUBDIR1) all
  endif
  ifndef NO_PERL
 -	$(QUIET_SUBDIR0)perl $(QUIET_SUBDIR1) PERL_PATH='$(PERL_PATH_SQ)' prefix='$(prefix_SQ)' all
 +	$(QUIET_SUBDIR0)perl $(QUIET_SUBDIR1) PERL_PATH='$(PERL_PATH_SQ)' prefix='$(prefix_SQ)' localedir='$(localedir_SQ)' all
  endif
  ifndef NO_PYTHON
  	$(QUIET_SUBDIR0)git_remote_helpers $(QUIET_SUBDIR1) PYTHON_PATH='$(PYTHON_PATH_SQ)' prefix='$(prefix_SQ)' all
@@@ -1885,7 -1814,6 +1888,7 @@@ sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|
      -e 's|@SHELL_PATH@|$(SHELL_PATH_SQ)|' \
      -e 's|@@DIFF@@|$(DIFF_SQ)|' \
      -e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \
 +    -e 's|@@LOCALEDIR@@|$(localedir_SQ)|g' \
      -e 's/@@NO_CURL@@/$(NO_CURL)/g' \
      -e $(BROKEN_PATH_FIX) \
      $@.sh >$@+
@@@ -2138,9 -2066,6 +2141,9 @@@ config.sp config.s config.o: EXTRA_CPPF
  attr.sp attr.s attr.o: EXTRA_CPPFLAGS = \
  	-DETC_GITATTRIBUTES='"$(ETC_GITATTRIBUTES_SQ)"'
  
 +gettext.sp gettext.s gettext.o: EXTRA_CPPFLAGS = \
 +	-DGIT_LOCALE_PATH='"$(localedir_SQ)"'
 +
  http.sp http.s http.o: EXTRA_CPPFLAGS = \
  	-DGIT_HTTP_USER_AGENT='"git/$(GIT_VERSION)"'
  
@@@ -2214,37 -2139,17 +2217,37 @@@ XGETTEXT_FLAGS = 
  XGETTEXT_FLAGS_C = $(XGETTEXT_FLAGS) --language=C \
  	--keyword=_ --keyword=N_ --keyword="Q_:1,2"
  XGETTEXT_FLAGS_SH = $(XGETTEXT_FLAGS) --language=Shell
 +XGETTEXT_FLAGS_PERL = $(XGETTEXT_FLAGS) --keyword=__ --language=Perl
  LOCALIZED_C := $(C_OBJ:o=c)
  LOCALIZED_SH := $(SCRIPT_SH)
 +LOCALIZED_PERL := $(SCRIPT_PERL)
 +
 +ifdef XGETTEXT_INCLUDE_TESTS
 +LOCALIZED_C += t/t0200/test.c
 +LOCALIZED_SH += t/t0200/test.sh
 +LOCALIZED_PERL += t/t0200/test.perl
 +endif
  
  po/git.pot: $(LOCALIZED_C)
  	$(QUIET_XGETTEXT)$(XGETTEXT) -o$@+ $(XGETTEXT_FLAGS_C) $(LOCALIZED_C)
  	$(QUIET_XGETTEXT)$(XGETTEXT) -o$@+ --join-existing $(XGETTEXT_FLAGS_SH) \
  		$(LOCALIZED_SH)
 +	$(QUIET_XGETTEXT)$(XGETTEXT) -o$@+ --join-existing $(XGETTEXT_FLAGS_PERL) \
 +		$(LOCALIZED_PERL)
  	mv $@+ $@
  
  pot: po/git.pot
  
 +POFILES := $(wildcard po/*.po)
 +MOFILES := $(patsubst po/%.po,po/build/locale/%/LC_MESSAGES/git.mo,$(POFILES))
 +
 +ifndef NO_GETTEXT
 +all:: $(MOFILES)
 +endif
 +
 +po/build/locale/%/LC_MESSAGES/git.mo: po/%.po
 +	$(QUIET_MSGFMT)mkdir -p $(dir $@) && $(MSGFMT) -o $@ $<
 +
  FIND_SOURCE_FILES = ( git ls-files '*.[hcS]' 2>/dev/null || \
  			$(FIND) . \( -name .git -type d -prune \) \
  				-o \( -name '*.[hcS]' -type f -print \) )
@@@ -2263,8 -2168,7 +2266,8 @@@ cscope
  
  ### Detect prefix changes
  TRACK_CFLAGS = $(CC):$(subst ','\'',$(ALL_CFLAGS)):\
 -             $(bindir_SQ):$(gitexecdir_SQ):$(template_dir_SQ):$(prefix_SQ)
 +             $(bindir_SQ):$(gitexecdir_SQ):$(template_dir_SQ):$(prefix_SQ):\
 +             $(localedir_SQ)
  
  GIT-CFLAGS: FORCE
  	@FLAGS='$(TRACK_CFLAGS)'; \
@@@ -2301,9 -2205,7 +2304,9 @@@ endi
  ifdef GIT_TEST_CMP_USE_COPIED_CONTEXT
  	@echo GIT_TEST_CMP_USE_COPIED_CONTEXT=YesPlease >>$@
  endif
 +	@echo NO_GETTEXT=\''$(subst ','\'',$(subst ','\'',$(NO_GETTEXT)))'\' >>$@
  	@echo GETTEXT_POISON=\''$(subst ','\'',$(subst ','\'',$(GETTEXT_POISON)))'\' >>$@
 +	@echo NO_UNIX_SOCKETS=\''$(subst ','\'',$(subst ','\'',$(NO_UNIX_SOCKETS)))'\' >>$@
  
  ### Detect Tck/Tk interpreter path changes
  ifndef NO_TCLTK
@@@ -2418,11 -2320,6 +2421,11 @@@ install: al
  	$(MAKE) -C templates DESTDIR='$(DESTDIR_SQ)' install
  	$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(mergetools_instdir_SQ)'
  	$(INSTALL) -m 644 mergetools/* '$(DESTDIR_SQ)$(mergetools_instdir_SQ)'
 +ifndef NO_GETTEXT
 +	$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(localedir_SQ)'
 +	(cd po/build/locale && $(TAR) cf - .) | \
 +	(cd '$(DESTDIR_SQ)$(localedir_SQ)' && umask 022 && $(TAR) xof -)
 +endif
  ifndef NO_PERL
  	$(MAKE) -C perl prefix='$(prefix_SQ)' DESTDIR='$(DESTDIR_SQ)' install
  	$(MAKE) -C gitweb install
@@@ -2559,7 -2456,6 +2562,7 @@@ clean
  	$(RM) $(TEST_PROGRAMS)
  	$(RM) -r bin-wrappers
  	$(RM) -r $(dep_dirs)
 +	$(RM) -r po/build/
  	$(RM) *.spec *.pyc *.pyo */*.pyc */*.pyo common-cmds.h $(ETAGS_TARGET) tags cscope*
  	$(RM) -r autom4te.cache
  	$(RM) config.log config.mak.autogen config.mak.append config.status config.cache