Masato Taruishi
taru****@users*****
2004年 10月 29日 (金) 02:05:21 JST
===================================================================
RCS file: ultrapossum/autogen.sh,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ultrapossum/autogen.sh 2004/10/12 09:28:46 1.7
+++ ultrapossum/autogen.sh 2004/10/28 17:05:21 1.8
@@ -2,7 +2,7 @@
set -e
-aclocal
+aclocal -I .
if test "x$1" = "x-c"; then
automake -a -c
===================================================================
RCS file: ultrapossum/configure.in,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- ultrapossum/configure.in 2004/10/21 04:17:42 1.64
+++ ultrapossum/configure.in 2004/10/28 17:05:21 1.65
@@ -31,50 +31,6 @@
# Checks for library functions.
-dnl
-dnl $1 variable name
-dnl $2 directory candidates
-dnl $3 file which should be there
-dnl $4 variable description
-AC_DEFUN([UP_DIRECTORY],
-[
-AC_ARG_WITH($1,
-[ --with-]$1=DIR $4,
-case ["$withval"] in
- [*)]
- $1=["$withval"]
- ;;
-esac
-)dnl
-
-AC_MSG_CHECKING(for $1)
-if test "x[$]$1" = "x"; then
- for d in $2
- do
- d=$(eval echo `echo $d`)
- for f in $3
- do
- if test -e "$d/$f"; then
- $1="$d"
- fi
- done
- done
-fi
-
-if test "x[$]$1" = "x"; then
- if test "x$automodules" = "x"; then
- AC_MSG_ERROR([no])
- else
- AC_MSG_RESULT([no])
- fi
-else
- AC_MSG_RESULT([$]$1)
-fi
-
-AC_SUBST($1)
-
-])
-
dnl ----------------------------------------------------------------
dnl --with-aclocaldir
aclocaldir="$datadir/aclocal"
@@ -146,7 +102,7 @@
return 1
}
-UP_DIRECTORY(ldapconfdir,
+AM_UPSM_DIRECTORY(ldapconfdir,
/etc/ldap /etc/openldap /usr/local/etc/ldap /usr/local/etc/openldap,
ldap.conf .,
[change default directory where ldap.conf are located])
@@ -155,7 +111,7 @@
modules="$modules client"
fi
-UP_DIRECTORY(ldaplibexecdir,
+AM_UPSM_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])
@@ -166,7 +122,7 @@
if include "server" "$modules"; then
- UP_DIRECTORY(ldapsysconfdir,
+ AM_UPSM_DIRECTORY(ldapsysconfdir,
/etc/ldap /etc/openldap dnl
/usr/local/etc/ldap /usr/local/etc/openldap dnl
$sysconfdir/openldap /etc/ultrapossum/slapd/openldap dnl
@@ -174,7 +130,7 @@
slapd.conf,
[change default directory where slapd.conf is located])
- UP_DIRECTORY(ldapdatadir,
+ AM_UPSM_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
@@ -182,7 +138,7 @@
ucdata ldapfriendly,
[change default directory of openldap datadir])
- UP_DIRECTORY(ldaplibdir,
+ AM_UPSM_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
@@ -190,7 +146,7 @@
.,
[change default directory where openldap backend modules are located])
- UP_DIRECTORY(opensslsysconfdir,
+ AM_UPSM_DIRECTORY(opensslsysconfdir,
/etc/openssl /etc/ssl /usr/local/etc/ssl /usr/local/etc/openssl,
openssl.cnf,
[change default directory where openssl.cnf is located])
@@ -209,27 +165,27 @@
if test "x$automodules" != "x" || include "failover" "$modules"; then
- UP_DIRECTORY(hasysconfdir,
+ AM_UPSM_DIRECTORY(hasysconfdir,
/etc/ha.d /usr/local/etc/ha.d,
ha.cf harc shellfuncs,
[change default directory where heartbeat configurations are located])
- UP_DIRECTORY(halocalstatedir,
+ AM_UPSM_DIRECTORY(halocalstatedir,
/var /usr/local/var,
lib/heartbeat,
[change default directory of heartbeat localstatedir])
- UP_DIRECTORY(monlibdir,
+ AM_UPSM_DIRECTORY(monlibdir,
/usr/lib/mon /usr/local/lib/mon,
mon.d alert.d,
[change default directory where mon files are located])
- UP_DIRECTORY(monsysconfdir,
+ AM_UPSM_DIRECTORY(monsysconfdir,
/etc/mon /usr/local/etc/mon,
mon.cf auth.cf monshow,
[change default directory where mon configurations are located])
- UP_DIRECTORY(monpiddir,
+ AM_UPSM_DIRECTORY(monpiddir,
/var/run /var/run/mon,
.,
[change default path where mon pid file is located])
@@ -237,7 +193,7 @@
monpidfile=$monpiddir/mon.pid
AC_SUBST(monpidfile)
- UP_DIRECTORY(sudoersdir,
+ AM_UPSM_DIRECTORY(sudoersdir,
/etc /usr/local/etc,
sudoers,
[change default directory where sudoers is located])
===================================================================
RCS file: ultrapossum/ultrapossum.m4,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ultrapossum/ultrapossum.m4 2004/04/13 17:47:50 1.3
+++ ultrapossum/ultrapossum.m4 2004/10/28 17:05:21 1.4
@@ -61,3 +61,47 @@
])
+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_ARG_WITH($1,
+[ --with-]$1=DIR $4,
+case ["$withval"] in
+ [*)]
+ $1=["$withval"]
+ ;;
+esac
+)dnl
+
+AC_MSG_CHECKING(for $1)
+if test "x[$]$1" = "x"; then
+ for d in $2
+ do
+ d=$(eval echo `echo $d`)
+ for f in $3
+ do
+ if test -e "$d/$f"; then
+ $1="$d"
+ fi
+ done
+ done
+fi
+
+if test "x[$]$1" = "x"; then
+ if test "x$automodules" = "x"; then
+ AC_MSG_ERROR([no])
+ else
+ AC_MSG_RESULT([no])
+ fi
+else
+ AC_MSG_RESULT([$]$1)
+fi
+
+AC_SUBST($1)
+
+])
+