author | Junio C Hamano <gitster@pobox.com> | |
Sat, 13 Jun 2009 19:48:34 +0000 (12:48 -0700) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Sat, 13 Jun 2009 19:48:34 +0000 (12:48 -0700) | ||
commit | 436f66b7e908d5ce2f292d1fd4e7f6f9de7c6fa1 | |
tree | 332d2360bb3dc9299ad734bb22cc6fbb3bbf2ace | tree | snapshot |
parent | 57c57a97e1b5b8607fa7c8fae8b0cf20706cc453 | commit | diff |
parent | 8fccb009fa539080a6c4fb18204dfea0be434433 | commit | diff |
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
* 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
Makefile | diff1 | | diff2 | | blob | history |
config.mak.in | diff1 | | diff2 | | blob | history |
configure.ac | diff1 | | diff2 | | blob | history |
git-compat-util.h | diff1 | | diff2 | | blob | history |