Commit 677c6887 authored by tim@cane.mysql.fi's avatar tim@cane.mysql.fi

configure.in Change PERL test to use perl instead of perl5, if possible.

parent 3669828a
...@@ -296,13 +296,21 @@ AC_PATH_PROG(CMP, cmp, cmp) ...@@ -296,13 +296,21 @@ AC_PATH_PROG(CMP, cmp, cmp)
AC_PATH_PROG(CHMOD, chmod, chmod) AC_PATH_PROG(CHMOD, chmod, chmod)
AC_PATH_PROG(HOSTNAME, hostname, hostname) AC_PATH_PROG(HOSTNAME, hostname, hostname)
dnl We use a path for perl so the script startup works dnl We use a path for perl so the script startup works
AC_PATH_PROG(PERL5, perl5, no) dnl We make sure to use perl, not perl5, in hopes that the RPMs will
dnl not depend on the perl5 binary being installed (probably a bug in RPM)
AC_PATH_PROG(PERL, perl, no) AC_PATH_PROG(PERL, perl, no)
if test "$PERL5" != no if test "$PERL" != "no" && $PERL -e 'require 5' > /dev/null 2>&1
then then
PERL=$PERL5 PERL5=$PERL
ac_cv_path_PERL=$ac_cv_path_PERL5 else
AC_PATH_PROG(PERL5, perl5, no)
if test "$PERL5" != no
then
PERL=$PERL5
ac_cv_path_PERL=$ac_cv_path_PERL5
fi
fi fi
AC_SUBST(HOSTNAME) AC_SUBST(HOSTNAME)
AC_SUBST(PERL) AC_SUBST(PERL)
AC_SUBST(PERL5) AC_SUBST(PERL5)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment