Revert "Allow branch.*.merge to talk about remote tracking branches."

diff --git a/config.mak.in b/config.mak.in
index 82c9781f0dab92e507f831b2bbd0efcadc4bcc0c..9a578405d856c3633e7137a24964b7b80fd96485 100644 (file)
--- a/config.mak.in
+++ b/config.mak.in
@@ -1,12 +1,18 @@
 # git Makefile configuration, included in main Makefile
 # @configure_input@
 
+CC = @CC@
+CFLAGS = @CFLAGS@
+AR = @AR@
+TAR = @TAR@
+#INSTALL = @INSTALL@           # needs install-sh or install.sh in sources
+
 prefix = @prefix@
 exec_prefix = @exec_prefix@
 bindir = @bindir@
 #gitexecdir = @libexecdir@/git-core/
+datarootdir = @datarootdir@
 template_dir = @datadir@/git-core/templates/
-GIT_PYTHON_DIR = @datadir@/git-core/python
 
 mandir=@mandir@
 
@@ -16,3 +22,19 @@ VPATH = @srcdir@
 export exec_prefix mandir
 export srcdir VPATH
 
+NEEDS_SSL_WITH_CRYPTO=@NEEDS_SSL_WITH_CRYPTO@
+NO_OPENSSL=@NO_OPENSSL@
+NO_CURL=@NO_CURL@
+NO_EXPAT=@NO_EXPAT@
+NEEDS_LIBICONV=@NEEDS_LIBICONV@
+NEEDS_SOCKET=@NEEDS_SOCKET@
+NO_D_INO_IN_DIRENT=@NO_D_INO_IN_DIRENT@
+NO_D_TYPE_IN_DIRENT=@NO_D_TYPE_IN_DIRENT@
+NO_SOCKADDR_STORAGE=@NO_SOCKADDR_STORAGE@
+NO_IPV6=@NO_IPV6@
+NO_C99_FORMAT=@NO_C99_FORMAT@
+NO_STRCASESTR=@NO_STRCASESTR@
+NO_STRLCPY=@NO_STRLCPY@
+NO_SETENV=@NO_SETENV@
+NO_ICONV=@NO_ICONV@
+