October 2006 - 389-commits - Fedora Mailing-Lists

[Fedora-directory-commits] ldapserver/m4 db.m4, 1.1, 1.2 mozldap.m4, 1.2, 1.3 netsnmp.m4, 1.1, 1.2 nspr.m4, 1.2, 1.3 nss.m4, 1.2, 1.3 sasl.m4, 1.1, 1.2

by Doctor Conrad

Author: nkinder Update of /cvs/dirsec/ldapserver/m4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20714/m4 Modified Files: db.m4 mozldap.m4 netsnmp.m4 nspr.m4 nss.m4 sasl.m4 Log Message: Resolves: 212038 Make configure create program wrapper scripts. Index: db.m4 =================================================================== RCS file: /cvs/dirsec/ldapserver/m4/db.m4,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- db.m4 17 Oct 2006 17:07:14 -0000 1.1 +++ db.m4 24 Oct 2006 21:11:01 -0000 1.2 @@ -38,6 +38,7 @@ dnl - check the user provided location DBDIR=$withval db_lib="-L$DBDIR/lib" + db_libdir="$DBDIR/lib" db_incdir="$DBDIR/include" if ! test -e "$db_incdir/db.h" ; then AC_MSG_ERROR([$withval include dir not found]) Index: mozldap.m4 =================================================================== RCS file: /cvs/dirsec/ldapserver/m4/mozldap.m4,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- mozldap.m4 19 Oct 2006 16:53:05 -0000 1.2 +++ mozldap.m4 24 Oct 2006 21:11:02 -0000 1.3 @@ -30,6 +30,7 @@ LDAPSDKDIR=$withval ldapsdk_inc="-I$LDAPSDKDIR/include" ldapsdk_lib="-L$LDAPSDKDIR/lib" + ldapsdk_libdir="$LDAPSDKDIR/lib" else echo AC_MSG_ERROR([$withval not found]) @@ -60,6 +61,7 @@ then AC_MSG_RESULT([using $withval]) ldapsdk_lib="-L$withval" + ldapsdk_libdir="$withval" else echo AC_MSG_ERROR([$withval not found]) @@ -70,13 +72,14 @@ # if LDAPSDK is not found yet, try pkg-config # last resort -if test -z "$ldapsdk_inc" -o -z "$ldapsdk_lib"; then +if test -z "$ldapsdk_inc" -o -z "$ldapsdk_lib" -o -z "$ldapsdk_libdir"; then AC_MSG_CHECKING(for mozldap with pkg-config) AC_PATH_PROG(PKG_CONFIG, pkg-config) if test -n "$PKG_CONFIG"; then if $PKG_CONFIG --exists mozldap6; then ldapsdk_inc=`$PKG_CONFIG --cflags-only-I mozldap6` ldapsdk_lib=`$PKG_CONFIG --libs-only-L mozldap6` + ldapsdk_libdir=`$PKG_CONFIG --libs-only-L mozldap6 | sed -e s/-L// | sed -e s/\ *$//` AC_MSG_RESULT([using system mozldap6]) else AC_MSG_ERROR([LDAPSDK not found, specify with --with-ldapsdk[-inc|-lib].]) Index: netsnmp.m4 =================================================================== RCS file: /cvs/dirsec/ldapserver/m4/netsnmp.m4,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- netsnmp.m4 17 Oct 2006 17:07:14 -0000 1.1 +++ netsnmp.m4 24 Oct 2006 21:11:02 -0000 1.2 @@ -35,6 +35,7 @@ fi netsnmp_lib="-L$withval/lib" + netsnmp_libdir="$withval/lib" else AC_MSG_RESULT(yes) AC_MSG_ERROR([$withval not found]) @@ -64,6 +65,7 @@ then AC_MSG_RESULT([using $withval]) netsnmp_lib="-L$withval" + netsnmp_libdir="$withval" else echo AC_MSG_ERROR([$withval not found]) Index: nspr.m4 =================================================================== RCS file: /cvs/dirsec/ldapserver/m4/nspr.m4,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- nspr.m4 19 Oct 2006 16:53:05 -0000 1.2 +++ nspr.m4 24 Oct 2006 21:11:02 -0000 1.3 @@ -30,6 +30,7 @@ NSPRDIR=$withval nspr_inc="-I$NSPRDIR/include" nspr_lib="-L$NSPRDIR/lib" + nspr_libdir="$NSPRDIR/lib" else echo AC_MSG_ERROR([$withval not found]) @@ -60,6 +61,7 @@ then AC_MSG_RESULT([using $withval]) nspr_lib="-L$withval" + nspr_libdir="$withval" else echo AC_MSG_ERROR([$withval not found]) @@ -70,17 +72,19 @@ # if NSPR is not found yet, try pkg-config # last resort -if test -z "$nspr_inc" -o -z "$nspr_lib"; then +if test -z "$nspr_inc" -o -z "$nspr_lib" -o -z "$nspr_libdir"; then AC_MSG_CHECKING(for nspr with pkg-config) AC_PATH_PROG(PKG_CONFIG, pkg-config) if test -n "$PKG_CONFIG"; then if $PKG_CONFIG --exists nspr; then nspr_inc=`$PKG_CONFIG --cflags-only-I nspr` nspr_lib=`$PKG_CONFIG --libs-only-L nspr` + nspr_libdir=`$PKG_CONFIG --libs-only-L nspr | sed -e s/-L// | sed -e s/\ *$//` AC_MSG_RESULT([using system NSPR]) elif $PKG_CONFIG --exists dirsec-nspr; then nspr_inc=`$PKG_CONFIG --cflags-only-I dirsec-nspr` nspr_lib=`$PKG_CONFIG --libs-only-L dirsec-nspr` + nspr_libdir=`$PKG_CONFIG --libs-only-L dirsec-nspr | sed -e s/-L// | sed -e s/\ *$//` AC_MSG_RESULT([using system dirsec NSPR]) else AC_MSG_ERROR([NSPR not found, specify with --with-nspr.]) Index: nss.m4 =================================================================== RCS file: /cvs/dirsec/ldapserver/m4/nss.m4,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- nss.m4 19 Oct 2006 16:53:05 -0000 1.2 +++ nss.m4 24 Oct 2006 21:11:02 -0000 1.3 @@ -30,6 +30,7 @@ NSSDIR=$withval nss_inc="-I$NSSDIR/include" nss_lib="-L$NSSDIR/lib" + nss_libdir="$NSSDIR/lib" else echo AC_MSG_ERROR([$withval not found]) @@ -60,6 +61,7 @@ then AC_MSG_RESULT([using $withval]) nss_lib="-L$withval" + nss_libdir="$withval" else echo AC_MSG_ERROR([$withval not found]) @@ -70,17 +72,19 @@ # if NSS is not found yet, try pkg-config # last resort -if test -z "$nss_inc" -o -z "$nss_lib"; then +if test -z "$nss_inc" -o -z "$nss_lib" -o -z "$nss_libdir"; then AC_MSG_CHECKING(for nss with pkg-config) AC_PATH_PROG(PKG_CONFIG, pkg-config) if test -n "$PKG_CONFIG"; then if $PKG_CONFIG --exists nss; then nss_inc=`$PKG_CONFIG --cflags-only-I nss` nss_lib=`$PKG_CONFIG --libs-only-L nss` + nss_libdir=`$PKG_CONFIG --libs-only-L nss | sed -e s/-L// | sed -e s/\ *$//` AC_MSG_RESULT([using system NSS]) elif $PKG_CONFIG --exists dirsec-nss; then nss_inc=`$PKG_CONFIG --cflags-only-I dirsec-nss` nss_lib=`$PKG_CONFIG --libs-only-L dirsec-nss` + nss_libdir=`$PKG_CONFIG --libs-only-L dirsec-nss | sed -e s/-L// | sed -e s/\ *$//` AC_MSG_RESULT([using system dirsec NSS]) else AC_MSG_ERROR([NSS not found, specify with --with-nss.]) Index: sasl.m4 =================================================================== RCS file: /cvs/dirsec/ldapserver/m4/sasl.m4,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sasl.m4 17 Oct 2006 17:07:14 -0000 1.1 +++ sasl.m4 24 Oct 2006 21:11:02 -0000 1.2 @@ -42,6 +42,7 @@ fi sasl_lib="-L$withval/lib" + sasl_libdir="$withval/lib" else AC_MSG_RESULT(yes) AC_MSG_ERROR([sasl not found in $withval]) @@ -70,6 +71,7 @@ if test -d "$withval"; then AC_MSG_RESULT([using $withval]) sasl_lib="-L$withval" + sasl_libdir="$withval" else echo AC_MSG_ERROR([$withval not found])

17 years, 6 months

1
0
0 / 0

[Fedora-directory-commits] ldapserver Makefile.am, 1.6, 1.7 Makefile.in, 1.6, 1.7 configure, 1.3, 1.4 configure.ac, 1.2, 1.3

by Doctor Conrad

Author: nkinder Update of /cvs/dirsec/ldapserver In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20714 Modified Files: Makefile.am Makefile.in configure configure.ac Log Message: Resolves: 212038 Make configure create program wrapper scripts. Index: Makefile.am =================================================================== RCS file: /cvs/dirsec/ldapserver/Makefile.am,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- Makefile.am 23 Oct 2006 18:31:38 -0000 1.6 +++ Makefile.am 24 Oct 2006 21:11:01 -0000 1.7 @@ -44,13 +44,13 @@ #------------------------ # Install Paths #------------------------ -bindir = @prefix@/usr/bin -configdir = @sysconfdir@/$(PACKAGE)/config -datadir = @prefix@/usr/share/$(PACKAGE)/data -propertydir = @sysconfdir@/$(PACKAGE)/property -schemadir = @sysconfdir@/$(PACKAGE)/schema -serverdir = @prefix@/usr/lib/$(PACKAGE) -serverplugindir = @prefix@/usr/lib/$(PACKAGE)/plugins +bindir = @prefix@@bindir@ +configdir = @sysconfdir@@configdir@ +datadir = @prefix@@datadir@ +propertydir = @sysconfdir@@propertydir@ +schemadir = @sysconfdir@@schemadir@ +serverdir = @prefix@@serverdir@ +serverplugindir = @prefix@@serverplugindir@ #------------------------ # Build Products @@ -113,7 +113,19 @@ $(srcdir)/ldap/schema/60pam-plugin.ldif \ $(srcdir)/ldap/schema/99user.ldif -bin_SCRIPTS = $(srcdir)/ldap/servers/slapd/tools/rsearch/scripts/dbgen.pl +bin_SCRIPTS = $(srcdir)/ldap/servers/slapd/tools/rsearch/scripts/dbgen.pl \ + wrappers/infadd \ + wrappers/ldclt \ + wrappers/rsearch + +server_SCRIPTS = wrappers/dbscan \ + wrappers/dsktune \ + wrappers/ds_newinst \ + wrappers/ldap-agent \ + wrappers/ldif \ + wrappers/migratecred \ + wrappers/mmldif \ + wrappers/pwdhash #//////////////////////////////////////////////////////////////// Index: Makefile.in =================================================================== RCS file: /cvs/dirsec/ldapserver/Makefile.in,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- Makefile.in 23 Oct 2006 18:31:38 -0000 1.6 +++ Makefile.in 24 Oct 2006 21:11:01 -0000 1.7 @@ -51,8 +51,18 @@ noinst_PROGRAMS = makstrdb$(EXEEXT) @SOLARIS_TRUE@am__append_1 = ldap/servers/slapd/tools/ldclt/opCheck.c DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(top_srcdir)/configure compile \ - config.guess config.sub depcomp install-sh ltmain.sh missing + $(srcdir)/Makefile.in $(top_srcdir)/configure \ + $(top_srcdir)/wrappers/dbscan.in \ + $(top_srcdir)/wrappers/ds_newinst.in \ + $(top_srcdir)/wrappers/dsktune.in \ + $(top_srcdir)/wrappers/infadd.in \ + $(top_srcdir)/wrappers/ldap-agent.in \ + $(top_srcdir)/wrappers/ldclt.in $(top_srcdir)/wrappers/ldif.in \ + $(top_srcdir)/wrappers/migratecred.in \ + $(top_srcdir)/wrappers/mmldif.in \ + $(top_srcdir)/wrappers/pwdhash.in \ + $(top_srcdir)/wrappers/rsearch.in 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/nspr.m4 $(top_srcdir)/m4/nss.m4 \ @@ -65,7 +75,10 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ configure.lineno configure.status.lineno mkinstalldirs = $(install_sh) -d -CONFIG_CLEAN_FILES = +CONFIG_CLEAN_FILES = wrappers/dbscan wrappers/dsktune \ + wrappers/ds_newinst wrappers/infadd wrappers/ldap-agent \ + wrappers/ldclt wrappers/ldif wrappers/migratecred \ + wrappers/mmldif wrappers/pwdhash wrappers/rsearch LIBRARIES = $(noinst_LIBRARIES) ARFLAGS = cru libavl_a_AR = $(AR) $(ARFLAGS) @@ -94,8 +107,9 @@ am__installdirs = "$(DESTDIR)$(serverdir)" \ "$(DESTDIR)$(serverplugindir)" "$(DESTDIR)$(bindir)" \ "$(DESTDIR)$(serverdir)" "$(DESTDIR)$(bindir)" \ - "$(DESTDIR)$(configdir)" "$(DESTDIR)$(datadir)" \ - "$(DESTDIR)$(propertydir)" "$(DESTDIR)$(schemadir)" + "$(DESTDIR)$(serverdir)" "$(DESTDIR)$(configdir)" \ + "$(DESTDIR)$(datadir)" "$(DESTDIR)$(propertydir)" \ + "$(DESTDIR)$(schemadir)" serverLTLIBRARIES_INSTALL = $(INSTALL) serverpluginLTLIBRARIES_INSTALL = $(INSTALL) LTLIBRARIES = $(server_LTLIBRARIES) $(serverplugin_LTLIBRARIES) @@ -664,7 +678,8 @@ rsearch_bin_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) binSCRIPT_INSTALL = $(INSTALL_SCRIPT) -SCRIPTS = $(bin_SCRIPTS) +serverSCRIPT_INSTALL = $(INSTALL_SCRIPT) +SCRIPTS = $(bin_SCRIPTS) $(server_SCRIPTS) DEFAULT_INCLUDES = -I. -I$(srcdir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -830,16 +845,18 @@ #------------------------ # Install Paths #------------------------ -bindir = @prefix@/usr/bin +bindir = @prefix@@bindir@ build = @build@ build_alias = @build_alias@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ -datadir = @prefix@/usr/share/$(PACKAGE)/data +configdir = @sysconfdir@@configdir@ +datadir = @prefix@@datadir@ db_inc = @db_inc@ db_incdir = @db_incdir@ db_lib = @db_lib@ +db_libdir = @db_libdir@ debug_defs = @debug_defs@ exec_prefix = @exec_prefix@ host = @host@ @@ -855,6 +872,7 @@ install_sh = @install_sh@ ldapsdk_inc = @ldapsdk_inc@ ldapsdk_lib = @ldapsdk_lib@ +ldapsdk_libdir = @ldapsdk_libdir@ libdir = @libdir@ libexecdir = @libexecdir@ localstatedir = @localstatedir@ @@ -862,18 +880,26 @@ mkdir_p = @mkdir_p@ netsnmp_inc = @netsnmp_inc@ netsnmp_lib = @netsnmp_lib@ +netsnmp_libdir = @netsnmp_libdir@ netsnmp_link = @netsnmp_link@ nspr_inc = @nspr_inc@ nspr_lib = @nspr_lib@ +nspr_libdir = @nspr_libdir@ nss_inc = @nss_inc@ nss_lib = @nss_lib@ +nss_libdir = @nss_libdir@ oldincludedir = @oldincludedir@ platform_defs = @platform_defs@ prefix = @prefix@ program_transform_name = @program_transform_name@ +propertydir = @sysconfdir@@propertydir@ sasl_inc = @sasl_inc@ sasl_lib = @sasl_lib@ +sasl_libdir = @sasl_libdir@ sbindir = @sbindir@ +schemadir = @sysconfdir@@schemadir@ +serverdir = @prefix@@serverdir@ +serverplugindir = @prefix@@serverplugindir@ sharedstatedir = @sharedstatedir@ svrcore_inc = @svrcore_inc@ svrcore_lib = @svrcore_lib@ @@ -916,11 +942,6 @@ #------------------------ BUILT_SOURCES = dirver.h dberrstrs.h CLEANFILES = dirver.h dberrstrs.h ns-slapd.properties -configdir = @sysconfdir@/$(PACKAGE)/config -propertydir = @sysconfdir@/$(PACKAGE)/property -schemadir = @sysconfdir@/$(PACKAGE)/schema -serverdir = @prefix@/usr/lib/$(PACKAGE) -serverplugindir = @prefix@/usr/lib/$(PACKAGE)/plugins server_LTLIBRARIES = libslapd.la libback-ldbm.la libds_admin.la libns-dshttpd.la serverplugin_LTLIBRARIES = libacl-plugin.la libattr-unique-plugin.la libchainingdb-plugin.la \ libcos-plugin.la libdes-plugin.la libdistrib-plugin.la \ @@ -970,7 +991,20 @@ $(srcdir)/ldap/schema/60pam-plugin.ldif \ $(srcdir)/ldap/schema/99user.ldif -bin_SCRIPTS = $(srcdir)/ldap/servers/slapd/tools/rsearch/scripts/dbgen.pl +bin_SCRIPTS = $(srcdir)/ldap/servers/slapd/tools/rsearch/scripts/dbgen.pl \ + wrappers/infadd \ + wrappers/ldclt \ + wrappers/rsearch + +server_SCRIPTS = wrappers/dbscan \ + wrappers/dsktune \ + wrappers/ds_newinst \ + wrappers/ldap-agent \ + wrappers/ldif \ + wrappers/migratecred \ + wrappers/mmldif \ + wrappers/pwdhash + #//////////////////////////////////////////////////////////////// # @@ -1708,6 +1742,28 @@ cd $(srcdir) && $(AUTOCONF) $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) +wrappers/dbscan: $(top_builddir)/config.status $(top_srcdir)/wrappers/dbscan.in + cd $(top_builddir) && $(SHELL) ./config.status $@ +wrappers/dsktune: $(top_builddir)/config.status $(top_srcdir)/wrappers/dsktune.in + cd $(top_builddir) && $(SHELL) ./config.status $@ +wrappers/ds_newinst: $(top_builddir)/config.status $(top_srcdir)/wrappers/ds_newinst.in + cd $(top_builddir) && $(SHELL) ./config.status $@ +wrappers/infadd: $(top_builddir)/config.status $(top_srcdir)/wrappers/infadd.in + cd $(top_builddir) && $(SHELL) ./config.status $@ +wrappers/ldap-agent: $(top_builddir)/config.status $(top_srcdir)/wrappers/ldap-agent.in + cd $(top_builddir) && $(SHELL) ./config.status $@ +wrappers/ldclt: $(top_builddir)/config.status $(top_srcdir)/wrappers/ldclt.in + cd $(top_builddir) && $(SHELL) ./config.status $@ +wrappers/ldif: $(top_builddir)/config.status $(top_srcdir)/wrappers/ldif.in + cd $(top_builddir) && $(SHELL) ./config.status $@ +wrappers/migratecred: $(top_builddir)/config.status $(top_srcdir)/wrappers/migratecred.in + cd $(top_builddir) && $(SHELL) ./config.status $@ +wrappers/mmldif: $(top_builddir)/config.status $(top_srcdir)/wrappers/mmldif.in + cd $(top_builddir) && $(SHELL) ./config.status $@ +wrappers/pwdhash: $(top_builddir)/config.status $(top_srcdir)/wrappers/pwdhash.in + cd $(top_builddir) && $(SHELL) ./config.status $@ +wrappers/rsearch: $(top_builddir)/config.status $(top_srcdir)/wrappers/rsearch.in + cd $(top_builddir) && $(SHELL) ./config.status $@ clean-noinstLIBRARIES: -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) @@ -3444,6 +3500,25 @@ echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ rm -f "$(DESTDIR)$(bindir)/$$f"; \ done +install-serverSCRIPTS: $(server_SCRIPTS) + @$(NORMAL_INSTALL) + test -z "$(serverdir)" || $(mkdir_p) "$(DESTDIR)$(serverdir)" + @list='$(server_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 " $(serverSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(serverdir)/$$f'"; \ + $(serverSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(serverdir)/$$f"; \ + else :; fi; \ + done + +uninstall-serverSCRIPTS: + @$(NORMAL_UNINSTALL) + @list='$(server_SCRIPTS)'; for p in $$list; do \ + f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ + echo " rm -f '$(DESTDIR)$(serverdir)/$$f'"; \ + rm -f "$(DESTDIR)$(serverdir)/$$f"; \ + done mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -8488,7 +8563,7 @@ distdir: $(DISTFILES) $(am__remove_distdir) mkdir $(distdir) - $(mkdir_p) $(distdir)/m4 + $(mkdir_p) $(distdir)/m4 $(distdir)/wrappers @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ list='$(DISTFILES)'; for file in $$list; do \ @@ -8618,7 +8693,7 @@ all-am: Makefile $(LIBRARIES) $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) \ $(DATA) installdirs: - for dir in "$(DESTDIR)$(serverdir)" "$(DESTDIR)$(serverplugindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(serverdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(configdir)" "$(DESTDIR)$(datadir)" "$(DESTDIR)$(propertydir)" "$(DESTDIR)$(schemadir)"; do \ + for dir in "$(DESTDIR)$(serverdir)" "$(DESTDIR)$(serverplugindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(serverdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(serverdir)" "$(DESTDIR)$(configdir)" "$(DESTDIR)$(datadir)" "$(DESTDIR)$(propertydir)" "$(DESTDIR)$(schemadir)"; do \ test -z "$$dir" || $(mkdir_p) "$$dir"; \ done install: $(BUILT_SOURCES) @@ -8745,7 +8820,7 @@ install-data-am: install-configDATA install-dataDATA \ install-nodist_propertyDATA install-schemaDATA \ install-serverLTLIBRARIES install-serverPROGRAMS \ - install-serverpluginLTLIBRARIES + install-serverSCRIPTS install-serverpluginLTLIBRARIES install-exec-am: install-binPROGRAMS install-binSCRIPTS @@ -8779,7 +8854,7 @@ uninstall-configDATA uninstall-dataDATA uninstall-info-am \ uninstall-nodist_propertyDATA uninstall-schemaDATA \ uninstall-serverLTLIBRARIES uninstall-serverPROGRAMS \ - uninstall-serverpluginLTLIBRARIES + uninstall-serverSCRIPTS uninstall-serverpluginLTLIBRARIES .PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \ clean-binPROGRAMS clean-generic clean-libtool \ @@ -8795,15 +8870,16 @@ install-exec-am install-info install-info-am install-man \ install-nodist_propertyDATA install-schemaDATA \ install-serverLTLIBRARIES install-serverPROGRAMS \ - install-serverpluginLTLIBRARIES 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-binPROGRAMS \ - uninstall-binSCRIPTS uninstall-configDATA uninstall-dataDATA \ - uninstall-info-am uninstall-nodist_propertyDATA \ - uninstall-schemaDATA uninstall-serverLTLIBRARIES \ - uninstall-serverPROGRAMS uninstall-serverpluginLTLIBRARIES + install-serverSCRIPTS install-serverpluginLTLIBRARIES \ + 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-binPROGRAMS uninstall-binSCRIPTS \ + uninstall-configDATA uninstall-dataDATA uninstall-info-am \ + uninstall-nodist_propertyDATA uninstall-schemaDATA \ + uninstall-serverLTLIBRARIES uninstall-serverPROGRAMS \ + uninstall-serverSCRIPTS uninstall-serverpluginLTLIBRARIES dirver.h: Makefile Index: configure =================================================================== RCS file: /cvs/dirsec/ldapserver/configure,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- configure 19 Oct 2006 16:53:04 -0000 1.3 +++ configure 24 Oct 2006 21:11:01 -0000 1.4 @@ -464,8 +464,8 @@ # include <unistd.h> #endif" -ac_default_prefix="/opt/\$(PACKAGE)" -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 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 EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBOBJS platfor! m_defs SOLARIS_TRUE SOLARIS_FALSE debug_defs PKG_CONFIG ICU_CONFIG NETSNMP_CONFIG nspr_inc nspr_lib nss_inc nss_lib ldapsdk_inc ldapsdk_lib db_inc db_incdir db_lib sasl_inc sasl_lib svrcore_inc svrcore_lib icu_lib icu_inc icu_bin netsnmp_inc netsnmp_lib netsnmp_link WINNT_TRUE WINNT_FALSE LTLIBOBJS' +ac_default_prefix=/opt/fedora-ds +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 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 EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBOBJS platfor! m_defs SOLARIS_TRUE SOLARIS_FALSE debug_defs PKG_CONFIG ICU_CONFIG NETSNMP_CONFIG nspr_inc nspr_lib nspr_libdir nss_inc nss_lib nss_libdir ldapsdk_inc ldapsdk_lib ldapsdk_libdir db_inc db_incdir db_lib db_libdir sasl_inc sasl_lib sasl_libdir svrcore_inc svrcore_lib icu_lib icu_inc icu_bin netsnmp_inc netsnmp_lib netsnmp_libdir netsnmp_link configdir propertydir schemadir serverdir serverplugindir WINNT_TRUE WINNT_FALSE LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -1046,7 +1046,6 @@ both] --with-tags[=TAGS] include additional configurations [automatic] - --with-brand=PATH Specify branding (fedora or redhat) --with-nspr=PATH Netscape Portable Runtime (NSPR) directory --with-nspr-inc=PATH Netscape Portable Runtime (NSPR) include file directory --with-nspr-lib=PATH Netscape Portable Runtime (NSPR) library directory @@ -4252,7 +4251,7 @@ ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 4255 "configure"' > conftest.$ac_ext + echo '#line 4254 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -5360,7 +5359,7 @@ # Provide some information about the compiler. -echo "$as_me:5363:" \ +echo "$as_me:5362:" \ "checking for Fortran 77 compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` { (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5 @@ -6394,11 +6393,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6397: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6396: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6401: \$? = $ac_status" >&5 + echo "$as_me:6400: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -6627,11 +6626,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6630: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6629: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6634: \$? = $ac_status" >&5 + echo "$as_me:6633: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -6687,11 +6686,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6690: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6689: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:6694: \$? = $ac_status" >&5 + echo "$as_me:6693: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -8021,7 +8020,7 @@ libsuff= case "$host_cpu" in x86_64*|s390x*|powerpc64*) - echo '#line 8024 "configure"' > conftest.$ac_ext + echo '#line 8023 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -8892,7 +8891,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 8895 "configure" +#line 8894 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -8990,7 +8989,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 8993 "configure" +#line 8992 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11169,11 +11168,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:11172: $lt_compile\"" >&5) + (eval echo "\"\$as_me:11171: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:11176: \$? = $ac_status" >&5 + echo "$as_me:11175: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -11229,11 +11228,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:11232: $lt_compile\"" >&5) + (eval echo "\"\$as_me:11231: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:11236: \$? = $ac_status" >&5 + echo "$as_me:11235: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -11740,7 +11739,7 @@ libsuff= case "$host_cpu" in x86_64*|s390x*|powerpc64*) - echo '#line 11743 "configure"' > conftest.$ac_ext + echo '#line 11742 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -12611,7 +12610,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 12614 "configure" +#line 12613 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12709,7 +12708,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 12712 "configure" +#line 12711 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13536,11 +13535,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13539: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13538: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:13543: \$? = $ac_status" >&5 + echo "$as_me:13542: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -13596,11 +13595,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13599: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13598: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:13603: \$? = $ac_status" >&5 + echo "$as_me:13602: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -14910,7 +14909,7 @@ libsuff= case "$host_cpu" in x86_64*|s390x*|powerpc64*) - echo '#line 14913 "configure"' > conftest.$ac_ext + echo '#line 14912 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -15651,11 +15650,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15654: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15653: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15658: \$? = $ac_status" >&5 + echo "$as_me:15657: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -15884,11 +15883,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15887: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15886: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15891: \$? = $ac_status" >&5 + echo "$as_me:15890: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -15944,11 +15943,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15947: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15946: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:15951: \$? = $ac_status" >&5 + echo "$as_me:15950: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -17278,7 +17277,7 @@ libsuff= case "$host_cpu" in x86_64*|s390x*|powerpc64*) - echo '#line 17281 "configure"' > conftest.$ac_ext + echo '#line 17280 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -18149,7 +18148,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 18152 "configure" +#line 18151 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -18247,7 +18246,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 18250 "configure" +#line 18249 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -23400,26 +23399,6 @@ fi; -BRAND=fedora -echo "$as_me:$LINENO: checking for --with-brand" >&5 -echo $ECHO_N "checking for --with-brand... $ECHO_C" >&6 - -# Check whether --with-brand or --without-brand was given. -if test "${with_brand+set}" = set; then - withval="$with_brand" - - if test "$withval" - then - echo "$as_me:$LINENO: result: using $withval" >&5 -echo "${ECHO_T}using $withval" >&6 - BRAND="$withval" - fi - -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi; -PKGNAME=$BRAND-ds # Check for library dependencies @@ -23461,6 +23440,7 @@ NSPRDIR=$withval nspr_inc="-I$NSPRDIR/include" nspr_lib="-L$NSPRDIR/lib" + nspr_libdir="$NSPRDIR/lib" else echo { { echo "$as_me:$LINENO: error: $withval not found" >&5 @@ -23511,6 +23491,7 @@ echo "$as_me:$LINENO: result: using $withval" >&5 echo "${ECHO_T}using $withval" >&6 nspr_lib="-L$withval" + nspr_libdir="$withval" else echo { { echo "$as_me:$LINENO: error: $withval not found" >&5 @@ -23526,7 +23507,7 @@ # if NSPR is not found yet, try pkg-config # last resort -if test -z "$nspr_inc" -o -z "$nspr_lib"; then +if test -z "$nspr_inc" -o -z "$nspr_lib" -o -z "$nspr_libdir"; then echo "$as_me:$LINENO: checking for nspr with pkg-config" >&5 echo $ECHO_N "checking for nspr with pkg-config... $ECHO_C" >&6 # Extract the first word of "pkg-config", so it can be a program name with args. @@ -23572,11 +23553,13 @@ if $PKG_CONFIG --exists nspr; then nspr_inc=`$PKG_CONFIG --cflags-only-I nspr` nspr_lib=`$PKG_CONFIG --libs-only-L nspr` + nspr_libdir=`$PKG_CONFIG --libs-only-L nspr | sed -e s/-L// | sed -e s/\ *$//` echo "$as_me:$LINENO: result: using system NSPR" >&5 echo "${ECHO_T}using system NSPR" >&6 elif $PKG_CONFIG --exists dirsec-nspr; then nspr_inc=`$PKG_CONFIG --cflags-only-I dirsec-nspr` nspr_lib=`$PKG_CONFIG --libs-only-L dirsec-nspr` + nspr_libdir=`$PKG_CONFIG --libs-only-L dirsec-nspr | sed -e s/-L// | sed -e s/\ *$//` echo "$as_me:$LINENO: result: using system dirsec NSPR" >&5 echo "${ECHO_T}using system dirsec NSPR" >&6 else @@ -23625,6 +23608,7 @@ NSSDIR=$withval nss_inc="-I$NSSDIR/include" nss_lib="-L$NSSDIR/lib" + nss_libdir="$NSSDIR/lib" else echo { { echo "$as_me:$LINENO: error: $withval not found" >&5 @@ -23675,6 +23659,7 @@ echo "$as_me:$LINENO: result: using $withval" >&5 echo "${ECHO_T}using $withval" >&6 nss_lib="-L$withval" + nss_libdir="$withval" else echo { { echo "$as_me:$LINENO: error: $withval not found" >&5 @@ -23690,7 +23675,7 @@ # if NSS is not found yet, try pkg-config # last resort -if test -z "$nss_inc" -o -z "$nss_lib"; then +if test -z "$nss_inc" -o -z "$nss_lib" -o -z "$nss_libdir"; then echo "$as_me:$LINENO: checking for nss with pkg-config" >&5 echo $ECHO_N "checking for nss with pkg-config... $ECHO_C" >&6 # Extract the first word of "pkg-config", so it can be a program name with args. @@ -23736,11 +23721,13 @@ if $PKG_CONFIG --exists nss; then nss_inc=`$PKG_CONFIG --cflags-only-I nss` nss_lib=`$PKG_CONFIG --libs-only-L nss` + nss_libdir=`$PKG_CONFIG --libs-only-L nss | sed -e s/-L// | sed -e s/\ *$//` echo "$as_me:$LINENO: result: using system NSS" >&5 echo "${ECHO_T}using system NSS" >&6 elif $PKG_CONFIG --exists dirsec-nss; then nss_inc=`$PKG_CONFIG --cflags-only-I dirsec-nss` nss_lib=`$PKG_CONFIG --libs-only-L dirsec-nss` + nss_libdir=`$PKG_CONFIG --libs-only-L dirsec-nss | sed -e s/-L// | sed -e s/\ *$//` echo "$as_me:$LINENO: result: using system dirsec NSS" >&5 echo "${ECHO_T}using system dirsec NSS" >&6 else @@ -23789,6 +23776,7 @@ LDAPSDKDIR=$withval ldapsdk_inc="-I$LDAPSDKDIR/include" ldapsdk_lib="-L$LDAPSDKDIR/lib" + ldapsdk_libdir="$LDAPSDKDIR/lib" else echo { { echo "$as_me:$LINENO: error: $withval not found" >&5 @@ -23839,6 +23827,7 @@ echo "$as_me:$LINENO: result: using $withval" >&5 echo "${ECHO_T}using $withval" >&6 ldapsdk_lib="-L$withval" + ldapsdk_libdir="$withval" else echo { { echo "$as_me:$LINENO: error: $withval not found" >&5 @@ -23854,7 +23843,7 @@ # if LDAPSDK is not found yet, try pkg-config # last resort -if test -z "$ldapsdk_inc" -o -z "$ldapsdk_lib"; then +if test -z "$ldapsdk_inc" -o -z "$ldapsdk_lib" -o -z "$ldapsdk_libdir"; then echo "$as_me:$LINENO: checking for mozldap with pkg-config" >&5 echo $ECHO_N "checking for mozldap with pkg-config... $ECHO_C" >&6 # Extract the first word of "pkg-config", so it can be a program name with args. @@ -23900,6 +23889,7 @@ if $PKG_CONFIG --exists mozldap6; then ldapsdk_inc=`$PKG_CONFIG --cflags-only-I mozldap6` ldapsdk_lib=`$PKG_CONFIG --libs-only-L mozldap6` + ldapsdk_libdir=`$PKG_CONFIG --libs-only-L mozldap6 | sed -e s/-L// | sed -e s/\ *$//` echo "$as_me:$LINENO: result: using system mozldap6" >&5 echo "${ECHO_T}using system mozldap6" >&6 else @@ -24029,6 +24019,7 @@ echo "${ECHO_T}using $withval" >&6 DBDIR=$withval db_lib="-L$DBDIR/lib" + db_libdir="$DBDIR/lib" db_incdir="$DBDIR/include" if ! test -e "$db_incdir/db.h" ; then { { echo "$as_me:$LINENO: error: $withval include dir not found" >&5 @@ -24109,6 +24100,7 @@ fi sasl_lib="-L$withval/lib" + sasl_libdir="$withval/lib" else echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 @@ -24156,6 +24148,7 @@ echo "$as_me:$LINENO: result: using $withval" >&5 echo "${ECHO_T}using $withval" >&6 sasl_lib="-L$withval" + sasl_libdir="$withval" else echo { { echo "$as_me:$LINENO: error: $withval not found" >&5 @@ -24787,6 +24780,7 @@ fi netsnmp_lib="-L$withval/lib" + netsnmp_libdir="$withval/lib" else echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 @@ -24835,6 +24829,7 @@ echo "$as_me:$LINENO: result: using $withval" >&5 echo "${ECHO_T}using $withval" >&6 netsnmp_lib="-L$withval" + netsnmp_libdir="$withval" else echo { { echo "$as_me:$LINENO: error: $withval not found" >&5 @@ -24945,6 +24940,28 @@ + + + + + + +# installation paths +bindir=/usr/bin +configdir=/fedora-ds/config +datadir=/usr/share/fedora-ds/data +propertydir=/fedora-ds/property +schemadir=/fedora-ds/schema +serverdir=/usr/lib/fedora-ds +serverplugindir=/usr/lib/fedora-ds/plugins + + + + + + + + # WINNT should be true if building on Windows system not using # cygnus, mingw, or the like and using cmd.exe as the shell @@ -24960,6 +24977,28 @@ ac_config_files="$ac_config_files Makefile" + ac_config_files="$ac_config_files wrappers/dbscan" + + ac_config_files="$ac_config_files wrappers/dsktune" + + ac_config_files="$ac_config_files wrappers/ds_newinst" + + ac_config_files="$ac_config_files wrappers/infadd" + + ac_config_files="$ac_config_files wrappers/ldap-agent" + + ac_config_files="$ac_config_files wrappers/ldclt" + + ac_config_files="$ac_config_files wrappers/ldif" + + ac_config_files="$ac_config_files wrappers/migratecred" + + ac_config_files="$ac_config_files wrappers/mmldif" + + ac_config_files="$ac_config_files wrappers/pwdhash" + + ac_config_files="$ac_config_files wrappers/rsearch" + cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure # tests run on this system so they can be shared between configure @@ -25557,6 +25596,17 @@ case "$ac_config_target" in # Handling of arguments. "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; + "wrappers/dbscan" ) CONFIG_FILES="$CONFIG_FILES wrappers/dbscan" ;; + "wrappers/dsktune" ) CONFIG_FILES="$CONFIG_FILES wrappers/dsktune" ;; + "wrappers/ds_newinst" ) CONFIG_FILES="$CONFIG_FILES wrappers/ds_newinst" ;; + "wrappers/infadd" ) CONFIG_FILES="$CONFIG_FILES wrappers/infadd" ;; + "wrappers/ldap-agent" ) CONFIG_FILES="$CONFIG_FILES wrappers/ldap-agent" ;; + "wrappers/ldclt" ) CONFIG_FILES="$CONFIG_FILES wrappers/ldclt" ;; + "wrappers/ldif" ) CONFIG_FILES="$CONFIG_FILES wrappers/ldif" ;; + "wrappers/migratecred" ) CONFIG_FILES="$CONFIG_FILES wrappers/migratecred" ;; + "wrappers/mmldif" ) CONFIG_FILES="$CONFIG_FILES wrappers/mmldif" ;; + "wrappers/pwdhash" ) CONFIG_FILES="$CONFIG_FILES wrappers/pwdhash" ;; + "wrappers/rsearch" ) CONFIG_FILES="$CONFIG_FILES wrappers/rsearch" ;; "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} @@ -25717,15 +25767,20 @@ s,@NETSNMP_CONFIG@,$NETSNMP_CONFIG,;t t s,@nspr_inc@,$nspr_inc,;t t s,@nspr_lib@,$nspr_lib,;t t +s,@nspr_libdir@,$nspr_libdir,;t t s,@nss_inc@,$nss_inc,;t t s,@nss_lib@,$nss_lib,;t t +s,@nss_libdir@,$nss_libdir,;t t s,@ldapsdk_inc@,$ldapsdk_inc,;t t s,@ldapsdk_lib@,$ldapsdk_lib,;t t +s,@ldapsdk_libdir@,$ldapsdk_libdir,;t t s,@db_inc@,$db_inc,;t t s,@db_incdir@,$db_incdir,;t t s,@db_lib@,$db_lib,;t t +s,@db_libdir@,$db_libdir,;t t s,@sasl_inc@,$sasl_inc,;t t s,@sasl_lib@,$sasl_lib,;t t +s,@sasl_libdir@,$sasl_libdir,;t t s,@svrcore_inc@,$svrcore_inc,;t t s,@svrcore_lib@,$svrcore_lib,;t t s,@icu_lib@,$icu_lib,;t t @@ -25733,7 +25788,13 @@ s,@icu_bin@,$icu_bin,;t t s,@netsnmp_inc@,$netsnmp_inc,;t t s,@netsnmp_lib@,$netsnmp_lib,;t t +s,@netsnmp_libdir@,$netsnmp_libdir,;t t s,@netsnmp_link@,$netsnmp_link,;t t +s,@configdir@,$configdir,;t t +s,@propertydir@,$propertydir,;t t +s,@schemadir@,$schemadir,;t t +s,@serverdir@,$serverdir,;t t +s,@serverplugindir@,$serverplugindir,;t t s,@WINNT_TRUE@,$WINNT_TRUE,;t t s,@WINNT_FALSE@,$WINNT_FALSE,;t t s,@LTLIBOBJS@,$LTLIBOBJS,;t t Index: configure.ac =================================================================== RCS file: /cvs/dirsec/ldapserver/configure.ac,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- configure.ac 18 Oct 2006 21:40:49 -0000 1.2 +++ configure.ac 24 Oct 2006 21:11:01 -0000 1.3 @@ -82,19 +82,7 @@ ]) AC_SUBST([debug_defs]) -BRAND=fedora -AC_MSG_CHECKING(for --with-brand) -AC_ARG_WITH(brand, [ --with-brand=PATH Specify branding (fedora or redhat)], -[ - if test "$withval" - then - AC_MSG_RESULT([using $withval]) - BRAND="$withval" - fi -], -AC_MSG_RESULT(no)) -PKGNAME=$BRAND-ds -AC_PREFIX_DEFAULT("/opt/\$(PACKAGE)") +AC_PREFIX_DEFAULT([/opt/fedora-ds]) # Check for library dependencies m4_include(m4/nspr.m4) @@ -109,15 +97,20 @@ # write out paths for binary components AC_SUBST(nspr_inc) AC_SUBST(nspr_lib) +AC_SUBST(nspr_libdir) AC_SUBST(nss_inc) AC_SUBST(nss_lib) +AC_SUBST(nss_libdir) AC_SUBST(ldapsdk_inc) AC_SUBST(ldapsdk_lib) +AC_SUBST(ldapsdk_libdir) AC_SUBST(db_inc) AC_SUBST(db_incdir) AC_SUBST(db_lib) +AC_SUBST(db_libdir) AC_SUBST(sasl_inc) AC_SUBST(sasl_lib) +AC_SUBST(sasl_libdir) AC_SUBST(svrcore_inc) AC_SUBST(svrcore_lib) AC_SUBST(icu_lib) @@ -125,11 +118,39 @@ AC_SUBST(icu_bin) AC_SUBST(netsnmp_inc) AC_SUBST(netsnmp_lib) +AC_SUBST(netsnmp_libdir) AC_SUBST(netsnmp_link) +# installation paths +bindir=/usr/bin +configdir=/fedora-ds/config +datadir=/usr/share/fedora-ds/data +propertydir=/fedora-ds/property +schemadir=/fedora-ds/schema +serverdir=/usr/lib/fedora-ds +serverplugindir=/usr/lib/fedora-ds/plugins +AC_SUBST(bindir) +AC_SUBST(configdir) +AC_SUBST(datadir) +AC_SUBST(propertydir) +AC_SUBST(schemadir) +AC_SUBST(serverdir) +AC_SUBST(serverplugindir) + # WINNT should be true if building on Windows system not using # cygnus, mingw, or the like and using cmd.exe as the shell AM_CONDITIONAL([WINNT], false) AC_CONFIG_FILES([Makefile]) +AC_CONFIG_FILES([wrappers/dbscan]) +AC_CONFIG_FILES([wrappers/dsktune]) +AC_CONFIG_FILES([wrappers/ds_newinst]) +AC_CONFIG_FILES([wrappers/infadd]) +AC_CONFIG_FILES([wrappers/ldap-agent]) +AC_CONFIG_FILES([wrappers/ldclt]) +AC_CONFIG_FILES([wrappers/ldif]) +AC_CONFIG_FILES([wrappers/migratecred]) +AC_CONFIG_FILES([wrappers/mmldif]) +AC_CONFIG_FILES([wrappers/pwdhash]) +AC_CONFIG_FILES([wrappers/rsearch]) AC_OUTPUT

17 years, 6 months

1
0
0 / 0

[Fedora-directory-commits] ldapserver/wrappers - New directory

by Doctor Conrad

Author: nkinder Update of /cvs/dirsec/ldapserver/wrappers In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20669/wrappers Log Message: Directory /cvs/dirsec/ldapserver/wrappers added to the repository

17 years, 6 months

1
0
0 / 0

[Fedora-directory-commits] ldapserver Makefile.am, 1.5, 1.6 Makefile.in, 1.5, 1.6

by Doctor Conrad

Author: nkinder Update of /cvs/dirsec/ldapserver In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13177 Modified Files: Makefile.am Makefile.in Log Message: Resolves: 211554 Fixed installation problem with libacl-plugin library. Index: Makefile.am =================================================================== RCS file: /cvs/dirsec/ldapserver/Makefile.am,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- Makefile.am 20 Oct 2006 21:16:32 -0000 1.5 +++ Makefile.am 23 Oct 2006 18:31:38 -0000 1.6 @@ -47,10 +47,10 @@ bindir = @prefix@/usr/bin configdir = @sysconfdir@/$(PACKAGE)/config datadir = @prefix@/usr/share/$(PACKAGE)/data -plugindir = @prefix@/usr/lib/$(PACKAGE)/plugins propertydir = @sysconfdir@/$(PACKAGE)/property schemadir = @sysconfdir@/$(PACKAGE)/schema serverdir = @prefix@/usr/lib/$(PACKAGE) +serverplugindir = @prefix@/usr/lib/$(PACKAGE)/plugins #------------------------ # Build Products @@ -62,7 +62,7 @@ server_LTLIBRARIES = libslapd.la libback-ldbm.la libds_admin.la libns-dshttpd.la -plugin_LTLIBRARIES = libacl-plugin.la libattr-unique-plugin.la libchainingdb-plugin.la \ +serverplugin_LTLIBRARIES = libacl-plugin.la libattr-unique-plugin.la libchainingdb-plugin.la \ libcos-plugin.la libdes-plugin.la libdistrib-plugin.la \ libhttp-client-plugin.la libcollation-plugin.la libpam-passthru-plugin.la \ libpassthru-plugin.la libpresence-plugin.la libpwdstorage-plugin.la \ Index: Makefile.in =================================================================== RCS file: /cvs/dirsec/ldapserver/Makefile.in,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- Makefile.in 20 Oct 2006 21:16:32 -0000 1.5 +++ Makefile.in 23 Oct 2006 18:31:38 -0000 1.6 @@ -91,14 +91,14 @@ *) f=$$p;; \ esac; am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; -am__installdirs = "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(serverdir)" \ - "$(DESTDIR)$(bindir)" "$(DESTDIR)$(serverdir)" \ - "$(DESTDIR)$(bindir)" "$(DESTDIR)$(configdir)" \ - "$(DESTDIR)$(datadir)" "$(DESTDIR)$(propertydir)" \ - "$(DESTDIR)$(schemadir)" -pluginLTLIBRARIES_INSTALL = $(INSTALL) +am__installdirs = "$(DESTDIR)$(serverdir)" \ + "$(DESTDIR)$(serverplugindir)" "$(DESTDIR)$(bindir)" \ + "$(DESTDIR)$(serverdir)" "$(DESTDIR)$(bindir)" \ + "$(DESTDIR)$(configdir)" "$(DESTDIR)$(datadir)" \ + "$(DESTDIR)$(propertydir)" "$(DESTDIR)$(schemadir)" serverLTLIBRARIES_INSTALL = $(INSTALL) -LTLIBRARIES = $(plugin_LTLIBRARIES) $(server_LTLIBRARIES) +serverpluginLTLIBRARIES_INSTALL = $(INSTALL) +LTLIBRARIES = $(server_LTLIBRARIES) $(serverplugin_LTLIBRARIES) libacl_plugin_la_DEPENDENCIES = libns-dshttpd.la am_libacl_plugin_la_OBJECTS = \ ldap/servers/plugins/acl/libacl_plugin_la-acl.lo \ @@ -917,12 +917,12 @@ BUILT_SOURCES = dirver.h dberrstrs.h CLEANFILES = dirver.h dberrstrs.h ns-slapd.properties configdir = @sysconfdir@/$(PACKAGE)/config -plugindir = @prefix@/usr/lib/$(PACKAGE)/plugins propertydir = @sysconfdir@/$(PACKAGE)/property schemadir = @sysconfdir@/$(PACKAGE)/schema serverdir = @prefix@/usr/lib/$(PACKAGE) +serverplugindir = @prefix@/usr/lib/$(PACKAGE)/plugins server_LTLIBRARIES = libslapd.la libback-ldbm.la libds_admin.la libns-dshttpd.la -plugin_LTLIBRARIES = libacl-plugin.la libattr-unique-plugin.la libchainingdb-plugin.la \ +serverplugin_LTLIBRARIES = libacl-plugin.la libattr-unique-plugin.la libchainingdb-plugin.la \ libcos-plugin.la libdes-plugin.la libdistrib-plugin.la \ libhttp-client-plugin.la libcollation-plugin.la libpam-passthru-plugin.la \ libpassthru-plugin.la libpresence-plugin.la libpwdstorage-plugin.la \ @@ -1761,55 +1761,55 @@ -rm -f libldaputil.a $(libldaputil_a_AR) libldaputil.a $(libldaputil_a_OBJECTS) $(libldaputil_a_LIBADD) $(RANLIB) libldaputil.a -install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES) +install-serverLTLIBRARIES: $(server_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(plugindir)" || $(mkdir_p) "$(DESTDIR)$(plugindir)" - @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ + test -z "$(serverdir)" || $(mkdir_p) "$(DESTDIR)$(serverdir)" + @list='$(server_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ - $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ + echo " $(LIBTOOL) --mode=install $(serverLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(serverdir)/$$f'"; \ + $(LIBTOOL) --mode=install $(serverLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(serverdir)/$$f"; \ else :; fi; \ done -uninstall-pluginLTLIBRARIES: +uninstall-serverLTLIBRARIES: @$(NORMAL_UNINSTALL) - @set -x; list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ + @set -x; list='$(server_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ - $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ + echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(serverdir)/$$p'"; \ + $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(serverdir)/$$p"; \ done -clean-pluginLTLIBRARIES: - -test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES) - @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ +clean-serverLTLIBRARIES: + -test -z "$(server_LTLIBRARIES)" || rm -f $(server_LTLIBRARIES) + @list='$(server_LTLIBRARIES)'; for p in $$list; do \ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ test "$$dir" != "$$p" || dir=.; \ echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done -install-serverLTLIBRARIES: $(server_LTLIBRARIES) +install-serverpluginLTLIBRARIES: $(serverplugin_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(serverdir)" || $(mkdir_p) "$(DESTDIR)$(serverdir)" - @list='$(server_LTLIBRARIES)'; for p in $$list; do \ + test -z "$(serverplugindir)" || $(mkdir_p) "$(DESTDIR)$(serverplugindir)" + @list='$(serverplugin_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=install $(serverLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(serverdir)/$$f'"; \ - $(LIBTOOL) --mode=install $(serverLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(serverdir)/$$f"; \ + echo " $(LIBTOOL) --mode=install $(serverpluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(serverplugindir)/$$f'"; \ + $(LIBTOOL) --mode=install $(serverpluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(serverplugindir)/$$f"; \ else :; fi; \ done -uninstall-serverLTLIBRARIES: +uninstall-serverpluginLTLIBRARIES: @$(NORMAL_UNINSTALL) - @set -x; list='$(server_LTLIBRARIES)'; for p in $$list; do \ + @set -x; list='$(serverplugin_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(serverdir)/$$p'"; \ - $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(serverdir)/$$p"; \ + echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(serverplugindir)/$$p'"; \ + $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(serverplugindir)/$$p"; \ done -clean-serverLTLIBRARIES: - -test -z "$(server_LTLIBRARIES)" || rm -f $(server_LTLIBRARIES) - @list='$(server_LTLIBRARIES)'; for p in $$list; do \ +clean-serverpluginLTLIBRARIES: + -test -z "$(serverplugin_LTLIBRARIES)" || rm -f $(serverplugin_LTLIBRARIES) + @list='$(serverplugin_LTLIBRARIES)'; for p in $$list; do \ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ test "$$dir" != "$$p" || dir=.; \ echo "rm -f \"$${dir}/so_locations\""; \ @@ -1858,7 +1858,7 @@ ldap/servers/plugins/acl/$(am__dirstamp) \ ldap/servers/plugins/acl/$(DEPDIR)/$(am__dirstamp) libacl-plugin.la: $(libacl_plugin_la_OBJECTS) $(libacl_plugin_la_DEPENDENCIES) - $(LINK) -rpath $(plugindir) $(libacl_plugin_la_LDFLAGS) $(libacl_plugin_la_OBJECTS) $(libacl_plugin_la_LIBADD) $(LIBS) + $(LINK) -rpath $(serverplugindir) $(libacl_plugin_la_LDFLAGS) $(libacl_plugin_la_OBJECTS) $(libacl_plugin_la_LIBADD) $(LIBS) ldap/servers/plugins/uiduniq/$(am__dirstamp): @$(mkdir_p) ldap/servers/plugins/uiduniq @: > ldap/servers/plugins/uiduniq/$(am__dirstamp) @@ -1881,7 +1881,7 @@ ldap/servers/plugins/shared/$(am__dirstamp) \ ldap/servers/plugins/shared/$(DEPDIR)/$(am__dirstamp) libattr-unique-plugin.la: $(libattr_unique_plugin_la_OBJECTS) $(libattr_unique_plugin_la_DEPENDENCIES) - $(LINK) -rpath $(plugindir) $(libattr_unique_plugin_la_LDFLAGS) $(libattr_unique_plugin_la_OBJECTS) $(libattr_unique_plugin_la_LIBADD) $(LIBS) + $(LINK) -rpath $(serverplugindir) $(libattr_unique_plugin_la_LDFLAGS) $(libattr_unique_plugin_la_OBJECTS) $(libattr_unique_plugin_la_LIBADD) $(LIBS) ldap/servers/slapd/back-ldbm/$(am__dirstamp): @$(mkdir_p) ldap/servers/slapd/back-ldbm @: > ldap/servers/slapd/back-ldbm/$(am__dirstamp) @@ -2146,7 +2146,7 @@ ldap/servers/plugins/chainingdb/$(am__dirstamp) \ ldap/servers/plugins/chainingdb/$(DEPDIR)/$(am__dirstamp) libchainingdb-plugin.la: $(libchainingdb_plugin_la_OBJECTS) $(libchainingdb_plugin_la_DEPENDENCIES) - $(LINK) -rpath $(plugindir) $(libchainingdb_plugin_la_LDFLAGS) $(libchainingdb_plugin_la_OBJECTS) $(libchainingdb_plugin_la_LIBADD) $(LIBS) + $(LINK) -rpath $(serverplugindir) $(libchainingdb_plugin_la_LDFLAGS) $(libchainingdb_plugin_la_OBJECTS) $(libchainingdb_plugin_la_LIBADD) $(LIBS) ldap/servers/plugins/collation/$(am__dirstamp): @$(mkdir_p) ldap/servers/plugins/collation @: > ldap/servers/plugins/collation/$(am__dirstamp) @@ -2163,7 +2163,7 @@ ldap/servers/plugins/collation/$(am__dirstamp) \ ldap/servers/plugins/collation/$(DEPDIR)/$(am__dirstamp) libcollation-plugin.la: $(libcollation_plugin_la_OBJECTS) $(libcollation_plugin_la_DEPENDENCIES) - $(LINK) -rpath $(plugindir) $(libcollation_plugin_la_LDFLAGS) $(libcollation_plugin_la_OBJECTS) $(libcollation_plugin_la_LIBADD) $(LIBS) + $(LINK) -rpath $(serverplugindir) $(libcollation_plugin_la_LDFLAGS) $(libcollation_plugin_la_OBJECTS) $(libcollation_plugin_la_LIBADD) $(LIBS) ldap/servers/plugins/cos/$(am__dirstamp): @$(mkdir_p) ldap/servers/plugins/cos @: > ldap/servers/plugins/cos/$(am__dirstamp) @@ -2177,7 +2177,7 @@ ldap/servers/plugins/cos/$(am__dirstamp) \ ldap/servers/plugins/cos/$(DEPDIR)/$(am__dirstamp) libcos-plugin.la: $(libcos_plugin_la_OBJECTS) $(libcos_plugin_la_DEPENDENCIES) - $(LINK) -rpath $(plugindir) $(libcos_plugin_la_LDFLAGS) $(libcos_plugin_la_OBJECTS) $(libcos_plugin_la_LIBADD) $(LIBS) + $(LINK) -rpath $(serverplugindir) $(libcos_plugin_la_LDFLAGS) $(libcos_plugin_la_OBJECTS) $(libcos_plugin_la_LIBADD) $(LIBS) ldap/servers/plugins/rever/$(am__dirstamp): @$(mkdir_p) ldap/servers/plugins/rever @: > ldap/servers/plugins/rever/$(am__dirstamp) @@ -2191,7 +2191,7 @@ ldap/servers/plugins/rever/$(am__dirstamp) \ ldap/servers/plugins/rever/$(DEPDIR)/$(am__dirstamp) libdes-plugin.la: $(libdes_plugin_la_OBJECTS) $(libdes_plugin_la_DEPENDENCIES) - $(LINK) -rpath $(plugindir) $(libdes_plugin_la_LDFLAGS) $(libdes_plugin_la_OBJECTS) $(libdes_plugin_la_LIBADD) $(LIBS) + $(LINK) -rpath $(serverplugindir) $(libdes_plugin_la_LDFLAGS) $(libdes_plugin_la_OBJECTS) $(libdes_plugin_la_LIBADD) $(LIBS) ldap/servers/plugins/distrib/$(am__dirstamp): @$(mkdir_p) ldap/servers/plugins/distrib @: > ldap/servers/plugins/distrib/$(am__dirstamp) @@ -2202,7 +2202,7 @@ ldap/servers/plugins/distrib/$(am__dirstamp) \ ldap/servers/plugins/distrib/$(DEPDIR)/$(am__dirstamp) libdistrib-plugin.la: $(libdistrib_plugin_la_OBJECTS) $(libdistrib_plugin_la_DEPENDENCIES) - $(LINK) -rpath $(plugindir) $(libdistrib_plugin_la_LDFLAGS) $(libdistrib_plugin_la_OBJECTS) $(libdistrib_plugin_la_LIBADD) $(LIBS) + $(LINK) -rpath $(serverplugindir) $(libdistrib_plugin_la_LDFLAGS) $(libdistrib_plugin_la_OBJECTS) $(libdistrib_plugin_la_LIBADD) $(LIBS) ldap/admin/lib/$(am__dirstamp): @$(mkdir_p) ldap/admin/lib @: > ldap/admin/lib/$(am__dirstamp) @@ -2263,7 +2263,7 @@ ldap/servers/plugins/http/$(am__dirstamp) \ ldap/servers/plugins/http/$(DEPDIR)/$(am__dirstamp) libhttp-client-plugin.la: $(libhttp_client_plugin_la_OBJECTS) $(libhttp_client_plugin_la_DEPENDENCIES) - $(LINK) -rpath $(plugindir) $(libhttp_client_plugin_la_LDFLAGS) $(libhttp_client_plugin_la_OBJECTS) $(libhttp_client_plugin_la_LIBADD) $(LIBS) + $(LINK) -rpath $(serverplugindir) $(libhttp_client_plugin_la_LDFLAGS) $(libhttp_client_plugin_la_OBJECTS) $(libhttp_client_plugin_la_LIBADD) $(LIBS) lib/libaccess/$(am__dirstamp): @$(mkdir_p) lib/libaccess @: > lib/libaccess/$(am__dirstamp) @@ -2465,7 +2465,7 @@ ldap/servers/plugins/pam_passthru/$(am__dirstamp) \ ldap/servers/plugins/pam_passthru/$(DEPDIR)/$(am__dirstamp) libpam-passthru-plugin.la: $(libpam_passthru_plugin_la_OBJECTS) $(libpam_passthru_plugin_la_DEPENDENCIES) - $(LINK) -rpath $(plugindir) $(libpam_passthru_plugin_la_LDFLAGS) $(libpam_passthru_plugin_la_OBJECTS) $(libpam_passthru_plugin_la_LIBADD) $(LIBS) + $(LINK) -rpath $(serverplugindir) $(libpam_passthru_plugin_la_LDFLAGS) $(libpam_passthru_plugin_la_OBJECTS) $(libpam_passthru_plugin_la_LIBADD) $(LIBS) ldap/servers/plugins/passthru/$(am__dirstamp): @$(mkdir_p) ldap/servers/plugins/passthru @: > ldap/servers/plugins/passthru/$(am__dirstamp) @@ -2491,7 +2491,7 @@ ldap/servers/plugins/passthru/$(am__dirstamp) \ ldap/servers/plugins/passthru/$(DEPDIR)/$(am__dirstamp) libpassthru-plugin.la: $(libpassthru_plugin_la_OBJECTS) $(libpassthru_plugin_la_DEPENDENCIES) - $(LINK) -rpath $(plugindir) $(libpassthru_plugin_la_LDFLAGS) $(libpassthru_plugin_la_OBJECTS) $(libpassthru_plugin_la_LIBADD) $(LIBS) + $(LINK) -rpath $(serverplugindir) $(libpassthru_plugin_la_LDFLAGS) $(libpassthru_plugin_la_OBJECTS) $(libpassthru_plugin_la_LIBADD) $(LIBS) ldap/servers/plugins/presence/$(am__dirstamp): @$(mkdir_p) ldap/servers/plugins/presence @: > ldap/servers/plugins/presence/$(am__dirstamp) @@ -2502,7 +2502,7 @@ ldap/servers/plugins/presence/$(am__dirstamp) \ ldap/servers/plugins/presence/$(DEPDIR)/$(am__dirstamp) libpresence-plugin.la: $(libpresence_plugin_la_OBJECTS) $(libpresence_plugin_la_DEPENDENCIES) - $(LINK) -rpath $(plugindir) $(libpresence_plugin_la_LDFLAGS) $(libpresence_plugin_la_OBJECTS) $(libpresence_plugin_la_LIBADD) $(LIBS) + $(LINK) -rpath $(serverplugindir) $(libpresence_plugin_la_LDFLAGS) $(libpresence_plugin_la_OBJECTS) $(libpresence_plugin_la_LIBADD) $(LIBS) ldap/servers/plugins/pwdstorage/$(am__dirstamp): @$(mkdir_p) ldap/servers/plugins/pwdstorage @: > ldap/servers/plugins/pwdstorage/$(am__dirstamp) @@ -2534,7 +2534,7 @@ ldap/servers/plugins/pwdstorage/$(am__dirstamp) \ ldap/servers/plugins/pwdstorage/$(DEPDIR)/$(am__dirstamp) libpwdstorage-plugin.la: $(libpwdstorage_plugin_la_OBJECTS) $(libpwdstorage_plugin_la_DEPENDENCIES) - $(LINK) -rpath $(plugindir) $(libpwdstorage_plugin_la_LDFLAGS) $(libpwdstorage_plugin_la_OBJECTS) $(libpwdstorage_plugin_la_LIBADD) $(LIBS) + $(LINK) -rpath $(serverplugindir) $(libpwdstorage_plugin_la_LDFLAGS) $(libpwdstorage_plugin_la_OBJECTS) $(libpwdstorage_plugin_la_LIBADD) $(LIBS) ldap/servers/plugins/referint/$(am__dirstamp): @$(mkdir_p) ldap/servers/plugins/referint @: > ldap/servers/plugins/referint/$(am__dirstamp) @@ -2545,7 +2545,7 @@ ldap/servers/plugins/referint/$(am__dirstamp) \ ldap/servers/plugins/referint/$(DEPDIR)/$(am__dirstamp) libreferint-plugin.la: $(libreferint_plugin_la_OBJECTS) $(libreferint_plugin_la_DEPENDENCIES) - $(LINK) -rpath $(plugindir) $(libreferint_plugin_la_LDFLAGS) $(libreferint_plugin_la_OBJECTS) $(libreferint_plugin_la_LIBADD) $(LIBS) + $(LINK) -rpath $(serverplugindir) $(libreferint_plugin_la_LDFLAGS) $(libreferint_plugin_la_OBJECTS) $(libreferint_plugin_la_LIBADD) $(LIBS) ldap/servers/plugins/replication/$(am__dirstamp): @$(mkdir_p) ldap/servers/plugins/replication @: > ldap/servers/plugins/replication/$(am__dirstamp) @@ -2712,7 +2712,7 @@ ldap/servers/plugins/replication/$(am__dirstamp) \ ldap/servers/plugins/replication/$(DEPDIR)/$(am__dirstamp) libreplication-plugin.la: $(libreplication_plugin_la_OBJECTS) $(libreplication_plugin_la_DEPENDENCIES) - $(LINK) -rpath $(plugindir) $(libreplication_plugin_la_LDFLAGS) $(libreplication_plugin_la_OBJECTS) $(libreplication_plugin_la_LIBADD) $(LIBS) + $(LINK) -rpath $(serverplugindir) $(libreplication_plugin_la_LDFLAGS) $(libreplication_plugin_la_OBJECTS) $(libreplication_plugin_la_LIBADD) $(LIBS) ldap/servers/plugins/retrocl/$(am__dirstamp): @$(mkdir_p) ldap/servers/plugins/retrocl @: > ldap/servers/plugins/retrocl/$(am__dirstamp) @@ -2738,7 +2738,7 @@ ldap/servers/plugins/retrocl/$(am__dirstamp) \ ldap/servers/plugins/retrocl/$(DEPDIR)/$(am__dirstamp) libretrocl-plugin.la: $(libretrocl_plugin_la_OBJECTS) $(libretrocl_plugin_la_DEPENDENCIES) - $(LINK) -rpath $(plugindir) $(libretrocl_plugin_la_LDFLAGS) $(libretrocl_plugin_la_OBJECTS) $(libretrocl_plugin_la_LIBADD) $(LIBS) + $(LINK) -rpath $(serverplugindir) $(libretrocl_plugin_la_LDFLAGS) $(libretrocl_plugin_la_OBJECTS) $(libretrocl_plugin_la_LIBADD) $(LIBS) ldap/servers/plugins/roles/$(am__dirstamp): @$(mkdir_p) ldap/servers/plugins/roles @: > ldap/servers/plugins/roles/$(am__dirstamp) @@ -2752,7 +2752,7 @@ ldap/servers/plugins/roles/$(am__dirstamp) \ ldap/servers/plugins/roles/$(DEPDIR)/$(am__dirstamp) libroles-plugin.la: $(libroles_plugin_la_OBJECTS) $(libroles_plugin_la_DEPENDENCIES) - $(LINK) -rpath $(plugindir) $(libroles_plugin_la_LDFLAGS) $(libroles_plugin_la_OBJECTS) $(libroles_plugin_la_LIBADD) $(LIBS) + $(LINK) -rpath $(serverplugindir) $(libroles_plugin_la_LDFLAGS) $(libroles_plugin_la_OBJECTS) $(libroles_plugin_la_LIBADD) $(LIBS) ldap/servers/slapd/$(am__dirstamp): @$(mkdir_p) ldap/servers/slapd @: > ldap/servers/slapd/$(am__dirstamp) @@ -3035,7 +3035,7 @@ ldap/servers/plugins/statechange/$(am__dirstamp) \ ldap/servers/plugins/statechange/$(DEPDIR)/$(am__dirstamp) libstatechange-plugin.la: $(libstatechange_plugin_la_OBJECTS) $(libstatechange_plugin_la_DEPENDENCIES) - $(LINK) -rpath $(plugindir) $(libstatechange_plugin_la_LDFLAGS) $(libstatechange_plugin_la_OBJECTS) $(libstatechange_plugin_la_LIBADD) $(LIBS) + $(LINK) -rpath $(serverplugindir) $(libstatechange_plugin_la_LDFLAGS) $(libstatechange_plugin_la_OBJECTS) $(libstatechange_plugin_la_LIBADD) $(LIBS) ldap/servers/plugins/syntaxes/$(am__dirstamp): @$(mkdir_p) ldap/servers/plugins/syntaxes @: > ldap/servers/plugins/syntaxes/$(am__dirstamp) @@ -3076,7 +3076,7 @@ ldap/servers/plugins/syntaxes/$(am__dirstamp) \ ldap/servers/plugins/syntaxes/$(DEPDIR)/$(am__dirstamp) libsyntax-plugin.la: $(libsyntax_plugin_la_OBJECTS) $(libsyntax_plugin_la_DEPENDENCIES) - $(LINK) -rpath $(plugindir) $(libsyntax_plugin_la_LDFLAGS) $(libsyntax_plugin_la_OBJECTS) $(libsyntax_plugin_la_LIBADD) $(LIBS) + $(LINK) -rpath $(serverplugindir) $(libsyntax_plugin_la_LDFLAGS) $(libsyntax_plugin_la_OBJECTS) $(libsyntax_plugin_la_LIBADD) $(LIBS) ldap/servers/plugins/views/$(am__dirstamp): @$(mkdir_p) ldap/servers/plugins/views @: > ldap/servers/plugins/views/$(am__dirstamp) @@ -3087,7 +3087,7 @@ ldap/servers/plugins/views/$(am__dirstamp) \ ldap/servers/plugins/views/$(DEPDIR)/$(am__dirstamp) libviews-plugin.la: $(libviews_plugin_la_OBJECTS) $(libviews_plugin_la_DEPENDENCIES) - $(LINK) -rpath $(plugindir) $(libviews_plugin_la_LDFLAGS) $(libviews_plugin_la_OBJECTS) $(libviews_plugin_la_LIBADD) $(LIBS) + $(LINK) -rpath $(serverplugindir) $(libviews_plugin_la_LDFLAGS) $(libviews_plugin_la_OBJECTS) $(libviews_plugin_la_LIBADD) $(LIBS) install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)" @@ -8618,7 +8618,7 @@ all-am: Makefile $(LIBRARIES) $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) \ $(DATA) installdirs: - for dir in "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(serverdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(serverdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(configdir)" "$(DESTDIR)$(datadir)" "$(DESTDIR)$(propertydir)" "$(DESTDIR)$(schemadir)"; do \ + for dir in "$(DESTDIR)$(serverdir)" "$(DESTDIR)$(serverplugindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(serverdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(configdir)" "$(DESTDIR)$(datadir)" "$(DESTDIR)$(propertydir)" "$(DESTDIR)$(schemadir)"; do \ test -z "$$dir" || $(mkdir_p) "$$dir"; \ done install: $(BUILT_SOURCES) @@ -8722,8 +8722,8 @@ clean-am: clean-binPROGRAMS clean-generic clean-libtool \ clean-noinstLIBRARIES clean-noinstPROGRAMS \ - clean-pluginLTLIBRARIES clean-serverLTLIBRARIES \ - clean-serverPROGRAMS mostlyclean-am + clean-serverLTLIBRARIES clean-serverPROGRAMS \ + clean-serverpluginLTLIBRARIES mostlyclean-am distclean: distclean-am -rm -f $(am__CONFIG_DISTCLEAN_FILES) @@ -8743,9 +8743,9 @@ info-am: install-data-am: install-configDATA install-dataDATA \ - install-nodist_propertyDATA install-pluginLTLIBRARIES \ - install-schemaDATA install-serverLTLIBRARIES \ - install-serverPROGRAMS + install-nodist_propertyDATA install-schemaDATA \ + install-serverLTLIBRARIES install-serverPROGRAMS \ + install-serverpluginLTLIBRARIES install-exec-am: install-binPROGRAMS install-binSCRIPTS @@ -8777,33 +8777,33 @@ uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS \ uninstall-configDATA uninstall-dataDATA uninstall-info-am \ - uninstall-nodist_propertyDATA uninstall-pluginLTLIBRARIES \ - uninstall-schemaDATA uninstall-serverLTLIBRARIES \ - uninstall-serverPROGRAMS + uninstall-nodist_propertyDATA uninstall-schemaDATA \ + uninstall-serverLTLIBRARIES uninstall-serverPROGRAMS \ + uninstall-serverpluginLTLIBRARIES .PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \ clean-binPROGRAMS clean-generic clean-libtool \ clean-noinstLIBRARIES clean-noinstPROGRAMS \ - clean-pluginLTLIBRARIES clean-serverLTLIBRARIES \ - clean-serverPROGRAMS ctags dist dist-all dist-bzip2 dist-gzip \ - dist-shar dist-tarZ dist-zip distcheck distclean \ + clean-serverLTLIBRARIES clean-serverPROGRAMS \ + clean-serverpluginLTLIBRARIES ctags dist dist-all dist-bzip2 \ + dist-gzip dist-shar dist-tarZ dist-zip distcheck distclean \ distclean-compile distclean-generic distclean-libtool \ distclean-tags distcleancheck distdir distuninstallcheck dvi \ dvi-am html html-am info info-am install install-am \ install-binPROGRAMS install-binSCRIPTS install-configDATA \ install-data install-data-am install-dataDATA install-exec \ install-exec-am install-info install-info-am install-man \ - install-nodist_propertyDATA install-pluginLTLIBRARIES \ - install-schemaDATA install-serverLTLIBRARIES \ - install-serverPROGRAMS install-strip installcheck \ + install-nodist_propertyDATA install-schemaDATA \ + install-serverLTLIBRARIES install-serverPROGRAMS \ + install-serverpluginLTLIBRARIES 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-binPROGRAMS \ uninstall-binSCRIPTS uninstall-configDATA uninstall-dataDATA \ uninstall-info-am uninstall-nodist_propertyDATA \ - uninstall-pluginLTLIBRARIES uninstall-schemaDATA \ - uninstall-serverLTLIBRARIES uninstall-serverPROGRAMS + uninstall-schemaDATA uninstall-serverLTLIBRARIES \ + uninstall-serverPROGRAMS uninstall-serverpluginLTLIBRARIES dirver.h: Makefile

17 years, 6 months

1
0
0 / 0

[Fedora-directory-commits] ldapserver Makefile.am, 1.4, 1.5 Makefile.in, 1.4, 1.5

by Doctor Conrad

Author: nkinder Update of /cvs/dirsec/ldapserver In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25655 Modified Files: Makefile.am Makefile.in Log Message: Resolves: 211554 make install now uses FHS paths. Index: Makefile.am =================================================================== RCS file: /cvs/dirsec/ldapserver/Makefile.am,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- Makefile.am 19 Oct 2006 15:54:32 -0000 1.4 +++ Makefile.am 20 Oct 2006 21:16:32 -0000 1.5 @@ -42,21 +42,78 @@ perl $(srcdir)/ldap/servers/slapd/mkDBErrStrs.pl -i @db_incdir@ -o . #------------------------ +# Install Paths +#------------------------ +bindir = @prefix@/usr/bin +configdir = @sysconfdir@/$(PACKAGE)/config +datadir = @prefix@/usr/share/$(PACKAGE)/data +plugindir = @prefix@/usr/lib/$(PACKAGE)/plugins +propertydir = @sysconfdir@/$(PACKAGE)/property +schemadir = @sysconfdir@/$(PACKAGE)/schema +serverdir = @prefix@/usr/lib/$(PACKAGE) + +#------------------------ # Build Products #------------------------ -bin_PROGRAMS = dbscan ds_newinst dsktune ldap-agent ldclt ldif \ - migratecred mmldif ns-slapd pwdhash rsearch -noinst_PROGRAMS = makstrdb -lib_LTLIBRARIES = libslapd.la libback-ldbm.la libds_admin.la libns-dshttpd.la \ - libacl-plugin.la libattr-unique-plugin.la libchainingdb-plugin.la \ +server_PROGRAMS = dbscan-bin ds_newinst-bin dsktune-bin ldap-agent-bin ldif-bin \ + migratecred-bin mmldif-bin ns-slapd pwdhash-bin + +bin_PROGRAMS = infadd-bin ldclt-bin rsearch-bin + +server_LTLIBRARIES = libslapd.la libback-ldbm.la libds_admin.la libns-dshttpd.la + +plugin_LTLIBRARIES = libacl-plugin.la libattr-unique-plugin.la libchainingdb-plugin.la \ libcos-plugin.la libdes-plugin.la libdistrib-plugin.la \ libhttp-client-plugin.la libcollation-plugin.la libpam-passthru-plugin.la \ libpassthru-plugin.la libpresence-plugin.la libpwdstorage-plugin.la \ libreferint-plugin.la libreplication-plugin.la libretrocl-plugin.la \ libroles-plugin.la libstatechange-plugin.la libsyntax-plugin.la \ libviews-plugin.la + +nodist_property_DATA = ns-slapd.properties + +noinst_PROGRAMS = makstrdb + noinst_LIBRARIES = libavl.a libldaputil.a -nodist_data_DATA = ns-slapd.properties + +#------------------------ +# Installed Files +#------------------------ +config_DATA = $(srcdir)/lib/ldaputil/certmap.conf \ + $(srcdir)/ldap/schema/slapd-collations.conf + +data_DATA = $(srcdir)/ldap/ldif/Ace.ldif \ + $(srcdir)/ldap/ldif/commonTasks.ldif \ + $(srcdir)/ldap/ldif/European.ldif \ + $(srcdir)/ldap/ldif/Eurosuffix.ldif \ + $(srcdir)/ldap/ldif/Example.ldif \ + $(srcdir)/ldap/ldif/Example-roles.ldif \ + $(srcdir)/ldap/ldif/Example-views.ldif \ + $(srcdir)/ldap/ldif/roledit.ldif \ + $(srcdir)/ldap/ldif/tasks.ldif \ + $(srcdir)/ldap/ldif/template.ldif \ + $(srcdir)/ldap/servers/slapd/tools/rsearch/scripts/dbgen-FamilyNames \ + $(srcdir)/ldap/servers/slapd/tools/rsearch/scripts/dbgen-GivenNames \ + $(srcdir)/ldap/servers/slapd/tools/rsearch/scripts/dbgen-OrgUnits + +schema_DATA = $(srcdir)/ldap/schema/00core.ldif \ + $(srcdir)/ldap/schema/05rfc2247.ldif \ + $(srcdir)/ldap/schema/05rfc2927.ldif \ + $(srcdir)/ldap/schema/10presence.ldif \ + $(srcdir)/ldap/schema/10rfc2307.ldif \ + $(srcdir)/ldap/schema/20subscriber.ldif \ + $(srcdir)/ldap/schema/25java-object.ldif \ + $(srcdir)/ldap/schema/28pilot.ldif \ + $(srcdir)/ldap/schema/30ns-common.ldif \ + $(srcdir)/ldap/schema/50ns-admin.ldif \ + $(srcdir)/ldap/schema/50ns-certificate.ldif \ + $(srcdir)/ldap/schema/50ns-directory.ldif \ + $(srcdir)/ldap/schema/50ns-value.ldif \ + $(srcdir)/ldap/schema/50ns-web.ldif \ + $(srcdir)/ldap/schema/60pam-plugin.ldif \ + $(srcdir)/ldap/schema/99user.ldif + +bin_SCRIPTS = $(srcdir)/ldap/servers/slapd/tools/rsearch/scripts/dbgen.pl #//////////////////////////////////////////////////////////////// @@ -633,42 +690,52 @@ #------------------------ # dbscan #------------------------ -dbscan_SOURCES = ldap/servers/slapd/tools/dbscan.c +dbscan_bin_SOURCES = ldap/servers/slapd/tools/dbscan.c -dbscan_CPPFLAGS = @db_inc@ $(AM_CPPFLAGS) -dbscan_LDADD = $(NSPR_LINK) $(DB_LINK) +dbscan_bin_CPPFLAGS = @db_inc@ $(AM_CPPFLAGS) +dbscan_bin_LDADD = $(NSPR_LINK) $(DB_LINK) #------------------------ # ds_newinst #------------------------ -ds_newinst_SOURCES = ldap/admin/src/cfg_sspt.c \ +ds_newinst_bin_SOURCES = ldap/admin/src/cfg_sspt.c \ ldap/admin/src/create_instance.c \ ldap/admin/src/ds_newinst.c \ ldap/admin/src/script-gen.c -ds_newinst_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/ldap/admin/include @ldapsdk_inc@ @nss_inc@ @nspr_inc@ -ds_newinst_LDADD = libds_admin.la $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(SASL_LINK) +ds_newinst_bin_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/ldap/admin/include @ldapsdk_inc@ @nss_inc@ @nspr_inc@ +ds_newinst_bin_LDADD = libds_admin.la $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(SASL_LINK) #------------------------ # dsktune #------------------------ -dsktune_SOURCES = ldap/systools/idsktune.c \ +dsktune_bin_SOURCES = ldap/systools/idsktune.c \ ldap/systools/pio.c #------------------------ +# infadd +#------------------------ +infadd_bin_SOURCES = ldap/servers/slapd/tools/rsearch/addthread.c \ + ldap/servers/slapd/tools/rsearch/infadd.c \ + ldap/servers/slapd/tools/rsearch/nametable.c + +infadd_bin_CPPFLAGS = $(AM_CPPFLAGS) @ldapsdk_inc@ @nss_inc@ @nspr_inc@ +infadd_bin_LDADD = $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(SASL_LINK) + +#------------------------ # ldap-agent #------------------------ -ldap_agent_SOURCES = ldap/servers/snmp/main.c \ +ldap_agent_bin_SOURCES = ldap/servers/snmp/main.c \ ldap/servers/snmp/ldap-agent.c \ ldap/servers/slapd/agtmmap.c -ldap_agent_CPPFLAGS = $(AM_CPPFLAGS) @netsnmp_inc@ @ldapsdk_inc@ @nss_inc@ @nspr_inc@ -ldap_agent_LDADD = $(NETSNMP_LINK) +ldap_agent_bin_CPPFLAGS = $(AM_CPPFLAGS) @netsnmp_inc@ @ldapsdk_inc@ @nss_inc@ @nspr_inc@ +ldap_agent_bin_LDADD = $(NETSNMP_LINK) #------------------------ # ldclt #------------------------ -ldclt_SOURCES = ldap/servers/slapd/tools/ldclt/data.c \ +ldclt_bin_SOURCES = ldap/servers/slapd/tools/ldclt/data.c \ ldap/servers/slapd/tools/ldclt/ldapfct.c \ ldap/servers/slapd/tools/ldclt/ldclt.c \ ldap/servers/slapd/tools/ldclt/ldcltU.c \ @@ -681,35 +748,35 @@ ldap/servers/slapd/tools/ldclt/workarounds.c if SOLARIS -ldclt_SOURCES += ldap/servers/slapd/tools/ldclt/opCheck.c +ldclt_bin_SOURCES += ldap/servers/slapd/tools/ldclt/opCheck.c endif -ldclt_CPPFLAGS = $(AM_CPPFLAGS) @ldapsdk_inc@ @nss_inc@ @nspr_inc@ -ldclt_LDADD = $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(SASL_LINK) +ldclt_bin_CPPFLAGS = $(AM_CPPFLAGS) @ldapsdk_inc@ @nss_inc@ @nspr_inc@ +ldclt_bin_LDADD = $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(SASL_LINK) #------------------------ # ldif #------------------------ -ldif_SOURCES = ldap/servers/slapd/tools/ldif.c +ldif_bin_SOURCES = ldap/servers/slapd/tools/ldif.c -ldif_CPPFLAGS = $(AM_CPPFLAGS) @ldapsdk_inc@ @nss_inc@ @nspr_inc@ -ldif_LDADD = $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(SASL_LINK) +ldif_bin_CPPFLAGS = $(AM_CPPFLAGS) @ldapsdk_inc@ @nss_inc@ @nspr_inc@ +ldif_bin_LDADD = $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(SASL_LINK) #------------------------ # migratecred #------------------------ -migratecred_SOURCES = ldap/servers/slapd/tools/migratecred.c +migratecred_bin_SOURCES = ldap/servers/slapd/tools/migratecred.c -migratecred_CPPFLAGS = $(AM_CPPFLAGS) @ldapsdk_inc@ @nss_inc@ @nspr_inc@ -migratecred_LDADD = libslapd.la $(NSPR_LINK) $(NSS_LINK) $(SVRCORE_LINK) $(LDAPSDK_LINK) $(SASL_LINK) +migratecred_bin_CPPFLAGS = $(AM_CPPFLAGS) @ldapsdk_inc@ @nss_inc@ @nspr_inc@ +migratecred_bin_LDADD = libslapd.la $(NSPR_LINK) $(NSS_LINK) $(SVRCORE_LINK) $(LDAPSDK_LINK) $(SASL_LINK) #------------------------ # mmldif #------------------------ -mmldif_SOURCES = ldap/servers/slapd/tools/mmldif.c +mmldif_bin_SOURCES = ldap/servers/slapd/tools/mmldif.c -mmldif_CPPFLAGS = $(AM_CPPFLAGS) @ldapsdk_inc@ @nss_inc@ @nspr_inc@ -mmldif_LDADD = libslapd.la $(NSPR_LINK) $(NSS_LINK) $(SVRCORE_LINK) $(LDAPSDK_LINK) $(SASL_LINK) +mmldif_bin_CPPFLAGS = $(AM_CPPFLAGS) @ldapsdk_inc@ @nss_inc@ @nspr_inc@ +mmldif_bin_LDADD = libslapd.la $(NSPR_LINK) $(NSS_LINK) $(SVRCORE_LINK) $(LDAPSDK_LINK) $(SASL_LINK) #------------------------ # ns-slapd @@ -756,18 +823,18 @@ #------------------------ # pwdhash #------------------------ -pwdhash_SOURCES = ldap/servers/slapd/tools/pwenc.c +pwdhash_bin_SOURCES = ldap/servers/slapd/tools/pwenc.c -pwdhash_CPPFLAGS = $(AM_CPPFLAGS) @ldapsdk_inc@ @nss_inc@ @nspr_inc@ -pwdhash_LDADD = libslapd.la $(NSPR_LINK) $(NSS_LINK) $(SVRCORE_LINK) $(LDAPSDK_LINK) $(SASL_LINK) +pwdhash_bin_CPPFLAGS = $(AM_CPPFLAGS) @ldapsdk_inc@ @nss_inc@ @nspr_inc@ +pwdhash_bin_LDADD = libslapd.la $(NSPR_LINK) $(NSS_LINK) $(SVRCORE_LINK) $(LDAPSDK_LINK) $(SASL_LINK) #------------------------ # rsearch #------------------------ -rsearch_SOURCES = ldap/servers/slapd/tools/rsearch/nametable.c \ +rsearch_bin_SOURCES = ldap/servers/slapd/tools/rsearch/nametable.c \ ldap/servers/slapd/tools/rsearch/rsearch.c \ ldap/servers/slapd/tools/rsearch/sdattable.c \ ldap/servers/slapd/tools/rsearch/searchthread.c -rsearch_CPPFLAGS = $(AM_CPPFLAGS) @ldapsdk_inc@ @nss_inc@ @nspr_inc@ -rsearch_LDADD = $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(SASL_LINK) +rsearch_bin_CPPFLAGS = $(AM_CPPFLAGS) @ldapsdk_inc@ @nss_inc@ @nspr_inc@ +rsearch_bin_LDADD = $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(SASL_LINK) View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.4 -r 1.5 Makefile.in Index: Makefile.in =================================================================== RCS file: /cvs/dirsec/ldapserver/Makefile.in,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- Makefile.in 19 Oct 2006 15:54:32 -0000 1.4 +++ Makefile.in 20 Oct 2006 21:16:32 -0000 1.5 @@ -17,7 +17,8 @@ -SOURCES = $(libavl_a_SOURCES) $(libldaputil_a_SOURCES) $(libacl_plugin_la_SOURCES) $(libattr_unique_plugin_la_SOURCES) $(libback_ldbm_la_SOURCES) $(libchainingdb_plugin_la_SOURCES) $(libcollation_plugin_la_SOURCES) $(libcos_plugin_la_SOURCES) $(libdes_plugin_la_SOURCES) $(libdistrib_plugin_la_SOURCES) $(libds_admin_la_SOURCES) $(libhttp_client_plugin_la_SOURCES) $(libns_dshttpd_la_SOURCES) $(libpam_passthru_plugin_la_SOURCES) $(libpassthru_plugin_la_SOURCES) $(libpresence_plugin_la_SOURCES) $(libpwdstorage_plugin_la_SOURCES) $(libreferint_plugin_la_SOURCES) $(libreplication_plugin_la_SOURCES) $(libretrocl_plugin_la_SOURCES) $(libroles_plugin_la_SOURCES) $(libslapd_la_SOURCES) $(libstatechange_plugin_la_SOURCES) $(libsyntax_plugin_la_SOURCES) $(libviews_plugin_la_SOURCES) $(dbscan_SOURCES) $(ds_newinst_SOURCES) $(dsktune_SOURCES) $(ldap_agent_SOURCES) $(ldclt_SOURCES) $(ldif_SOURCES) $(makstrdb_SOURCES) $(migratecred_SOURCES) $(mmldif_SOURCES) $(ns_slapd_SOURCES) $(pwdhash_S! OURCES) $(rsearch_SOURCES) + +SOURCES = $(libavl_a_SOURCES) $(libldaputil_a_SOURCES) $(libacl_plugin_la_SOURCES) $(libattr_unique_plugin_la_SOURCES) $(libback_ldbm_la_SOURCES) $(libchainingdb_plugin_la_SOURCES) $(libcollation_plugin_la_SOURCES) $(libcos_plugin_la_SOURCES) $(libdes_plugin_la_SOURCES) $(libdistrib_plugin_la_SOURCES) $(libds_admin_la_SOURCES) $(libhttp_client_plugin_la_SOURCES) $(libns_dshttpd_la_SOURCES) $(libpam_passthru_plugin_la_SOURCES) $(libpassthru_plugin_la_SOURCES) $(libpresence_plugin_la_SOURCES) $(libpwdstorage_plugin_la_SOURCES) $(libreferint_plugin_la_SOURCES) $(libreplication_plugin_la_SOURCES) $(libretrocl_plugin_la_SOURCES) $(libroles_plugin_la_SOURCES) $(libslapd_la_SOURCES) $(libstatechange_plugin_la_SOURCES) $(libsyntax_plugin_la_SOURCES) $(libviews_plugin_la_SOURCES) $(dbscan_bin_SOURCES) $(ds_newinst_bin_SOURCES) $(dsktune_bin_SOURCES) $(infadd_bin_SOURCES) $(ldap_agent_bin_SOURCES) $(ldclt_bin_SOURCES) $(ldif_bin_SOURCES) $(makstrdb_SOURCES) $(migratecred_bin_SOURCES)! $(mmldif_bin_SOURCES) $(ns_slapd_SOURCES) $(pwdhash_bin_SOURCES) $(rsearch_bin_SOURCES) srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -41,10 +42,12 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -bin_PROGRAMS = dbscan$(EXEEXT) ds_newinst$(EXEEXT) dsktune$(EXEEXT) \ - ldap-agent$(EXEEXT) ldclt$(EXEEXT) ldif$(EXEEXT) \ - migratecred$(EXEEXT) mmldif$(EXEEXT) ns-slapd$(EXEEXT) \ - pwdhash$(EXEEXT) rsearch$(EXEEXT) +server_PROGRAMS = dbscan-bin$(EXEEXT) ds_newinst-bin$(EXEEXT) \ + dsktune-bin$(EXEEXT) ldap-agent-bin$(EXEEXT) ldif-bin$(EXEEXT) \ + migratecred-bin$(EXEEXT) mmldif-bin$(EXEEXT) ns-slapd$(EXEEXT) \ + pwdhash-bin$(EXEEXT) +bin_PROGRAMS = infadd-bin$(EXEEXT) ldclt-bin$(EXEEXT) \ + rsearch-bin$(EXEEXT) noinst_PROGRAMS = makstrdb$(EXEEXT) @SOLARIS_TRUE@am__append_1 = ldap/servers/slapd/tools/ldclt/opCheck.c DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \ @@ -88,10 +91,14 @@ *) f=$$p;; \ esac; am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; -am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \ - "$(DESTDIR)$(datadir)" -libLTLIBRARIES_INSTALL = $(INSTALL) -LTLIBRARIES = $(lib_LTLIBRARIES) +am__installdirs = "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(serverdir)" \ + "$(DESTDIR)$(bindir)" "$(DESTDIR)$(serverdir)" \ + "$(DESTDIR)$(bindir)" "$(DESTDIR)$(configdir)" \ + "$(DESTDIR)$(datadir)" "$(DESTDIR)$(propertydir)" \ + "$(DESTDIR)$(schemadir)" +pluginLTLIBRARIES_INSTALL = $(INSTALL) +serverLTLIBRARIES_INSTALL = $(INSTALL) +LTLIBRARIES = $(plugin_LTLIBRARIES) $(server_LTLIBRARIES) libacl_plugin_la_DEPENDENCIES = libns-dshttpd.la am_libacl_plugin_la_OBJECTS = \ ldap/servers/plugins/acl/libacl_plugin_la-acl.lo \ @@ -526,28 +533,38 @@ ldap/servers/plugins/views/libviews_plugin_la-views.lo libviews_plugin_la_OBJECTS = $(am_libviews_plugin_la_OBJECTS) binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) -PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS) -am_dbscan_OBJECTS = ldap/servers/slapd/tools/dbscan-dbscan.$(OBJEXT) -dbscan_OBJECTS = $(am_dbscan_OBJECTS) -dbscan_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) -am_ds_newinst_OBJECTS = ldap/admin/src/ds_newinst-cfg_sspt.$(OBJEXT) \ - ldap/admin/src/ds_newinst-create_instance.$(OBJEXT) \ - ldap/admin/src/ds_newinst-ds_newinst.$(OBJEXT) \ - ldap/admin/src/ds_newinst-script-gen.$(OBJEXT) -ds_newinst_OBJECTS = $(am_ds_newinst_OBJECTS) -ds_newinst_DEPENDENCIES = libds_admin.la $(am__DEPENDENCIES_1) \ +serverPROGRAMS_INSTALL = $(INSTALL_PROGRAM) +PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS) $(server_PROGRAMS) +am_dbscan_bin_OBJECTS = \ + ldap/servers/slapd/tools/dbscan_bin-dbscan.$(OBJEXT) +dbscan_bin_OBJECTS = $(am_dbscan_bin_OBJECTS) +dbscan_bin_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) +am_ds_newinst_bin_OBJECTS = \ + ldap/admin/src/ds_newinst_bin-cfg_sspt.$(OBJEXT) \ + ldap/admin/src/ds_newinst_bin-create_instance.$(OBJEXT) \ + ldap/admin/src/ds_newinst_bin-ds_newinst.$(OBJEXT) \ + ldap/admin/src/ds_newinst_bin-script-gen.$(OBJEXT) +ds_newinst_bin_OBJECTS = $(am_ds_newinst_bin_OBJECTS) +ds_newinst_bin_DEPENDENCIES = libds_admin.la $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) -am_dsktune_OBJECTS = ldap/systools/idsktune.$(OBJEXT) \ +am_dsktune_bin_OBJECTS = ldap/systools/idsktune.$(OBJEXT) \ ldap/systools/pio.$(OBJEXT) -dsktune_OBJECTS = $(am_dsktune_OBJECTS) -dsktune_LDADD = $(LDADD) -am_ldap_agent_OBJECTS = ldap/servers/snmp/ldap_agent-main.$(OBJEXT) \ - ldap/servers/snmp/ldap_agent-ldap-agent.$(OBJEXT) \ - ldap/servers/slapd/ldap_agent-agtmmap.$(OBJEXT) -ldap_agent_OBJECTS = $(am_ldap_agent_OBJECTS) -ldap_agent_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__ldclt_SOURCES_DIST = ldap/servers/slapd/tools/ldclt/data.c \ +dsktune_bin_OBJECTS = $(am_dsktune_bin_OBJECTS) +dsktune_bin_LDADD = $(LDADD) +am_infadd_bin_OBJECTS = ldap/servers/slapd/tools/rsearch/infadd_bin-addthread.$(OBJEXT) \ + ldap/servers/slapd/tools/rsearch/infadd_bin-infadd.$(OBJEXT) \ + ldap/servers/slapd/tools/rsearch/infadd_bin-nametable.$(OBJEXT) +infadd_bin_OBJECTS = $(am_infadd_bin_OBJECTS) +infadd_bin_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) +am_ldap_agent_bin_OBJECTS = \ + ldap/servers/snmp/ldap_agent_bin-main.$(OBJEXT) \ + ldap/servers/snmp/ldap_agent_bin-ldap-agent.$(OBJEXT) \ + ldap/servers/slapd/ldap_agent_bin-agtmmap.$(OBJEXT) +ldap_agent_bin_OBJECTS = $(am_ldap_agent_bin_OBJECTS) +ldap_agent_bin_DEPENDENCIES = $(am__DEPENDENCIES_1) +am__ldclt_bin_SOURCES_DIST = ldap/servers/slapd/tools/ldclt/data.c \ ldap/servers/slapd/tools/ldclt/ldapfct.c \ ldap/servers/slapd/tools/ldclt/ldclt.c \ ldap/servers/slapd/tools/ldclt/ldcltU.c \ @@ -559,39 +576,40 @@ ldap/servers/slapd/tools/ldclt/version.c \ ldap/servers/slapd/tools/ldclt/workarounds.c \ ldap/servers/slapd/tools/ldclt/opCheck.c -@SOLARIS_TRUE@am__objects_3 = ldap/servers/slapd/tools/ldclt/ldclt-opCheck.$(OBJEXT) -am_ldclt_OBJECTS = \ - ldap/servers/slapd/tools/ldclt/ldclt-data.$(OBJEXT) \ - ldap/servers/slapd/tools/ldclt/ldclt-ldapfct.$(OBJEXT) \ - ldap/servers/slapd/tools/ldclt/ldclt-ldclt.$(OBJEXT) \ - ldap/servers/slapd/tools/ldclt/ldclt-ldcltU.$(OBJEXT) \ - ldap/servers/slapd/tools/ldclt/ldclt-parser.$(OBJEXT) \ - ldap/servers/slapd/tools/ldclt/ldclt-port.$(OBJEXT) \ - ldap/servers/slapd/tools/ldclt/ldclt-scalab01.$(OBJEXT) \ - ldap/servers/slapd/tools/ldclt/ldclt-threadMain.$(OBJEXT) \ - ldap/servers/slapd/tools/ldclt/ldclt-utils.$(OBJEXT) \ - ldap/servers/slapd/tools/ldclt/ldclt-version.$(OBJEXT) \ - ldap/servers/slapd/tools/ldclt/ldclt-workarounds.$(OBJEXT) \ +@SOLARIS_TRUE@am__objects_3 = ldap/servers/slapd/tools/ldclt/ldclt_bin-opCheck.$(OBJEXT) +am_ldclt_bin_OBJECTS = \ + ldap/servers/slapd/tools/ldclt/ldclt_bin-data.$(OBJEXT) \ + ldap/servers/slapd/tools/ldclt/ldclt_bin-ldapfct.$(OBJEXT) \ + ldap/servers/slapd/tools/ldclt/ldclt_bin-ldclt.$(OBJEXT) \ + ldap/servers/slapd/tools/ldclt/ldclt_bin-ldcltU.$(OBJEXT) \ + ldap/servers/slapd/tools/ldclt/ldclt_bin-parser.$(OBJEXT) \ + ldap/servers/slapd/tools/ldclt/ldclt_bin-port.$(OBJEXT) \ + ldap/servers/slapd/tools/ldclt/ldclt_bin-scalab01.$(OBJEXT) \ + ldap/servers/slapd/tools/ldclt/ldclt_bin-threadMain.$(OBJEXT) \ + ldap/servers/slapd/tools/ldclt/ldclt_bin-utils.$(OBJEXT) \ + ldap/servers/slapd/tools/ldclt/ldclt_bin-version.$(OBJEXT) \ + ldap/servers/slapd/tools/ldclt/ldclt_bin-workarounds.$(OBJEXT) \ $(am__objects_3) -ldclt_OBJECTS = $(am_ldclt_OBJECTS) -ldclt_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ +ldclt_bin_OBJECTS = $(am_ldclt_bin_OBJECTS) +ldclt_bin_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) -am_ldif_OBJECTS = ldap/servers/slapd/tools/ldif-ldif.$(OBJEXT) -ldif_OBJECTS = $(am_ldif_OBJECTS) -ldif_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ +am_ldif_bin_OBJECTS = \ + ldap/servers/slapd/tools/ldif_bin-ldif.$(OBJEXT) +ldif_bin_OBJECTS = $(am_ldif_bin_OBJECTS) +ldif_bin_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) am_makstrdb_OBJECTS = lib/libsi18n/makstrdb-makstrdb.$(OBJEXT) makstrdb_OBJECTS = $(am_makstrdb_OBJECTS) makstrdb_LDADD = $(LDADD) -am_migratecred_OBJECTS = \ - ldap/servers/slapd/tools/migratecred-migratecred.$(OBJEXT) -migratecred_OBJECTS = $(am_migratecred_OBJECTS) -migratecred_DEPENDENCIES = libslapd.la $(am__DEPENDENCIES_1) \ +am_migratecred_bin_OBJECTS = ldap/servers/slapd/tools/migratecred_bin-migratecred.$(OBJEXT) +migratecred_bin_OBJECTS = $(am_migratecred_bin_OBJECTS) +migratecred_bin_DEPENDENCIES = libslapd.la $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) -am_mmldif_OBJECTS = ldap/servers/slapd/tools/mmldif-mmldif.$(OBJEXT) -mmldif_OBJECTS = $(am_mmldif_OBJECTS) -mmldif_DEPENDENCIES = libslapd.la $(am__DEPENDENCIES_1) \ +am_mmldif_bin_OBJECTS = \ + ldap/servers/slapd/tools/mmldif_bin-mmldif.$(OBJEXT) +mmldif_bin_OBJECTS = $(am_mmldif_bin_OBJECTS) +mmldif_bin_DEPENDENCIES = libslapd.la $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) am_ns_slapd_OBJECTS = ldap/servers/slapd/ns_slapd-abandon.$(OBJEXT) \ @@ -632,19 +650,21 @@ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) -am_pwdhash_OBJECTS = ldap/servers/slapd/tools/pwdhash-pwenc.$(OBJEXT) -pwdhash_OBJECTS = $(am_pwdhash_OBJECTS) -pwdhash_DEPENDENCIES = libslapd.la $(am__DEPENDENCIES_1) \ +am_pwdhash_bin_OBJECTS = \ + ldap/servers/slapd/tools/pwdhash_bin-pwenc.$(OBJEXT) +pwdhash_bin_OBJECTS = $(am_pwdhash_bin_OBJECTS) +pwdhash_bin_DEPENDENCIES = libslapd.la $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) -am_rsearch_OBJECTS = \ - ldap/servers/slapd/tools/rsearch/rsearch-nametable.$(OBJEXT) \ - ldap/servers/slapd/tools/rsearch/rsearch-rsearch.$(OBJEXT) \ - ldap/servers/slapd/tools/rsearch/rsearch-sdattable.$(OBJEXT) \ - ldap/servers/slapd/tools/rsearch/rsearch-searchthread.$(OBJEXT) -rsearch_OBJECTS = $(am_rsearch_OBJECTS) -rsearch_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ +am_rsearch_bin_OBJECTS = ldap/servers/slapd/tools/rsearch/rsearch_bin-nametable.$(OBJEXT) \ + ldap/servers/slapd/tools/rsearch/rsearch_bin-rsearch.$(OBJEXT) \ [...1708 lines suppressed...] -@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(rsearch_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/slapd/tools/rsearch/rsearch-searchthread.o -MD -MP -MF "ldap/servers/slapd/tools/rsearch/$(DEPDIR)/rsearch-searchthread.Tpo" -c -o ldap/servers/slapd/tools/rsearch/rsearch-searchthread.o `test -f 'ldap/servers/slapd/tools/rsearch/searchthread.c' || echo '$(srcdir)/'`ldap/servers/slapd/tools/rsearch/searchthread.c; \ -@am__fastdepCC_TRUE@ then mv -f "ldap/servers/slapd/tools/rsearch/$(DEPDIR)/rsearch-searchthread.Tpo" "ldap/servers/slapd/tools/rsearch/$(DEPDIR)/rsearch-searchthread.Po"; else rm -f "ldap/servers/slapd/tools/rsearch/$(DEPDIR)/rsearch-searchthread.Tpo"; exit 1; fi -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ldap/servers/slapd/tools/rsearch/searchthread.c' object='ldap/servers/slapd/tools/rsearch/rsearch-searchthread.o' libtool=no @AMDEPBACKSLASH@ +ldap/servers/slapd/tools/rsearch/rsearch_bin-searchthread.o: ldap/servers/slapd/tools/rsearch/searchthread.c +@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(rsearch_bin_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/slapd/tools/rsearch/rsearch_bin-searchthread.o -MD -MP -MF "ldap/servers/slapd/tools/rsearch/$(DEPDIR)/rsearch_bin-searchthread.Tpo" -c -o ldap/servers/slapd/tools/rsearch/rsearch_bin-searchthread.o `test -f 'ldap/servers/slapd/tools/rsearch/searchthread.c' || echo '$(srcdir)/'`ldap/servers/slapd/tools/rsearch/searchthread.c; \ +@am__fastdepCC_TRUE@ then mv -f "ldap/servers/slapd/tools/rsearch/$(DEPDIR)/rsearch_bin-searchthread.Tpo" "ldap/servers/slapd/tools/rsearch/$(DEPDIR)/rsearch_bin-searchthread.Po"; else rm -f "ldap/servers/slapd/tools/rsearch/$(DEPDIR)/rsearch_bin-searchthread.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ldap/servers/slapd/tools/rsearch/searchthread.c' object='ldap/servers/slapd/tools/rsearch/rsearch_bin-searchthread.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(rsearch_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/slapd/tools/rsearch/rsearch-searchthread.o `test -f 'ldap/servers/slapd/tools/rsearch/searchthread.c' || echo '$(srcdir)/'`ldap/servers/slapd/tools/rsearch/searchthread.c +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(rsearch_bin_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/slapd/tools/rsearch/rsearch_bin-searchthread.o `test -f 'ldap/servers/slapd/tools/rsearch/searchthread.c' || echo '$(srcdir)/'`ldap/servers/slapd/tools/rsearch/searchthread.c -ldap/servers/slapd/tools/rsearch/rsearch-searchthread.obj: ldap/servers/slapd/tools/rsearch/searchthread.c -@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(rsearch_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/slapd/tools/rsearch/rsearch-searchthread.obj -MD -MP -MF "ldap/servers/slapd/tools/rsearch/$(DEPDIR)/rsearch-searchthread.Tpo" -c -o ldap/servers/slapd/tools/rsearch/rsearch-searchthread.obj `if test -f 'ldap/servers/slapd/tools/rsearch/searchthread.c'; then $(CYGPATH_W) 'ldap/servers/slapd/tools/rsearch/searchthread.c'; else $(CYGPATH_W) '$(srcdir)/ldap/servers/slapd/tools/rsearch/searchthread.c'; fi`; \ -@am__fastdepCC_TRUE@ then mv -f "ldap/servers/slapd/tools/rsearch/$(DEPDIR)/rsearch-searchthread.Tpo" "ldap/servers/slapd/tools/rsearch/$(DEPDIR)/rsearch-searchthread.Po"; else rm -f "ldap/servers/slapd/tools/rsearch/$(DEPDIR)/rsearch-searchthread.Tpo"; exit 1; fi -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ldap/servers/slapd/tools/rsearch/searchthread.c' object='ldap/servers/slapd/tools/rsearch/rsearch-searchthread.obj' libtool=no @AMDEPBACKSLASH@ +ldap/servers/slapd/tools/rsearch/rsearch_bin-searchthread.obj: ldap/servers/slapd/tools/rsearch/searchthread.c +@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(rsearch_bin_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/slapd/tools/rsearch/rsearch_bin-searchthread.obj -MD -MP -MF "ldap/servers/slapd/tools/rsearch/$(DEPDIR)/rsearch_bin-searchthread.Tpo" -c -o ldap/servers/slapd/tools/rsearch/rsearch_bin-searchthread.obj `if test -f 'ldap/servers/slapd/tools/rsearch/searchthread.c'; then $(CYGPATH_W) 'ldap/servers/slapd/tools/rsearch/searchthread.c'; else $(CYGPATH_W) '$(srcdir)/ldap/servers/slapd/tools/rsearch/searchthread.c'; fi`; \ +@am__fastdepCC_TRUE@ then mv -f "ldap/servers/slapd/tools/rsearch/$(DEPDIR)/rsearch_bin-searchthread.Tpo" "ldap/servers/slapd/tools/rsearch/$(DEPDIR)/rsearch_bin-searchthread.Po"; else rm -f "ldap/servers/slapd/tools/rsearch/$(DEPDIR)/rsearch_bin-searchthread.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ldap/servers/slapd/tools/rsearch/searchthread.c' object='ldap/servers/slapd/tools/rsearch/rsearch_bin-searchthread.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(rsearch_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/slapd/tools/rsearch/rsearch-searchthread.obj `if test -f 'ldap/servers/slapd/tools/rsearch/searchthread.c'; then $(CYGPATH_W) 'ldap/servers/slapd/tools/rsearch/searchthread.c'; else $(CYGPATH_W) '$(srcdir)/ldap/servers/slapd/tools/rsearch/searchthread.c'; fi` +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(rsearch_bin_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/slapd/tools/rsearch/rsearch_bin-searchthread.obj `if test -f 'ldap/servers/slapd/tools/rsearch/searchthread.c'; then $(CYGPATH_W) 'ldap/servers/slapd/tools/rsearch/searchthread.c'; else $(CYGPATH_W) '$(srcdir)/ldap/servers/slapd/tools/rsearch/searchthread.c'; fi` .cpp.o: @am__fastdepCXX_TRUE@ depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`; \ @@ -8147,23 +8368,74 @@ distclean-libtool: -rm -f libtool uninstall-info-am: -install-nodist_dataDATA: $(nodist_data_DATA) +install-configDATA: $(config_DATA) + @$(NORMAL_INSTALL) + test -z "$(configdir)" || $(mkdir_p) "$(DESTDIR)$(configdir)" + @list='$(config_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ + echo " $(configDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(configdir)/$$f'"; \ + $(configDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(configdir)/$$f"; \ + done + +uninstall-configDATA: + @$(NORMAL_UNINSTALL) + @list='$(config_DATA)'; for p in $$list; do \ + f=$(am__strip_dir) \ + echo " rm -f '$(DESTDIR)$(configdir)/$$f'"; \ + rm -f "$(DESTDIR)$(configdir)/$$f"; \ + done +install-dataDATA: $(data_DATA) @$(NORMAL_INSTALL) test -z "$(datadir)" || $(mkdir_p) "$(DESTDIR)$(datadir)" - @list='$(nodist_data_DATA)'; for p in $$list; do \ + @list='$(data_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f=$(am__strip_dir) \ - echo " $(nodist_dataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(datadir)/$$f'"; \ - $(nodist_dataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(datadir)/$$f"; \ + echo " $(dataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(datadir)/$$f'"; \ + $(dataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(datadir)/$$f"; \ done -uninstall-nodist_dataDATA: +uninstall-dataDATA: @$(NORMAL_UNINSTALL) - @list='$(nodist_data_DATA)'; for p in $$list; do \ + @list='$(data_DATA)'; for p in $$list; do \ f=$(am__strip_dir) \ echo " rm -f '$(DESTDIR)$(datadir)/$$f'"; \ rm -f "$(DESTDIR)$(datadir)/$$f"; \ done +install-nodist_propertyDATA: $(nodist_property_DATA) + @$(NORMAL_INSTALL) + test -z "$(propertydir)" || $(mkdir_p) "$(DESTDIR)$(propertydir)" + @list='$(nodist_property_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ + echo " $(nodist_propertyDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(propertydir)/$$f'"; \ + $(nodist_propertyDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(propertydir)/$$f"; \ + done + +uninstall-nodist_propertyDATA: + @$(NORMAL_UNINSTALL) + @list='$(nodist_property_DATA)'; for p in $$list; do \ + f=$(am__strip_dir) \ + echo " rm -f '$(DESTDIR)$(propertydir)/$$f'"; \ + rm -f "$(DESTDIR)$(propertydir)/$$f"; \ + done +install-schemaDATA: $(schema_DATA) + @$(NORMAL_INSTALL) + test -z "$(schemadir)" || $(mkdir_p) "$(DESTDIR)$(schemadir)" + @list='$(schema_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ + echo " $(schemaDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(schemadir)/$$f'"; \ + $(schemaDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(schemadir)/$$f"; \ + done + +uninstall-schemaDATA: + @$(NORMAL_UNINSTALL) + @list='$(schema_DATA)'; for p in $$list; do \ + f=$(am__strip_dir) \ + echo " rm -f '$(DESTDIR)$(schemadir)/$$f'"; \ + rm -f "$(DESTDIR)$(schemadir)/$$f"; \ + done ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -8343,11 +8615,10 @@ check-am: all-am check: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) check-am -all-am: Makefile $(LIBRARIES) $(LTLIBRARIES) $(PROGRAMS) $(DATA) -install-binPROGRAMS: install-libLTLIBRARIES - +all-am: Makefile $(LIBRARIES) $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) \ + $(DATA) installdirs: - for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(datadir)"; do \ + for dir in "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(serverdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(serverdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(configdir)" "$(DESTDIR)$(datadir)" "$(DESTDIR)$(propertydir)" "$(DESTDIR)$(schemadir)"; do \ test -z "$$dir" || $(mkdir_p) "$$dir"; \ done install: $(BUILT_SOURCES) @@ -8449,9 +8720,10 @@ -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) clean: clean-am -clean-am: clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \ - clean-libtool clean-noinstLIBRARIES clean-noinstPROGRAMS \ - mostlyclean-am +clean-am: clean-binPROGRAMS clean-generic clean-libtool \ + clean-noinstLIBRARIES clean-noinstPROGRAMS \ + clean-pluginLTLIBRARIES clean-serverLTLIBRARIES \ + clean-serverPROGRAMS mostlyclean-am distclean: distclean-am -rm -f $(am__CONFIG_DISTCLEAN_FILES) @@ -8470,9 +8742,12 @@ info-am: -install-data-am: install-nodist_dataDATA +install-data-am: install-configDATA install-dataDATA \ + install-nodist_propertyDATA install-pluginLTLIBRARIES \ + install-schemaDATA install-serverLTLIBRARIES \ + install-serverPROGRAMS -install-exec-am: install-binPROGRAMS install-libLTLIBRARIES +install-exec-am: install-binPROGRAMS install-binSCRIPTS install-info: install-info-am @@ -8500,26 +8775,35 @@ ps-am: -uninstall-am: uninstall-binPROGRAMS uninstall-info-am \ - uninstall-libLTLIBRARIES uninstall-nodist_dataDATA +uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS \ + uninstall-configDATA uninstall-dataDATA uninstall-info-am \ + uninstall-nodist_propertyDATA uninstall-pluginLTLIBRARIES \ + uninstall-schemaDATA uninstall-serverLTLIBRARIES \ + uninstall-serverPROGRAMS .PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \ - clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \ - clean-libtool clean-noinstLIBRARIES clean-noinstPROGRAMS ctags \ - dist dist-all dist-bzip2 dist-gzip dist-shar dist-tarZ \ - dist-zip distcheck distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags \ - distcleancheck distdir distuninstallcheck dvi dvi-am html \ - html-am info info-am install install-am install-binPROGRAMS \ - install-data install-data-am install-exec install-exec-am \ - install-info install-info-am install-libLTLIBRARIES \ - install-man install-nodist_dataDATA install-strip installcheck \ + clean-binPROGRAMS clean-generic clean-libtool \ + clean-noinstLIBRARIES clean-noinstPROGRAMS \ + clean-pluginLTLIBRARIES clean-serverLTLIBRARIES \ + clean-serverPROGRAMS ctags dist dist-all dist-bzip2 dist-gzip \ + dist-shar dist-tarZ dist-zip distcheck distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distcleancheck distdir distuninstallcheck dvi \ + dvi-am html html-am info info-am install install-am \ + install-binPROGRAMS install-binSCRIPTS install-configDATA \ + install-data install-data-am install-dataDATA install-exec \ + install-exec-am install-info install-info-am install-man \ + install-nodist_propertyDATA install-pluginLTLIBRARIES \ + install-schemaDATA install-serverLTLIBRARIES \ + install-serverPROGRAMS 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-binPROGRAMS \ - uninstall-info-am uninstall-libLTLIBRARIES \ - uninstall-nodist_dataDATA + uninstall-binSCRIPTS uninstall-configDATA uninstall-dataDATA \ + uninstall-info-am uninstall-nodist_propertyDATA \ + uninstall-pluginLTLIBRARIES uninstall-schemaDATA \ + uninstall-serverLTLIBRARIES uninstall-serverPROGRAMS dirver.h: Makefile

17 years, 6 months

1
0
0 / 0

[Fedora-directory-commits] mod_nss mod_nss.c, 1.14, 1.15 mod_nss.h, 1.16, 1.17 nss_engine_config.c, 1.13, 1.14 nss_engine_init.c, 1.24, 1.25 nss.conf.in, 1.9, 1.10

by Doctor Conrad

Author: rcritten Update of /cvs/dirsec/mod_nss In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1460 Modified Files: mod_nss.c mod_nss.h nss_engine_config.c nss_engine_init.c nss.conf.in Log Message: 211612 Add support for setting a default OCSP responder. Index: mod_nss.c =================================================================== RCS file: /cvs/dirsec/mod_nss/mod_nss.c,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- mod_nss.c 9 Aug 2006 19:17:56 -0000 1.14 +++ mod_nss.c 20 Oct 2006 15:23:39 -0000 1.15 @@ -63,6 +63,15 @@ SSL_CMD_SRV(OCSP, FLAG, "OCSP (Online Certificate Status Protocol)" "(`on', `off')") + SSL_CMD_SRV(OCSPDefaultResponder, FLAG, + "Use a default OCSP Responder" + "(`on', `off')") + SSL_CMD_SRV(OCSPDefaultURL, TAKE1, + "The URL of the OCSP default responder" + "(`http://example.com:80/ocsp") + SSL_CMD_SRV(OCSPDefaultName, TAKE1, + "The nickname of the certificate to trust to sign the OCSP responses." + "(`OCSP_Cert`") SSL_CMD_SRV(RandomSeed, TAKE23, "SSL Pseudo Random Number Generator (PRNG) seeding source " "(`startup builtin|file:/path|exec:/path [bytes]')") Index: mod_nss.h =================================================================== RCS file: /cvs/dirsec/mod_nss/mod_nss.h,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- mod_nss.h 25 Aug 2006 20:19:48 -0000 1.16 +++ mod_nss.h 20 Oct 2006 15:23:39 -0000 1.17 @@ -291,6 +291,9 @@ struct SSLSrvConfigRec { SSLModConfigRec *mc; BOOL fips; + BOOL ocsp_default; + const char *ocsp_url; + const char *ocsp_name; BOOL ocsp; BOOL enabled; BOOL proxy_enabled; @@ -370,6 +373,9 @@ const char *nss_cmd_NSSFIPS(cmd_parms *, void *, int); const char *nss_cmd_NSSEngine(cmd_parms *, void *, int); const char *nss_cmd_NSSOCSP(cmd_parms *, void *, int); +const char *nss_cmd_NSSOCSPDefaultResponder(cmd_parms *, void *, int); +const char *nss_cmd_NSSOCSPDefaultURL(cmd_parms *, void *dcfg, const char *arg); +const char *nss_cmd_NSSOCSPDefaultName(cmd_parms *, void *, const char *arg); const char *nss_cmd_NSSCertificateDatabase(cmd_parms *cmd, void *dcfg, const char *arg); const char *nss_cmd_NSSDBPrefix(cmd_parms *cmd, void *dcfg, const char *arg); const char *nss_cmd_NSSCipherSuite(cmd_parms *cmd, void *dcfg, const char *arg); Index: nss_engine_config.c =================================================================== RCS file: /cvs/dirsec/mod_nss/nss_engine_config.c,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- nss_engine_config.c 25 Aug 2006 20:19:48 -0000 1.13 +++ nss_engine_config.c 20 Oct 2006 15:23:39 -0000 1.14 @@ -126,6 +126,9 @@ sc->mc = NULL; sc->ocsp = UNSET; + sc->ocsp_default = UNSET; + sc->ocsp_url = NULL; + sc->ocsp_name = NULL; sc->fips = UNSET; sc->enabled = UNSET; sc->proxy_enabled = UNSET; @@ -197,6 +200,9 @@ cfgMerge(mc, NULL); cfgMergeBool(ocsp); + cfgMergeBool(ocsp_default); + cfgMerge(ocsp_url, NULL); + cfgMerge(ocsp_name, NULL); cfgMergeBool(fips); cfgMergeBool(enabled); cfgMergeBool(proxy_enabled); @@ -314,6 +320,37 @@ return NULL; } +const char *nss_cmd_NSSOCSPDefaultResponder(cmd_parms *cmd, void *dcfg, int flag) +{ + SSLSrvConfigRec *sc = mySrvConfig(cmd->server); + + sc->ocsp_default = flag ? TRUE : FALSE; + + return NULL; +} + +const char *nss_cmd_NSSOCSPDefaultURL(cmd_parms *cmd, + void *dcfg, + const char *arg) +{ + SSLSrvConfigRec *sc = mySrvConfig(cmd->server); + + sc->ocsp_url = arg; + + return NULL; +} + +const char *nss_cmd_NSSOCSPDefaultName(cmd_parms *cmd, + void *dcfg, + const char *arg) +{ + SSLSrvConfigRec *sc = mySrvConfig(cmd->server); + + sc->ocsp_name = arg; + + return NULL; +} + const char *nss_cmd_NSSCertificateDatabase(cmd_parms *cmd, void *dcfg, const char *arg) Index: nss_engine_init.c =================================================================== RCS file: /cvs/dirsec/mod_nss/nss_engine_init.c,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- nss_engine_init.c 17 Oct 2006 16:45:57 -0000 1.24 +++ nss_engine_init.c 20 Oct 2006 15:23:39 -0000 1.25 @@ -21,6 +21,7 @@ #include "pk11func.h" #include "ocsp.h" #include "keyhi.h" +#include "cert.h" static SECStatus ownBadCertHandler(void *arg, PRFileDesc * socket); static SECStatus ownHandshakeCallback(PRFileDesc * socket, void *arg); @@ -137,7 +138,8 @@ * passwords. */ static void nss_init_SSLLibrary(server_rec *s, int sslenabled, int fipsenabled, - int ocspenabled) + int ocspenabled, int ocspdefault, + const char * ocspurl, const char *ocspname) { SECStatus rv; SSLModConfigRec *mc = myModConfig(s); @@ -280,6 +282,30 @@ CERT_EnableOCSPChecking(CERT_GetDefaultCertDB()); ap_log_error(APLOG_MARK, APLOG_INFO, 0, s, "OCSP is enabled."); + + /* We ensure that ocspname and ocspurl are not NULL in nss_init_Module + */ + if (ocspdefault) { + SECStatus sv; + + sv = CERT_SetOCSPDefaultResponder(CERT_GetDefaultCertDB(), + ocspurl, ocspname); + + if (sv == SECFailure) { + ap_log_error(APLOG_MARK, APLOG_INFO, 0, s, + "Unable to set OCSP default responder nickname %s.", ocspname); + nss_log_nss_error(APLOG_MARK, APLOG_INFO, s); + nss_die(); + } + + sv = CERT_EnableOCSPDefaultResponder(CERT_GetDefaultCertDB()); + if (sv == SECFailure) { + ap_log_error(APLOG_MARK, APLOG_INFO, 0, s, + "Unable to enable the OCSP default responder, %s (this shouldn't happen).", ocspname); + nss_log_nss_error(APLOG_MARK, APLOG_INFO, s); + nss_die(); + } + } } } @@ -293,6 +319,9 @@ int sslenabled = FALSE; int fipsenabled = FALSE; int ocspenabled = FALSE; + int ocspdefault = FALSE; + const char * ocspurl = NULL; + const char * ocspname = NULL; mc->nInitCount++; @@ -382,9 +411,21 @@ if (sc->proxy_enabled == UNSET) { sc->proxy_enabled = FALSE; } + + if (sc->ocsp_default == TRUE) { + ocspdefault = TRUE; + ocspurl = sc->ocsp_url; + ocspname = sc->ocsp_name; + if ((ocspurl == NULL) || (ocspname == NULL)) { + ap_log_error(APLOG_MARK, APLOG_ERR, 0, s, + "When NSSOCSPDefaultResponder is enabled both a default URL (NSSOCSPDefaultUrl) and certificate nickname (NSSOCSPDefaultName) are required."); + nss_die(); + } + } } - nss_init_SSLLibrary(base_server, sslenabled, fipsenabled, ocspenabled); + nss_init_SSLLibrary(base_server, sslenabled, fipsenabled, ocspenabled, + ocspdefault, ocspurl, ocspname); ap_log_error(APLOG_MARK, APLOG_INFO, 0, s, "done Init: Initializing NSS library"); @@ -1061,11 +1102,19 @@ } if (shutdown) { + if (CERT_DisableOCSPDefaultResponder(CERT_GetDefaultCertDB()) + != SECSuccess) { + ap_log_error(APLOG_MARK, APLOG_ERR, 0, NULL, + "Turning off the OCSP default responder failed."); + nss_log_nss_error(APLOG_MARK, APLOG_ERR, NULL); + } + SSL_ShutdownServerSessionIDCache(); if ((rv = NSS_Shutdown()) != SECSuccess) { ap_log_error(APLOG_MARK, APLOG_ERR, 0, NULL, - "NSS_Shutdown failed: %d", PR_GetError()); + "NSS_Shutdown failed"); + nss_log_nss_error(APLOG_MARK, APLOG_ERR, NULL); } } Index: nss.conf.in =================================================================== RCS file: /cvs/dirsec/mod_nss/nss.conf.in,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- nss.conf.in 2 Aug 2006 15:14:47 -0000 1.9 +++ nss.conf.in 20 Oct 2006 15:23:39 -0000 1.10 @@ -131,6 +131,18 @@ # Verify that certificates have not been revoked before accepting them. #NSSOCSP off +# +# Use a default OCSP responder. If enabled this will be used regardless +# of whether one is included in a client certificate. Note that the +# server certificate is verified during startup. +# +# NSSOCSPDefaultURL defines the service URL of the OCSP responder +# NSSOCSPDefaultName is the nickname of the certificate to trust to +# sign the OCSP responses. +#NSSOCSPDefaultResponder on +#NSSOCSPDefaultURL http://example.com/ocsp/status +#NSSOCSPDefaultName ocsp-nickname + # Access Control: # With SSLRequire you can do per-directory access control based # on arbitrary complex boolean expressions containing server

17 years, 6 months

1
0
0 / 0

[Fedora-directory-commits] ldapserver/m4 mozldap.m4, 1.1, 1.2 nspr.m4, 1.1, 1.2 nss.m4, 1.1, 1.2 svrcore.m4, 1.1, 1.2

by Doctor Conrad

Author: rmeggins Update of /cvs/dirsec/ldapserver/m4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10279/m4 Modified Files: mozldap.m4 nspr.m4 nss.m4 svrcore.m4 Log Message: Bug(s) fixed: 211426 Bug Description: autotools: support dirsec packages, mozldap6, svrcore Reviewed by: nkinder (Thanks!) Fix Description: Look for the dirsec-nspr and dirsec-nss if nspr and nss are not found in pkg-config. Look for mozldap6 then mozldap in pkg-config. Look for svrcore-devel in pkg-config, then look for it in the system directories. Nathan pointed out that we do not support mozldap v5.x anymore, so we should just look for mozldap6 with pkg-config. I also added an explicit check of the vendor version in the header file to make sure we are using 600 or greater. Platforms tested: RHEL4 Flag Day: no Doc impact: no Index: mozldap.m4 =================================================================== RCS file: /cvs/dirsec/ldapserver/m4/mozldap.m4,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- mozldap.m4 17 Oct 2006 17:07:14 -0000 1.1 +++ mozldap.m4 19 Oct 2006 16:53:05 -0000 1.2 @@ -74,9 +74,10 @@ AC_MSG_CHECKING(for mozldap with pkg-config) AC_PATH_PROG(PKG_CONFIG, pkg-config) if test -n "$PKG_CONFIG"; then - if $PKG_CONFIG --exists mozldap; then - nspr_inc=`$PKG_CONFIG --cflags-only-I mozldap` - nspr_lib=`$PKG_CONFIG --libs-only-L mozldap` + if $PKG_CONFIG --exists mozldap6; then + ldapsdk_inc=`$PKG_CONFIG --cflags-only-I mozldap6` + ldapsdk_lib=`$PKG_CONFIG --libs-only-L mozldap6` + AC_MSG_RESULT([using system mozldap6]) else AC_MSG_ERROR([LDAPSDK not found, specify with --with-ldapsdk[-inc|-lib].]) fi @@ -85,3 +86,19 @@ if test -z "$ldapsdk_inc" -o -z "$ldapsdk_lib"; then AC_MSG_ERROR([LDAPSDK not found, specify with --with-ldapsdk[-inc|-lib].]) fi +dnl make sure the ldap sdk version is 6 or greater - we do not support +dnl the old 5.x or prior versions - the ldap server code expects the new +dnl ber types and other code used with version 6 +save_cppflags="$CPPFLAGS" +CPPFLAGS="$ldapsdk_inc $nss_inc $nspr_inc" +AC_CHECK_HEADER([ldap.h], [isversion6=1], [isversion6=], +[#include <ldap-standard.h> +#if LDAP_VENDOR_VERSION < 600 +#error The LDAP C SDK version is not supported +#endif +]) +CPPFLAGS="$save_cppflags" + +if test -z "$isversion6" ; then + AC_MSG_ERROR([The LDAPSDK version in $ldapsdk_inc/ldap-standard.h is not supported]) +fi Index: nspr.m4 =================================================================== RCS file: /cvs/dirsec/ldapserver/m4/nspr.m4,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- nspr.m4 17 Oct 2006 17:07:14 -0000 1.1 +++ nspr.m4 19 Oct 2006 16:53:05 -0000 1.2 @@ -78,6 +78,10 @@ nspr_inc=`$PKG_CONFIG --cflags-only-I nspr` nspr_lib=`$PKG_CONFIG --libs-only-L nspr` AC_MSG_RESULT([using system NSPR]) + elif $PKG_CONFIG --exists dirsec-nspr; then + nspr_inc=`$PKG_CONFIG --cflags-only-I dirsec-nspr` + nspr_lib=`$PKG_CONFIG --libs-only-L dirsec-nspr` + AC_MSG_RESULT([using system dirsec NSPR]) else AC_MSG_ERROR([NSPR not found, specify with --with-nspr.]) fi Index: nss.m4 =================================================================== RCS file: /cvs/dirsec/ldapserver/m4/nss.m4,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- nss.m4 17 Oct 2006 17:07:14 -0000 1.1 +++ nss.m4 19 Oct 2006 16:53:05 -0000 1.2 @@ -78,6 +78,10 @@ nss_inc=`$PKG_CONFIG --cflags-only-I nss` nss_lib=`$PKG_CONFIG --libs-only-L nss` AC_MSG_RESULT([using system NSS]) + elif $PKG_CONFIG --exists dirsec-nss; then + nss_inc=`$PKG_CONFIG --cflags-only-I dirsec-nss` + nss_lib=`$PKG_CONFIG --libs-only-L dirsec-nss` + AC_MSG_RESULT([using system dirsec NSS]) else AC_MSG_ERROR([NSS not found, specify with --with-nss.]) fi Index: svrcore.m4 =================================================================== RCS file: /cvs/dirsec/ldapserver/m4/svrcore.m4,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- svrcore.m4 17 Oct 2006 17:07:14 -0000 1.1 +++ svrcore.m4 19 Oct 2006 16:53:05 -0000 1.2 @@ -63,6 +63,32 @@ ], AC_MSG_RESULT(no)) +dnl svrcore not given - look for pkg-config if test -z "$svrcore_inc" -o -z "$svrcore_lib"; then - AC_MSG_ERROR([svrcore not found, specify with --with-svrcore.]) + AC_MSG_CHECKING(for svrcore with pkg-config) + AC_PATH_PROG(PKG_CONFIG, pkg-config) + if test -n "$PKG_CONFIG"; then + if $PKG_CONFIG --exists svrcore-devel; then + svrcore_inc=`$PKG_CONFIG --cflags-only-I svrcore-devel` + svrcore_lib=`$PKG_CONFIG --libs-only-L svrcore-devel` + AC_MSG_RESULT([using system svrcore]) + fi + fi +fi + +if test -z "$svrcore_inc" -o -z "$svrcore_lib"; then +dnl just see if svrcore is already a system library + AC_CHECK_LIB([svrcore], [SVRCORE_GetRegisteredPinObj], [havesvrcore=1], + [], [$nss_inc $nspr_inc $nss_lib -lnss3 -lsoftokn3 $nspr_lib -lplds4 -lplc4 -lnspr4]) + if test -n "$havesvrcore" ; then +dnl just see if svrcore is already a system header file + save_cppflags="$CPPFLAGS" + CPPFLAGS="$nss_inc $nspr_inc" + AC_CHECK_HEADER([svrcore.h], [havesvrcore=1], [havesvrcore=]) + CPPFLAGS="$save_cppflags" + fi +dnl for svrcore to be present, both the library and the header must exist + if test -z "$havesvrcore" ; then + AC_MSG_ERROR([svrcore not found, specify with --with-svrcore.]) + fi fi

17 years, 6 months

1
0
0 / 0

[Fedora-directory-commits] ldapserver configure,1.2,1.3

by Doctor Conrad

Author: rmeggins Update of /cvs/dirsec/ldapserver In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10279 Modified Files: configure Log Message: Bug(s) fixed: 211426 Bug Description: autotools: support dirsec packages, mozldap6, svrcore Reviewed by: nkinder (Thanks!) Fix Description: Look for the dirsec-nspr and dirsec-nss if nspr and nss are not found in pkg-config. Look for mozldap6 then mozldap in pkg-config. Look for svrcore-devel in pkg-config, then look for it in the system directories. Nathan pointed out that we do not support mozldap v5.x anymore, so we should just look for mozldap6 with pkg-config. I also added an explicit check of the vendor version in the header file to make sure we are using 600 or greater. Platforms tested: RHEL4 Flag Day: no Doc impact: no Index: configure =================================================================== RCS file: /cvs/dirsec/ldapserver/configure,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- configure 18 Oct 2006 21:40:49 -0000 1.2 +++ configure 19 Oct 2006 16:53:04 -0000 1.3 @@ -23574,6 +23574,11 @@ nspr_lib=`$PKG_CONFIG --libs-only-L nspr` echo "$as_me:$LINENO: result: using system NSPR" >&5 echo "${ECHO_T}using system NSPR" >&6 + elif $PKG_CONFIG --exists dirsec-nspr; then + nspr_inc=`$PKG_CONFIG --cflags-only-I dirsec-nspr` + nspr_lib=`$PKG_CONFIG --libs-only-L dirsec-nspr` + echo "$as_me:$LINENO: result: using system dirsec NSPR" >&5 +echo "${ECHO_T}using system dirsec NSPR" >&6 else { { echo "$as_me:$LINENO: error: NSPR not found, specify with --with-nspr." >&5 echo "$as_me: error: NSPR not found, specify with --with-nspr." >&2;} @@ -23733,6 +23738,11 @@ nss_lib=`$PKG_CONFIG --libs-only-L nss` echo "$as_me:$LINENO: result: using system NSS" >&5 echo "${ECHO_T}using system NSS" >&6 + elif $PKG_CONFIG --exists dirsec-nss; then + nss_inc=`$PKG_CONFIG --cflags-only-I dirsec-nss` + nss_lib=`$PKG_CONFIG --libs-only-L dirsec-nss` + echo "$as_me:$LINENO: result: using system dirsec NSS" >&5 +echo "${ECHO_T}using system dirsec NSS" >&6 else { { echo "$as_me:$LINENO: error: NSS not found, specify with --with-nss." >&5 echo "$as_me: error: NSS not found, specify with --with-nss." >&2;} @@ -23887,9 +23897,11 @@ fi if test -n "$PKG_CONFIG"; then - if $PKG_CONFIG --exists mozldap; then - nspr_inc=`$PKG_CONFIG --cflags-only-I mozldap` - nspr_lib=`$PKG_CONFIG --libs-only-L mozldap` + if $PKG_CONFIG --exists mozldap6; then + ldapsdk_inc=`$PKG_CONFIG --cflags-only-I mozldap6` + ldapsdk_lib=`$PKG_CONFIG --libs-only-L mozldap6` + echo "$as_me:$LINENO: result: using system mozldap6" >&5 +echo "${ECHO_T}using system mozldap6" >&6 else { { echo "$as_me:$LINENO: error: LDAPSDK not found, specify with --with-ldapsdk-inc|-lib." >&5 echo "$as_me: error: LDAPSDK not found, specify with --with-ldapsdk-inc|-lib." >&2;} @@ -23902,6 +23914,74 @@ echo "$as_me: error: LDAPSDK not found, specify with --with-ldapsdk-inc|-lib." >&2;} { (exit 1); exit 1; }; } fi +save_cppflags="$CPPFLAGS" +CPPFLAGS="$ldapsdk_inc $nss_inc $nspr_inc" +echo "$as_me:$LINENO: checking for ldap.h" >&5 +echo $ECHO_N "checking for ldap.h... $ECHO_C" >&6 +if test "${ac_cv_header_ldap_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <ldap-standard.h> +#if LDAP_VENDOR_VERSION < 600 +#error The LDAP C SDK version is not supported +#endif + + +#include <ldap.h> +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_header_ldap_h=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_header_ldap_h=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: $ac_cv_header_ldap_h" >&5 +echo "${ECHO_T}$ac_cv_header_ldap_h" >&6 +if test $ac_cv_header_ldap_h = yes; then + isversion6=1 +else + isversion6= +fi + + +CPPFLAGS="$save_cppflags" + +if test -z "$isversion6" ; then + { { echo "$as_me:$LINENO: error: The LDAPSDK version in $ldapsdk_inc/ldap-standard.h is not supported" >&5 +echo "$as_me: error: The LDAPSDK version in $ldapsdk_inc/ldap-standard.h is not supported" >&2;} + { (exit 1); exit 1; }; } +fi # BEGIN COPYRIGHT BLOCK # Copyright (C) 2006 Red Hat, Inc. @@ -24204,9 +24284,280 @@ fi; if test -z "$svrcore_inc" -o -z "$svrcore_lib"; then - { { echo "$as_me:$LINENO: error: svrcore not found, specify with --with-svrcore." >&5 + echo "$as_me:$LINENO: checking for svrcore with pkg-config" >&5 +echo $ECHO_N "checking for svrcore with pkg-config... $ECHO_C" >&6 + # Extract the first word of "pkg-config", so it can be a program name with args. +set dummy pkg-config; ac_word=$2 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_PKG_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done + + ;; +esac +fi +PKG_CONFIG=$ac_cv_path_PKG_CONFIG + +if test -n "$PKG_CONFIG"; then + echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6 +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + if test -n "$PKG_CONFIG"; then + if $PKG_CONFIG --exists svrcore-devel; then + svrcore_inc=`$PKG_CONFIG --cflags-only-I svrcore-devel` + svrcore_lib=`$PKG_CONFIG --libs-only-L svrcore-devel` + echo "$as_me:$LINENO: result: using system svrcore" >&5 +echo "${ECHO_T}using system svrcore" >&6 + fi + fi +fi + +if test -z "$svrcore_inc" -o -z "$svrcore_lib"; then + echo "$as_me:$LINENO: checking for SVRCORE_GetRegisteredPinObj in -lsvrcore" >&5 +echo $ECHO_N "checking for SVRCORE_GetRegisteredPinObj in -lsvrcore... $ECHO_C" >&6 +if test "${ac_cv_lib_svrcore_SVRCORE_GetRegisteredPinObj+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lsvrcore $nss_inc $nspr_inc $nss_lib -lnss3 -lsoftokn3 $nspr_lib -lplds4 -lplc4 -lnspr4 $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char SVRCORE_GetRegisteredPinObj (); +int +main () +{ +SVRCORE_GetRegisteredPinObj (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_svrcore_SVRCORE_GetRegisteredPinObj=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_lib_svrcore_SVRCORE_GetRegisteredPinObj=no +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_lib_svrcore_SVRCORE_GetRegisteredPinObj" >&5 +echo "${ECHO_T}$ac_cv_lib_svrcore_SVRCORE_GetRegisteredPinObj" >&6 +if test $ac_cv_lib_svrcore_SVRCORE_GetRegisteredPinObj = yes; then + havesvrcore=1 +fi + + if test -n "$havesvrcore" ; then + save_cppflags="$CPPFLAGS" + CPPFLAGS="$nss_inc $nspr_inc" + if test "${ac_cv_header_svrcore_h+set}" = set; then + echo "$as_me:$LINENO: checking for svrcore.h" >&5 +echo $ECHO_N "checking for svrcore.h... $ECHO_C" >&6 +if test "${ac_cv_header_svrcore_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +echo "$as_me:$LINENO: result: $ac_cv_header_svrcore_h" >&5 +echo "${ECHO_T}$ac_cv_header_svrcore_h" >&6 +else + # Is the header compilable? +echo "$as_me:$LINENO: checking svrcore.h usability" >&5 +echo $ECHO_N "checking svrcore.h usability... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include <svrcore.h> +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_header_compiler=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 + +# Is the header present? +echo "$as_me:$LINENO: checking svrcore.h presence" >&5 +echo $ECHO_N "checking svrcore.h presence... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <svrcore.h> +_ACEOF +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no +fi +rm -f conftest.err conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { echo "$as_me:$LINENO: WARNING: svrcore.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: svrcore.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: svrcore.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: svrcore.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: svrcore.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: svrcore.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: svrcore.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: svrcore.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: svrcore.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: svrcore.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: svrcore.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: svrcore.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: svrcore.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: svrcore.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: svrcore.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: svrcore.h: in the future, the compiler will take precedence" >&2;} + ( + cat <<\_ASBOX +## ------------------------------------------ ## +## Report this to http://bugzilla.redhat.com/ ## +## ------------------------------------------ ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 + ;; +esac +echo "$as_me:$LINENO: checking for svrcore.h" >&5 +echo $ECHO_N "checking for svrcore.h... $ECHO_C" >&6 +if test "${ac_cv_header_svrcore_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_header_svrcore_h=$ac_header_preproc +fi +echo "$as_me:$LINENO: result: $ac_cv_header_svrcore_h" >&5 +echo "${ECHO_T}$ac_cv_header_svrcore_h" >&6 + +fi +if test $ac_cv_header_svrcore_h = yes; then + havesvrcore=1 +else + havesvrcore= +fi + + + CPPFLAGS="$save_cppflags" + fi + if test -z "$havesvrcore" ; then + { { echo "$as_me:$LINENO: error: svrcore not found, specify with --with-svrcore." >&5 echo "$as_me: error: svrcore not found, specify with --with-svrcore." >&2;} { (exit 1); exit 1; }; } + fi fi # BEGIN COPYRIGHT BLOCK

17 years, 6 months

1
0
0 / 0

[Fedora-directory-commits] ldapserver Makefile.am, 1.3, 1.4 Makefile.in, 1.3, 1.4

by Doctor Conrad

Author: nkinder Update of /cvs/dirsec/ldapserver In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6743 Modified Files: Makefile.am Makefile.in Log Message: Resolves: 211419 Use libldif shared library from Mozldap instead of our own static library. Index: Makefile.am =================================================================== RCS file: /cvs/dirsec/ldapserver/Makefile.am,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- Makefile.am 18 Oct 2006 21:40:49 -0000 1.3 +++ Makefile.am 19 Oct 2006 15:54:32 -0000 1.4 @@ -20,7 +20,7 @@ #------------------------ NSPR_LINK = @nspr_lib@ -lplc4 -lplds4 -lnspr4 NSS_LINK = @nss_lib@ -lssl3 -lnss3 -lsoftokn3 -LDAPSDK_LINK = @ldapsdk_lib@ -lssldap60 -lldap60 -lprldap60 +LDAPSDK_LINK = @ldapsdk_lib@ -lssldap60 -lldap60 -lprldap60 -lldif60 DB_LINK = @db_lib@ -ldb-4.2 SASL_LINK = @sasl_lib@ -lsasl2 SVRCORE_LINK = @svrcore_lib@ -lsvrcore @@ -55,7 +55,7 @@ libreferint-plugin.la libreplication-plugin.la libretrocl-plugin.la \ libroles-plugin.la libstatechange-plugin.la libsyntax-plugin.la \ libviews-plugin.la -noinst_LIBRARIES = libavl.a libldaputil.a libldif.a +noinst_LIBRARIES = libavl.a libldaputil.a nodist_data_DATA = ns-slapd.properties @@ -103,14 +103,6 @@ libldaputil_a_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/lib/ldaputil @ldapsdk_inc@ @nss_inc@ @nspr_inc@ -#------------------------ -# libldif -#------------------------ -libldif_a_SOURCES = ldap/libraries/libldif/fileurl.c \ - ldap/libraries/libldif/line64.c - -libldif_a_CPPFLAGS = $(AM_CPPFLAGS) @ldapsdk_inc@ @nss_inc@ @nspr_inc@ - #//////////////////////////////////////////////////////////////// # @@ -133,8 +125,7 @@ ldap/admin/lib/dsalib_pw.c \ ldap/admin/lib/dsalib_tailf.c \ ldap/admin/lib/dsalib_updown.c \ - ldap/admin/lib/dsalib_util.c \ - $(libldif_a_SOURCES) + ldap/admin/lib/dsalib_util.c libds_admin_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/ldap/admin/include @ldapsdk_inc@ @nss_inc@ @nspr_inc@ libds_admin_la_LIBADD = $(NSS_LINK) $(NSPR_LINK) @@ -288,8 +279,7 @@ ldap/servers/slapd/value.c \ ldap/servers/slapd/valueset.c \ ldap/servers/slapd/vattr.c \ - $(libavl_a_SOURCES) \ - $(libldif_a_SOURCES) + $(libavl_a_SOURCES) libslapd_la_CPPFLAGS = $(PLUGIN_CPPFLAGS) @db_inc@ @svrcore_inc@ libslapd_la_LIBADD = $(LDAPSDK_LINK) $(NSS_LINK) $(NSPR_LINK) @@ -578,8 +568,7 @@ ldap/servers/plugins/replication/windows_inc_protocol.c \ ldap/servers/plugins/replication/windows_private.c \ ldap/servers/plugins/replication/windows_protocol_util.c \ - ldap/servers/plugins/replication/windows_tot_protocol.c \ - $(libldif_a_SOURCES) + ldap/servers/plugins/replication/windows_tot_protocol.c libreplication_plugin_la_CPPFLAGS = @icu_inc@ @db_inc@ $(PLUGIN_CPPFLAGS) libreplication_plugin_la_LIBADD = $(ICU_LINK) @@ -592,8 +581,7 @@ ldap/servers/plugins/retrocl/retrocl_create.c \ ldap/servers/plugins/retrocl/retrocl_po.c \ ldap/servers/plugins/retrocl/retrocl_rootdse.c \ - ldap/servers/plugins/retrocl/retrocl_trim.c \ - $(libldif_a_SOURCES) + ldap/servers/plugins/retrocl/retrocl_trim.c libretrocl_plugin_la_CPPFLAGS = $(PLUGIN_CPPFLAGS) @@ -705,7 +693,7 @@ ldif_SOURCES = ldap/servers/slapd/tools/ldif.c ldif_CPPFLAGS = $(AM_CPPFLAGS) @ldapsdk_inc@ @nss_inc@ @nspr_inc@ -ldif_LDADD = $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(SASL_LINK) libldif.a +ldif_LDADD = $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(SASL_LINK) #------------------------ # migratecred Index: Makefile.in =================================================================== RCS file: /cvs/dirsec/ldapserver/Makefile.in,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- Makefile.in 18 Oct 2006 21:40:49 -0000 1.3 +++ Makefile.in 19 Oct 2006 15:54:32 -0000 1.4 @@ -17,7 +17,7 @@ -SOURCES = $(libavl_a_SOURCES) $(libldaputil_a_SOURCES) $(libldif_a_SOURCES) $(libacl_plugin_la_SOURCES) $(libattr_unique_plugin_la_SOURCES) $(libback_ldbm_la_SOURCES) $(libchainingdb_plugin_la_SOURCES) $(libcollation_plugin_la_SOURCES) $(libcos_plugin_la_SOURCES) $(libdes_plugin_la_SOURCES) $(libdistrib_plugin_la_SOURCES) $(libds_admin_la_SOURCES) $(libhttp_client_plugin_la_SOURCES) $(libns_dshttpd_la_SOURCES) $(libpam_passthru_plugin_la_SOURCES) $(libpassthru_plugin_la_SOURCES) $(libpresence_plugin_la_SOURCES) $(libpwdstorage_plugin_la_SOURCES) $(libreferint_plugin_la_SOURCES) $(libreplication_plugin_la_SOURCES) $(libretrocl_plugin_la_SOURCES) $(libroles_plugin_la_SOURCES) $(libslapd_la_SOURCES) $(libstatechange_plugin_la_SOURCES) $(libsyntax_plugin_la_SOURCES) $(libviews_plugin_la_SOURCES) $(dbscan_SOURCES) $(ds_newinst_SOURCES) $(dsktune_SOURCES) $(ldap_agent_SOURCES) $(ldclt_SOURCES) $(ldif_SOURCES) $(makstrdb_SOURCES) $(migratecred_SOURCES) $(mmldif_SOURCES) $(ns_slapd! _SOURCES) $(pwdhash_SOURCES) $(rsearch_SOURCES) +SOURCES = $(libavl_a_SOURCES) $(libldaputil_a_SOURCES) $(libacl_plugin_la_SOURCES) $(libattr_unique_plugin_la_SOURCES) $(libback_ldbm_la_SOURCES) $(libchainingdb_plugin_la_SOURCES) $(libcollation_plugin_la_SOURCES) $(libcos_plugin_la_SOURCES) $(libdes_plugin_la_SOURCES) $(libdistrib_plugin_la_SOURCES) $(libds_admin_la_SOURCES) $(libhttp_client_plugin_la_SOURCES) $(libns_dshttpd_la_SOURCES) $(libpam_passthru_plugin_la_SOURCES) $(libpassthru_plugin_la_SOURCES) $(libpresence_plugin_la_SOURCES) $(libpwdstorage_plugin_la_SOURCES) $(libreferint_plugin_la_SOURCES) $(libreplication_plugin_la_SOURCES) $(libretrocl_plugin_la_SOURCES) $(libroles_plugin_la_SOURCES) $(libslapd_la_SOURCES) $(libstatechange_plugin_la_SOURCES) $(libsyntax_plugin_la_SOURCES) $(libviews_plugin_la_SOURCES) $(dbscan_SOURCES) $(ds_newinst_SOURCES) $(dsktune_SOURCES) $(ldap_agent_SOURCES) $(ldclt_SOURCES) $(ldif_SOURCES) $(makstrdb_SOURCES) $(migratecred_SOURCES) $(mmldif_SOURCES) $(ns_slapd_SOURCES) $(pwdhash_S! OURCES) $(rsearch_SOURCES) srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -82,12 +82,6 @@ lib/ldaputil/libldaputil_a-ldapdb.$(OBJEXT) \ lib/ldaputil/libldaputil_a-vtable.$(OBJEXT) libldaputil_a_OBJECTS = $(am_libldaputil_a_OBJECTS) -libldif_a_AR = $(AR) $(ARFLAGS) -libldif_a_LIBADD = -am_libldif_a_OBJECTS = \ - ldap/libraries/libldif/libldif_a-fileurl.$(OBJEXT) \ - ldap/libraries/libldif/libldif_a-line64.$(OBJEXT) -libldif_a_OBJECTS = $(am_libldif_a_OBJECTS) am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -231,8 +225,6 @@ libdistrib_plugin_la_OBJECTS = $(am_libdistrib_plugin_la_OBJECTS) libds_admin_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) -am__objects_1 = ldap/libraries/libldif/libds_admin_la-fileurl.lo \ - ldap/libraries/libldif/libds_admin_la-line64.lo am_libds_admin_la_OBJECTS = \ ldap/admin/lib/libds_admin_la-dsalib_conf.lo \ ldap/admin/lib/libds_admin_la-dsalib_confs.lo \ @@ -246,7 +238,7 @@ ldap/admin/lib/libds_admin_la-dsalib_pw.lo \ ldap/admin/lib/libds_admin_la-dsalib_tailf.lo \ ldap/admin/lib/libds_admin_la-dsalib_updown.lo \ - ldap/admin/lib/libds_admin_la-dsalib_util.lo $(am__objects_1) + ldap/admin/lib/libds_admin_la-dsalib_util.lo libds_admin_la_OBJECTS = $(am_libds_admin_la_OBJECTS) libhttp_client_plugin_la_LIBADD = am_libhttp_client_plugin_la_OBJECTS = ldap/servers/plugins/http/libhttp_client_plugin_la-http_client.lo \ @@ -254,7 +246,7 @@ libhttp_client_plugin_la_OBJECTS = \ $(am_libhttp_client_plugin_la_OBJECTS) libns_dshttpd_la_LIBADD = -am__objects_2 = lib/ldaputil/libns_dshttpd_la-cert.lo \ +am__objects_1 = lib/ldaputil/libns_dshttpd_la-cert.lo \ lib/ldaputil/libns_dshttpd_la-certmap.lo \ lib/ldaputil/libns_dshttpd_la-dbconf.lo \ lib/ldaputil/libns_dshttpd_la-encode.lo \ @@ -315,7 +307,7 @@ lib/libsi18n/libns_dshttpd_la-getlang.lo \ lib/libsi18n/libns_dshttpd_la-propset.lo \ lib/libsi18n/libns_dshttpd_la-reshash.lo \ - lib/libsi18n/libns_dshttpd_la-txtfile.lo $(am__objects_2) + lib/libsi18n/libns_dshttpd_la-txtfile.lo $(am__objects_1) libns_dshttpd_la_OBJECTS = $(am_libns_dshttpd_la_OBJECTS) libpam_passthru_plugin_la_DEPENDENCIES = $(am__DEPENDENCIES_1) am_libpam_passthru_plugin_la_OBJECTS = ldap/servers/plugins/pam_passthru/libpam_passthru_plugin_la-pam_ptconfig.lo \ @@ -351,9 +343,6 @@ am_libreferint_plugin_la_OBJECTS = ldap/servers/plugins/referint/libreferint_plugin_la-referint.lo libreferint_plugin_la_OBJECTS = $(am_libreferint_plugin_la_OBJECTS) libreplication_plugin_la_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_3 = \ - ldap/libraries/libldif/libreplication_plugin_la-fileurl.lo \ - ldap/libraries/libldif/libreplication_plugin_la-line64.lo am_libreplication_plugin_la_OBJECTS = ldap/servers/plugins/replication/libreplication_plugin_la-cl5_clcache.lo \ ldap/servers/plugins/replication/libreplication_plugin_la-cl5_config.lo \ ldap/servers/plugins/replication/libreplication_plugin_la-cl5_init.lo \ @@ -406,22 +395,17 @@ ldap/servers/plugins/replication/libreplication_plugin_la-windows_inc_protocol.lo \ ldap/servers/plugins/replication/libreplication_plugin_la-windows_private.lo \ ldap/servers/plugins/replication/libreplication_plugin_la-windows_protocol_util.lo \ - ldap/servers/plugins/replication/libreplication_plugin_la-windows_tot_protocol.lo \ - $(am__objects_3) + ldap/servers/plugins/replication/libreplication_plugin_la-windows_tot_protocol.lo libreplication_plugin_la_OBJECTS = \ $(am_libreplication_plugin_la_OBJECTS) libretrocl_plugin_la_LIBADD = -am__objects_4 = \ - ldap/libraries/libldif/libretrocl_plugin_la-fileurl.lo \ - ldap/libraries/libldif/libretrocl_plugin_la-line64.lo am_libretrocl_plugin_la_OBJECTS = \ ldap/servers/plugins/retrocl/libretrocl_plugin_la-retrocl.lo \ ldap/servers/plugins/retrocl/libretrocl_plugin_la-retrocl_cn.lo \ ldap/servers/plugins/retrocl/libretrocl_plugin_la-retrocl_create.lo \ ldap/servers/plugins/retrocl/libretrocl_plugin_la-retrocl_po.lo \ ldap/servers/plugins/retrocl/libretrocl_plugin_la-retrocl_rootdse.lo \ - ldap/servers/plugins/retrocl/libretrocl_plugin_la-retrocl_trim.lo \ - $(am__objects_4) + ldap/servers/plugins/retrocl/libretrocl_plugin_la-retrocl_trim.lo libretrocl_plugin_la_OBJECTS = $(am_libretrocl_plugin_la_OBJECTS) libroles_plugin_la_LIBADD = am_libroles_plugin_la_OBJECTS = \ @@ -430,9 +414,7 @@ libroles_plugin_la_OBJECTS = $(am_libroles_plugin_la_OBJECTS) libslapd_la_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) -am__objects_5 = ldap/libraries/libavl/libslapd_la-avl.lo -am__objects_6 = ldap/libraries/libldif/libslapd_la-fileurl.lo \ - ldap/libraries/libldif/libslapd_la-line64.lo +am__objects_2 = ldap/libraries/libavl/libslapd_la-avl.lo am_libslapd_la_OBJECTS = ldap/servers/slapd/libslapd_la-add.lo \ ldap/servers/slapd/libslapd_la-agtmmap.lo \ ldap/servers/slapd/libslapd_la-apibroker.lo \ @@ -519,8 +501,7 @@ ldap/servers/slapd/libslapd_la-uuid.lo \ ldap/servers/slapd/libslapd_la-value.lo \ ldap/servers/slapd/libslapd_la-valueset.lo \ - ldap/servers/slapd/libslapd_la-vattr.lo $(am__objects_5) \ - $(am__objects_6) + ldap/servers/slapd/libslapd_la-vattr.lo $(am__objects_2) libslapd_la_OBJECTS = $(am_libslapd_la_OBJECTS) libstatechange_plugin_la_LIBADD = am_libstatechange_plugin_la_OBJECTS = ldap/servers/plugins/statechange/libstatechange_plugin_la-statechange.lo @@ -578,7 +559,7 @@ ldap/servers/slapd/tools/ldclt/version.c \ ldap/servers/slapd/tools/ldclt/workarounds.c \ ldap/servers/slapd/tools/ldclt/opCheck.c -@SOLARIS_TRUE@am__objects_7 = ldap/servers/slapd/tools/ldclt/ldclt-opCheck.$(OBJEXT) +@SOLARIS_TRUE@am__objects_3 = ldap/servers/slapd/tools/ldclt/ldclt-opCheck.$(OBJEXT) am_ldclt_OBJECTS = \ ldap/servers/slapd/tools/ldclt/ldclt-data.$(OBJEXT) \ ldap/servers/slapd/tools/ldclt/ldclt-ldapfct.$(OBJEXT) \ @@ -591,14 +572,14 @@ ldap/servers/slapd/tools/ldclt/ldclt-utils.$(OBJEXT) \ ldap/servers/slapd/tools/ldclt/ldclt-version.$(OBJEXT) \ ldap/servers/slapd/tools/ldclt/ldclt-workarounds.$(OBJEXT) \ - $(am__objects_7) + $(am__objects_3) ldclt_OBJECTS = $(am_ldclt_OBJECTS) ldclt_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) am_ldif_OBJECTS = ldap/servers/slapd/tools/ldif-ldif.$(OBJEXT) ldif_OBJECTS = $(am_ldif_OBJECTS) ldif_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) libldif.a + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) am_makstrdb_OBJECTS = lib/libsi18n/makstrdb-makstrdb.$(OBJEXT) makstrdb_OBJECTS = $(am_makstrdb_OBJECTS) makstrdb_LDADD = $(LDADD) @@ -684,7 +665,7 @@ CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \ $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ SOURCES = $(libavl_a_SOURCES) $(libldaputil_a_SOURCES) \ - $(libldif_a_SOURCES) $(libacl_plugin_la_SOURCES) \ + $(libacl_plugin_la_SOURCES) \ $(libattr_unique_plugin_la_SOURCES) $(libback_ldbm_la_SOURCES) \ $(libchainingdb_plugin_la_SOURCES) \ $(libcollation_plugin_la_SOURCES) $(libcos_plugin_la_SOURCES) \ @@ -705,7 +686,7 @@ $(makstrdb_SOURCES) $(migratecred_SOURCES) $(mmldif_SOURCES) \ $(ns_slapd_SOURCES) $(pwdhash_SOURCES) $(rsearch_SOURCES) DIST_SOURCES = $(libavl_a_SOURCES) $(libldaputil_a_SOURCES) \ - $(libldif_a_SOURCES) $(libacl_plugin_la_SOURCES) \ + $(libacl_plugin_la_SOURCES) \ $(libattr_unique_plugin_la_SOURCES) $(libback_ldbm_la_SOURCES) \ $(libchainingdb_plugin_la_SOURCES) \ $(libcollation_plugin_la_SOURCES) $(libcos_plugin_la_SOURCES) \ @@ -889,7 +870,7 @@ #------------------------ NSPR_LINK = @nspr_lib@ -lplc4 -lplds4 -lnspr4 NSS_LINK = @nss_lib@ -lssl3 -lnss3 -lsoftokn3 -LDAPSDK_LINK = @ldapsdk_lib@ -lssldap60 -lldap60 -lprldap60 +LDAPSDK_LINK = @ldapsdk_lib@ -lssldap60 -lldap60 -lprldap60 -lldif60 DB_LINK = @db_lib@ -ldb-4.2 SASL_LINK = @sasl_lib@ -lsasl2 SVRCORE_LINK = @svrcore_lib@ -lsvrcore @@ -911,7 +892,7 @@ libroles-plugin.la libstatechange-plugin.la libsyntax-plugin.la \ libviews-plugin.la -noinst_LIBRARIES = libavl.a libldaputil.a libldif.a +noinst_LIBRARIES = libavl.a libldaputil.a nodist_data_DATA = ns-slapd.properties #//////////////////////////////////////////////////////////////// @@ -950,14 +931,6 @@ libldaputil_a_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/lib/ldaputil @ldapsdk_inc@ @nss_inc@ @nspr_inc@ -#------------------------ -# libldif -#------------------------ -libldif_a_SOURCES = ldap/libraries/libldif/fileurl.c \ - ldap/libraries/libldif/line64.c - -libldif_a_CPPFLAGS = $(AM_CPPFLAGS) @ldapsdk_inc@ @nss_inc@ @nspr_inc@ - #//////////////////////////////////////////////////////////////// # # Dynamic Server Libraries @@ -979,8 +952,7 @@ ldap/admin/lib/dsalib_pw.c \ ldap/admin/lib/dsalib_tailf.c \ ldap/admin/lib/dsalib_updown.c \ - ldap/admin/lib/dsalib_util.c \ - $(libldif_a_SOURCES) + ldap/admin/lib/dsalib_util.c libds_admin_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/ldap/admin/include @ldapsdk_inc@ @nss_inc@ @nspr_inc@ libds_admin_la_LIBADD = $(NSS_LINK) $(NSPR_LINK) @@ -1134,8 +1106,7 @@ ldap/servers/slapd/value.c \ ldap/servers/slapd/valueset.c \ ldap/servers/slapd/vattr.c \ - $(libavl_a_SOURCES) \ - $(libldif_a_SOURCES) + $(libavl_a_SOURCES) libslapd_la_CPPFLAGS = $(PLUGIN_CPPFLAGS) @db_inc@ @svrcore_inc@ libslapd_la_LIBADD = $(LDAPSDK_LINK) $(NSS_LINK) $(NSPR_LINK) @@ -1419,8 +1390,7 @@ ldap/servers/plugins/replication/windows_inc_protocol.c \ ldap/servers/plugins/replication/windows_private.c \ ldap/servers/plugins/replication/windows_protocol_util.c \ - ldap/servers/plugins/replication/windows_tot_protocol.c \ - $(libldif_a_SOURCES) + ldap/servers/plugins/replication/windows_tot_protocol.c libreplication_plugin_la_CPPFLAGS = @icu_inc@ @db_inc@ $(PLUGIN_CPPFLAGS) libreplication_plugin_la_LIBADD = $(ICU_LINK) @@ -1433,8 +1403,7 @@ ldap/servers/plugins/retrocl/retrocl_create.c \ ldap/servers/plugins/retrocl/retrocl_po.c \ ldap/servers/plugins/retrocl/retrocl_rootdse.c \ - ldap/servers/plugins/retrocl/retrocl_trim.c \ - $(libldif_a_SOURCES) + ldap/servers/plugins/retrocl/retrocl_trim.c libretrocl_plugin_la_CPPFLAGS = $(PLUGIN_CPPFLAGS) @@ -1537,7 +1506,7 @@ #------------------------ ldif_SOURCES = ldap/servers/slapd/tools/ldif.c ldif_CPPFLAGS = $(AM_CPPFLAGS) @ldapsdk_inc@ @nss_inc@ @nspr_inc@ -ldif_LDADD = $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(SASL_LINK) libldif.a +ldif_LDADD = $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(SASL_LINK) #------------------------ # migratecred @@ -1705,22 +1674,6 @@ -rm -f libldaputil.a $(libldaputil_a_AR) libldaputil.a $(libldaputil_a_OBJECTS) $(libldaputil_a_LIBADD) $(RANLIB) libldaputil.a -ldap/libraries/libldif/$(am__dirstamp): - @$(mkdir_p) ldap/libraries/libldif - @: > ldap/libraries/libldif/$(am__dirstamp) -ldap/libraries/libldif/$(DEPDIR)/$(am__dirstamp): - @$(mkdir_p) ldap/libraries/libldif/$(DEPDIR) - @: > ldap/libraries/libldif/$(DEPDIR)/$(am__dirstamp) -ldap/libraries/libldif/libldif_a-fileurl.$(OBJEXT): \ - ldap/libraries/libldif/$(am__dirstamp) \ - ldap/libraries/libldif/$(DEPDIR)/$(am__dirstamp) -ldap/libraries/libldif/libldif_a-line64.$(OBJEXT): \ - ldap/libraries/libldif/$(am__dirstamp) \ - ldap/libraries/libldif/$(DEPDIR)/$(am__dirstamp) -libldif.a: $(libldif_a_OBJECTS) $(libldif_a_DEPENDENCIES) - -rm -f libldif.a - $(libldif_a_AR) libldif.a $(libldif_a_OBJECTS) $(libldif_a_LIBADD) - $(RANLIB) libldif.a install-libLTLIBRARIES: $(lib_LTLIBRARIES) @$(NORMAL_INSTALL) test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)" @@ -2181,12 +2134,6 @@ ldap/admin/lib/libds_admin_la-dsalib_util.lo: \ ldap/admin/lib/$(am__dirstamp) \ ldap/admin/lib/$(DEPDIR)/$(am__dirstamp) -ldap/libraries/libldif/libds_admin_la-fileurl.lo: \ - ldap/libraries/libldif/$(am__dirstamp) \ - ldap/libraries/libldif/$(DEPDIR)/$(am__dirstamp) -ldap/libraries/libldif/libds_admin_la-line64.lo: \ - ldap/libraries/libldif/$(am__dirstamp) \ - ldap/libraries/libldif/$(DEPDIR)/$(am__dirstamp) libds_admin.la: $(libds_admin_la_OBJECTS) $(libds_admin_la_DEPENDENCIES) $(LINK) -rpath $(libdir) $(libds_admin_la_LDFLAGS) $(libds_admin_la_OBJECTS) $(libds_admin_la_LIBADD) $(LIBS) ldap/servers/plugins/http/$(am__dirstamp): @@ -2650,12 +2597,6 @@ ldap/servers/plugins/replication/libreplication_plugin_la-windows_tot_protocol.lo: \ ldap/servers/plugins/replication/$(am__dirstamp) \ ldap/servers/plugins/replication/$(DEPDIR)/$(am__dirstamp) -ldap/libraries/libldif/libreplication_plugin_la-fileurl.lo: \ - ldap/libraries/libldif/$(am__dirstamp) \ - ldap/libraries/libldif/$(DEPDIR)/$(am__dirstamp) -ldap/libraries/libldif/libreplication_plugin_la-line64.lo: \ - ldap/libraries/libldif/$(am__dirstamp) \ - ldap/libraries/libldif/$(DEPDIR)/$(am__dirstamp) libreplication-plugin.la: $(libreplication_plugin_la_OBJECTS) $(libreplication_plugin_la_DEPENDENCIES) $(LINK) -rpath $(libdir) $(libreplication_plugin_la_LDFLAGS) $(libreplication_plugin_la_OBJECTS) $(libreplication_plugin_la_LIBADD) $(LIBS) ldap/servers/plugins/retrocl/$(am__dirstamp): @@ -2682,12 +2623,6 @@ ldap/servers/plugins/retrocl/libretrocl_plugin_la-retrocl_trim.lo: \ ldap/servers/plugins/retrocl/$(am__dirstamp) \ ldap/servers/plugins/retrocl/$(DEPDIR)/$(am__dirstamp) -ldap/libraries/libldif/libretrocl_plugin_la-fileurl.lo: \ - ldap/libraries/libldif/$(am__dirstamp) \ - ldap/libraries/libldif/$(DEPDIR)/$(am__dirstamp) -ldap/libraries/libldif/libretrocl_plugin_la-line64.lo: \ - ldap/libraries/libldif/$(am__dirstamp) \ - ldap/libraries/libldif/$(DEPDIR)/$(am__dirstamp) libretrocl-plugin.la: $(libretrocl_plugin_la_OBJECTS) $(libretrocl_plugin_la_DEPENDENCIES) $(LINK) -rpath $(libdir) $(libretrocl_plugin_la_LDFLAGS) $(libretrocl_plugin_la_OBJECTS) $(libretrocl_plugin_la_LIBADD) $(LIBS) ldap/servers/plugins/roles/$(am__dirstamp): @@ -2974,12 +2909,6 @@ ldap/libraries/libavl/libslapd_la-avl.lo: \ ldap/libraries/libavl/$(am__dirstamp) \ ldap/libraries/libavl/$(DEPDIR)/$(am__dirstamp) -ldap/libraries/libldif/libslapd_la-fileurl.lo: \ - ldap/libraries/libldif/$(am__dirstamp) \ - ldap/libraries/libldif/$(DEPDIR)/$(am__dirstamp) -ldap/libraries/libldif/libslapd_la-line64.lo: \ - ldap/libraries/libldif/$(am__dirstamp) \ - ldap/libraries/libldif/$(DEPDIR)/$(am__dirstamp) libslapd.la: $(libslapd_la_OBJECTS) $(libslapd_la_DEPENDENCIES) $(LINK) -rpath $(libdir) $(libslapd_la_LDFLAGS) $(libslapd_la_OBJECTS) $(libslapd_la_LIBADD) $(LIBS) ldap/servers/plugins/statechange/$(am__dirstamp): @@ -3378,24 +3307,6 @@ -rm -f ldap/libraries/libavl/avl.$(OBJEXT) -rm -f ldap/libraries/libavl/libslapd_la-avl.$(OBJEXT) -rm -f ldap/libraries/libavl/libslapd_la-avl.lo - -rm -f ldap/libraries/libldif/libds_admin_la-fileurl.$(OBJEXT) - -rm -f ldap/libraries/libldif/libds_admin_la-fileurl.lo - -rm -f ldap/libraries/libldif/libds_admin_la-line64.$(OBJEXT) - -rm -f ldap/libraries/libldif/libds_admin_la-line64.lo - -rm -f ldap/libraries/libldif/libldif_a-fileurl.$(OBJEXT) - -rm -f ldap/libraries/libldif/libldif_a-line64.$(OBJEXT) - -rm -f ldap/libraries/libldif/libreplication_plugin_la-fileurl.$(OBJEXT) - -rm -f ldap/libraries/libldif/libreplication_plugin_la-fileurl.lo - -rm -f ldap/libraries/libldif/libreplication_plugin_la-line64.$(OBJEXT) - -rm -f ldap/libraries/libldif/libreplication_plugin_la-line64.lo - -rm -f ldap/libraries/libldif/libretrocl_plugin_la-fileurl.$(OBJEXT) - -rm -f ldap/libraries/libldif/libretrocl_plugin_la-fileurl.lo - -rm -f ldap/libraries/libldif/libretrocl_plugin_la-line64.$(OBJEXT) - -rm -f ldap/libraries/libldif/libretrocl_plugin_la-line64.lo - -rm -f ldap/libraries/libldif/libslapd_la-fileurl.$(OBJEXT) - -rm -f ldap/libraries/libldif/libslapd_la-fileurl.lo - -rm -f ldap/libraries/libldif/libslapd_la-line64.$(OBJEXT) - -rm -f ldap/libraries/libldif/libslapd_la-line64.lo -rm -f ldap/servers/plugins/acl/libacl_plugin_la-acl.$(OBJEXT) -rm -f ldap/servers/plugins/acl/libacl_plugin_la-acl.lo -rm -f ldap/servers/plugins/acl/libacl_plugin_la-acl_ext.$(OBJEXT) @@ -4188,16 +4099,6 @@ @AMDEP_TRUE@@am__include@ @am__quote@ldap/admin/src/$(DEPDIR)/ds_newinst-script-gen.Po(a)am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@ldap/libraries/libavl/$(DEPDIR)/avl.Po(a)am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@ldap/libraries/libavl/$(DEPDIR)/libslapd_la-avl.Plo(a)am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@ldap/libraries/libldif/$(DEPDIR)/libds_admin_la-fileurl.Plo(a)am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@ldap/libraries/libldif/$(DEPDIR)/libds_admin_la-line64.Plo(a)am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@ldap/libraries/libldif/$(DEPDIR)/libldif_a-fileurl.Po(a)am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@ldap/libraries/libldif/$(DEPDIR)/libldif_a-line64.Po(a)am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@ldap/libraries/libldif/$(DEPDIR)/libreplication_plugin_la-fileurl.Plo(a)am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@ldap/libraries/libldif/$(DEPDIR)/libreplication_plugin_la-line64.Plo(a)am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@ldap/libraries/libldif/$(DEPDIR)/libretrocl_plugin_la-fileurl.Plo(a)am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@ldap/libraries/libldif/$(DEPDIR)/libretrocl_plugin_la-line64.Plo(a)am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@ldap/libraries/libldif/$(DEPDIR)/libslapd_la-fileurl.Plo(a)am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@ldap/libraries/libldif/$(DEPDIR)/libslapd_la-line64.Plo(a)am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acl.Plo(a)am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acl_ext.Plo(a)am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-aclanom.Plo(a)am__quote@ @@ -4768,34 +4669,6 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libldaputil_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib/ldaputil/libldaputil_a-vtable.obj `if test -f 'lib/ldaputil/vtable.c'; then $(CYGPATH_W) 'lib/ldaputil/vtable.c'; else $(CYGPATH_W) '$(srcdir)/lib/ldaputil/vtable.c'; fi` -ldap/libraries/libldif/libldif_a-fileurl.o: ldap/libraries/libldif/fileurl.c -@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libldif_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/libraries/libldif/libldif_a-fileurl.o -MD -MP -MF "ldap/libraries/libldif/$(DEPDIR)/libldif_a-fileurl.Tpo" -c -o ldap/libraries/libldif/libldif_a-fileurl.o `test -f 'ldap/libraries/libldif/fileurl.c' || echo '$(srcdir)/'`ldap/libraries/libldif/fileurl.c; \ -@am__fastdepCC_TRUE@ then mv -f "ldap/libraries/libldif/$(DEPDIR)/libldif_a-fileurl.Tpo" "ldap/libraries/libldif/$(DEPDIR)/libldif_a-fileurl.Po"; else rm -f "ldap/libraries/libldif/$(DEPDIR)/libldif_a-fileurl.Tpo"; exit 1; fi -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ldap/libraries/libldif/fileurl.c' object='ldap/libraries/libldif/libldif_a-fileurl.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libldif_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/libraries/libldif/libldif_a-fileurl.o `test -f 'ldap/libraries/libldif/fileurl.c' || echo '$(srcdir)/'`ldap/libraries/libldif/fileurl.c - -ldap/libraries/libldif/libldif_a-fileurl.obj: ldap/libraries/libldif/fileurl.c -@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libldif_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/libraries/libldif/libldif_a-fileurl.obj -MD -MP -MF "ldap/libraries/libldif/$(DEPDIR)/libldif_a-fileurl.Tpo" -c -o ldap/libraries/libldif/libldif_a-fileurl.obj `if test -f 'ldap/libraries/libldif/fileurl.c'; then $(CYGPATH_W) 'ldap/libraries/libldif/fileurl.c'; else $(CYGPATH_W) '$(srcdir)/ldap/libraries/libldif/fileurl.c'; fi`; \ -@am__fastdepCC_TRUE@ then mv -f "ldap/libraries/libldif/$(DEPDIR)/libldif_a-fileurl.Tpo" "ldap/libraries/libldif/$(DEPDIR)/libldif_a-fileurl.Po"; else rm -f "ldap/libraries/libldif/$(DEPDIR)/libldif_a-fileurl.Tpo"; exit 1; fi -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ldap/libraries/libldif/fileurl.c' object='ldap/libraries/libldif/libldif_a-fileurl.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libldif_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/libraries/libldif/libldif_a-fileurl.obj `if test -f 'ldap/libraries/libldif/fileurl.c'; then $(CYGPATH_W) 'ldap/libraries/libldif/fileurl.c'; else $(CYGPATH_W) '$(srcdir)/ldap/libraries/libldif/fileurl.c'; fi` - -ldap/libraries/libldif/libldif_a-line64.o: ldap/libraries/libldif/line64.c -@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libldif_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/libraries/libldif/libldif_a-line64.o -MD -MP -MF "ldap/libraries/libldif/$(DEPDIR)/libldif_a-line64.Tpo" -c -o ldap/libraries/libldif/libldif_a-line64.o `test -f 'ldap/libraries/libldif/line64.c' || echo '$(srcdir)/'`ldap/libraries/libldif/line64.c; \ -@am__fastdepCC_TRUE@ then mv -f "ldap/libraries/libldif/$(DEPDIR)/libldif_a-line64.Tpo" "ldap/libraries/libldif/$(DEPDIR)/libldif_a-line64.Po"; else rm -f "ldap/libraries/libldif/$(DEPDIR)/libldif_a-line64.Tpo"; exit 1; fi -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ldap/libraries/libldif/line64.c' object='ldap/libraries/libldif/libldif_a-line64.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libldif_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/libraries/libldif/libldif_a-line64.o `test -f 'ldap/libraries/libldif/line64.c' || echo '$(srcdir)/'`ldap/libraries/libldif/line64.c - -ldap/libraries/libldif/libldif_a-line64.obj: ldap/libraries/libldif/line64.c -@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libldif_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/libraries/libldif/libldif_a-line64.obj -MD -MP -MF "ldap/libraries/libldif/$(DEPDIR)/libldif_a-line64.Tpo" -c -o ldap/libraries/libldif/libldif_a-line64.obj `if test -f 'ldap/libraries/libldif/line64.c'; then $(CYGPATH_W) 'ldap/libraries/libldif/line64.c'; else $(CYGPATH_W) '$(srcdir)/ldap/libraries/libldif/line64.c'; fi`; \ -@am__fastdepCC_TRUE@ then mv -f "ldap/libraries/libldif/$(DEPDIR)/libldif_a-line64.Tpo" "ldap/libraries/libldif/$(DEPDIR)/libldif_a-line64.Po"; else rm -f "ldap/libraries/libldif/$(DEPDIR)/libldif_a-line64.Tpo"; exit 1; fi -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ldap/libraries/libldif/line64.c' object='ldap/libraries/libldif/libldif_a-line64.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libldif_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/libraries/libldif/libldif_a-line64.obj `if test -f 'ldap/libraries/libldif/line64.c'; then $(CYGPATH_W) 'ldap/libraries/libldif/line64.c'; else $(CYGPATH_W) '$(srcdir)/ldap/libraries/libldif/line64.c'; fi` - ldap/servers/plugins/acl/libacl_plugin_la-acl.lo: ldap/servers/plugins/acl/acl.c @am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libacl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/acl/libacl_plugin_la-acl.lo -MD -MP -MF "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acl.Tpo" -c -o ldap/servers/plugins/acl/libacl_plugin_la-acl.lo `test -f 'ldap/servers/plugins/acl/acl.c' || echo '$(srcdir)/'`ldap/servers/plugins/acl/acl.c; \ @am__fastdepCC_TRUE@ then mv -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acl.Tpo" "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acl.Plo"; else rm -f "ldap/servers/plugins/acl/$(DEPDIR)/libacl_plugin_la-acl.Tpo"; exit 1; fi @@ -5629,20 +5502,6 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libds_admin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/admin/lib/libds_admin_la-dsalib_util.lo `test -f 'ldap/admin/lib/dsalib_util.c' || echo '$(srcdir)/'`ldap/admin/lib/dsalib_util.c -ldap/libraries/libldif/libds_admin_la-fileurl.lo: ldap/libraries/libldif/fileurl.c -@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libds_admin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/libraries/libldif/libds_admin_la-fileurl.lo -MD -MP -MF "ldap/libraries/libldif/$(DEPDIR)/libds_admin_la-fileurl.Tpo" -c -o ldap/libraries/libldif/libds_admin_la-fileurl.lo `test -f 'ldap/libraries/libldif/fileurl.c' || echo '$(srcdir)/'`ldap/libraries/libldif/fileurl.c; \ -@am__fastdepCC_TRUE@ then mv -f "ldap/libraries/libldif/$(DEPDIR)/libds_admin_la-fileurl.Tpo" "ldap/libraries/libldif/$(DEPDIR)/libds_admin_la-fileurl.Plo"; else rm -f "ldap/libraries/libldif/$(DEPDIR)/libds_admin_la-fileurl.Tpo"; exit 1; fi -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ldap/libraries/libldif/fileurl.c' object='ldap/libraries/libldif/libds_admin_la-fileurl.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libds_admin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/libraries/libldif/libds_admin_la-fileurl.lo `test -f 'ldap/libraries/libldif/fileurl.c' || echo '$(srcdir)/'`ldap/libraries/libldif/fileurl.c - -ldap/libraries/libldif/libds_admin_la-line64.lo: ldap/libraries/libldif/line64.c -@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libds_admin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/libraries/libldif/libds_admin_la-line64.lo -MD -MP -MF "ldap/libraries/libldif/$(DEPDIR)/libds_admin_la-line64.Tpo" -c -o ldap/libraries/libldif/libds_admin_la-line64.lo `test -f 'ldap/libraries/libldif/line64.c' || echo '$(srcdir)/'`ldap/libraries/libldif/line64.c; \ -@am__fastdepCC_TRUE@ then mv -f "ldap/libraries/libldif/$(DEPDIR)/libds_admin_la-line64.Tpo" "ldap/libraries/libldif/$(DEPDIR)/libds_admin_la-line64.Plo"; else rm -f "ldap/libraries/libldif/$(DEPDIR)/libds_admin_la-line64.Tpo"; exit 1; fi -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ldap/libraries/libldif/line64.c' object='ldap/libraries/libldif/libds_admin_la-line64.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libds_admin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/libraries/libldif/libds_admin_la-line64.lo `test -f 'ldap/libraries/libldif/line64.c' || echo '$(srcdir)/'`ldap/libraries/libldif/line64.c - ldap/servers/plugins/http/libhttp_client_plugin_la-http_client.lo: ldap/servers/plugins/http/http_client.c @am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libhttp_client_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/http/libhttp_client_plugin_la-http_client.lo -MD -MP -MF "ldap/servers/plugins/http/$(DEPDIR)/libhttp_client_plugin_la-http_client.Tpo" -c -o ldap/servers/plugins/http/libhttp_client_plugin_la-http_client.lo `test -f 'ldap/servers/plugins/http/http_client.c' || echo '$(srcdir)/'`ldap/servers/plugins/http/http_client.c; \ @am__fastdepCC_TRUE@ then mv -f "ldap/servers/plugins/http/$(DEPDIR)/libhttp_client_plugin_la-http_client.Tpo" "ldap/servers/plugins/http/$(DEPDIR)/libhttp_client_plugin_la-http_client.Plo"; else rm -f "ldap/servers/plugins/http/$(DEPDIR)/libhttp_client_plugin_la-http_client.Tpo"; exit 1; fi @@ -6315,20 +6174,6 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libreplication_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/replication/libreplication_plugin_la-windows_tot_protocol.lo `test -f 'ldap/servers/plugins/replication/windows_tot_protocol.c' || echo '$(srcdir)/'`ldap/servers/plugins/replication/windows_tot_protocol.c -ldap/libraries/libldif/libreplication_plugin_la-fileurl.lo: ldap/libraries/libldif/fileurl.c -@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libreplication_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/libraries/libldif/libreplication_plugin_la-fileurl.lo -MD -MP -MF "ldap/libraries/libldif/$(DEPDIR)/libreplication_plugin_la-fileurl.Tpo" -c -o ldap/libraries/libldif/libreplication_plugin_la-fileurl.lo `test -f 'ldap/libraries/libldif/fileurl.c' || echo '$(srcdir)/'`ldap/libraries/libldif/fileurl.c; \ -@am__fastdepCC_TRUE@ then mv -f "ldap/libraries/libldif/$(DEPDIR)/libreplication_plugin_la-fileurl.Tpo" "ldap/libraries/libldif/$(DEPDIR)/libreplication_plugin_la-fileurl.Plo"; else rm -f "ldap/libraries/libldif/$(DEPDIR)/libreplication_plugin_la-fileurl.Tpo"; exit 1; fi -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ldap/libraries/libldif/fileurl.c' object='ldap/libraries/libldif/libreplication_plugin_la-fileurl.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libreplication_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/libraries/libldif/libreplication_plugin_la-fileurl.lo `test -f 'ldap/libraries/libldif/fileurl.c' || echo '$(srcdir)/'`ldap/libraries/libldif/fileurl.c - -ldap/libraries/libldif/libreplication_plugin_la-line64.lo: ldap/libraries/libldif/line64.c -@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libreplication_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/libraries/libldif/libreplication_plugin_la-line64.lo -MD -MP -MF "ldap/libraries/libldif/$(DEPDIR)/libreplication_plugin_la-line64.Tpo" -c -o ldap/libraries/libldif/libreplication_plugin_la-line64.lo `test -f 'ldap/libraries/libldif/line64.c' || echo '$(srcdir)/'`ldap/libraries/libldif/line64.c; \ -@am__fastdepCC_TRUE@ then mv -f "ldap/libraries/libldif/$(DEPDIR)/libreplication_plugin_la-line64.Tpo" "ldap/libraries/libldif/$(DEPDIR)/libreplication_plugin_la-line64.Plo"; else rm -f "ldap/libraries/libldif/$(DEPDIR)/libreplication_plugin_la-line64.Tpo"; exit 1; fi -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ldap/libraries/libldif/line64.c' object='ldap/libraries/libldif/libreplication_plugin_la-line64.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libreplication_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/libraries/libldif/libreplication_plugin_la-line64.lo `test -f 'ldap/libraries/libldif/line64.c' || echo '$(srcdir)/'`ldap/libraries/libldif/line64.c - ldap/servers/plugins/retrocl/libretrocl_plugin_la-retrocl.lo: ldap/servers/plugins/retrocl/retrocl.c @am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libretrocl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/retrocl/libretrocl_plugin_la-retrocl.lo -MD -MP -MF "ldap/servers/plugins/retrocl/$(DEPDIR)/libretrocl_plugin_la-retrocl.Tpo" -c -o ldap/servers/plugins/retrocl/libretrocl_plugin_la-retrocl.lo `test -f 'ldap/servers/plugins/retrocl/retrocl.c' || echo '$(srcdir)/'`ldap/servers/plugins/retrocl/retrocl.c; \ @am__fastdepCC_TRUE@ then mv -f "ldap/servers/plugins/retrocl/$(DEPDIR)/libretrocl_plugin_la-retrocl.Tpo" "ldap/servers/plugins/retrocl/$(DEPDIR)/libretrocl_plugin_la-retrocl.Plo"; else rm -f "ldap/servers/plugins/retrocl/$(DEPDIR)/libretrocl_plugin_la-retrocl.Tpo"; exit 1; fi @@ -6371,20 +6216,6 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libretrocl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/plugins/retrocl/libretrocl_plugin_la-retrocl_trim.lo `test -f 'ldap/servers/plugins/retrocl/retrocl_trim.c' || echo '$(srcdir)/'`ldap/servers/plugins/retrocl/retrocl_trim.c -ldap/libraries/libldif/libretrocl_plugin_la-fileurl.lo: ldap/libraries/libldif/fileurl.c -@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libretrocl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/libraries/libldif/libretrocl_plugin_la-fileurl.lo -MD -MP -MF "ldap/libraries/libldif/$(DEPDIR)/libretrocl_plugin_la-fileurl.Tpo" -c -o ldap/libraries/libldif/libretrocl_plugin_la-fileurl.lo `test -f 'ldap/libraries/libldif/fileurl.c' || echo '$(srcdir)/'`ldap/libraries/libldif/fileurl.c; \ -@am__fastdepCC_TRUE@ then mv -f "ldap/libraries/libldif/$(DEPDIR)/libretrocl_plugin_la-fileurl.Tpo" "ldap/libraries/libldif/$(DEPDIR)/libretrocl_plugin_la-fileurl.Plo"; else rm -f "ldap/libraries/libldif/$(DEPDIR)/libretrocl_plugin_la-fileurl.Tpo"; exit 1; fi -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ldap/libraries/libldif/fileurl.c' object='ldap/libraries/libldif/libretrocl_plugin_la-fileurl.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libretrocl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/libraries/libldif/libretrocl_plugin_la-fileurl.lo `test -f 'ldap/libraries/libldif/fileurl.c' || echo '$(srcdir)/'`ldap/libraries/libldif/fileurl.c - -ldap/libraries/libldif/libretrocl_plugin_la-line64.lo: ldap/libraries/libldif/line64.c -@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libretrocl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/libraries/libldif/libretrocl_plugin_la-line64.lo -MD -MP -MF "ldap/libraries/libldif/$(DEPDIR)/libretrocl_plugin_la-line64.Tpo" -c -o ldap/libraries/libldif/libretrocl_plugin_la-line64.lo `test -f 'ldap/libraries/libldif/line64.c' || echo '$(srcdir)/'`ldap/libraries/libldif/line64.c; \ -@am__fastdepCC_TRUE@ then mv -f "ldap/libraries/libldif/$(DEPDIR)/libretrocl_plugin_la-line64.Tpo" "ldap/libraries/libldif/$(DEPDIR)/libretrocl_plugin_la-line64.Plo"; else rm -f "ldap/libraries/libldif/$(DEPDIR)/libretrocl_plugin_la-line64.Tpo"; exit 1; fi -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ldap/libraries/libldif/line64.c' object='ldap/libraries/libldif/libretrocl_plugin_la-line64.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libretrocl_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/libraries/libldif/libretrocl_plugin_la-line64.lo `test -f 'ldap/libraries/libldif/line64.c' || echo '$(srcdir)/'`ldap/libraries/libldif/line64.c - ldap/servers/plugins/roles/libroles_plugin_la-roles_cache.lo: ldap/servers/plugins/roles/roles_cache.c @am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libroles_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/roles/libroles_plugin_la-roles_cache.lo -MD -MP -MF "ldap/servers/plugins/roles/$(DEPDIR)/libroles_plugin_la-roles_cache.Tpo" -c -o ldap/servers/plugins/roles/libroles_plugin_la-roles_cache.lo `test -f 'ldap/servers/plugins/roles/roles_cache.c' || echo '$(srcdir)/'`ldap/servers/plugins/roles/roles_cache.c; \ @am__fastdepCC_TRUE@ then mv -f "ldap/servers/plugins/roles/$(DEPDIR)/libroles_plugin_la-roles_cache.Tpo" "ldap/servers/plugins/roles/$(DEPDIR)/libroles_plugin_la-roles_cache.Plo"; else rm -f "ldap/servers/plugins/roles/$(DEPDIR)/libroles_plugin_la-roles_cache.Tpo"; exit 1; fi @@ -7015,20 +6846,6 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libslapd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/libraries/libavl/libslapd_la-avl.lo `test -f 'ldap/libraries/libavl/avl.c' || echo '$(srcdir)/'`ldap/libraries/libavl/avl.c -ldap/libraries/libldif/libslapd_la-fileurl.lo: ldap/libraries/libldif/fileurl.c -@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libslapd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/libraries/libldif/libslapd_la-fileurl.lo -MD -MP -MF "ldap/libraries/libldif/$(DEPDIR)/libslapd_la-fileurl.Tpo" -c -o ldap/libraries/libldif/libslapd_la-fileurl.lo `test -f 'ldap/libraries/libldif/fileurl.c' || echo '$(srcdir)/'`ldap/libraries/libldif/fileurl.c; \ -@am__fastdepCC_TRUE@ then mv -f "ldap/libraries/libldif/$(DEPDIR)/libslapd_la-fileurl.Tpo" "ldap/libraries/libldif/$(DEPDIR)/libslapd_la-fileurl.Plo"; else rm -f "ldap/libraries/libldif/$(DEPDIR)/libslapd_la-fileurl.Tpo"; exit 1; fi -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ldap/libraries/libldif/fileurl.c' object='ldap/libraries/libldif/libslapd_la-fileurl.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libslapd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/libraries/libldif/libslapd_la-fileurl.lo `test -f 'ldap/libraries/libldif/fileurl.c' || echo '$(srcdir)/'`ldap/libraries/libldif/fileurl.c - -ldap/libraries/libldif/libslapd_la-line64.lo: ldap/libraries/libldif/line64.c -@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libslapd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/libraries/libldif/libslapd_la-line64.lo -MD -MP -MF "ldap/libraries/libldif/$(DEPDIR)/libslapd_la-line64.Tpo" -c -o ldap/libraries/libldif/libslapd_la-line64.lo `test -f 'ldap/libraries/libldif/line64.c' || echo '$(srcdir)/'`ldap/libraries/libldif/line64.c; \ -@am__fastdepCC_TRUE@ then mv -f "ldap/libraries/libldif/$(DEPDIR)/libslapd_la-line64.Tpo" "ldap/libraries/libldif/$(DEPDIR)/libslapd_la-line64.Plo"; else rm -f "ldap/libraries/libldif/$(DEPDIR)/libslapd_la-line64.Tpo"; exit 1; fi -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ldap/libraries/libldif/line64.c' object='ldap/libraries/libldif/libslapd_la-line64.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libslapd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/libraries/libldif/libslapd_la-line64.lo `test -f 'ldap/libraries/libldif/line64.c' || echo '$(srcdir)/'`ldap/libraries/libldif/line64.c - ldap/servers/plugins/statechange/libstatechange_plugin_la-statechange.lo: ldap/servers/plugins/statechange/statechange.c @am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libstatechange_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/plugins/statechange/libstatechange_plugin_la-statechange.lo -MD -MP -MF "ldap/servers/plugins/statechange/$(DEPDIR)/libstatechange_plugin_la-statechange.Tpo" -c -o ldap/servers/plugins/statechange/libstatechange_plugin_la-statechange.lo `test -f 'ldap/servers/plugins/statechange/statechange.c' || echo '$(srcdir)/'`ldap/servers/plugins/statechange/statechange.c; \ @am__fastdepCC_TRUE@ then mv -f "ldap/servers/plugins/statechange/$(DEPDIR)/libstatechange_plugin_la-statechange.Tpo" "ldap/servers/plugins/statechange/$(DEPDIR)/libstatechange_plugin_la-statechange.Plo"; else rm -f "ldap/servers/plugins/statechange/$(DEPDIR)/libstatechange_plugin_la-statechange.Tpo"; exit 1; fi @@ -8299,7 +8116,6 @@ -rm -rf .libs _libs -rm -rf ldap/admin/lib/.libs ldap/admin/lib/_libs -rm -rf ldap/libraries/libavl/.libs ldap/libraries/libavl/_libs - -rm -rf ldap/libraries/libldif/.libs ldap/libraries/libldif/_libs -rm -rf ldap/servers/plugins/acl/.libs ldap/servers/plugins/acl/_libs -rm -rf ldap/servers/plugins/chainingdb/.libs ldap/servers/plugins/chainingdb/_libs -rm -rf ldap/servers/plugins/collation/.libs ldap/servers/plugins/collation/_libs @@ -8562,8 +8378,6 @@ -rm -f ldap/admin/src/$(am__dirstamp) -rm -f ldap/libraries/libavl/$(DEPDIR)/$(am__dirstamp) -rm -f ldap/libraries/libavl/$(am__dirstamp) - -rm -f ldap/libraries/libldif/$(DEPDIR)/$(am__dirstamp) - -rm -f ldap/libraries/libldif/$(am__dirstamp) -rm -f ldap/servers/plugins/acl/$(DEPDIR)/$(am__dirstamp) -rm -f ldap/servers/plugins/acl/$(am__dirstamp) -rm -f ldap/servers/plugins/chainingdb/$(DEPDIR)/$(am__dirstamp) @@ -8641,7 +8455,7 @@ distclean: distclean-am -rm -f $(am__CONFIG_DISTCLEAN_FILES) - -rm -rf ldap/admin/lib/$(DEPDIR) ldap/admin/src/$(DEPDIR) ldap/libraries/libavl/$(DEPDIR) ldap/libraries/libldif/$(DEPDIR) ldap/servers/plugins/acl/$(DEPDIR) ldap/servers/plugins/chainingdb/$(DEPDIR) ldap/servers/plugins/collation/$(DEPDIR) ldap/servers/plugins/cos/$(DEPDIR) ldap/servers/plugins/distrib/$(DEPDIR) ldap/servers/plugins/http/$(DEPDIR) ldap/servers/plugins/pam_passthru/$(DEPDIR) ldap/servers/plugins/passthru/$(DEPDIR) ldap/servers/plugins/presence/$(DEPDIR) ldap/servers/plugins/pwdstorage/$(DEPDIR) ldap/servers/plugins/referint/$(DEPDIR) ldap/servers/plugins/replication/$(DEPDIR) ldap/servers/plugins/retrocl/$(DEPDIR) ldap/servers/plugins/rever/$(DEPDIR) ldap/servers/plugins/roles/$(DEPDIR) ldap/servers/plugins/shared/$(DEPDIR) ldap/servers/plugins/statechange/$(DEPDIR) ldap/servers/plugins/syntaxes/$(DEPDIR) ldap/servers/plugins/uiduniq/$(DEPDIR) ldap/servers/plugins/views/$(DEPDIR) ldap/servers/slapd/$(DEPDIR) ldap/servers/slapd/back-ldbm/$(DEPDIR) ldap/serv! ers/slapd/tools/$(DEPDIR) ldap/servers/slapd/tools/ldclt/$(DEPDIR) ldap/servers/slapd/tools/rsearch/$(DEPDIR) ldap/servers/snmp/$(DEPDIR) ldap/systools/$(DEPDIR) lib/base/$(DEPDIR) lib/ldaputil/$(DEPDIR) lib/libaccess/$(DEPDIR) lib/libadmin/$(DEPDIR) lib/libsi18n/$(DEPDIR) + -rm -rf ldap/admin/lib/$(DEPDIR) ldap/admin/src/$(DEPDIR) ldap/libraries/libavl/$(DEPDIR) ldap/servers/plugins/acl/$(DEPDIR) ldap/servers/plugins/chainingdb/$(DEPDIR) ldap/servers/plugins/collation/$(DEPDIR) ldap/servers/plugins/cos/$(DEPDIR) ldap/servers/plugins/distrib/$(DEPDIR) ldap/servers/plugins/http/$(DEPDIR) ldap/servers/plugins/pam_passthru/$(DEPDIR) ldap/servers/plugins/passthru/$(DEPDIR) ldap/servers/plugins/presence/$(DEPDIR) ldap/servers/plugins/pwdstorage/$(DEPDIR) ldap/servers/plugins/referint/$(DEPDIR) ldap/servers/plugins/replication/$(DEPDIR) ldap/servers/plugins/retrocl/$(DEPDIR) ldap/servers/plugins/rever/$(DEPDIR) ldap/servers/plugins/roles/$(DEPDIR) ldap/servers/plugins/shared/$(DEPDIR) ldap/servers/plugins/statechange/$(DEPDIR) ldap/servers/plugins/syntaxes/$(DEPDIR) ldap/servers/plugins/uiduniq/$(DEPDIR) ldap/servers/plugins/views/$(DEPDIR) ldap/servers/slapd/$(DEPDIR) ldap/servers/slapd/back-ldbm/$(DEPDIR) ldap/servers/slapd/tools/$(DEPDIR) ldap/se! rvers/slapd/tools/ldclt/$(DEPDIR) ldap/servers/slapd/tools/rsearch/$(DEPDIR) ldap/servers/snmp/$(DEPDIR) ldap/systools/$(DEPDIR) lib/base/$(DEPDIR) lib/ldaputil/$(DEPDIR) lib/libaccess/$(DEPDIR) lib/libadmin/$(DEPDIR) lib/libsi18n/$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-libtool distclean-tags @@ -8669,7 +8483,7 @@ maintainer-clean: maintainer-clean-am -rm -f $(am__CONFIG_DISTCLEAN_FILES) -rm -rf $(top_srcdir)/autom4te.cache - -rm -rf ldap/admin/lib/$(DEPDIR) ldap/admin/src/$(DEPDIR) ldap/libraries/libavl/$(DEPDIR) ldap/libraries/libldif/$(DEPDIR) ldap/servers/plugins/acl/$(DEPDIR) ldap/servers/plugins/chainingdb/$(DEPDIR) ldap/servers/plugins/collation/$(DEPDIR) ldap/servers/plugins/cos/$(DEPDIR) ldap/servers/plugins/distrib/$(DEPDIR) ldap/servers/plugins/http/$(DEPDIR) ldap/servers/plugins/pam_passthru/$(DEPDIR) ldap/servers/plugins/passthru/$(DEPDIR) ldap/servers/plugins/presence/$(DEPDIR) ldap/servers/plugins/pwdstorage/$(DEPDIR) ldap/servers/plugins/referint/$(DEPDIR) ldap/servers/plugins/replication/$(DEPDIR) ldap/servers/plugins/retrocl/$(DEPDIR) ldap/servers/plugins/rever/$(DEPDIR) ldap/servers/plugins/roles/$(DEPDIR) ldap/servers/plugins/shared/$(DEPDIR) ldap/servers/plugins/statechange/$(DEPDIR) ldap/servers/plugins/syntaxes/$(DEPDIR) ldap/servers/plugins/uiduniq/$(DEPDIR) ldap/servers/plugins/views/$(DEPDIR) ldap/servers/slapd/$(DEPDIR) ldap/servers/slapd/back-ldbm/$(DEPDIR) ldap/serv! ers/slapd/tools/$(DEPDIR) ldap/servers/slapd/tools/ldclt/$(DEPDIR) ldap/servers/slapd/tools/rsearch/$(DEPDIR) ldap/servers/snmp/$(DEPDIR) ldap/systools/$(DEPDIR) lib/base/$(DEPDIR) lib/ldaputil/$(DEPDIR) lib/libaccess/$(DEPDIR) lib/libadmin/$(DEPDIR) lib/libsi18n/$(DEPDIR) + -rm -rf ldap/admin/lib/$(DEPDIR) ldap/admin/src/$(DEPDIR) ldap/libraries/libavl/$(DEPDIR) ldap/servers/plugins/acl/$(DEPDIR) ldap/servers/plugins/chainingdb/$(DEPDIR) ldap/servers/plugins/collation/$(DEPDIR) ldap/servers/plugins/cos/$(DEPDIR) ldap/servers/plugins/distrib/$(DEPDIR) ldap/servers/plugins/http/$(DEPDIR) ldap/servers/plugins/pam_passthru/$(DEPDIR) ldap/servers/plugins/passthru/$(DEPDIR) ldap/servers/plugins/presence/$(DEPDIR) ldap/servers/plugins/pwdstorage/$(DEPDIR) ldap/servers/plugins/referint/$(DEPDIR) ldap/servers/plugins/replication/$(DEPDIR) ldap/servers/plugins/retrocl/$(DEPDIR) ldap/servers/plugins/rever/$(DEPDIR) ldap/servers/plugins/roles/$(DEPDIR) ldap/servers/plugins/shared/$(DEPDIR) ldap/servers/plugins/statechange/$(DEPDIR) ldap/servers/plugins/syntaxes/$(DEPDIR) ldap/servers/plugins/uiduniq/$(DEPDIR) ldap/servers/plugins/views/$(DEPDIR) ldap/servers/slapd/$(DEPDIR) ldap/servers/slapd/back-ldbm/$(DEPDIR) ldap/servers/slapd/tools/$(DEPDIR) ldap/se! rvers/slapd/tools/ldclt/$(DEPDIR) ldap/servers/slapd/tools/rsearch/$(DEPDIR) ldap/servers/snmp/$(DEPDIR) ldap/systools/$(DEPDIR) lib/base/$(DEPDIR) lib/ldaputil/$(DEPDIR) lib/libaccess/$(DEPDIR) lib/libadmin/$(DEPDIR) lib/libsi18n/$(DEPDIR) -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic

17 years, 6 months

1
0
0 / 0

[Fedora-directory-commits] ldapserver Makefile.am, 1.2, 1.3 Makefile.in, 1.2, 1.3 configure, 1.1, 1.2 configure.ac, 1.1, 1.2

by Doctor Conrad

Author: nkinder Update of /cvs/dirsec/ldapserver In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9892 Modified Files: Makefile.am Makefile.in configure configure.ac Log Message: Resolves: 211386 Added --enable-debug configure option to add debug defines. Index: Makefile.am =================================================================== RCS file: /cvs/dirsec/ldapserver/Makefile.am,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Makefile.am 18 Oct 2006 16:01:50 -0000 1.2 +++ Makefile.am 18 Oct 2006 21:40:49 -0000 1.3 @@ -6,13 +6,13 @@ #------------------------ BUILDNUM := $(shell perl $(srcdir)/buildnum.pl) PLATFORM_DEFINES = @platform_defs@ -# NGK - Other defines which may need to be conditionally set +DEBUG_DEFINES = @debug_defs@ DS_DEFINES = -DNS_DS -DNET_SSL -DLDAP_DEBUG -DLDAP_DONT_USE_SMARTHEAP \ -DUPGRADEDB -DNSPR20 -DLDAPDB_THREAD_SAFE -DCLIENT_AUTH \ -DMCC_HTTPD -DNS_DOMESTIC -DSPAPI20 -DSERVER_BUILD \ -DBUILD_NUM=$(BUILDNUM) DS_INCLUDES = -I$(srcdir)/ldap/include -I$(srcdir)/ldap/servers/slapd -I$(srcdir)/include -I. -AM_CPPFLAGS = $(PLATFORM_DEFINES) $(DS_DEFINES) $(DS_INCLUDES) +AM_CPPFLAGS = $(PLATFORM_DEFINES) $(DEBUG_DEFINES) $(DS_DEFINES) $(DS_INCLUDES) PLUGIN_CPPFLAGS = $(AM_CPPFLAGS) @ldapsdk_inc@ @nss_inc@ @nspr_inc@ #------------------------ Index: Makefile.in =================================================================== RCS file: /cvs/dirsec/ldapserver/Makefile.in,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Makefile.in 18 Oct 2006 16:01:50 -0000 1.2 +++ Makefile.in 18 Oct 2006 21:40:49 -0000 1.3 @@ -826,6 +826,7 @@ db_inc = @db_inc@ db_incdir = @db_incdir@ db_lib = @db_lib@ +debug_defs = @debug_defs@ exec_prefix = @exec_prefix@ host = @host@ host_alias = @host_alias@ @@ -873,14 +874,14 @@ #------------------------ BUILDNUM := $(shell perl $(srcdir)/buildnum.pl) PLATFORM_DEFINES = @platform_defs@ -# NGK - Other defines which may need to be conditionally set +DEBUG_DEFINES = @debug_defs@ DS_DEFINES = -DNS_DS -DNET_SSL -DLDAP_DEBUG -DLDAP_DONT_USE_SMARTHEAP \ -DUPGRADEDB -DNSPR20 -DLDAPDB_THREAD_SAFE -DCLIENT_AUTH \ -DMCC_HTTPD -DNS_DOMESTIC -DSPAPI20 -DSERVER_BUILD \ -DBUILD_NUM=$(BUILDNUM) DS_INCLUDES = -I$(srcdir)/ldap/include -I$(srcdir)/ldap/servers/slapd -I$(srcdir)/include -I. -AM_CPPFLAGS = $(PLATFORM_DEFINES) $(DS_DEFINES) $(DS_INCLUDES) +AM_CPPFLAGS = $(PLATFORM_DEFINES) $(DEBUG_DEFINES) $(DS_DEFINES) $(DS_INCLUDES) PLUGIN_CPPFLAGS = $(AM_CPPFLAGS) @ldapsdk_inc@ @nss_inc@ @nspr_inc@ #------------------------ Index: configure =================================================================== RCS file: /cvs/dirsec/ldapserver/configure,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- configure 17 Oct 2006 17:07:13 -0000 1.1 +++ configure 18 Oct 2006 21:40:49 -0000 1.2 @@ -464,8 +464,8 @@ # include <unistd.h> #endif" -ac_default_prefix=/opt/$PKGNAME -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 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 EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBOBJS platfor! m_defs SOLARIS_TRUE SOLARIS_FALSE PKG_CONFIG ICU_CONFIG NETSNMP_CONFIG nspr_inc nspr_lib nss_inc nss_lib ldapsdk_inc ldapsdk_lib db_inc db_incdir db_lib sasl_inc sasl_lib svrcore_inc svrcore_lib icu_lib icu_inc icu_bin netsnmp_inc netsnmp_lib netsnmp_link WINNT_TRUE WINNT_FALSE LTLIBOBJS' +ac_default_prefix="/opt/\$(PACKAGE)" +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 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 EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBOBJS platfor! m_defs SOLARIS_TRUE SOLARIS_FALSE debug_defs PKG_CONFIG ICU_CONFIG NETSNMP_CONFIG nspr_inc nspr_lib nss_inc nss_lib ldapsdk_inc ldapsdk_lib db_inc db_incdir db_lib sasl_inc sasl_lib svrcore_inc svrcore_lib icu_lib icu_inc icu_bin netsnmp_inc netsnmp_lib netsnmp_link WINNT_TRUE WINNT_FALSE LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -1036,6 +1036,7 @@ --enable-fast-install[=PKGS] optimize for fast installation [default=yes] --disable-libtool-lock avoid locking (might break parallel builds) + --enable-debug Enable debug features Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] @@ -4251,7 +4252,7 @@ ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 4254 "configure"' > conftest.$ac_ext + echo '#line 4255 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -5359,7 +5360,7 @@ # Provide some information about the compiler. -echo "$as_me:5362:" \ +echo "$as_me:5363:" \ "checking for Fortran 77 compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` { (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5 @@ -6393,11 +6394,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6396: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6397: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6400: \$? = $ac_status" >&5 + echo "$as_me:6401: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -6626,11 +6627,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6629: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6630: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6633: \$? = $ac_status" >&5 + echo "$as_me:6634: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -6686,11 +6687,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6689: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6690: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:6693: \$? = $ac_status" >&5 + echo "$as_me:6694: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -8020,7 +8021,7 @@ libsuff= case "$host_cpu" in x86_64*|s390x*|powerpc64*) - echo '#line 8023 "configure"' > conftest.$ac_ext + echo '#line 8024 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -8891,7 +8892,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 8894 "configure" +#line 8895 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -8989,7 +8990,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 8992 "configure" +#line 8993 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11168,11 +11169,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:11171: $lt_compile\"" >&5) + (eval echo "\"\$as_me:11172: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:11175: \$? = $ac_status" >&5 + echo "$as_me:11176: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -11228,11 +11229,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:11231: $lt_compile\"" >&5) + (eval echo "\"\$as_me:11232: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:11235: \$? = $ac_status" >&5 + echo "$as_me:11236: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -11739,7 +11740,7 @@ libsuff= case "$host_cpu" in x86_64*|s390x*|powerpc64*) - echo '#line 11742 "configure"' > conftest.$ac_ext + echo '#line 11743 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -12610,7 +12611,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 12613 "configure" +#line 12614 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12708,7 +12709,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 12711 "configure" +#line 12712 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13535,11 +13536,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13538: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13539: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:13542: \$? = $ac_status" >&5 + echo "$as_me:13543: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -13595,11 +13596,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13598: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13599: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:13602: \$? = $ac_status" >&5 + echo "$as_me:13603: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -14909,7 +14910,7 @@ libsuff= case "$host_cpu" in x86_64*|s390x*|powerpc64*) - echo '#line 14912 "configure"' > conftest.$ac_ext + echo '#line 14913 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -15650,11 +15651,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15653: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15654: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15657: \$? = $ac_status" >&5 + echo "$as_me:15658: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -15883,11 +15884,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15886: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15887: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15890: \$? = $ac_status" >&5 + echo "$as_me:15891: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -15943,11 +15944,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15946: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15947: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:15950: \$? = $ac_status" >&5 + echo "$as_me:15951: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -17277,7 +17278,7 @@ libsuff= case "$host_cpu" in x86_64*|s390x*|powerpc64*) - echo '#line 17280 "configure"' > conftest.$ac_ext + echo '#line 17281 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -18148,7 +18149,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 18151 "configure" +#line 18152 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -18246,7 +18247,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 18249 "configure" +#line 18250 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -23371,7 +23372,6 @@ - if test $platform = solaris; then SOLARIS_TRUE= SOLARIS_FALSE='#' @@ -23381,7 +23381,28 @@ fi +echo "$as_me:$LINENO: checking for --enable-debug" >&5 +echo $ECHO_N "checking for --enable-debug... $ECHO_C" >&6 +# Check whether --enable-debug or --disable-debug was given. +if test "${enable_debug+set}" = set; then + enableval="$enable_debug" + + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + debug_defs="-DDEBUG -DMCC_DEBUG" + +else + + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 + debug_defs="" + +fi; + + BRAND=fedora +echo "$as_me:$LINENO: checking for --with-brand" >&5 +echo $ECHO_N "checking for --with-brand... $ECHO_C" >&6 # Check whether --with-brand or --without-brand was given. if test "${with_brand+set}" = set; then @@ -25339,6 +25360,7 @@ s,@platform_defs@,$platform_defs,;t t s,@SOLARIS_TRUE@,$SOLARIS_TRUE,;t t s,@SOLARIS_FALSE@,$SOLARIS_FALSE,;t t +s,@debug_defs@,$debug_defs,;t t s,@PKG_CONFIG@,$PKG_CONFIG,;t t s,@ICU_CONFIG@,$ICU_CONFIG,;t t s,@NETSNMP_CONFIG@,$NETSNMP_CONFIG,;t t Index: configure.ac =================================================================== RCS file: /cvs/dirsec/ldapserver/configure.ac,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- configure.ac 17 Oct 2006 17:07:13 -0000 1.1 +++ configure.ac 18 Oct 2006 21:40:49 -0000 1.2 @@ -68,10 +68,22 @@ ;; esac AC_SUBST([platform_defs]) - AM_CONDITIONAL(SOLARIS,test $platform = solaris) +AC_MSG_CHECKING(for --enable-debug) +AC_ARG_ENABLE(debug, [ --enable-debug Enable debug features], +[ + AC_MSG_RESULT(yes) + debug_defs="-DDEBUG -DMCC_DEBUG" +], +[ + AC_MSG_RESULT(no) + debug_defs="" +]) +AC_SUBST([debug_defs]) + BRAND=fedora +AC_MSG_CHECKING(for --with-brand) AC_ARG_WITH(brand, [ --with-brand=PATH Specify branding (fedora or redhat)], [ if test "$withval" @@ -82,7 +94,7 @@ ], AC_MSG_RESULT(no)) PKGNAME=$BRAND-ds -AC_PREFIX_DEFAULT([/opt/$PKGNAME]) +AC_PREFIX_DEFAULT("/opt/\$(PACKAGE)") # Check for library dependencies m4_include(m4/nspr.m4)

17 years, 6 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

389-commits October 2006