summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile.am5
-rw-r--r--Makefile.in8
2 files changed, 3 insertions, 10 deletions
diff --git a/Makefile.am b/Makefile.am
index 6f86b79a..25bad419 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,10 +7,7 @@ ACLOCAL_AMFLAGS = -I m4
BUILDNUM := $(shell perl $(srcdir)/buildnum.pl)
PLATFORM_DEFINES = @platform_defs@
DEBUG_DEFINES = @debug_defs@
-DS_DEFINES = -DNS_DS -DNET_SSL -DLDAP_DEBUG -DLDAP_DONT_USE_SMARTHEAP \
- -DUPGRADEDB -DNSPR20 -DLDAPDB_THREAD_SAFE -DCLIENT_AUTH \
- -DMCC_HTTPD -DNS_DOMESTIC -DSPAPI20 -DSERVER_BUILD \
- -DBUILD_NUM=$(BUILDNUM)
+DS_DEFINES = -DLDAP_DEBUG -DLDAP_DONT_USE_SMARTHEAP -DBUILD_NUM=$(BUILDNUM)
DS_INCLUDES = -I$(srcdir)/ldap/include -I$(srcdir)/ldap/servers/slapd -I$(srcdir)/include -I.
AM_CPPFLAGS = $(PLATFORM_DEFINES) $(DEBUG_DEFINES) $(DS_DEFINES) $(DS_INCLUDES)
PLUGIN_CPPFLAGS = $(AM_CPPFLAGS) @ldapsdk_inc@ @nss_inc@ @nspr_inc@
diff --git a/Makefile.in b/Makefile.in
index 5a5c0c11..b7913470 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -911,11 +911,7 @@ ACLOCAL_AMFLAGS = -I m4
BUILDNUM := $(shell perl $(srcdir)/buildnum.pl)
PLATFORM_DEFINES = @platform_defs@
DEBUG_DEFINES = @debug_defs@
-DS_DEFINES = -DNS_DS -DNET_SSL -DLDAP_DEBUG -DLDAP_DONT_USE_SMARTHEAP \
- -DUPGRADEDB -DNSPR20 -DLDAPDB_THREAD_SAFE -DCLIENT_AUTH \
- -DMCC_HTTPD -DNS_DOMESTIC -DSPAPI20 -DSERVER_BUILD \
- -DBUILD_NUM=$(BUILDNUM)
-
+DS_DEFINES = -DLDAP_DEBUG -DLDAP_DONT_USE_SMARTHEAP -DBUILD_NUM=$(BUILDNUM)
DS_INCLUDES = -I$(srcdir)/ldap/include -I$(srcdir)/ldap/servers/slapd -I$(srcdir)/include -I.
AM_CPPFLAGS = $(PLATFORM_DEFINES) $(DEBUG_DEFINES) $(DS_DEFINES) $(DS_INCLUDES)
PLUGIN_CPPFLAGS = $(AM_CPPFLAGS) @ldapsdk_inc@ @nss_inc@ @nspr_inc@
@@ -8964,7 +8960,7 @@ ns-slapd.properties: makstrdb
./makstrdb
%: %.in
- mkdir -p $(dir $@)
+ mkdir -p $(dir $@)
$(fixupcmd) $^ > $@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.