Masato Taruishi
taru****@users*****
2004年 10月 10日 (日) 21:05:45 JST
===================================================================
RCS file: ultrapossum/Makefile.am,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- ultrapossum/Makefile.am 2004/10/09 06:40:13 1.22
+++ ultrapossum/Makefile.am 2004/10/10 12:05:44 1.23
@@ -27,6 +27,7 @@
variable: modules init.d/variable Makefile
egrep "[A-Z_][A-Z_]*=" modules | cut -d= -f1 | grep -v IFS | tr -d '# ' | sort | uniq > $@T
sort init.d/variable $@T | uniq > $@
+ /bin/rm -f $@T
pysical: modules init.d/pysical Makefile
egrep "[A-Z_][A-Z_]*=" modules | grep ultrapossum_getconf | cut -d= -f1 | grep -v IFS | tr -d '# ' | sort | uniq > $@T
@@ -41,7 +42,7 @@
init.d/pysical:
$(MAKE) -C init.d pysical
-CLEANFILES = variable pysical logical update-ultrapossum.8 ultrapossum-config.1
+CLEANFILES = variable variableT pysical logical update-ultrapossum.8 ultrapossum-config.1
CONFIGS = ultrapossum.cf default.cf config.cf
===================================================================
RCS file: ultrapossum/configure.in,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- ultrapossum/configure.in 2004/10/07 02:58:43 1.53
+++ ultrapossum/configure.in 2004/10/10 12:05:44 1.54
@@ -116,6 +116,7 @@
if test "x$modules" = "x"; then
automodules=1
+ modules="client"
fi
include() {
@@ -128,13 +129,18 @@
return 1
}
+UP_DIRECTORY(ldapconfdir,
+ /etc/ldap /etc/openldap /usr/local/etc/ldap /usr/local/etc/openldap,
+ ldap.conf,
+[change default directory where ldap.conf are located])
+
UP_DIRECTORY(ldaplibexecdir,
/usr/sbin /usr/lib/libexec /usr/local/libexec /usr/local/sbin $prefix/libexec /usr/share/ultrapossum/module.d/slapd/libexec $pkgdatadir/module.d/slapd/libexec,
slapd,
[change default directory where slapd and slurpd are located])
if test "x$automodules" != "x" && test "x$ldaplibexecdir" != "x"; then
- modules="server test"
+ modules="$modules server test"
fi
if include "server" "$modules"; then
@@ -226,15 +232,14 @@
CONFARGS=`grep configure config.log | grep \\\\$ | head -1 | cut -d' ' -f4-`
AC_SUBST(CONFARGS)
-AC_CONFIG_FILES([test/run test/Makefile Makefile init.d/Makefile module/test/Makefile module/test/test.d/Makefile module/ultrapossum.am module/failover/heartbeat/Makefile modules ultrapossum-config module/Makefile module/server/Makefile module/failover/Makefile module/startTLS/Makefile module/dnsbalance/Makefile module/vaj-robust/Makefile config/Makefile config/ldap/Makefile ultrapossum-server])
+AC_CONFIG_FILES([test/run test/Makefile Makefile init.d/Makefile module/test/Makefile module/test/test.d/Makefile module/ultrapossum.am module/failover/heartbeat/Makefile modules ultrapossum-config module/Makefile module/client/Makefile module/server/Makefile module/failover/Makefile module/startTLS/Makefile module/dnsbalance/Makefile module/vaj-robust/Makefile config/Makefile config/ldap/Makefile ultrapossum-server])
AC_OUTPUT
if include "startTLS" "$modules"; then
echo "startTLS plugin will be used which includes software"
echo " developed by the OpenSSL Project for use in the OpenSSL"
echo " Toolkit. (http://www.openssl.org/)"
fi
-if test "x$modules" = "x"; then
- echo "WARNING: NO MODULES SELECTED: It'll be built as client environement."
-else
- echo "built-in modules: $modules"
+if ! include "server" "$modules"; then
+ echo "WARNING: NO SERVER MODULE SELECTED: It'll be built as client environement."
fi
+echo "built-in modules: $modules"
===================================================================
RCS file: ultrapossum/modules.in,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- ultrapossum/modules.in 2004/10/09 05:12:56 1.48
+++ ultrapossum/modules.in 2004/10/10 12:05:44 1.49
@@ -26,6 +26,7 @@
datadir=${datadir:- ＠ datadir@}
libdir=${libdir:- ＠ libdir@}
sysconfdir=${sysconfdir:- ＠ sysconfdir@}
+ldapconfdir=${ldapconfdir:- ＠ ldapconfdir@}
ldaplibexecdir=${ldaplibexecdir:- ＠ ldaplibexecdir@}
ldapdatadir=${ldapdatadir:- ＠ ldapdatadir@}
ldaplibdir=${ldaplibdir:- ＠ ldaplibdir@}