summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile.am2
-rw-r--r--Makefile.in1
2 files changed, 3 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am
index 5d74aa18..168d1a42 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -914,6 +914,8 @@ ns_slapd_LDADD = libslapd.la libldaputil.a $(LDAPSDK_LINK) $(NSS_LINK) \
# some C++ shared libraries (such as icu).
if HPUX
ns_slapd_LINK = $(CXXLINK)
+else
+ns_slapd_LINK = $(LINK)
endif
#------------------------
diff --git a/Makefile.in b/Makefile.in
index ec15572e..41fc3c5f 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1778,6 +1778,7 @@ ns_slapd_CPPFLAGS = $(AM_CPPFLAGS) @sasl_inc@ @ldapsdk_inc@ @nss_inc@ \
ns_slapd_LDADD = libslapd.la libldaputil.a $(LDAPSDK_LINK) $(NSS_LINK) \
$(NSPR_LINK) $(SASL_LINK) $(SVRCORE_LINK) $(LIBNSL) $(LIBSOCKET)
+@HPUX_FALSE@ns_slapd_LINK = $(LINK)
# We need to link ns-slapd with the C++ compiler on HP-UX since we load
# some C++ shared libraries (such as icu).
@HPUX_TRUE@ns_slapd_LINK = $(CXXLINK)