[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
Nathan Kinder (nkinder)
fedora-directory-commits at redhat.com
Tue Oct 24 21:11:03 UTC 2006
- Previous message: [Fedora-directory-commits] ldapserver/wrappers - New directory
- Next message: [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
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
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 at 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, at NETSNMP_CONFIG@,$NETSNMP_CONFIG,;t t
s, at nspr_inc@,$nspr_inc,;t t
s, at nspr_lib@,$nspr_lib,;t t
+s, at nspr_libdir@,$nspr_libdir,;t t
s, at nss_inc@,$nss_inc,;t t
s, at nss_lib@,$nss_lib,;t t
+s, at nss_libdir@,$nss_libdir,;t t
s, at ldapsdk_inc@,$ldapsdk_inc,;t t
s, at ldapsdk_lib@,$ldapsdk_lib,;t t
+s, at ldapsdk_libdir@,$ldapsdk_libdir,;t t
s, at db_inc@,$db_inc,;t t
s, at db_incdir@,$db_incdir,;t t
s, at db_lib@,$db_lib,;t t
+s, at db_libdir@,$db_libdir,;t t
s, at sasl_inc@,$sasl_inc,;t t
s, at sasl_lib@,$sasl_lib,;t t
+s, at sasl_libdir@,$sasl_libdir,;t t
s, at svrcore_inc@,$svrcore_inc,;t t
s, at svrcore_lib@,$svrcore_lib,;t t
s, at icu_lib@,$icu_lib,;t t
@@ -25733,7 +25788,13 @@
s, at icu_bin@,$icu_bin,;t t
s, at netsnmp_inc@,$netsnmp_inc,;t t
s, at netsnmp_lib@,$netsnmp_lib,;t t
+s, at netsnmp_libdir@,$netsnmp_libdir,;t t
s, at netsnmp_link@,$netsnmp_link,;t t
+s, at configdir@,$configdir,;t t
+s, at propertydir@,$propertydir,;t t
+s, at schemadir@,$schemadir,;t t
+s, at serverdir@,$serverdir,;t t
+s, at serverplugindir@,$serverplugindir,;t t
s, at WINNT_TRUE@,$WINNT_TRUE,;t t
s, at WINNT_FALSE@,$WINNT_FALSE,;t t
s, at 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
- Previous message: [Fedora-directory-commits] ldapserver/wrappers - New directory
- Next message: [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
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the 389-commits
mailing list