Attachment 156525 Details for Bug 237356 – add setup perl modules to ds

[patch] add setup perl modules to ds

cvsdiffs (text/plain), 6.37 KB, created by Rich Megginson on 2007-06-07 22:57:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Rich Megginson

Created: 2007-06-07 22:57:55 UTC

Size: 6.37 KB

patch

obsolete

>Index: ldapserver/Makefile.am
>===================================================================
>RCS file: /cvs/dirsec/ldapserver/Makefile.am,v
>retrieving revision 1.39
>diff -u -8 -r1.39 Makefile.am
>--- ldapserver/Makefile.am	16 May 2007 19:45:26 -0000	1.39
>+++ ldapserver/Makefile.am	7 Jun 2007 22:55:32 -0000
>@@ -69,16 +69,17 @@
> sampledatadir = $(datadir)@sampledatadir@
> propertydir = $(sysconfdir)@propertydir@
> schemadir = $(sysconfdir)@schemadir@
> serverdir = $(libdir)@serverdir@
> serverplugindir = $(libdir)@serverplugindir@
> taskdir = $(datadir)@scripttemplatedir@
> initdir = $(sysconfdir)@initdir@
> instconfigdir = @instconfigdir@
>+perldir = $(libdir)@perldir@
> 
> #------------------------
> # Build Products
> #------------------------
> sbin_PROGRAMS = ns-slapd
> 
> bin_PROGRAMS = dbscan-bin ds_newinst-bin dsktune-bin infadd-bin ldap-agent-bin \
> 	ldclt-bin ldif-bin migratecred-bin mmldif-bin pwdhash-bin rsearch-bin
>@@ -162,17 +163,31 @@
> 	ldap/admin/src/migrateTo11 \
> 	wrappers/migratecred \
> 	wrappers/mmldif \
> 	wrappers/pwdhash \
> 	wrappers/rsearch \
> 	wrappers/cl-dump \
> 	ldap/admin/src/scripts/cl-dump.pl \
> 	wrappers/repl-monitor \
>-	ldap/admin/src/scripts/repl-monitor.pl
>+	ldap/admin/src/scripts/repl-monitor.pl \
>+	ldap/admin/src/scripts/setup-ds.pl
>+
>+perl_SCRIPTS = ldap/admin/src/scripts/SetupLog.pm \
>+	ldap/admin/src/scripts/Resource.pm \
>+	ldap/admin/src/scripts/Util.pm \
>+	ldap/admin/src/scripts/Setup.pm \
>+	ldap/admin/src/scripts/SetupDialogs.pm \
>+	ldap/admin/src/scripts/Inf.pm \
>+	ldap/admin/src/scripts/DialogManager.pm \
>+	ldap/admin/src/scripts/Dialog.pm \
>+	ldap/admin/src/scripts/DSDialogs.pm \
>+	ldap/admin/src/scripts/Setup.pm
>+
>+property_DATA = ldap/admin/src/scripts/setup-ds.res
> 
> task_SCRIPTS = ldap/admin/src/scripts/template-bak2db \
> 	ldap/admin/src/scripts/template-db2bak \
> 	ldap/admin/src/scripts/template-db2index \
> 	ldap/admin/src/scripts/template-db2ldif \
> 	ldap/admin/src/scripts/template-ldif2db \
> 	ldap/admin/src/scripts/template-ldif2ldap \
> 	ldap/admin/src/scripts/template-monitor \
>@@ -322,17 +337,17 @@
> 	lib/libsi18n/getstrprop.c \
> 	lib/libsi18n/getlang.c \
> 	lib/libsi18n/propset.c \
> 	lib/libsi18n/reshash.c \
> 	lib/libsi18n/txtfile.c \
> 	$(libldaputil_a_SOURCES)
> 
> libns_dshttpd_la_CPPFLAGS = -I$(srcdir)/include/base $(AM_CPPFLAGS) -I$(srcdir)/lib/ldaputil @ldapsdk_inc@ @nss_inc@ @nspr_inc@
>-libns_dshttpd_la_LIBADD = $(LDAPSDK_LINK) $(NSS_LINK) $(NSPR_LINK)
>+libns_dshttpd_la_LIBADD = $(LDAPSDK_LINK) $(SASL_LINK) $(NSS_LINK) $(NSPR_LINK)
> 
> #------------------------
> # libslapd
> #------------------------
> libslapd_la_SOURCES = ldap/servers/slapd/add.c \
> 	ldap/servers/slapd/agtmmap.c \
> 	ldap/servers/slapd/apibroker.c \
> 	ldap/servers/slapd/attr.c \
>@@ -992,17 +1007,21 @@
> 	-e 's,@serverplugindir\@,$(serverplugindir),g' \
> 	-e 's,@taskdir\@,$(taskdir),g' \
> 	-e 's,@configdir\@,$(configdir),g' \
> 	-e 's,@sysconfdir\@,$(sysconfdir),g' \
> 	-e 's,@localstatedir\@,$(localstatedir),g' \
> 	-e 's,@package_name\@,$(PACKAGE_NAME),g' \
> 	-e 's,@instconfigdir\@,$(instconfigdir),g' \
> 	-e 's,@ECHO_N\@,$(ECHO_N),g' \
>-	-e 's,@ECHO_C\@,$(ECHO_C),g'
>+	-e 's,@ECHO_C\@,$(ECHO_C),g' \
>+	-e 's,@brand\@,$(brand),g' \
>+	-e 's,@capbrand\@,$(capbrand),g' \
>+	-e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' \
>+	-e 's,@perldir\@,$(perldir),g'
> else
> fixupcmd = sed \
> 	-e 's,@bindir\@,$(bindir),g' \
> 	-e 's,@sbindir\@,$(sbindir),g' \
> 	-e 's,@libdir\@,$(libdir),g' \
> 	-e 's,@nspr_libdir\@,$(nspr_libdir),g' \
> 	-e 's,@nss_libdir\@,$(nss_libdir),g' \
> 	-e 's,@ldapsdk_libdir\@,$(ldapsdk_libdir),g' \
>@@ -1018,17 +1037,21 @@
> 	-e 's,@serverplugindir\@,$(serverplugindir),g' \
> 	-e 's,@taskdir\@,$(taskdir),g' \
> 	-e 's,@configdir\@,$(configdir),g' \
> 	-e 's,@sysconfdir\@,$(sysconfdir),g' \
> 	-e 's,@localstatedir\@,$(localstatedir),g' \
> 	-e 's,@package_name\@,$(PACKAGE_NAME),g' \
> 	-e 's,@instconfigdir\@,$(instconfigdir),g' \
> 	-e 's,@ECHO_N\@,$(ECHO_N),g' \
>-	-e 's,@ECHO_C\@,$(ECHO_C),g'
>+	-e 's,@ECHO_C\@,$(ECHO_C),g' \
>+	-e 's,@brand\@,$(brand),g' \
>+	-e 's,@capbrand\@,$(capbrand),g' \
>+	-e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' \
>+	-e 's,@perldir\@,$(perldir),g'
> endif
> 
> %: %.in
> 	mkdir -p $(dir $@)
> 	$(fixupcmd) $^ > $@
> 
> %/$(PACKAGE_NAME): %/initscript.in
> 	$(fixupcmd) $^ > $@
>Index: ldapserver/configure.ac
>===================================================================
>RCS file: /cvs/dirsec/ldapserver/configure.ac,v
>retrieving revision 1.28
>diff -u -8 -r1.28 configure.ac
>--- ldapserver/configure.ac	16 May 2007 19:45:26 -0000	1.28
>+++ ldapserver/configure.ac	7 Jun 2007 22:55:33 -0000
>@@ -134,16 +134,20 @@
> else
>   AC_MSG_RESULT(no)
> fi
> AM_CONDITIONAL(enable_bitwise,test "$enable_bitwise" = "yes")
> 
> # the default prefix - override with --prefix or --with-fhs
> AC_PREFIX_DEFAULT([/opt/$PACKAGE_NAME])
> 
>+brand=fedora
>+capbrand=Fedora
>+vendor="Fedora Project"
>+
> m4_include(m4/fhs.m4)
> 
> # installation paths - by default, we store everything
> # under the prefix.  The with-fhs option will use /usr,
> # /etc, and /var.  The with-fhs-opt option will use the
> # prefix, but it's sysconfdir and localstatedir will be
> # /etc/opt, and /var/opt.
> if test "$with_fhs_opt" = "yes"; then
>@@ -181,24 +185,27 @@
> 
> # Shared paths for all layouts
> # relative to sysconfdir
> configdir=/$PACKAGE_NAME/config
> # relative to sysconfdir
> propertydir=/$PACKAGE_NAME/property
> # relative to sysconfdir
> schemadir=/$PACKAGE_NAME/schema
>+# relative to libdir
>+perldir=/$PACKAGE_NAME/perl
> 
> AC_SUBST(configdir)
> AC_SUBST(sampledatadir)
> AC_SUBST(propertydir)
> AC_SUBST(schemadir)
> AC_SUBST(serverdir)
> AC_SUBST(serverplugindir)
> AC_SUBST(scripttemplatedir)
>+AC_SUBST(perldir)
> 
> # check for --with-instconfigdir
> AC_MSG_CHECKING(for --with-instconfigdir)
> AC_ARG_WITH(instconfigdir,
>         AS_HELP_STRING([--with-instconfigdir=/path],
>                        [Base directory for instance specific writable configuration directories (default $sysconfdir/$PACKAGE_NAME)]),
> [
>   if test $withval = yes ; then
>@@ -327,16 +334,20 @@
> AC_SUBST(icu_lib)
> AC_SUBST(icu_inc)
> AC_SUBST(icu_bin)
> AC_SUBST(netsnmp_inc)
> AC_SUBST(netsnmp_lib)
> AC_SUBST(netsnmp_libdir)
> AC_SUBST(netsnmp_link)
> 
>+AC_SUBST(brand)
>+AC_SUBST(capbrand)
>+AC_SUBST(vendor)
>+
> AC_DEFINE([LDAP_DEBUG], [1], [LDAP debug flag])
> AC_DEFINE([LDAP_DONT_USE_SMARTHEAP], [1], [Don't use smartheap])
> 
> 
> # libtool on fedora/rhel contains some gcc-isms which cause problems
> # if not using gcc (e.g. Forte on Solaris, aCC on HP-UX)
> # we remove them here
> if test "$GCC" != yes ; then

Actions: View | Diff

Attachments on bug 237356: 153230 | 153562 | 153667 | 153668 | 153674 | 153675 | 153677 | 153678 | 155103 | 155105 | 155406 | 155407 | 155408 | 155409 | 155410 | 155411 | 155412 | 155413 | 155414 | 155483 | 155484 | 155485 | 155486 | 155487 | 155488 | 155489 | 155490 | 156389 | 156510 | 156525 | 156539 | 156540 | 156541 | 156612 | 156613 | 156614 | 156626 | 156633 | 156634 | 156741 | 156829 | 156834 | 156839 | 156840 | 156895 | 157043 | 157044 | 157133 | 157159 | 157160 | 157164 | 157165 | 157167 | 157298 | 157378 | 157381 | 157388 | 157390 | 157400 | 157401 | 157407 | 157408 | 157429 | 157431 | 157469 | 157471 | 157479 | 157480 | 160762