Masato Taruishi
taru****@users*****
2004年 10月 21日 (木) 13:16:31 JST
=================================================================== RCS file: ultrapossum/configure.in,v retrieving revision 1.61 retrieving revision 1.62 diff -u -r1.61 -r1.62 --- ultrapossum/configure.in 2004/10/20 16:40:59 1.61 +++ ultrapossum/configure.in 2004/10/21 04:16:31 1.62 @@ -13,9 +13,14 @@ if test "x$perl" != "x"; then AC_MSG_CHECKING(for perl version) perlver=`$perl -v | grep 'This is perl' | cut -d' ' -f4 | tr -d v` - AC_MSG_RESULT([$perlver]) v="`echo $perlver | tr -d .`" AM_CONDITIONAL(PERL_SUPPORT_DESTDIR, test $v -ge 583) + AM_CONDITIONAL(PERL,test $v -ge 580) + if test "x$PERL_TRUE" = "x"; then + AC_MSG_RESULT([$perlver]) + else + AC_MSG_RESULT([old ($oldver)]) + fi fi # Checks for libraries. @@ -255,10 +260,12 @@ 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 test "x$perlver" = "x5.8.4"; then - cd perl && $perl Makefile.PL INSTALLDIRS=vendor -else - cd perl && $perl Makefile.PL +if test "x$PERL_TRUE" = "x"; then + if test "x$PERL_SUPPORT_DESTDIR_TRUE" = "x"; then + cd perl && $perl Makefile.PL INSTALLDIRS=vendor + else + cd perl && $perl Makefile.PL + fi fi if include "startTLS" "$modules"; then echo "startTLS plugin will be used which includes software"
