[Fedora-directory-commits] ldapserver Makefile.am, 1.60, 1.61 Makefile.in, 1.74, 1.75 configure, 1.69, 1.70 configure.ac, 1.39, 1.40
Nathan Kinder (nkinder)
fedora-directory-commits at redhat.com
Tue Oct 9 18:30:41 UTC 2007
Author: nkinder
Update of /cvs/dirsec/ldapserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27524
Modified Files:
Makefile.am Makefile.in configure configure.ac
Log Message:
Resolves: 325281
Summary: Install SNMP subagent mibs.
Index: Makefile.am
===================================================================
RCS file: /cvs/dirsec/ldapserver/Makefile.am,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- Makefile.am 5 Oct 2007 23:45:49 -0000 1.60
+++ Makefile.am 9 Oct 2007 18:30:38 -0000 1.61
@@ -82,6 +82,7 @@
instconfigdir = @instconfigdir@
perldir = $(libdir)@perldir@
infdir = $(datadir)@infdir@
+mibdir = $(datadir)@mibdir@
defaultuser=@defaultuser@
defaultgroup=@defaultgroup@
@@ -248,6 +249,14 @@
ldap/admin/src/scripts/dscreate.map \
ldap/admin/src/scripts/dsorgentries.map
+mib_DATA = ldap/servers/snmp/RFC-1215.txt \
+ ldap/servers/snmp/SNMPv2-TC.txt \
+ ldap/servers/snmp/redhat-directory.mib \
+ ldap/servers/snmp/SNMPv2-CONF.txt \
+ ldap/servers/snmp/NETWORK-SERVICES-MIB.txt \
+ ldap/servers/snmp/RFC1155-SMI.txt \
+ ldap/servers/snmp/SNMPv2-SMI.txt
+
#////////////////////////////////////////////////////////////////
#
# Server Strings
@@ -1020,6 +1029,7 @@
-e 's, at sysconfdir\@,$(sysconfdir),g' \
-e 's, at localstatedir\@,$(localstatedir),g' \
-e 's, at infdir\@,$(infdir),g' \
+ -e 's, at mibdir\@,$(mibdir),g' \
-e 's, at templatedir\@,$(sampledatadir),g' \
-e 's, at package_name\@,$(PACKAGE_NAME),g' \
-e 's, at instconfigdir\@,$(instconfigdir),g' \
@@ -1068,6 +1078,7 @@
-e 's, at sysconfdir\@,$(sysconfdir),g' \
-e 's, at localstatedir\@,$(localstatedir),g' \
-e 's, at infdir\@,$(infdir),g' \
+ -e 's, at mibdir\@,$(mibdir),g' \
-e 's, at templatedir\@,$(sampledatadir),g' \
-e 's, at package_name\@,$(PACKAGE_NAME),g' \
-e 's, at instconfigdir\@,$(instconfigdir),g' \
Index: Makefile.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/Makefile.in,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- Makefile.in 5 Oct 2007 23:45:49 -0000 1.74
+++ Makefile.in 9 Oct 2007 18:30:38 -0000 1.75
@@ -96,9 +96,9 @@
"$(DESTDIR)$(initdir)" "$(DESTDIR)$(initconfigdir)" \
"$(DESTDIR)$(perldir)" "$(DESTDIR)$(sbindir)" \
"$(DESTDIR)$(taskdir)" "$(DESTDIR)$(configdir)" \
- "$(DESTDIR)$(infdir)" "$(DESTDIR)$(propertydir)" \
- "$(DESTDIR)$(propertydir)" "$(DESTDIR)$(sampledatadir)" \
- "$(DESTDIR)$(schemadir)"
+ "$(DESTDIR)$(infdir)" "$(DESTDIR)$(mibdir)" \
+ "$(DESTDIR)$(propertydir)" "$(DESTDIR)$(propertydir)" \
+ "$(DESTDIR)$(sampledatadir)" "$(DESTDIR)$(schemadir)"
serverLTLIBRARIES_INSTALL = $(INSTALL)
serverpluginLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(server_LTLIBRARIES) $(serverplugin_LTLIBRARIES)
@@ -768,11 +768,12 @@
$(pwdhash_bin_SOURCES) $(rsearch_bin_SOURCES)
configDATA_INSTALL = $(INSTALL_DATA)
infDATA_INSTALL = $(INSTALL_DATA)
+mibDATA_INSTALL = $(INSTALL_DATA)
nodist_propertyDATA_INSTALL = $(INSTALL_DATA)
propertyDATA_INSTALL = $(INSTALL_DATA)
sampledataDATA_INSTALL = $(INSTALL_DATA)
schemaDATA_INSTALL = $(INSTALL_DATA)
-DATA = $(config_DATA) $(inf_DATA) $(nodist_property_DATA) \
+DATA = $(config_DATA) $(inf_DATA) $(mib_DATA) $(nodist_property_DATA) \
$(property_DATA) $(sampledata_DATA) $(schema_DATA)
ETAGS = etags
CTAGS = ctags
@@ -931,6 +932,7 @@
libexecdir = @libexecdir@
localstatedir = @localstatedir@
mandir = @mandir@
+mibdir = $(datadir)@mibdir@
mkdir_p = @mkdir_p@
netsnmp_inc = @netsnmp_inc@
netsnmp_lib = @netsnmp_lib@
@@ -1161,6 +1163,14 @@
ldap/admin/src/scripts/dscreate.map \
ldap/admin/src/scripts/dsorgentries.map
+mib_DATA = ldap/servers/snmp/RFC-1215.txt \
+ ldap/servers/snmp/SNMPv2-TC.txt \
+ ldap/servers/snmp/redhat-directory.mib \
+ ldap/servers/snmp/SNMPv2-CONF.txt \
+ ldap/servers/snmp/NETWORK-SERVICES-MIB.txt \
+ ldap/servers/snmp/RFC1155-SMI.txt \
+ ldap/servers/snmp/SNMPv2-SMI.txt
+
#////////////////////////////////////////////////////////////////
#
@@ -1892,6 +1902,7 @@
@BUNDLE_FALSE@ -e 's, at sysconfdir\@,$(sysconfdir),g' \
@BUNDLE_FALSE@ -e 's, at localstatedir\@,$(localstatedir),g' \
@BUNDLE_FALSE@ -e 's, at infdir\@,$(infdir),g' \
+ at BUNDLE_FALSE@ -e 's, at mibdir\@,$(mibdir),g' \
@BUNDLE_FALSE@ -e 's, at templatedir\@,$(sampledatadir),g' \
@BUNDLE_FALSE@ -e 's, at package_name\@,$(PACKAGE_NAME),g' \
@BUNDLE_FALSE@ -e 's, at instconfigdir\@,$(instconfigdir),g' \
@@ -1950,6 +1961,7 @@
@BUNDLE_TRUE@ -e 's, at sysconfdir\@,$(sysconfdir),g' \
@BUNDLE_TRUE@ -e 's, at localstatedir\@,$(localstatedir),g' \
@BUNDLE_TRUE@ -e 's, at infdir\@,$(infdir),g' \
+ at BUNDLE_TRUE@ -e 's, at mibdir\@,$(mibdir),g' \
@BUNDLE_TRUE@ -e 's, at templatedir\@,$(sampledatadir),g' \
@BUNDLE_TRUE@ -e 's, at package_name\@,$(PACKAGE_NAME),g' \
@BUNDLE_TRUE@ -e 's, at instconfigdir\@,$(instconfigdir),g' \
@@ -8651,6 +8663,23 @@
echo " rm -f '$(DESTDIR)$(infdir)/$$f'"; \
rm -f "$(DESTDIR)$(infdir)/$$f"; \
done
+install-mibDATA: $(mib_DATA)
+ @$(NORMAL_INSTALL)
+ test -z "$(mibdir)" || $(mkdir_p) "$(DESTDIR)$(mibdir)"
+ @list='$(mib_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+ echo " $(mibDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(mibdir)/$$f'"; \
+ $(mibDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(mibdir)/$$f"; \
+ done
+
+uninstall-mibDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(mib_DATA)'; for p in $$list; do \
+ f=$(am__strip_dir) \
+ echo " rm -f '$(DESTDIR)$(mibdir)/$$f'"; \
+ rm -f "$(DESTDIR)$(mibdir)/$$f"; \
+ done
install-nodist_propertyDATA: $(nodist_property_DATA)
@$(NORMAL_INSTALL)
test -z "$(propertydir)" || $(mkdir_p) "$(DESTDIR)$(propertydir)"
@@ -8901,7 +8930,7 @@
all-am: Makefile $(LIBRARIES) $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) \
$(DATA) config.h
installdirs:
- for dir in "$(DESTDIR)$(serverdir)" "$(DESTDIR)$(serverplugindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(initdir)" "$(DESTDIR)$(initconfigdir)" "$(DESTDIR)$(perldir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(taskdir)" "$(DESTDIR)$(configdir)" "$(DESTDIR)$(infdir)" "$(DESTDIR)$(propertydir)" "$(DESTDIR)$(propertydir)" "$(DESTDIR)$(sampledatadir)" "$(DESTDIR)$(schemadir)"; do \
+ for dir in "$(DESTDIR)$(serverdir)" "$(DESTDIR)$(serverplugindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(initdir)" "$(DESTDIR)$(initconfigdir)" "$(DESTDIR)$(perldir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(taskdir)" "$(DESTDIR)$(configdir)" "$(DESTDIR)$(infdir)" "$(DESTDIR)$(mibdir)" "$(DESTDIR)$(propertydir)" "$(DESTDIR)$(propertydir)" "$(DESTDIR)$(sampledatadir)" "$(DESTDIR)$(schemadir)"; do \
test -z "$$dir" || $(mkdir_p) "$$dir"; \
done
install: $(BUILT_SOURCES)
@@ -9026,7 +9055,7 @@
info-am:
install-data-am: install-configDATA install-infDATA \
- install-initSCRIPTS install-initconfigSCRIPTS \
+ install-initSCRIPTS install-initconfigSCRIPTS install-mibDATA \
install-nodist_propertyDATA install-perlSCRIPTS \
install-propertyDATA install-sampledataDATA install-schemaDATA \
install-serverLTLIBRARIES install-serverpluginLTLIBRARIES \
@@ -9064,11 +9093,12 @@
uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS \
uninstall-configDATA uninstall-infDATA uninstall-info-am \
uninstall-initSCRIPTS uninstall-initconfigSCRIPTS \
- uninstall-nodist_propertyDATA uninstall-perlSCRIPTS \
- uninstall-propertyDATA uninstall-sampledataDATA \
- uninstall-sbinPROGRAMS uninstall-sbinSCRIPTS \
- uninstall-schemaDATA uninstall-serverLTLIBRARIES \
- uninstall-serverpluginLTLIBRARIES uninstall-taskSCRIPTS
+ uninstall-mibDATA uninstall-nodist_propertyDATA \
+ uninstall-perlSCRIPTS uninstall-propertyDATA \
+ uninstall-sampledataDATA uninstall-sbinPROGRAMS \
+ uninstall-sbinSCRIPTS uninstall-schemaDATA \
+ uninstall-serverLTLIBRARIES uninstall-serverpluginLTLIBRARIES \
+ uninstall-taskSCRIPTS
.PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \
clean-binPROGRAMS clean-generic clean-libtool \
@@ -9083,9 +9113,10 @@
install-data install-data-am install-exec install-exec-am \
install-infDATA install-info install-info-am \
install-initSCRIPTS install-initconfigSCRIPTS install-man \
- install-nodist_propertyDATA install-perlSCRIPTS \
- install-propertyDATA install-sampledataDATA \
- install-sbinPROGRAMS install-sbinSCRIPTS install-schemaDATA \
+ install-mibDATA install-nodist_propertyDATA \
+ install-perlSCRIPTS install-propertyDATA \
+ install-sampledataDATA install-sbinPROGRAMS \
+ install-sbinSCRIPTS install-schemaDATA \
install-serverLTLIBRARIES install-serverpluginLTLIBRARIES \
install-strip install-taskSCRIPTS installcheck installcheck-am \
installdirs maintainer-clean maintainer-clean-generic \
@@ -9094,11 +9125,12 @@
uninstall-am uninstall-binPROGRAMS uninstall-binSCRIPTS \
uninstall-configDATA uninstall-infDATA uninstall-info-am \
uninstall-initSCRIPTS uninstall-initconfigSCRIPTS \
- uninstall-nodist_propertyDATA uninstall-perlSCRIPTS \
- uninstall-propertyDATA uninstall-sampledataDATA \
- uninstall-sbinPROGRAMS uninstall-sbinSCRIPTS \
- uninstall-schemaDATA uninstall-serverLTLIBRARIES \
- uninstall-serverpluginLTLIBRARIES uninstall-taskSCRIPTS
+ uninstall-mibDATA uninstall-nodist_propertyDATA \
+ uninstall-perlSCRIPTS uninstall-propertyDATA \
+ uninstall-sampledataDATA uninstall-sbinPROGRAMS \
+ uninstall-sbinSCRIPTS uninstall-schemaDATA \
+ uninstall-serverLTLIBRARIES uninstall-serverpluginLTLIBRARIES \
+ uninstall-taskSCRIPTS
dirver.h: Makefile
Index: configure
===================================================================
RCS file: /cvs/dirsec/ldapserver/configure,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- configure 5 Oct 2007 23:45:49 -0000 1.69
+++ configure 9 Oct 2007 18:30:39 -0000 1.70
@@ -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 with_fhs_opt configdir sampledatadir propertydir schemadir serverdir serverplugindir scripttemplatedir perldir infdir defaultuser defaultgroup instconfigdir WINNT_TRUE WINNT_FALSE LIBSOCKET LIBNSL LIBDL LIBCSTD LIBCRUN initdir perlexec initconfigdir HPUX_TRUE HPUX_FALSE SOLARIS_TRUE SOLARIS_FALSE PKG_CONFIG ICU_CONFIG NETSNMP_CONFIG PACKAGE_BASE_VERSION 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 sasl_path 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 with_fhs_opt configdir sampledatadir propertydir schemadir serverdir serverplugindir scripttemplatedir perldir infdir mibdir defaultuser defaultgroup instconfigdir WINNT_TRUE WINNT_FALSE LIBSOCKET LIBNSL LIBDL LIBCSTD LIBCRUN initdir perlexec initconfigdir HPUX_TRUE HPUX_FALSE SOLARIS_TRUE SOLARIS_FALSE PKG_CONFIG ICU_CONFIG NETSNMP_CONFIG PACKAGE_BASE_VERSION 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 sasl_path 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.
@@ -23160,6 +23160,8 @@
serverplugindir=/plugins
# relative to datadir
infdir=/inf
+ # relative to datadir
+ mibdir=/mibs
# location of property/resource files, relative to datadir
propertydir=/properties
# relative to libdir
@@ -23182,6 +23184,8 @@
serverplugindir=/$PACKAGE_NAME/plugins
# relative to datadir
infdir=/$PACKAGE_NAME/inf
+ # relative to datadir
+ mibdir=/$PACKAGE_NAME/mibs
# location of property/resource files, relative to datadir
propertydir=/$PACKAGE_NAME/properties
# relative to libdir
@@ -23211,6 +23215,7 @@
+
# check for --with-instconfigdir
echo "$as_me:$LINENO: checking for --with-instconfigdir" >&5
echo $ECHO_N "checking for --with-instconfigdir... $ECHO_C" >&6
@@ -26079,6 +26084,7 @@
s, at scripttemplatedir@,$scripttemplatedir,;t t
s, at perldir@,$perldir,;t t
s, at infdir@,$infdir,;t t
+s, at mibdir@,$mibdir,;t t
s, at defaultuser@,$defaultuser,;t t
s, at defaultgroup@,$defaultgroup,;t t
s, at instconfigdir@,$instconfigdir,;t t
Index: configure.ac
===================================================================
RCS file: /cvs/dirsec/ldapserver/configure.ac,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- configure.ac 5 Oct 2007 23:45:49 -0000 1.39
+++ configure.ac 9 Oct 2007 18:30:39 -0000 1.40
@@ -165,6 +165,8 @@
serverplugindir=/plugins
# relative to datadir
infdir=/inf
+ # relative to datadir
+ mibdir=/mibs
# location of property/resource files, relative to datadir
propertydir=/properties
# relative to libdir
@@ -189,6 +191,8 @@
serverplugindir=/$PACKAGE_NAME/plugins
# relative to datadir
infdir=/$PACKAGE_NAME/inf
+ # relative to datadir
+ mibdir=/$PACKAGE_NAME/mibs
# location of property/resource files, relative to datadir
propertydir=/$PACKAGE_NAME/properties
# relative to libdir
@@ -214,6 +218,7 @@
AC_SUBST(scripttemplatedir)
AC_SUBST(perldir)
AC_SUBST(infdir)
+AC_SUBST(mibdir)
AC_SUBST(defaultuser)
AC_SUBST(defaultgroup)
More information about the Fedora-directory-commits
mailing list