Masato Taruishi
taru****@users*****
2004年 10月 30日 (土) 03:38:54 JST
=================================================================== RCS file: ultrapossum/configure.in,v retrieving revision 1.66 retrieving revision 1.67 diff -u -r1.66 -r1.67 --- ultrapossum/configure.in 2004/10/29 16:27:17 1.66 +++ ultrapossum/configure.in 2004/10/29 18:38:54 1.67 @@ -7,6 +7,35 @@ AC_INIT(ultrapossum, 0.1beta13, taru****@ultra*****) AM_INIT_AUTOMAKE(ultrapossum, 0.1beta13) +# Checks for directories. +SHAREDIR="${datadir}"'/${PACKAGE}' +TESTDIR='${libdir}/${PACKAGE}/test' +TESTSCRIPTSDIR='${TESTDIR}/test.d' +CONFDIR='${localstatedir}/lib/${PACKAGE}/conf.d/${ULTRAPOSSUM_PROJECT}' +APPSDIR='${SHAREDIR}/apps.d' +MODULEDIR='${SHAREDIR}/module.d' +UPDATEDIR='${SHAREDIR}/update.d' +BACKUPDIR='${localstatedir}/backups/${PACKAGE}' +SYSCONFDIR='${sysconfdir}/${PACKAGE}' +APPSCONFDIR='${SYSCONFDIR}/apps' +TEMPLATEDIR='${SYSCONFDIR}/in.d' +MODULECONFDIR='${SYSCONFDIR}/module.d' +SSHKEYDIR='${SYSCONFDIR}/ssh' + +AC_SUBST(SHAREDIR) +AC_SUBST(TESTDIR) +AC_SUBST(TESTSCRIPTSDIR) +AC_SUBST(CONFDIR) +AC_SUBST(APPSDIR) +AC_SUBST(MODULEDIR) +AC_SUBST(UPDATEDIR) +AC_SUBST(BACKUPDIR) +AC_SUBST(SYSCONFDIR) +AC_SUBST(APPSCONFDIR) +AC_SUBST(TEMPLATEDIR) +AC_SUBST(MODULECONFDIR) +AC_SUBST(SSHKEYDIR) + # Checks for programs. AC_PROG_INSTALL AC_CHECK_PROGS(perl, perl ) @@ -214,7 +243,7 @@ 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/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_CONFIG_FILES([test/run test/Makefile Makefile init.d/Makefile module/test/Makefile module/test/test.d/Makefile 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 test "x$PERL_TRUE" = "x"; then if test "x$PERL_SUPPORT_DESTDIR_TRUE" = "x"; then =================================================================== RCS file: ultrapossum/modules.in,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- ultrapossum/modules.in 2004/10/26 12:59:23 1.52 +++ ultrapossum/modules.in 2004/10/29 18:38:54 1.53 @@ -47,19 +47,19 @@ CACHEDIR=${CACHEDIR:-$localstatedir/cache/@PACKAGE@} # Directory Definition -SHAREDIR=${SHAREDIR:- ＠ datadir@/@PACKAGE@} -TESTDIR=${TESTDIR:- ＠ libdir@/@PACKAGE@/test} -TESTSCRIPTSDIR=${TESTSCRIPTSDIR:-$TESTDIR/test.d} -CONFDIR=${CONFDIR:-$localstatedir/lib/$PACKAGE/conf.d/$ULTRAPOSSUM_PROJECT} -APPSDIR=${APPSDIR:-$SHAREDIR/apps.d} -MODULEDIR=${MODULEDIR:-$SHAREDIR/module.d} -UPDATEDIR=${UPDATEDIR:-$SHAREDIR/update.d} -BACKUPDIR=${BACKUPDIR:-$localstatedir/backups/@PACKAGE@} -SYSCONFDIR=${SYSCONFDIR:-$sysconfdir/@PACKAGE@} -APPSCONFDIR=${APPSCONFDIR:-$SYSCONFDIR/apps} -TEMPLATEDIR=${TEMPLATEDIR:-$SYSCONFDIR/in.d} -MODULECONFDIR=${MODULECONFDIR:-$SYSCONFDIR/module.d} -SSHKEYDIR=${SSHKEYDIR:-$SYSCONFDIR/ssh} +SHAREDIR=${SHAREDIR:- ＠ SHAREDIR@} +TESTDIR=${TESTDIR:- ＠ TESTDIR@} +TESTSCRIPTSDIR=${TESTSCRIPTSDIR:- ＠ TESTSCRIPTSDIR@} +CONFDIR=${CONFDIR:- ＠ CONFDIR@} +APPSDIR=${APPSDIR:- ＠ APPSDIR@} +MODULEDIR=${MODULEDIR:- ＠ MODULEDIR@} +UPDATEDIR=${UPDATEDIR:- ＠ UPDATEDIR@} +BACKUPDIR=${BACKUPDIR:- ＠ BACKUPDIR@} +SYSCONFDIR=${SYSCONFDIR:- ＠ SYSCONFDIR@} +APPSCONFDIR=${APPSCONFDIR:- ＠ APPSCONFDIR@} +TEMPLATEDIR=${TEMPLATEDIR:- ＠ TEMPLATEDIR@} +MODULECONFDIR=${MODULECONFDIR:- ＠ MODULECONFDIR@} +SSHKEYDIR=${SSHKEYDIR:- ＠ SSHKEYDIR@} CONFSTATUS=${CONFSTATUS:-$CONFDIR/status} ULTRAPOSSUMCF=${ULTRAPOSSUMCF:-$SYSCONFDIR/ultrapossum.cf} =================================================================== RCS file: ultrapossum/ultrapossum.m4,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- ultrapossum/ultrapossum.m4 2004/10/29 16:27:17 1.5 +++ ultrapossum/ultrapossum.m4 2004/10/29 18:38:54 1.6 @@ -31,35 +31,32 @@ ] ) -AC_DEFUN([AM_ULTRAPOSSUM_SERVER_MODULE], +AC_DEFUN([AM_ULTRAPOSSUM_MODULE], [ AC_PROG_ULTRAPOSSUMCONFIG - AC_MSG_CHECKING([for UltraPossum server module directories]) - eval `$ULTRAPOSSUMCONFIG get MODULEDIR UPDATEDIR MODULECONFDIR TEMPLATEDIR 2> /dev/null` - if test "x$MODULEDIR" = "x"; then - AC_MSG_ERROR([null]) - fi - AC_SUBST([MODULEDIR]) + AC_MSG_CHECKING([for UltraPossum module variables]) + eval `$ULTRAPOSSUMCONFIG get` - if test "x$UPDATEDIR" = "x"; then - AC_MSG_ERROR([null]) - fi - AC_SUBST([UPDATEDIR]) - - if test "x$MODULECONFDIR" = "x"; then - AC_MSG_ERROR([null]) - fi - AC_SUBST([MODULECONFDIR]) + AC_SUBST(SHAREDIR) + AC_SUBST(TESTDIR) + AC_SUBST(TESTSCRIPTSDIR) + AC_SUBST(CONFDIR) + AC_SUBST(APPSDIR) + AC_SUBST(MODULEDIR) + AC_SUBST(UPDATEDIR) + AC_SUBST(BACKUPDIR) + AC_SUBST(SYSCONFDIR) + AC_SUBST(APPSCONFDIR) + AC_SUBST(TEMPLATEDIR) + AC_SUBST(MODULECONFDIR) + AC_SUBST(SSHKEYDIR) + + AC_MSG_RESULT([ok]) - if test "x$TEMPLATEDIR" = "x"; then - AC_MSG_ERROR([null]) - fi - AC_SUBST([TEMPLATEDIR]) +] +) - AC_MSG_RESULT([ok]) - -]) dnl $1 variable name dnl $2 directory candidates
