diff options
| author | Noriko Hosoi <nhosoi@redhat.com> | 2006-02-28 21:51:26 +0000 |
|---|---|---|
| committer | Noriko Hosoi <nhosoi@redhat.com> | 2006-02-28 21:51:26 +0000 |
| commit | 73128d9e3cac31c1461c5b76c202d0e5b312900c (patch) | |
| tree | adeb81f848e41e53a4c556472a4a3fa229f07d68 | |
| parent | 9a8d95ef1d9dffbb63b0b9c6bdf26203b0541afa (diff) | |
| download | ds-73128d9e3cac31c1461c5b76c202d0e5b312900c.tar.gz ds-73128d9e3cac31c1461c5b76c202d0e5b312900c.tar.xz ds-73128d9e3cac31c1461c5b76c202d0e5b312900c.zip | |
Fixing Solaris build
1) NSCONFIG accidentally got a white space (for non-Linux platforms)
2) Solaris needs to include limits.h explicitly
| -rw-r--r-- | ldap/servers/slapd/slap.h | 3 | ||||
| -rw-r--r-- | nsconfig.mk | 18 |
2 files changed, 11 insertions, 10 deletions
diff --git a/ldap/servers/slapd/slap.h b/ldap/servers/slapd/slap.h index ca3f68e4..1e957f4c 100644 --- a/ldap/servers/slapd/slap.h +++ b/ldap/servers/slapd/slap.h @@ -91,6 +91,9 @@ void *dlsym(void *a, char *b); #include <string.h> #include <ctype.h> #include <errno.h> +#if defined(SOLARIS) +#include <limits.h> /* for LONG_MAX */ +#endif /* there's a bug in the dbm code we import (from where?) -- FIXME */ #ifdef LINUX diff --git a/nsconfig.mk b/nsconfig.mk index cb2fa5da..d2490272 100644 --- a/nsconfig.mk +++ b/nsconfig.mk @@ -286,23 +286,21 @@ else ifeq ($(NSOS_ARCH),HP-UX) NSOS_TEST1 := $(shell uname -m) ifeq ($(NSOS_TEST1), ia64) - NSCONFIG = $(NSOS_ARCH)$(NSOS_RELEASE)_$(NSOS_TEST1) - NSCONFIG_NOTAG = $(NSOS_ARCH)$(NSOS_RELEASE_NOTAG)_$(NSOS_TEST1) + NSCONFIG = $(NSOS_ARCH)$(NSOS_RELEASE)_$(NSOS_TEST1)$(NS64TAG) + NSCONFIG_NOTAG = $(NSOS_ARCH)$(NSOS_RELEASE_NOTAG)_$(NSOS_TEST1)$(NS64TAG) else - NSCONFIG = $(NSOS_ARCH)$(NSOS_RELEASE) - NSCONFIG_NOTAG = $(NSOS_ARCH)$(NSOS_RELEASE_NOTAG) + NSCONFIG = $(NSOS_ARCH)$(NSOS_RELEASE)$(NS64TAG) + NSCONFIG_NOTAG = $(NSOS_ARCH)$(NSOS_RELEASE_NOTAG)$(NS64TAG) endif else ifeq ($(NSOS_TEST1),i86pc) - NSCONFIG = $(NSOS_ARCH)$(NSOS_RELEASE)_$(NSOS_TEST1) - NSCONFIG_NOTAG = $(NSOS_ARCH)$(NSOS_RELEASE_NOTAG)_$(NSOS_TEST1) + NSCONFIG = $(NSOS_ARCH)$(NSOS_RELEASE)_$(NSOS_TEST1)$(NS64TAG) + NSCONFIG_NOTAG = $(NSOS_ARCH)$(NSOS_RELEASE_NOTAG)_$(NSOS_TEST1)$(NS64TAG) else - NSCONFIG = $(NSOS_ARCH)$(NSOS_RELEASE) - NSCONFIG_NOTAG = $(NSOS_ARCH)$(NSOS_RELEASE_NOTAG) + NSCONFIG = $(NSOS_ARCH)$(NSOS_RELEASE)$(NS64TAG) + NSCONFIG_NOTAG = $(NSOS_ARCH)$(NSOS_RELEASE_NOTAG)$(NS64TAG) endif endif - NSCONFIG += $(NS64TAG) - NSCONFIG_NOTAG += $(NS64TAG) endif endif |