diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-09-11 22:25:49 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-09-17 11:57:50 -0700 |
| commit | 5a90d4ac1ab4d7700595e415e3a2062ecb378523 (patch) | |
| tree | 60a205f9615995917e7e69224083dcd50414d74a | |
| parent | aa894d8887c96a8b72adf94c2b52c519f7b47174 (diff) | |
| download | git-5a90d4ac1ab4d7700595e415e3a2062ecb378523.tar.gz | |
[PATCH] getdomainname should be usable on SunOS with -lnsl
Jason Riedy suggests that we should be able to use getdomainname
if we properly specify which libraries to link.
Signed-off-by: Junio C Hamano <junkio@cox.net>
| -rw-r--r-- | Makefile | 7 | ||||
| -rw-r--r-- | convert-objects.c | 1 | ||||
| -rw-r--r-- | ident.c | 2 |
3 files changed, 6 insertions, 4 deletions
@@ -151,7 +151,8 @@ ifeq ($(shell uname -s),Darwin) endif ifeq ($(shell uname -s),SunOS) NEEDS_SOCKET = YesPlease - PLATFORM_DEFINES += -DNO_GETDOMAINNAME=1 + NEEDS_NSL = YesPlease + PLATFORM_DEFINES += -D__EXTENSIONS__ endif ifndef SHELL_PATH @@ -198,6 +199,10 @@ ifdef NEEDS_SOCKET LIBS += -lsocket SIMPLE_LIB += -lsocket endif +ifdef NEEDS_NSL + LIBS += -lnsl + SIMPLE_LIB += -lnsl +endif DEFINES += '-DSHA1_HEADER=$(SHA1_HEADER)' diff --git a/convert-objects.c b/convert-objects.c index 073cab592f..9ad0c77678 100644 --- a/convert-objects.c +++ b/convert-objects.c @@ -1,5 +1,4 @@ #define _XOPEN_SOURCE /* glibc2 needs this */ -#define __EXTENSIONS__ /* solaris needs this */ #include <time.h> #include <ctype.h> #include "cache.h" @@ -36,13 +36,11 @@ int setup_ident(void) memcpy(real_email, pw->pw_name, len); real_email[len++] = '@'; gethostname(real_email + len, sizeof(real_email) - len); -#ifndef NO_GETDOMAINNAME if (!strchr(real_email+len, '.')) { len = strlen(real_email); real_email[len++] = '.'; getdomainname(real_email+len, sizeof(real_email)-len); } -#endif /* And set the default date */ datestamp(real_date, sizeof(real_date)); return 0; |