ソースを参照

Fixing Solaris build
1) NSCONFIG accidentally got a white space (for non-Linux platforms)
2) Solaris needs to include limits.h explicitly

Noriko Hosoi 20 年 前
コミット
73128d9e3c
2 ファイル変更11 行追加10 行削除
  1. 3 0
      ldap/servers/slapd/slap.h
  2. 8 10
      nsconfig.mk

+ 3 - 0
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

+ 8 - 10
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