Browse code

Perl is not required (bb #1781).

Török Edvin authored on 2010/01/26 22:37:14
Showing 3 changed files
... ...
@@ -247,7 +247,6 @@
247 247
 	    \footnote{Note that several versions of GCC have bugs when compiling LLVM, see
248 248
 		\url{http://llvm.org/docs/GettingStarted.html#brokengcc} for a
249 249
 		    full list.}
250
-	\item Perl (version 5.6.0 or newer)
251 250
 	\item A supported CPU for the JIT, either of: X86, X86-64, PowerPC, PowerPC64
252 251
     \end{itemize}
253 252
     The following packages are optional, but needed for the JIT unit tests:
... ...
@@ -879,14 +879,15 @@ if test "$DOTTY" != "echo dotty" ; then
879 879
 fi
880 880
 
881 881
 dnl Look for a sufficiently recent version of Perl.
882
-LLVM_PROG_PERL([5.006])
883
-AC_SUBST(PERL)
884
-if test x"$PERL" = xnone; then
882
+dnl CLAMAV local: don't need Perl, we use automake buildsystem not llvm-config
883
+dnl LLVM_PROG_PERL([5.006])
884
+dnl AC_SUBST(PERL)
885
+dnl if test x"$PERL" = xnone; then
885 886
    AC_SUBST(HAVE_PERL,0)
886
-   AC_MSG_ERROR([perl is required but was not found, please install it])
887
-else
888
-   AC_SUBST(HAVE_PERL,1)
889
-fi
887
+dnl   AC_MSG_ERROR([perl is required but was not found, please install it])
888
+dnl else
889
+dnl   AC_SUBST(HAVE_PERL,1)
890
+dnl fi
890 891
 
891 892
 dnl Find the install program
892 893
 AC_PROG_INSTALL
... ...
@@ -658,7 +658,6 @@ INSTALL_DATA
658 658
 INSTALL_SCRIPT
659 659
 INSTALL_PROGRAM
660 660
 HAVE_PERL
661
-PERL
662 661
 DOTTY
663 662
 GV
664 663
 CIRCO
... ...
@@ -7097,70 +7096,8 @@ _ACEOF
7097 7097
 
7098 7098
 fi
7099 7099
 
7100
-
7101
-# Extract the first word of "perl", so it can be a program name with args.
7102
-set dummy perl; ac_word=$2
7103
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
7104
-$as_echo_n "checking for $ac_word... " >&6; }
7105
-if test "${ac_cv_path_PERL+set}" = set; then :
7106
-  $as_echo_n "(cached) " >&6
7107
-else
7108
-  case $PERL in
7109
-  [\\/]* | ?:[\\/]*)
7110
-  ac_cv_path_PERL="$PERL" # Let the user override the test with a path.
7111
-  ;;
7112
-  *)
7113
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
7114
-for as_dir in $PATH
7115
-do
7116
-  IFS=$as_save_IFS
7117
-  test -z "$as_dir" && as_dir=.
7118
-    for ac_exec_ext in '' $ac_executable_extensions; do
7119
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7120
-    ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext"
7121
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7122
-    break 2
7123
-  fi
7124
-done
7125
-  done
7126
-IFS=$as_save_IFS
7127
-
7128
-  test -z "$ac_cv_path_PERL" && ac_cv_path_PERL="none"
7129
-  ;;
7130
-esac
7131
-fi
7132
-PERL=$ac_cv_path_PERL
7133
-if test -n "$PERL"; then
7134
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PERL" >&5
7135
-$as_echo "$PERL" >&6; }
7136
-else
7137
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
7138
-$as_echo "no" >&6; }
7139
-fi
7140
-
7141
-
7142
-if test "$PERL" != "none"; then
7143
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Perl 5.006 or newer" >&5
7144
-$as_echo_n "checking for Perl 5.006 or newer... " >&6; }
7145
-  if $PERL -e 'use 5.006;' 2>&1 > /dev/null; then
7146
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
7147
-$as_echo "yes" >&6; }
7148
-  else
7149
-    PERL=none
7150
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
7151
-$as_echo "not found" >&6; }
7152
-  fi
7153
-fi
7154
-
7155
-
7156
-if test x"$PERL" = xnone; then
7157 7100
    HAVE_PERL=0
7158 7101
 
7159
-   as_fn_error "perl is required but was not found, please install it" "$LINENO" 5
7160
-else
7161
-   HAVE_PERL=1
7162
-
7163
-fi
7164 7102
 
7165 7103
 # Find a good install program.  We prefer a C program (faster),
7166 7104
 # so one script is as good as another.  But avoid the broken or
... ...
@@ -9510,7 +9447,7 @@ else
9510 9510
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
9511 9511
   lt_status=$lt_dlunknown
9512 9512
   cat > conftest.$ac_ext <<EOF
9513
-#line 9513 "configure"
9513
+#line 9450 "configure"
9514 9514
 #include "confdefs.h"
9515 9515
 
9516 9516
 #if HAVE_DLFCN_H