Masato Taruishi
taru****@users*****
2004年 10月 30日 (土) 01:27:17 JST
===================================================================
RCS file: ultrapossum/configure.in,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- ultrapossum/configure.in 2004/10/28 17:05:21 1.65
+++ ultrapossum/configure.in 2004/10/29 16:27:17 1.66
@@ -102,7 +102,7 @@
return 1
}
-AM_UPSM_DIRECTORY(ldapconfdir,
+AM_ULTRAPOSSUM_DIRECTORY(ldapconfdir,
/etc/ldap /etc/openldap /usr/local/etc/ldap /usr/local/etc/openldap,
ldap.conf .,
[change default directory where ldap.conf are located])
@@ -111,7 +111,7 @@
modules="$modules client"
fi
-AM_UPSM_DIRECTORY(ldaplibexecdir,
+AM_ULTRAPOSSUM_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])
@@ -122,7 +122,7 @@
if include "server" "$modules"; then
- AM_UPSM_DIRECTORY(ldapsysconfdir,
+ AM_ULTRAPOSSUM_DIRECTORY(ldapsysconfdir,
/etc/ldap /etc/openldap dnl
/usr/local/etc/ldap /usr/local/etc/openldap dnl
$sysconfdir/openldap /etc/ultrapossum/slapd/openldap dnl
@@ -130,7 +130,7 @@
slapd.conf,
[change default directory where slapd.conf is located])
- AM_UPSM_DIRECTORY(ldapdatadir,
+ AM_ULTRAPOSSUM_DIRECTORY(ldapdatadir,
/usr/share/ldap /usr/share/openldap /usr/local/share/ldap dnl
/usr/local/share/openldap $datadir/ldap $datadir/openldap dnl
/usr/share/ultrapossum/module.d/slapd/share/openldap dnl
@@ -138,7 +138,7 @@
ucdata ldapfriendly,
[change default directory of openldap datadir])
- AM_UPSM_DIRECTORY(ldaplibdir,
+ AM_ULTRAPOSSUM_DIRECTORY(ldaplibdir,
/usr/lib/ldap /usr/lib/openldap /usr/local/lib/ldap dnl
/usr/local/lib/openldap $libdir/ldap $libdir/openldap dnl
/usr/share/ultrapossum/module.d/slapd/lib/openldap dnl
@@ -146,7 +146,7 @@
.,
[change default directory where openldap backend modules are located])
- AM_UPSM_DIRECTORY(opensslsysconfdir,
+ AM_ULTRAPOSSUM_DIRECTORY(opensslsysconfdir,
/etc/openssl /etc/ssl /usr/local/etc/ssl /usr/local/etc/openssl,
openssl.cnf,
[change default directory where openssl.cnf is located])
@@ -165,27 +165,27 @@
if test "x$automodules" != "x" || include "failover" "$modules"; then
- AM_UPSM_DIRECTORY(hasysconfdir,
+ AM_ULTRAPOSSUM_DIRECTORY(hasysconfdir,
/etc/ha.d /usr/local/etc/ha.d,
ha.cf harc shellfuncs,
[change default directory where heartbeat configurations are located])
- AM_UPSM_DIRECTORY(halocalstatedir,
+ AM_ULTRAPOSSUM_DIRECTORY(halocalstatedir,
/var /usr/local/var,
lib/heartbeat,
[change default directory of heartbeat localstatedir])
- AM_UPSM_DIRECTORY(monlibdir,
+ AM_ULTRAPOSSUM_DIRECTORY(monlibdir,
/usr/lib/mon /usr/local/lib/mon,
mon.d alert.d,
[change default directory where mon files are located])
- AM_UPSM_DIRECTORY(monsysconfdir,
+ AM_ULTRAPOSSUM_DIRECTORY(monsysconfdir,
/etc/mon /usr/local/etc/mon,
mon.cf auth.cf monshow,
[change default directory where mon configurations are located])
- AM_UPSM_DIRECTORY(monpiddir,
+ AM_ULTRAPOSSUM_DIRECTORY(monpiddir,
/var/run /var/run/mon,
.,
[change default path where mon pid file is located])
@@ -193,7 +193,7 @@
monpidfile=$monpiddir/mon.pid
AC_SUBST(monpidfile)
- AM_UPSM_DIRECTORY(sudoersdir,
+ AM_ULTRAPOSSUM_DIRECTORY(sudoersdir,
/etc /usr/local/etc,
sudoers,
[change default directory where sudoers is located])
===================================================================
RCS file: ultrapossum/ultrapossum.m4,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ultrapossum/ultrapossum.m4 2004/10/28 17:05:21 1.4
+++ ultrapossum/ultrapossum.m4 2004/10/29 16:27:17 1.5
@@ -61,12 +61,11 @@
])
-dnl
dnl $1 variable name
dnl $2 directory candidates
dnl $3 file which should be there
dnl $4 variable description
-AC_DEFUN([AM_UPSM_DIRECTORY],
+AC_DEFUN([AM_ULTRAPOSSUM_DIRECTORY],
[
AC_ARG_WITH($1,
[ --with-]$1=DIR $4,