[Fedora-directory-commits] dsgw Makefile.am, 1.3, 1.4 Makefile.in, 1.3, 1.4 configure, 1.3, 1.4 configure.ac, 1.3, 1.4 dsgw-httpd.conf.in, 1.2, 1.3
Author: nkinder
Update of /cvs/dirsec/dsgw In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20288
Modified Files: Makefile.am Makefile.in configure configure.ac dsgw-httpd.conf.in Log Message: Added orgchart to dsgw.
Index: Makefile.am =================================================================== RCS file: /cvs/dirsec/dsgw/Makefile.am,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- Makefile.am 10 Jan 2008 01:19:36 -0000 1.3 +++ Makefile.am 11 Jan 2008 21:58:09 -0000 1.4 @@ -25,6 +25,7 @@ cgibindir = $(libdir)@cgibindir@ htmldir = $(datadir)@htmldir@ pbhtmldir = $(datadir)@pbhtmldir@ +orghtmldir = $(datadir)@orghtmldir@ # config is a bit of a misnomer - these are really configurable templates configdir = $(datadir)@configdir@ pbconfigdir = $(datadir)@pbconfigdir@ @@ -34,6 +35,7 @@ securitydir=$(instconfigdir)@securitydir@ # relative to $localstatedir cookiedir=$(localstatedir)@cookiedir@ +perldir = $(libdir)@perldir@
DSGW_VER_STR := "Directory-Server-Gateway/$(PACKAGE_VERSION)"
@@ -66,6 +68,8 @@
cgibin_PROGRAMS = auth doauth edit domodify dnedit dosearch $(NEED_SECGLUE) $(CKUTILPROGS)
+cgibin_SCRIPTS = orgbin/org orgbin/myorg + noinst_PROGRAMS = propmaker # I need propmaker to build with no libraries - I don't know of any other way to set # the LIBS for a specific program (no, propmaker_LIBS doesn't work) - LDADD is the @@ -130,6 +134,14 @@ pbhtml/conference.gif pbhtml/orgicon.gif pbhtml/view_vcard_sm.gif \ pbhtml/confirm.html
+dist_orghtml_DATA = \ + orghtml/aim-online.gif orghtml/arrow.gif orghtml/botframe.html \ + orghtml/branch-cc1.gif orghtml/index.html orghtml/ldap-person.gif \ + orghtml/mag.gif orghtml/mail.gif orghtml/new-branch-blank.gif \ + orghtml/new-branch-first.gif orghtml/new-branch-straight.gif orghtml/orgicon.gif \ + orghtml/styles.css orghtml/topframe.html + + dist_config_DATA = \ config/authPassword.html config/dsgw-l10n.conf \ config/authSearch.html config/dsgwsearchprefs.conf \ @@ -151,7 +163,7 @@ config/display-orgperson.html config/newentry.html \ config/display-orgunit.html config/newentryName.html \ config/display-person.html config/newentryType.html \ - config/search.html \ + config/orgchart.tmpl config/search.html \ config/dsgwfilter.conf config/searchString.html \ config/en/dsgwcollate.conf config/en/dsgw-l10n.conf
@@ -220,15 +232,20 @@ -e 's,@localstatedir@,$(localstatedir),g' \ -e 's,@cgibindir@,$(cgibindir),g' \ -e 's,@cgiuri@,$(cgiuri),g' \ + -e 's,@orguri@,$(orguri),g' \ + -e 's,@dsgwuri@,$(dsgwuri),g' \ -e 's,@cmdbindir@,$(cmdbindir),g' \ -e 's,@propertydir@,$(propertydir),g' \ -e 's,@htmldir@,$(htmldir),g' \ -e 's,@pbhtmldir@,$(pbhtmldir),g' \ + -e 's,@orghtmldir@,$(orghtmldir),g' \ -e 's,@configdir@,$(configdir),g' \ -e 's,@pbconfigdir@,$(pbconfigdir),g' \ -e 's,@contextdir@,$(contextdir),g' \ -e 's,@securitydir@,$(securitydir),g' \ -e 's,@instconfigdir@,$(instconfigdir),g' \ + -e 's,@perlpath@,$(perldir),g' \ + -e 's,@perlexec@,@perlexec@,g' \ -e 's,@BUILD_NUM@,$(BUILDNUM),g' \ -e 's,@NQBUILD_NUM@,$(NQBUILDNUM),g' \ -e 's,@package_name@,$(PACKAGE_NAME),g' \
Index: Makefile.in =================================================================== RCS file: /cvs/dirsec/dsgw/Makefile.in,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- Makefile.in 10 Jan 2008 01:19:36 -0000 1.3 +++ Makefile.in 11 Jan 2008 21:58:09 -0000 1.4 @@ -35,6 +35,7 @@ # END COPYRIGHT BLOCK
+ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ @@ -64,11 +65,11 @@ $(am__EXEEXT_1) noinst_PROGRAMS = propmaker$(EXEEXT) DIST_COMMON = README $(am__configure_deps) $(dist_config_DATA) \ - $(dist_html_DATA) $(dist_pbconfig_DATA) $(dist_pbhtml_DATA) \ - $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(srcdir)/config.h.in $(top_srcdir)/configure AUTHORS \ - ChangeLog NEWS compile config.guess config.sub depcomp \ - install-sh ltmain.sh missing + $(dist_html_DATA) $(dist_orghtml_DATA) $(dist_pbconfig_DATA) \ + $(dist_pbhtml_DATA) $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in $(srcdir)/config.h.in \ + $(top_srcdir)/configure AUTHORS ChangeLog NEWS compile \ + config.guess config.sub depcomp install-sh ltmain.sh missing subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/fhs.m4 $(top_srcdir)/m4/nspr.m4 \ @@ -84,8 +85,9 @@ CONFIG_CLEAN_FILES = am__EXEEXT_1 = unauth$(EXEEXT) search$(EXEEXT) csearch$(EXEEXT) \ newentry$(EXEEXT) tutor$(EXEEXT) lang$(EXEEXT) -am__installdirs = "$(DESTDIR)$(cgibindir)" "$(DESTDIR)$(configdir)" \ - "$(DESTDIR)$(htmldir)" "$(DESTDIR)$(pbconfigdir)" \ +am__installdirs = "$(DESTDIR)$(cgibindir)" "$(DESTDIR)$(cgibindir)" \ + "$(DESTDIR)$(configdir)" "$(DESTDIR)$(htmldir)" \ + "$(DESTDIR)$(orghtmldir)" "$(DESTDIR)$(pbconfigdir)" \ "$(DESTDIR)$(pbhtmldir)" "$(DESTDIR)$(contextdir)" \ "$(DESTDIR)$(propertydir)" cgibinPROGRAMS_INSTALL = $(INSTALL_PROGRAM) @@ -139,6 +141,8 @@ secglue.$(OBJEXT) unauth_OBJECTS = $(am_unauth_OBJECTS) unauth_LDADD = $(LDADD) +cgibinSCRIPT_INSTALL = $(INSTALL_SCRIPT) +SCRIPTS = $(cgibin_SCRIPTS) DEFAULT_INCLUDES = -I. -I$(srcdir) -I. depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -168,13 +172,14 @@ am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; dist_configDATA_INSTALL = $(INSTALL_DATA) dist_htmlDATA_INSTALL = $(INSTALL_DATA) +dist_orghtmlDATA_INSTALL = $(INSTALL_DATA) dist_pbconfigDATA_INSTALL = $(INSTALL_DATA) dist_pbhtmlDATA_INSTALL = $(INSTALL_DATA) nodist_contextDATA_INSTALL = $(INSTALL_DATA) nodist_propertyDATA_INSTALL = $(INSTALL_DATA) -DATA = $(dist_config_DATA) $(dist_html_DATA) $(dist_pbconfig_DATA) \ - $(dist_pbhtml_DATA) $(nodist_context_DATA) \ - $(nodist_property_DATA) +DATA = $(dist_config_DATA) $(dist_html_DATA) $(dist_orghtml_DATA) \ + $(dist_pbconfig_DATA) $(dist_pbhtml_DATA) \ + $(nodist_context_DATA) $(nodist_property_DATA) ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -305,6 +310,7 @@ # relative to $localstatedir cookiedir = $(localstatedir)@cookiedir@ datadir = @datadir@ +dsgwuri = @dsgwuri@ exec_prefix = @exec_prefix@ host = @host@ host_alias = @host_alias@ @@ -335,8 +341,12 @@ nss_lib = @nss_lib@ nss_libdir = @nss_libdir@ oldincludedir = @oldincludedir@ +orghtmldir = $(datadir)@orghtmldir@ +orguri = @orguri@ pbconfigdir = $(datadir)@pbconfigdir@ pbhtmldir = $(datadir)@pbhtmldir@ +perldir = $(libdir)@perldir@ +perlexec = @perlexec@ prefix = @prefix@ program_transform_name = @program_transform_name@ propertydir = $(datadir)@propertydir@ @@ -364,6 +374,7 @@
# these are programs which we do not want to link with nss NEED_SECGLUE = unauth search csearch newentry tutor lang +cgibin_SCRIPTS = orgbin/org orgbin/myorg # I need propmaker to build with no libraries - I don't know of any other way to set # the LIBS for a specific program (no, propmaker_LIBS doesn't work) - LDADD is the # last thing on the link line before LIBS, so just have it terminate the command @@ -424,6 +435,13 @@ pbhtml/conference.gif pbhtml/orgicon.gif pbhtml/view_vcard_sm.gif \ pbhtml/confirm.html
+dist_orghtml_DATA = \ + orghtml/aim-online.gif orghtml/arrow.gif orghtml/botframe.html \ + orghtml/branch-cc1.gif orghtml/index.html orghtml/ldap-person.gif \ + orghtml/mag.gif orghtml/mail.gif orghtml/new-branch-blank.gif \ + orghtml/new-branch-first.gif orghtml/new-branch-straight.gif orghtml/orgicon.gif \ + orghtml/styles.css orghtml/topframe.html + dist_config_DATA = \ config/authPassword.html config/dsgw-l10n.conf \ config/authSearch.html config/dsgwsearchprefs.conf \ @@ -445,7 +463,7 @@ config/display-orgperson.html config/newentry.html \ config/display-orgunit.html config/newentryName.html \ config/display-person.html config/newentryType.html \ - config/search.html \ + config/orgchart.tmpl config/search.html \ config/dsgwfilter.conf config/searchString.html \ config/en/dsgwcollate.conf config/en/dsgw-l10n.conf
@@ -491,15 +509,20 @@ -e 's,@localstatedir@,$(localstatedir),g' \ -e 's,@cgibindir@,$(cgibindir),g' \ -e 's,@cgiuri@,$(cgiuri),g' \ + -e 's,@orguri@,$(orguri),g' \ + -e 's,@dsgwuri@,$(dsgwuri),g' \ -e 's,@cmdbindir@,$(cmdbindir),g' \ -e 's,@propertydir@,$(propertydir),g' \ -e 's,@htmldir@,$(htmldir),g' \ -e 's,@pbhtmldir@,$(pbhtmldir),g' \ + -e 's,@orghtmldir@,$(orghtmldir),g' \ -e 's,@configdir@,$(configdir),g' \ -e 's,@pbconfigdir@,$(pbconfigdir),g' \ -e 's,@contextdir@,$(contextdir),g' \ -e 's,@securitydir@,$(securitydir),g' \ -e 's,@instconfigdir@,$(instconfigdir),g' \ + -e 's,@perlpath@,$(perldir),g' \ + -e 's,@perlexec@,@perlexec@,g' \ -e 's,@BUILD_NUM@,$(BUILDNUM),g' \ -e 's,@NQBUILD_NUM@,$(NQBUILDNUM),g' \ -e 's,@package_name@,$(PACKAGE_NAME),g' \ @@ -639,6 +662,25 @@ unauth$(EXEEXT): $(unauth_OBJECTS) $(unauth_DEPENDENCIES) @rm -f unauth$(EXEEXT) $(LINK) $(unauth_LDFLAGS) $(unauth_OBJECTS) $(unauth_LDADD) $(LIBS) +install-cgibinSCRIPTS: $(cgibin_SCRIPTS) + @$(NORMAL_INSTALL) + test -z "$(cgibindir)" || $(mkdir_p) "$(DESTDIR)$(cgibindir)" + @list='$(cgibin_SCRIPTS)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + if test -f $$d$$p; then \ + f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ + echo " $(cgibinSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(cgibindir)/$$f'"; \ + $(cgibinSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(cgibindir)/$$f"; \ + else :; fi; \ + done + +uninstall-cgibinSCRIPTS: + @$(NORMAL_UNINSTALL) + @list='$(cgibin_SCRIPTS)'; for p in $$list; do \ + f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ + echo " rm -f '$(DESTDIR)$(cgibindir)/$$f'"; \ + rm -f "$(DESTDIR)$(cgibindir)/$$f"; \ + done
mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -744,6 +786,23 @@ echo " rm -f '$(DESTDIR)$(htmldir)/$$f'"; \ rm -f "$(DESTDIR)$(htmldir)/$$f"; \ done +install-dist_orghtmlDATA: $(dist_orghtml_DATA) + @$(NORMAL_INSTALL) + test -z "$(orghtmldir)" || $(mkdir_p) "$(DESTDIR)$(orghtmldir)" + @list='$(dist_orghtml_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ + echo " $(dist_orghtmlDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(orghtmldir)/$$f'"; \ + $(dist_orghtmlDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(orghtmldir)/$$f"; \ + done + +uninstall-dist_orghtmlDATA: + @$(NORMAL_UNINSTALL) + @list='$(dist_orghtml_DATA)'; for p in $$list; do \ + f=$(am__strip_dir) \ + echo " rm -f '$(DESTDIR)$(orghtmldir)/$$f'"; \ + rm -f "$(DESTDIR)$(orghtmldir)/$$f"; \ + done install-dist_pbconfigDATA: $(dist_pbconfig_DATA) @$(NORMAL_INSTALL) test -z "$(pbconfigdir)" || $(mkdir_p) "$(DESTDIR)$(pbconfigdir)" @@ -864,7 +923,7 @@ distdir: $(DISTFILES) $(am__remove_distdir) mkdir $(distdir) - $(mkdir_p) $(distdir)/config $(distdir)/config/en $(distdir)/html $(distdir)/m4 $(distdir)/pbconfig $(distdir)/pbhtml + $(mkdir_p) $(distdir)/config $(distdir)/config/en $(distdir)/html $(distdir)/m4 $(distdir)/orghtml $(distdir)/pbconfig $(distdir)/pbhtml @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ list='$(DISTFILES)'; for file in $$list; do \ @@ -990,9 +1049,9 @@ exit 1; } >&2 check-am: all-am check: check-am -all-am: Makefile $(PROGRAMS) $(DATA) config.h +all-am: Makefile $(PROGRAMS) $(SCRIPTS) $(DATA) config.h installdirs: - for dir in "$(DESTDIR)$(cgibindir)" "$(DESTDIR)$(configdir)" "$(DESTDIR)$(htmldir)" "$(DESTDIR)$(pbconfigdir)" "$(DESTDIR)$(pbhtmldir)" "$(DESTDIR)$(contextdir)" "$(DESTDIR)$(propertydir)"; do \ + for dir in "$(DESTDIR)$(cgibindir)" "$(DESTDIR)$(cgibindir)" "$(DESTDIR)$(configdir)" "$(DESTDIR)$(htmldir)" "$(DESTDIR)$(orghtmldir)" "$(DESTDIR)$(pbconfigdir)" "$(DESTDIR)$(pbhtmldir)" "$(DESTDIR)$(contextdir)" "$(DESTDIR)$(propertydir)"; do \ test -z "$$dir" || $(mkdir_p) "$$dir"; \ done install: install-am @@ -1042,8 +1101,9 @@
info-am:
-install-data-am: install-cgibinPROGRAMS install-dist_configDATA \ - install-dist_htmlDATA install-dist_pbconfigDATA \ +install-data-am: install-cgibinPROGRAMS install-cgibinSCRIPTS \ + install-dist_configDATA install-dist_htmlDATA \ + install-dist_orghtmlDATA install-dist_pbconfigDATA \ install-dist_pbhtmlDATA install-nodist_contextDATA \ install-nodist_propertyDATA
@@ -1075,8 +1135,9 @@
ps-am:
-uninstall-am: uninstall-cgibinPROGRAMS uninstall-dist_configDATA \ - uninstall-dist_htmlDATA uninstall-dist_pbconfigDATA \ +uninstall-am: uninstall-cgibinPROGRAMS uninstall-cgibinSCRIPTS \ + uninstall-dist_configDATA uninstall-dist_htmlDATA \ + uninstall-dist_orghtmlDATA uninstall-dist_pbconfigDATA \ uninstall-dist_pbhtmlDATA uninstall-info-am \ uninstall-nodist_contextDATA uninstall-nodist_propertyDATA
@@ -1087,17 +1148,20 @@ distclean-compile distclean-generic distclean-hdr \ distclean-libtool distclean-tags distcleancheck distdir \ distuninstallcheck dvi dvi-am html html-am info info-am \ - install install-am install-cgibinPROGRAMS install-data \ - install-data-am install-dist_configDATA install-dist_htmlDATA \ - install-dist_pbconfigDATA install-dist_pbhtmlDATA install-exec \ - install-exec-am install-info install-info-am install-man \ + install install-am install-cgibinPROGRAMS \ + install-cgibinSCRIPTS install-data install-data-am \ + install-dist_configDATA install-dist_htmlDATA \ + install-dist_orghtmlDATA install-dist_pbconfigDATA \ + install-dist_pbhtmlDATA install-exec install-exec-am \ + install-info install-info-am install-man \ install-nodist_contextDATA install-nodist_propertyDATA \ install-strip installcheck installcheck-am installdirs \ maintainer-clean maintainer-clean-generic mostlyclean \ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ pdf pdf-am ps ps-am tags uninstall uninstall-am \ - uninstall-cgibinPROGRAMS uninstall-dist_configDATA \ - uninstall-dist_htmlDATA uninstall-dist_pbconfigDATA \ + uninstall-cgibinPROGRAMS uninstall-cgibinSCRIPTS \ + uninstall-dist_configDATA uninstall-dist_htmlDATA \ + uninstall-dist_orghtmlDATA uninstall-dist_pbconfigDATA \ uninstall-dist_pbhtmlDATA uninstall-info-am \ uninstall-nodist_contextDATA uninstall-nodist_propertyDATA
Index: configure =================================================================== RCS file: /cvs/dirsec/dsgw/configure,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- configure 10 Jan 2008 01:19:36 -0000 1.3 +++ configure 11 Jan 2008 21:58:09 -0000 1.4 @@ -466,7 +466,7 @@ #endif"
ac_default_prefix=/opt/dirsrv -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT build build_cpu build_vendor build_os host host_cpu host_vendor host_os CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE SED EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CP! P CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBOBJS POW_LIB PACKAGE_BASE_NAME instconfigdir BUNDLE_TRUE BUNDLE_FALSE LIBSOCKET LIBNSL LIBCSTD LIBCRUN CXXLINK_REQUIRED_TRUE CXXLINK_REQUIRED_FALSE HPUX_TRUE HPUX_FALSE SOLARIS_TRUE SOLARIS_FALSE PKG_CONFIG ICU_CONFIG nspr_inc nspr_lib nspr_libdir nss_inc nss_lib nss_libdir sasl_inc sasl_lib sasl_libdir ldapsdk_inc ldapsdk_lib ldapsdk_libdir adminutil_inc adminutil_lib adminutil_libdir adminutil_ver icu_lib icu_libdir icu_inc icu_bin cgibindir cgiuri propertydir htmldir pbhtmldir configdir pbconfigdir contextdir securitydir cookiedir NEED_LDIF_TRUE NEED_LDIF_FALSE WINNT_TRUE WINNT_FALSE LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT build build_cpu build_vendor build_os host host_cpu host_vendor host_os CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE SED EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CP! P CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBOBJS POW_LIB PACKAGE_BASE_NAME instconfigdir BUNDLE_TRUE BUNDLE_FALSE LIBSOCKET LIBNSL LIBCSTD LIBCRUN perlexec CXXLINK_REQUIRED_TRUE CXXLINK_REQUIRED_FALSE HPUX_TRUE HPUX_FALSE SOLARIS_TRUE SOLARIS_FALSE PKG_CONFIG ICU_CONFIG nspr_inc nspr_lib nspr_libdir nss_inc nss_lib nss_libdir sasl_inc sasl_lib sasl_libdir ldapsdk_inc ldapsdk_lib ldapsdk_libdir adminutil_inc adminutil_lib adminutil_libdir adminutil_ver icu_lib icu_libdir icu_inc icu_bin cgibindir cgiuri dsgwuri orguri propertydir htmldir pbhtmldir orghtmldir configdir pbconfigdir contextdir securitydir cookiedir perldir NEED_LDIF_TRUE NEED_LDIF_FALSE WINNT_TRUE WINNT_FALSE LTLIBOBJS' ac_subst_files=''
# Initialize some variables set by options. @@ -21242,6 +21242,14 @@
CXXLINK_REQUIRED=0 +# on most platforms, we will just use perl from PATH +# On some platforms, we cannot. Why not just use any old +# perl? Because of perldap. We use a perldap that is +# compiled to either 32bit or 64bit, so we must use a native +# perl binary compiled with the same bitsize. On Solaris +# and HP-UX, /usr/bin/perl is 32 bit, so we cannot use +# those with our 64 bit compiled product. +perlexec='/usr/bin/env perl' case $host in *-*-linux*)
@@ -21308,6 +21316,8 @@ _ACEOF
CXXLINK_REQUIRED=1 + # assume 64 bit + perlexec='/opt/perl_64/bin/perl' platform="hpux" ;; hppa*-hp-hpux*) @@ -21357,6 +21367,8 @@ _ACEOF
CXXLINK_REQUIRED=1 + # assume 64 bit + perlexec='/opt/perl_64/bin/perl' platform="hpux" ;; sparc-sun-solaris*) @@ -21423,12 +21435,16 @@ LIBCRUN=$LIBCRUN
CXXLINK_REQUIRED=1 + # assume 64 bit + perlexec='/opt/perl5x/bin/perl' platform="solaris" ;; *) esac
+ + if test "$CXXLINK_REQUIRED" = 1; then CXXLINK_REQUIRED_TRUE= CXXLINK_REQUIRED_FALSE='#' @@ -21490,38 +21506,40 @@ # relative to datadir htmldir=/$PACKAGE_NAME/html pbhtmldir=/$PACKAGE_NAME/pbhtml + orghtmldir=/$PACKAGE_NAME/orghtml configdir=/$PACKAGE_NAME/config pbconfigdir=/$PACKAGE_NAME/pbconfig manualuri=/$PACKAGE_NAME/manual propertydir=/$PACKAGE_NAME/properties # relative to libdir cgibindir=/$PACKAGE_NAME/cgi-bin - # location of property/resource files, relative to datadir - cgiuri=/cgi-bin + perldir=/$PACKAGE_NAME/perl elif test "$with_fhs_opt" = "yes"; then # relative to datadir htmldir=/dsgw/html pbhtmldir=/dsgw/pbhtml + orghtmldir=/dsgw/orghtml configdir=/dsgw/config pbconfigdir=/dsgw/pbconfig manualuri=/dsgw/manual propertydir=/properties/dsgw + # relative to libdir + perldir=/perl # same as server's cgibindir cgibindir=/cgi-bin - cgiuri=/cgi-bin else # relative to datadir htmldir=/$PACKAGE_BASE_NAME/dsgw/html pbhtmldir=/$PACKAGE_BASE_NAME/dsgw/pbhtml + orghtmldir=/$PACKAGE_BASE_NAME/dsgw/orghtml configdir=/$PACKAGE_BASE_NAME/dsgw/config pbconfigdir=/$PACKAGE_BASE_NAME/dsgw/pbconfig manualuri=/$PACKAGE_BASE_NAME/dsgw/manual propertydir=/$PACKAGE_BASE_NAME/properties/dsgw # relative to libdir + perldir=/$PACKAGE_BASE_NAME/perl # CGI program directory cgibindir=/$PACKAGE_BASE_NAME/cgi-bin - # location of property/resource files, relative to datadir - cgiuri=/cgi-bin fi
# relative to instconfigdir @@ -21529,6 +21547,10 @@ securitydir=/dsgw # relative to $localstatedir cookiedir=/run/$PACKAGE_BASE_NAME/dsgw/cookies +# URIs +cgiuri=/cgi-bin +dsgwuri=/dsgw +orguri=/orgchart
# Check for library dependencies # BEGIN COPYRIGHT BLOCK @@ -22600,6 +22622,10 @@
+ + + + # need a check here to see if the ldif functions are exported from libldap # for now, just assume they are not
@@ -23433,6 +23459,7 @@ s,@LIBNSL@,$LIBNSL,;t t s,@LIBCSTD@,$LIBCSTD,;t t s,@LIBCRUN@,$LIBCRUN,;t t +s,@perlexec@,$perlexec,;t t s,@CXXLINK_REQUIRED_TRUE@,$CXXLINK_REQUIRED_TRUE,;t t s,@CXXLINK_REQUIRED_FALSE@,$CXXLINK_REQUIRED_FALSE,;t t s,@HPUX_TRUE@,$HPUX_TRUE,;t t @@ -23463,14 +23490,18 @@ s,@icu_bin@,$icu_bin,;t t s,@cgibindir@,$cgibindir,;t t s,@cgiuri@,$cgiuri,;t t +s,@dsgwuri@,$dsgwuri,;t t +s,@orguri@,$orguri,;t t s,@propertydir@,$propertydir,;t t s,@htmldir@,$htmldir,;t t s,@pbhtmldir@,$pbhtmldir,;t t +s,@orghtmldir@,$orghtmldir,;t t s,@configdir@,$configdir,;t t s,@pbconfigdir@,$pbconfigdir,;t t s,@contextdir@,$contextdir,;t t s,@securitydir@,$securitydir,;t t s,@cookiedir@,$cookiedir,;t t +s,@perldir@,$perldir,;t t s,@NEED_LDIF_TRUE@,$NEED_LDIF_TRUE,;t t s,@NEED_LDIF_FALSE@,$NEED_LDIF_FALSE,;t t s,@WINNT_TRUE@,$WINNT_TRUE,;t t
Index: configure.ac =================================================================== RCS file: /cvs/dirsec/dsgw/configure.ac,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- configure.ac 10 Jan 2008 01:19:36 -0000 1.3 +++ configure.ac 11 Jan 2008 21:58:09 -0000 1.4 @@ -125,6 +125,14 @@ m4_include(m4/fhs.m4)
CXXLINK_REQUIRED=0 +# on most platforms, we will just use perl from PATH +# On some platforms, we cannot. Why not just use any old +# perl? Because of perldap. We use a perldap that is +# compiled to either 32bit or 64bit, so we must use a native +# perl binary compiled with the same bitsize. On Solaris +# and HP-UX, /usr/bin/perl is 32 bit, so we cannot use +# those with our 64 bit compiled product. +perlexec='/usr/bin/env perl' case $host in *-*-linux*) AC_DEFINE([XP_UNIX], [1], [UNIX]) @@ -143,6 +151,8 @@ AC_DEFINE([_POSIX_C_SOURCE], [199506L], [POSIX revision]) AC_DEFINE([_HPUX_SOURCE], [1], [Source namespace]) CXXLINK_REQUIRED=1 + # assume 64 bit + perlexec='/opt/perl_64/bin/perl' platform="hpux" ;; hppa*-hp-hpux*) @@ -156,6 +166,8 @@ AC_DEFINE([_POSIX_C_SOURCE], [199506L], [POSIX revision]) AC_DEFINE([_HPUX_SOURCE], [1], [Source namespace]) CXXLINK_REQUIRED=1 + # assume 64 bit + perlexec='/opt/perl_64/bin/perl' platform="hpux" ;; sparc-sun-solaris*) @@ -180,10 +192,14 @@ LIBCRUN=-lCrun AC_SUBST([LIBCRUN], [$LIBCRUN]) CXXLINK_REQUIRED=1 + # assume 64 bit + perlexec='/opt/perl5x/bin/perl' platform="solaris" ;; *) esac +AC_SUBST(perlexec) + AM_CONDITIONAL([CXXLINK_REQUIRED], test "$CXXLINK_REQUIRED" = 1) AM_CONDITIONAL([HPUX],test "$platform" = "hpux") AM_CONDITIONAL([SOLARIS],test "$platform" = "solaris") @@ -217,38 +233,40 @@ # relative to datadir htmldir=/$PACKAGE_NAME/html pbhtmldir=/$PACKAGE_NAME/pbhtml + orghtmldir=/$PACKAGE_NAME/orghtml configdir=/$PACKAGE_NAME/config pbconfigdir=/$PACKAGE_NAME/pbconfig manualuri=/$PACKAGE_NAME/manual propertydir=/$PACKAGE_NAME/properties # relative to libdir cgibindir=/$PACKAGE_NAME/cgi-bin - # location of property/resource files, relative to datadir - cgiuri=/cgi-bin + perldir=/$PACKAGE_NAME/perl elif test "$with_fhs_opt" = "yes"; then # relative to datadir htmldir=/dsgw/html pbhtmldir=/dsgw/pbhtml + orghtmldir=/dsgw/orghtml configdir=/dsgw/config pbconfigdir=/dsgw/pbconfig manualuri=/dsgw/manual propertydir=/properties/dsgw + # relative to libdir + perldir=/perl # same as server's cgibindir cgibindir=/cgi-bin - cgiuri=/cgi-bin else # relative to datadir htmldir=/$PACKAGE_BASE_NAME/dsgw/html pbhtmldir=/$PACKAGE_BASE_NAME/dsgw/pbhtml + orghtmldir=/$PACKAGE_BASE_NAME/dsgw/orghtml configdir=/$PACKAGE_BASE_NAME/dsgw/config pbconfigdir=/$PACKAGE_BASE_NAME/dsgw/pbconfig manualuri=/$PACKAGE_BASE_NAME/dsgw/manual propertydir=/$PACKAGE_BASE_NAME/properties/dsgw # relative to libdir + perldir=/$PACKAGE_BASE_NAME/perl # CGI program directory cgibindir=/$PACKAGE_BASE_NAME/cgi-bin - # location of property/resource files, relative to datadir - cgiuri=/cgi-bin fi
# relative to instconfigdir @@ -256,6 +274,10 @@ securitydir=/dsgw # relative to $localstatedir cookiedir=/run/$PACKAGE_BASE_NAME/dsgw/cookies +# URIs +cgiuri=/cgi-bin +dsgwuri=/dsgw +orguri=/orgchart
# Check for library dependencies m4_include(m4/nspr.m4) @@ -291,14 +313,18 @@ # write out paths for data/config files AC_SUBST(cgibindir) AC_SUBST(cgiuri) +AC_SUBST(dsgwuri) +AC_SUBST(orguri) AC_SUBST(propertydir) AC_SUBST(htmldir) AC_SUBST(pbhtmldir) +AC_SUBST(orghtmldir) AC_SUBST(configdir) AC_SUBST(pbconfigdir) AC_SUBST(contextdir) AC_SUBST(securitydir) AC_SUBST(cookiedir) +AC_SUBST(perldir)
# need a check here to see if the ldif functions are exported from libldap # for now, just assume they are not
Index: dsgw-httpd.conf.in =================================================================== RCS file: /cvs/dirsec/dsgw/dsgw-httpd.conf.in,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- dsgw-httpd.conf.in 2 Jun 2006 22:57:17 -0000 1.2 +++ dsgw-httpd.conf.in 11 Jan 2008 21:58:09 -0000 1.3 @@ -28,6 +28,10 @@ # Enable CGI execution for these uris in this directory ScriptAlias @cgiuri@ "@cgibindir@"
+# URI aliases for html content +Alias @dsgwuri@ @htmldir@ +Alias @orguri@ @orghtmldir@ + # Allow access to the dsgw html files <Directory "@htmldir@"> AllowOverride None @@ -44,6 +48,14 @@ Allow from all </Directory>
+# Allow access to the org html files +<Directory "@orghtmldir@"> + AllowOverride None + Options None + Order allow,deny + Allow from all +</Directory> + # Allow access to the dsgw html templates <Directory "@configdir@"> AllowOverride None
389-commits@lists.fedoraproject.org
-
Doctor Conrad