... | ... |
@@ -714,6 +714,7 @@ CLAMSCAN_CPPFLAGS |
714 | 714 |
FRESHCLAM_CPPFLAGS |
715 | 715 |
CLAMSUBMIT_CFLAGS |
716 | 716 |
CLAMSUBMIT_LIBS |
717 |
+curl_config |
|
717 | 718 |
BUILD_CLAMONACC_FALSE |
718 | 719 |
BUILD_CLAMONACC_TRUE |
719 | 720 |
LIBPRELUDE_CONFIG_PREFIX |
... | ... |
@@ -29095,30 +29096,103 @@ $as_echo "$LIBCURL_HOME" >&6; } |
29095 | 29095 |
save_LDFLAGS="$LDFLAGS" |
29096 | 29096 |
LDFLAGS="$CURL_LDFLAGS $CURL_LIBS" |
29097 | 29097 |
|
29098 |
- if test -z "$BUILD_CLAMONACC_TRUE"; then : |
|
29099 |
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
|
29100 |
-/* end confdefs.h. */ |
|
29101 |
-#include <curl/curl.h> |
|
29102 |
-int |
|
29103 |
-main () |
|
29104 |
-{ |
|
29098 |
+ for ac_prog in gawk mawk nawk awk |
|
29099 |
+do |
|
29100 |
+ # Extract the first word of "$ac_prog", so it can be a program name with args. |
|
29101 |
+set dummy $ac_prog; ac_word=$2 |
|
29102 |
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
|
29103 |
+$as_echo_n "checking for $ac_word... " >&6; } |
|
29104 |
+if ${ac_cv_prog_AWK+:} false; then : |
|
29105 |
+ $as_echo_n "(cached) " >&6 |
|
29106 |
+else |
|
29107 |
+ if test -n "$AWK"; then |
|
29108 |
+ ac_cv_prog_AWK="$AWK" # Let the user override the test. |
|
29109 |
+else |
|
29110 |
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
|
29111 |
+for as_dir in $PATH |
|
29112 |
+do |
|
29113 |
+ IFS=$as_save_IFS |
|
29114 |
+ test -z "$as_dir" && as_dir=. |
|
29115 |
+ for ac_exec_ext in '' $ac_executable_extensions; do |
|
29116 |
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
|
29117 |
+ ac_cv_prog_AWK="$ac_prog" |
|
29118 |
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
|
29119 |
+ break 2 |
|
29120 |
+ fi |
|
29121 |
+done |
|
29122 |
+ done |
|
29123 |
+IFS=$as_save_IFS |
|
29105 | 29124 |
|
29106 |
- int x; |
|
29107 |
- curl_easy_setopt(NULL,CURLOPT_URL,NULL); |
|
29108 |
- x=CURLOPT_UNIX_SOCKET_PATH; |
|
29109 |
- x=CURLINFO_ACTIVESOCKET; |
|
29110 |
- if (x) {;} |
|
29111 |
- ; |
|
29112 |
- return 0; |
|
29113 |
-} |
|
29114 |
-_ACEOF |
|
29115 |
-if ac_fn_c_try_link "$LINENO"; then : |
|
29116 |
- $enable_clamonacc="yes" |
|
29125 |
+fi |
|
29126 |
+fi |
|
29127 |
+AWK=$ac_cv_prog_AWK |
|
29128 |
+if test -n "$AWK"; then |
|
29129 |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5 |
|
29130 |
+$as_echo "$AWK" >&6; } |
|
29131 |
+else |
|
29132 |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
|
29133 |
+$as_echo "no" >&6; } |
|
29134 |
+fi |
|
29135 |
+ |
|
29136 |
+ |
|
29137 |
+ test -n "$AWK" && break |
|
29138 |
+done |
|
29139 |
+ |
|
29140 |
+ |
|
29141 |
+ curl_version_parse="eval $AWK '{split(\$NF,A,\".\"); X=256*256*A[1]+256*A[2]+A[3]; print X;}'" |
|
29142 |
+ # Extract the first word of "curl-config", so it can be a program name with args. |
|
29143 |
+set dummy curl-config; ac_word=$2 |
|
29144 |
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
|
29145 |
+$as_echo_n "checking for $ac_word... " >&6; } |
|
29146 |
+if ${ac_cv_path_curl_config+:} false; then : |
|
29147 |
+ $as_echo_n "(cached) " >&6 |
|
29117 | 29148 |
else |
29118 |
- as_fn_error $? "Your libcurl (e.g. libcurl-devel) is too old. ClamAV requires libcurl 7.45 or higher." "$LINENO" 5 |
|
29149 |
+ case $curl_config in |
|
29150 |
+ [\\/]* | ?:[\\/]*) |
|
29151 |
+ ac_cv_path_curl_config="$curl_config" # Let the user override the test with a path. |
|
29152 |
+ ;; |
|
29153 |
+ *) |
|
29154 |
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
|
29155 |
+for as_dir in "$LIBCURL_HOME/bin" |
|
29156 |
+do |
|
29157 |
+ IFS=$as_save_IFS |
|
29158 |
+ test -z "$as_dir" && as_dir=. |
|
29159 |
+ for ac_exec_ext in '' $ac_executable_extensions; do |
|
29160 |
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
|
29161 |
+ ac_cv_path_curl_config="$as_dir/$ac_word$ac_exec_ext" |
|
29162 |
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
|
29163 |
+ break 2 |
|
29164 |
+ fi |
|
29165 |
+done |
|
29166 |
+ done |
|
29167 |
+IFS=$as_save_IFS |
|
29168 |
+ |
|
29169 |
+ test -z "$ac_cv_path_curl_config" && ac_cv_path_curl_config=""notfound"" |
|
29170 |
+ ;; |
|
29171 |
+esac |
|
29119 | 29172 |
fi |
29120 |
-rm -f core conftest.err conftest.$ac_objext \ |
|
29121 |
- conftest$ac_exeext conftest.$ac_ext |
|
29173 |
+curl_config=$ac_cv_path_curl_config |
|
29174 |
+if test -n "$curl_config"; then |
|
29175 |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $curl_config" >&5 |
|
29176 |
+$as_echo "$curl_config" >&6; } |
|
29177 |
+else |
|
29178 |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
|
29179 |
+$as_echo "no" >&6; } |
|
29180 |
+fi |
|
29181 |
+ |
|
29182 |
+ |
|
29183 |
+ |
|
29184 |
+ |
|
29185 |
+ awk_curl_version=`$curl_config --version | $AWK '{print $2}'` |
|
29186 |
+ curl_version=`echo $awk_curl_version | $curl_version_parse` |
|
29187 |
+ |
|
29188 |
+ if test -z "$BUILD_CLAMONACC_TRUE"; then : |
|
29189 |
+ if test $curl_version -ge 470272 ; then |
|
29190 |
+ $enable_clamonacc="yes" |
|
29191 |
+ else |
|
29192 |
+ as_fn_error $? "Your libcurl (e.g. libcurl-devel) is too old. ClamAV (with clamonacc) requires libcurl 7.45 or higher." "$LINENO" 5 |
|
29193 |
+ fi |
|
29194 |
+ |
|
29122 | 29195 |
fi |
29123 | 29196 |
|
29124 | 29197 |
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for curl_easy_init in -lcurl" >&5 |
... | ... |
@@ -5765,8 +5765,8 @@ maintainer-clean-generic: |
5765 | 5765 |
@echo "This command is intended for maintainers to use" |
5766 | 5766 |
@echo "it deletes files that may require special tools to rebuild." |
5767 | 5767 |
-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) |
5768 |
-@BUILD_EXTERNAL_LLVM_TRUE@distclean-local: |
|
5769 | 5768 |
@BUILD_EXTERNAL_LLVM_TRUE@clean-local: |
5769 |
+@BUILD_EXTERNAL_LLVM_TRUE@distclean-local: |
|
5770 | 5770 |
clean: clean-am |
5771 | 5771 |
|
5772 | 5772 |
clean-am: clean-generic clean-libtool clean-local \ |