summaryrefslogtreecommitdiff
path: root/config.mak.in
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-06-13 12:48:34 -0700
committerJunio C Hamano <gitster@pobox.com>2009-06-13 12:48:34 -0700
commit436f66b7e908d5ce2f292d1fd4e7f6f9de7c6fa1 (patch)
tree332d2360bb3dc9299ad734bb22cc6fbb3bbf2ace /config.mak.in
parent57c57a97e1b5b8607fa7c8fae8b0cf20706cc453 (diff)
parent8fccb009fa539080a6c4fb18204dfea0be434433 (diff)
downloadgit-436f66b7e908d5ce2f292d1fd4e7f6f9de7c6fa1.tar.gz
Merge branch 'bc/solaris'
* bc/solaris: configure: test whether -lresolv is needed Makefile: insert SANE_TOOL_PATH to PATH before /bin or /usr/bin git-compat-util.h: avoid using c99 flex array feature with Sun compiler 5.8 Makefile: add section for SunOS 5.7 Makefile: introduce SANE_TOOL_PATH for prepending required elements to PATH Makefile: define __sun__ on SunOS git-compat-util.h: tweak the way _XOPEN_SOURCE is set on Solaris On Solaris choose the OLD_ICONV iconv() declaration based on the UNIX spec Makefile: add NEEDS_RESOLV to optionally add -lresolv to compile arguments Makefile: use /usr/ucb/install on SunOS platforms rather than ginstall Conflicts: Makefile
Diffstat (limited to 'config.mak.in')
-rw-r--r--config.mak.in1
1 files changed, 1 insertions, 0 deletions
diff --git a/config.mak.in b/config.mak.in
index e8d96e88b9..dd60451318 100644
--- a/config.mak.in
+++ b/config.mak.in
@@ -33,6 +33,7 @@ NO_EXPAT=@NO_EXPAT@
NO_LIBGEN_H=@NO_LIBGEN_H@
NEEDS_LIBICONV=@NEEDS_LIBICONV@
NEEDS_SOCKET=@NEEDS_SOCKET@
+NEEDS_RESOLV=@NEEDS_RESOLV@
NO_SYS_SELECT_H=@NO_SYS_SELECT_H@
NO_D_INO_IN_DIRENT=@NO_D_INO_IN_DIRENT@
NO_D_TYPE_IN_DIRENT=@NO_D_TYPE_IN_DIRENT@