Author: rmeggins Update of /cvs/dirsec/ldapserver In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25137/ldapserver Modified Files: Makefile.am configure.ac aclocal.m4 configure missing install-sh depcomp compile config.sub config.guess Makefile.in Log Message: Resolves: bug 237356 Description: Move DS Admin Code into Admin Server Fix Description: The Resource class needs to support more than 1 resource file e.g. for ds-base and ds-admin. The property dir should be under $datadir. Property files are data files, not really config files. Added a shared_lib_suffix token Fixed some wording errors in the resource file. Platforms tested: RHEL4 Flag Day: no Doc impact: No new doc impact from previous commits for this bug. Index: Makefile.am =================================================================== RCS file: /cvs/dirsec/ldapserver/Makefile.am,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- Makefile.am 8 Jun 2007 01:09:14 -0000 1.40 +++ Makefile.am 8 Jun 2007 20:36:52 -0000 1.41 @@ -67,7 +67,7 @@ #------------------------ configdir = $(sysconfdir)@configdir@ sampledatadir = $(datadir)@sampledatadir@ -propertydir = $(sysconfdir)@propertydir@ +propertydir = $(datadir)@propertydir@ schemadir = $(sysconfdir)@schemadir@ serverdir = $(libdir)@serverdir@ serverplugindir = $(libdir)@serverplugindir@ @@ -76,6 +76,8 @@ instconfigdir = @instconfigdir@ perldir = $(libdir)@perldir@ +shared_lib_suffix = @shared_lib_suffix@ + #------------------------ # Build Products #------------------------ @@ -1016,7 +1018,8 @@ -e 's,@brand\@,$(brand),g' \ -e 's,@capbrand\@,$(capbrand),g' \ -e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' \ - -e 's,@perldir\@,$(perldir),g' + -e 's,@perldir\@,$(perldir),g' \ + -e 's,@shared_lib_suffix\@,$(shared_lib_suffix),g' else fixupcmd = sed \ -e 's,@bindir\@,$(bindir),g' \ @@ -1046,7 +1049,8 @@ -e 's,@brand\@,$(brand),g' \ -e 's,@capbrand\@,$(capbrand),g' \ -e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' \ - -e 's,@perldir\@,$(perldir),g' + -e 's,@perldir\@,$(perldir),g' \ + -e 's,@shared_lib_suffix\@,$(shared_lib_suffix),g' endif %: %.in Index: configure.ac =================================================================== RCS file: /cvs/dirsec/ldapserver/configure.ac,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- configure.ac 8 Jun 2007 01:09:15 -0000 1.29 +++ configure.ac 8 Jun 2007 20:36:52 -0000 1.30 @@ -186,8 +186,8 @@ # Shared paths for all layouts # relative to sysconfdir configdir=/$PACKAGE_NAME/config -# relative to sysconfdir -propertydir=/$PACKAGE_NAME/property +# location of property/resource files, relative to datadir +propertydir=/$PACKAGE_NAME/properties # relative to sysconfdir schemadir=/$PACKAGE_NAME/schema # relative to libdir @@ -223,6 +223,7 @@ # cygnus, mingw, or the like and using cmd.exe as the shell AM_CONDITIONAL([WINNT], false) +shared_lib_suffix=.so # Deal with platform dependent defines # relative to sysconfdir initdir=/rc.d @@ -260,6 +261,7 @@ AC_DEFINE([OS_hpux], [1], [OS HP-UX]) AC_DEFINE([_POSIX_C_SOURCE], [199506L], [POSIX revision]) AC_DEFINE([_HPUX_SOURCE], [1], [Source namespace]) + shared_lib_suffix=.sl platform="hpux" ;; sparc-sun-solaris*) @@ -295,6 +297,7 @@ ;; esac AC_SUBST(initdir) +AC_SUBST(shared_lib_suffix) AM_CONDITIONAL(HPUX,test "$platform" = "hpux") AM_CONDITIONAL(SOLARIS,test "$platform" = "solaris") Index: configure =================================================================== RCS file: /cvs/dirsec/ldapserver/configure,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- configure 8 Jun 2007 01:09:15 -0000 1.43 +++ configure 8 Jun 2007 20:36:52 -0000 1.44 @@ -465,7 +465,7 @@ #endif" ac_default_prefix=/opt/$PACKAGE_NAME -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 debug_defs BUNDLE_TRUE BUNDLE_FALSE enable_pam_passthru_TRUE enable_pam_passthru_FALSE enable_dna_TRUE enable_dna_FALSE enable_ldapi_TRUE enable_ldapi_FALSE enable_bitwise_TRUE enable_bitwise_FALSE configdir sampledatadir propertydir schemadir serverdir serverplugindir scripttemplatedir perldir instconfigdir WINNT_TRUE WINNT_FALSE LIBSOCKET LIBNSL LIBDL LIBCSTD LIBCRUN initdir HPUX_TRUE HPUX_FALSE SOLARIS_TRUE SOLARIS_FALSE PKG_CONFIG ICU_CONFIG NETSNMP_CONFIG nspr_inc nspr_lib nspr_libdir nss_inc nss_lib nss_libdir ldapsdk_inc ldapsdk_lib ldapsdk_libdir ldapsdk_bindir db_inc db_incdir db_lib db_libdir db_bindir db_libver sasl_inc sasl_lib sasl_libdir svrcore_inc svrcore_lib icu_lib icu_inc icu_bin netsnmp_inc netsnmp_lib netsnmp_libdir netsnmp_link brand capbrand vendor 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 debug_defs BUNDLE_TRUE BUNDLE_FALSE enable_pam_passthru_TRUE enable_pam_passthru_FALSE enable_dna_TRUE enable_dna_FALSE enable_ldapi_TRUE enable_ldapi_FALSE enable_bitwise_TRUE enable_bitwise_FALSE configdir sampledatadir propertydir schemadir serverdir serverplugindir scripttemplatedir perldir instconfigdir WINNT_TRUE WINNT_FALSE LIBSOCKET LIBNSL LIBDL LIBCSTD LIBCRUN initdir shared_lib_suffix HPUX_TRUE HPUX_FALSE SOLARIS_TRUE SOLARIS_FALSE PKG_CONFIG ICU_CONFIG NETSNMP_CONFIG nspr_inc nspr_lib nspr_libdir nss_inc nss_lib nss_libdir ldapsdk_inc ldapsdk_lib ldapsdk_libdir ldapsdk_bindir db_inc db_incdir db_lib db_libdir db_bindir db_libver sasl_inc sasl_lib sasl_libdir svrcore_inc svrcore_lib icu_lib icu_inc icu_bin netsnmp_inc netsnmp_lib netsnmp_libdir netsnmp_link brand capbrand vendor LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -23177,8 +23177,8 @@ # Shared paths for all layouts # relative to sysconfdir configdir=/$PACKAGE_NAME/config -# relative to sysconfdir -propertydir=/$PACKAGE_NAME/property +# location of property/resource files, relative to datadir +propertydir=/$PACKAGE_NAME/properties # relative to sysconfdir schemadir=/$PACKAGE_NAME/schema # relative to libdir @@ -23228,6 +23228,7 @@ fi +shared_lib_suffix=.so # Deal with platform dependent defines # relative to sysconfdir initdir=/rc.d @@ -23361,6 +23362,7 @@ #define _HPUX_SOURCE 1 _ACEOF + shared_lib_suffix=.sl platform="hpux" ;; sparc-sun-solaris*) @@ -23446,6 +23448,7 @@ + if test "$platform" = "hpux"; then HPUX_TRUE= HPUX_FALSE='#' @@ -25999,6 +26002,7 @@ s,@LIBCSTD@,$LIBCSTD,;t t s,@LIBCRUN@,$LIBCRUN,;t t s,@initdir@,$initdir,;t t +s,@shared_lib_suffix@,$shared_lib_suffix,;t t s,@HPUX_TRUE@,$HPUX_TRUE,;t t s,@HPUX_FALSE@,$HPUX_FALSE,;t t s,@SOLARIS_TRUE@,$SOLARIS_TRUE,;t t Index: Makefile.in =================================================================== RCS file: /cvs/dirsec/ldapserver/Makefile.in,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- Makefile.in 8 Jun 2007 01:09:15 -0000 1.47 +++ Makefile.in 8 Jun 2007 20:36:52 -0000 1.48 @@ -962,7 +962,7 @@ perldir = $(libdir)@perldir@ prefix = @prefix@ program_transform_name = @program_transform_name@ -propertydir = $(sysconfdir)@propertydir@ +propertydir = $(datadir)@propertydir@ sampledatadir = $(datadir)@sampledatadir@ sasl_inc = @sasl_inc@ sasl_lib = @sasl_lib@ @@ -972,6 +972,7 @@ scripttemplatedir = @scripttemplatedir@ serverdir = $(libdir)@serverdir@ serverplugindir = $(libdir)@serverplugindir@ +shared_lib_suffix = @shared_lib_suffix@ sharedstatedir = @sharedstatedir@ svrcore_inc = @svrcore_inc@ svrcore_lib = @svrcore_lib@ @@ -1909,7 +1910,8 @@ @BUNDLE_FALSE@ -e 's,@brand\@,$(brand),g' \ @BUNDLE_FALSE@ -e 's,@capbrand\@,$(capbrand),g' \ @BUNDLE_FALSE@ -e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' \ -@BUNDLE_FALSE@ -e 's,@perldir\@,$(perldir),g' +@BUNDLE_FALSE@ -e 's,@perldir\@,$(perldir),g' \ +@BUNDLE_FALSE@ -e 's,@shared_lib_suffix\@,$(shared_lib_suffix),g' # these are for the config files and scripts that we need to generate and replace @@ -1946,7 +1948,8 @@ @BUNDLE_TRUE@ -e 's,@brand\@,$(brand),g' \ @BUNDLE_TRUE@ -e 's,@capbrand\@,$(capbrand),g' \ @BUNDLE_TRUE@ -e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' \ -@BUNDLE_TRUE@ -e 's,@perldir\@,$(perldir),g' +@BUNDLE_TRUE@ -e 's,@perldir\@,$(perldir),g' \ +@BUNDLE_TRUE@ -e 's,@shared_lib_suffix\@,$(shared_lib_suffix),g' all: $(BUILT_SOURCES) config.h $(MAKE) $(AM_MAKEFLAGS) all-am