Perl is not required (bb #1781).

0.96
Török Edvin 16 years ago
parent b1249c5eb3
commit 84b7b79da3
  1. 1
      docs/clamdoc.tex
  2. 15
      libclamav/c++/llvm/autoconf/configure.ac
  3. 65
      libclamav/c++/llvm/configure

@ -247,7 +247,6 @@
\footnote{Note that several versions of GCC have bugs when compiling LLVM, see
\url{http://llvm.org/docs/GettingStarted.html#brokengcc} for a
full list.}
\item Perl (version 5.6.0 or newer)
\item A supported CPU for the JIT, either of: X86, X86-64, PowerPC, PowerPC64
\end{itemize}
The following packages are optional, but needed for the JIT unit tests:

@ -879,14 +879,15 @@ if test "$DOTTY" != "echo dotty" ; then
fi
dnl Look for a sufficiently recent version of Perl.
LLVM_PROG_PERL([5.006])
AC_SUBST(PERL)
if test x"$PERL" = xnone; then
dnl CLAMAV local: don't need Perl, we use automake buildsystem not llvm-config
dnl LLVM_PROG_PERL([5.006])
dnl AC_SUBST(PERL)
dnl if test x"$PERL" = xnone; then
AC_SUBST(HAVE_PERL,0)
AC_MSG_ERROR([perl is required but was not found, please install it])
else
AC_SUBST(HAVE_PERL,1)
fi
dnl AC_MSG_ERROR([perl is required but was not found, please install it])
dnl else
dnl AC_SUBST(HAVE_PERL,1)
dnl fi
dnl Find the install program
AC_PROG_INSTALL

@ -658,7 +658,6 @@ INSTALL_DATA
INSTALL_SCRIPT
INSTALL_PROGRAM
HAVE_PERL
PERL
DOTTY
GV
CIRCO
@ -7097,70 +7096,8 @@ _ACEOF
fi
# Extract the first word of "perl", so it can be a program name with args.
set dummy perl; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_path_PERL+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $PERL in
[\\/]* | ?:[\\/]*)
ac_cv_path_PERL="$PERL" # Let the user override the test with a path.
;;
*)
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
IFS=$as_save_IFS
test -z "$ac_cv_path_PERL" && ac_cv_path_PERL="none"
;;
esac
fi
PERL=$ac_cv_path_PERL
if test -n "$PERL"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $PERL" >&5
$as_echo "$PERL" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
if test "$PERL" != "none"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Perl 5.006 or newer" >&5
$as_echo_n "checking for Perl 5.006 or newer... " >&6; }
if $PERL -e 'use 5.006;' 2>&1 > /dev/null; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
else
PERL=none
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
$as_echo "not found" >&6; }
fi
fi
if test x"$PERL" = xnone; then
HAVE_PERL=0
as_fn_error "perl is required but was not found, please install it" "$LINENO" 5
else
HAVE_PERL=1
fi
# Find a good install program. We prefer a C program (faster),
# so one script is as good as another. But avoid the broken or
@ -9510,7 +9447,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
#line 9513 "configure"
#line 9450 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H

Loading…
Cancel
Save