diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-06-13 19:48:34 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-06-13 19:48:34 (GMT) |
| commit | 436f66b7e908d5ce2f292d1fd4e7f6f9de7c6fa1 (patch) | |
| tree | 332d2360bb3dc9299ad734bb22cc6fbb3bbf2ace /configure.ac | |
| parent | 57c57a97e1b5b8607fa7c8fae8b0cf20706cc453 (diff) | |
| parent | 8fccb009fa539080a6c4fb18204dfea0be434433 (diff) | |
| download | git-436f66b7e908d5ce2f292d1fd4e7f6f9de7c6fa1.zip git-436f66b7e908d5ce2f292d1fd4e7f6f9de7c6fa1.tar.gz git-436f66b7e908d5ce2f292d1fd4e7f6f9de7c6fa1.tar.bz2 | |
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 'configure.ac')
| -rw-r--r-- | configure.ac | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index 108a97f..7937e60 100644 --- a/configure.ac +++ b/configure.ac @@ -467,6 +467,15 @@ AC_CHECK_LIB([c], [socket], AC_SUBST(NEEDS_SOCKET) test -n "$NEEDS_SOCKET" && LIBS="$LIBS -lsocket" +# +# Define NEEDS_RESOLV if linking with -lnsl and/or -lsocket is not enough. +# Notably on Solaris hstrerror resides in libresolv and on Solaris 7 +# inet_ntop and inet_pton additionally reside there. +AC_CHECK_LIB([resolv], [hstrerror], +[NEEDS_RESOLV=], +[NEEDS_RESOLV=YesPlease]) +AC_SUBST(NEEDS_RESOLV) +test -n "$NEEDS_RESOLV" && LIBS="$LIBS -lresolv" ## Checks for header files. AC_MSG_NOTICE([CHECKS for header files]) |