11:38 a.m.
Author: rmeggins
Update of /cvs/dirsec/dsgw
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28167/dsgw
Modified Files:
Makefile.am aclocal.m4 configure missing install-sh
Makefile.in depcomp config.sub config.guess compile
Log Message:
added CXXLINK stuff for HP-UX
Index: Makefile.am
===================================================================
RCS file: /cvs/dirsec/dsgw/Makefile.am,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Makefile.am 30 Jan 2008 17:16:45 -0000 1.10
+++ Makefile.am 30 Jan 2008 17:38:03 -0000 1.11
@@ -67,6 +67,12 @@
@nss_lib@ -lsmime3 -lssl3 -lnss3 -lsoftokn3 \
@nspr_lib@ -lplds4 -lplc4 -lnspr4
+if CXXLINK_REQUIRED
+MYLINK = $(CXXLINK)
+else
+MYLINK = $(LINK)
+endif
+
# these are programs which we do not want to link with nss
NEED_SECGLUE = unauth search csearch newentry tutor lang
# these are programs which are not used at runtime but may be useful
@@ -75,6 +81,20 @@
cgibin_PROGRAMS = auth doauth edit domodify dnedit dosearch $(NEED_SECGLUE)
$(CKUTILPROGS)
+# for c++ linkage on those platforms that require it
+auth_LINK = $(MYLINK)
+doauth_LINK = $(MYLINK)
+edit_LINK = $(MYLINK)
+domodify_LINK = $(MYLINK)
+dnedit_LINK = $(MYLINK)
+dosearch_LINK = $(MYLINK)
+unauth_LINK = $(MYLINK)
+search_LINK = $(MYLINK)
+csearch_LINK = $(MYLINK)
+newentry_LINK = $(MYLINK)
+tutor_LINK = $(MYLINK)
+lang_LINK = $(MYLINK)
+
cgibin_SCRIPTS = orgbin/org orgbin/myorg
if DEBUG
DBGSCRIPTS = $(addsuffix .sh,$(cgibin_PROGRAMS))
Index: Makefile.in
===================================================================
RCS file: /cvs/dirsec/dsgw/Makefile.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Makefile.in 30 Jan 2008 17:16:45 -0000 1.10
+++ Makefile.in 30 Jan 2008 17:38:03 -0000 1.11
@@ -387,9 +387,25 @@
-DINSTCONFIGDIR=\"$(instconfigdir)\" \
-DMANUALDIR=\"$(manualdir)\" -DCGIURIBASE=\"$(cgiuri)\" \
-DMANUALSUBDIR=\"$(manualsubdir)\" -DINFODIR=\"$(gwinfodir)\"
+@CXXLINK_REQUIRED_FALSE@MYLINK = $(LINK)
+@CXXLINK_REQUIRED_TRUE@MYLINK = $(CXXLINK)
# these are programs which we do not want to link with nss
NEED_SECGLUE = unauth search csearch newentry tutor lang
+
+# for c++ linkage on those platforms that require it
+auth_LINK = $(MYLINK)
+doauth_LINK = $(MYLINK)
+edit_LINK = $(MYLINK)
+domodify_LINK = $(MYLINK)
+dnedit_LINK = $(MYLINK)
+dosearch_LINK = $(MYLINK)
+unauth_LINK = $(MYLINK)
+search_LINK = $(MYLINK)
+csearch_LINK = $(MYLINK)
+newentry_LINK = $(MYLINK)
+tutor_LINK = $(MYLINK)
+lang_LINK = $(MYLINK)
cgibin_SCRIPTS = orgbin/org orgbin/myorg $(am__append_3)
@DEBUG_TRUE@DBGSCRIPTS = $(addsuffix .sh,$(cgibin_PROGRAMS))
# I need propmaker to build with no libraries - I don't know of any other way to set
@@ -650,43 +666,43 @@
done
auth$(EXEEXT): $(auth_OBJECTS) $(auth_DEPENDENCIES)
@rm -f auth$(EXEEXT)
- $(LINK) $(auth_LDFLAGS) $(auth_OBJECTS) $(auth_LDADD) $(LIBS)
+ $(auth_LINK) $(auth_LDFLAGS) $(auth_OBJECTS) $(auth_LDADD) $(LIBS)
csearch$(EXEEXT): $(csearch_OBJECTS) $(csearch_DEPENDENCIES)
@rm -f csearch$(EXEEXT)
- $(LINK) $(csearch_LDFLAGS) $(csearch_OBJECTS) $(csearch_LDADD) $(LIBS)
+ $(csearch_LINK) $(csearch_LDFLAGS) $(csearch_OBJECTS) $(csearch_LDADD) $(LIBS)
dnedit$(EXEEXT): $(dnedit_OBJECTS) $(dnedit_DEPENDENCIES)
@rm -f dnedit$(EXEEXT)
- $(LINK) $(dnedit_LDFLAGS) $(dnedit_OBJECTS) $(dnedit_LDADD) $(LIBS)
+ $(dnedit_LINK) $(dnedit_LDFLAGS) $(dnedit_OBJECTS) $(dnedit_LDADD) $(LIBS)
doauth$(EXEEXT): $(doauth_OBJECTS) $(doauth_DEPENDENCIES)
@rm -f doauth$(EXEEXT)
- $(LINK) $(doauth_LDFLAGS) $(doauth_OBJECTS) $(doauth_LDADD) $(LIBS)
+ $(doauth_LINK) $(doauth_LDFLAGS) $(doauth_OBJECTS) $(doauth_LDADD) $(LIBS)
domodify$(EXEEXT): $(domodify_OBJECTS) $(domodify_DEPENDENCIES)
@rm -f domodify$(EXEEXT)
- $(LINK) $(domodify_LDFLAGS) $(domodify_OBJECTS) $(domodify_LDADD) $(LIBS)
+ $(domodify_LINK) $(domodify_LDFLAGS) $(domodify_OBJECTS) $(domodify_LDADD) $(LIBS)
dosearch$(EXEEXT): $(dosearch_OBJECTS) $(dosearch_DEPENDENCIES)
@rm -f dosearch$(EXEEXT)
- $(LINK) $(dosearch_LDFLAGS) $(dosearch_OBJECTS) $(dosearch_LDADD) $(LIBS)
+ $(dosearch_LINK) $(dosearch_LDFLAGS) $(dosearch_OBJECTS) $(dosearch_LDADD) $(LIBS)
edit$(EXEEXT): $(edit_OBJECTS) $(edit_DEPENDENCIES)
@rm -f edit$(EXEEXT)
- $(LINK) $(edit_LDFLAGS) $(edit_OBJECTS) $(edit_LDADD) $(LIBS)
+ $(edit_LINK) $(edit_LDFLAGS) $(edit_OBJECTS) $(edit_LDADD) $(LIBS)
lang$(EXEEXT): $(lang_OBJECTS) $(lang_DEPENDENCIES)
@rm -f lang$(EXEEXT)
- $(LINK) $(lang_LDFLAGS) $(lang_OBJECTS) $(lang_LDADD) $(LIBS)
+ $(lang_LINK) $(lang_LDFLAGS) $(lang_OBJECTS) $(lang_LDADD) $(LIBS)
newentry$(EXEEXT): $(newentry_OBJECTS) $(newentry_DEPENDENCIES)
@rm -f newentry$(EXEEXT)
- $(LINK) $(newentry_LDFLAGS) $(newentry_OBJECTS) $(newentry_LDADD) $(LIBS)
+ $(newentry_LINK) $(newentry_LDFLAGS) $(newentry_OBJECTS) $(newentry_LDADD) $(LIBS)
propmaker$(EXEEXT): $(propmaker_OBJECTS) $(propmaker_DEPENDENCIES)
@rm -f propmaker$(EXEEXT)
$(LINK) $(propmaker_LDFLAGS) $(propmaker_OBJECTS) $(propmaker_LDADD) $(LIBS)
search$(EXEEXT): $(search_OBJECTS) $(search_DEPENDENCIES)
@rm -f search$(EXEEXT)
- $(LINK) $(search_LDFLAGS) $(search_OBJECTS) $(search_LDADD) $(LIBS)
+ $(search_LINK) $(search_LDFLAGS) $(search_OBJECTS) $(search_LDADD) $(LIBS)
tutor$(EXEEXT): $(tutor_OBJECTS) $(tutor_DEPENDENCIES)
@rm -f tutor$(EXEEXT)
- $(LINK) $(tutor_LDFLAGS) $(tutor_OBJECTS) $(tutor_LDADD) $(LIBS)
+ $(tutor_LINK) $(tutor_LDFLAGS) $(tutor_OBJECTS) $(tutor_LDADD) $(LIBS)
unauth$(EXEEXT): $(unauth_OBJECTS) $(unauth_DEPENDENCIES)
@rm -f unauth$(EXEEXT)
- $(LINK) $(unauth_LDFLAGS) $(unauth_OBJECTS) $(unauth_LDADD) $(LIBS)
+ $(unauth_LINK) $(unauth_LDFLAGS) $(unauth_OBJECTS) $(unauth_LDADD) $(LIBS)
install-cgibinSCRIPTS: $(cgibin_SCRIPTS)
@$(NORMAL_INSTALL)
test -z "$(cgibindir)" || $(mkdir_p) "$(DESTDIR)$(cgibindir)"