Browse code

autojunk'd

Mickey Sola authored on 2019/06/21 05:04:58
Showing 23 changed files
... ...
@@ -571,6 +571,7 @@ build_cpu = @build_cpu@
571 571
 build_os = @build_os@
572 572
 build_vendor = @build_vendor@
573 573
 builddir = @builddir@
574
+curl_config = @curl_config@
574 575
 datadir = @datadir@
575 576
 datarootdir = @datarootdir@
576 577
 docdir = @docdir@
... ...
@@ -519,6 +519,7 @@ build_cpu = @build_cpu@
519 519
 build_os = @build_os@
520 520
 build_vendor = @build_vendor@
521 521
 builddir = @builddir@
522
+curl_config = @curl_config@
522 523
 datadir = @datadir@
523 524
 datarootdir = @datarootdir@
524 525
 docdir = @docdir@
... ...
@@ -453,6 +453,7 @@ build_cpu = @build_cpu@
453 453
 build_os = @build_os@
454 454
 build_vendor = @build_vendor@
455 455
 builddir = @builddir@
456
+curl_config = @curl_config@
456 457
 datadir = @datadir@
457 458
 datarootdir = @datarootdir@
458 459
 docdir = @docdir@
... ...
@@ -473,6 +473,7 @@ build_cpu = @build_cpu@
473 473
 build_os = @build_os@
474 474
 build_vendor = @build_vendor@
475 475
 builddir = @builddir@
476
+curl_config = @curl_config@
476 477
 datadir = @datadir@
477 478
 datarootdir = @datarootdir@
478 479
 docdir = @docdir@
... ...
@@ -521,6 +521,7 @@ build_cpu = @build_cpu@
521 521
 build_os = @build_os@
522 522
 build_vendor = @build_vendor@
523 523
 builddir = @builddir@
524
+curl_config = @curl_config@
524 525
 datadir = @datadir@
525 526
 datarootdir = @datarootdir@
526 527
 docdir = @docdir@
... ...
@@ -483,6 +483,7 @@ build_cpu = @build_cpu@
483 483
 build_os = @build_os@
484 484
 build_vendor = @build_vendor@
485 485
 builddir = @builddir@
486
+curl_config = @curl_config@
486 487
 datadir = @datadir@
487 488
 datarootdir = @datarootdir@
488 489
 docdir = @docdir@
... ...
@@ -488,6 +488,7 @@ build_cpu = @build_cpu@
488 488
 build_os = @build_os@
489 489
 build_vendor = @build_vendor@
490 490
 builddir = @builddir@
491
+curl_config = @curl_config@
491 492
 datadir = @datadir@
492 493
 datarootdir = @datarootdir@
493 494
 docdir = @docdir@
... ...
@@ -504,6 +504,7 @@ build_cpu = @build_cpu@
504 504
 build_os = @build_os@
505 505
 build_vendor = @build_vendor@
506 506
 builddir = @builddir@
507
+curl_config = @curl_config@
507 508
 datadir = @datadir@
508 509
 datarootdir = @datarootdir@
509 510
 docdir = @docdir@
... ...
@@ -476,6 +476,7 @@ build_cpu = @build_cpu@
476 476
 build_os = @build_os@
477 477
 build_vendor = @build_vendor@
478 478
 builddir = @builddir@
479
+curl_config = @curl_config@
479 480
 datadir = @datadir@
480 481
 datarootdir = @datarootdir@
481 482
 docdir = @docdir@
... ...
@@ -516,6 +516,7 @@ build_cpu = @build_cpu@
516 516
 build_os = @build_os@
517 517
 build_vendor = @build_vendor@
518 518
 builddir = @builddir@
519
+curl_config = @curl_config@
519 520
 datadir = @datadir@
520 521
 datarootdir = @datarootdir@
521 522
 docdir = @docdir@
... ...
@@ -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
... ...
@@ -422,6 +422,7 @@ build_cpu = @build_cpu@
422 422
 build_os = @build_os@
423 423
 build_vendor = @build_vendor@
424 424
 builddir = @builddir@
425
+curl_config = @curl_config@
425 426
 datadir = @datadir@
426 427
 datarootdir = @datarootdir@
427 428
 docdir = @docdir@
... ...
@@ -456,6 +456,7 @@ build_cpu = @build_cpu@
456 456
 build_os = @build_os@
457 457
 build_vendor = @build_vendor@
458 458
 builddir = @builddir@
459
+curl_config = @curl_config@
459 460
 datadir = @datadir@
460 461
 datarootdir = @datarootdir@
461 462
 docdir = @docdir@
... ...
@@ -452,6 +452,7 @@ build_cpu = @build_cpu@
452 452
 build_os = @build_os@
453 453
 build_vendor = @build_vendor@
454 454
 builddir = @builddir@
455
+curl_config = @curl_config@
455 456
 datadir = @datadir@
456 457
 datarootdir = @datarootdir@
457 458
 docdir = @docdir@
... ...
@@ -507,6 +507,7 @@ build_cpu = @build_cpu@
507 507
 build_os = @build_os@
508 508
 build_vendor = @build_vendor@
509 509
 builddir = @builddir@
510
+curl_config = @curl_config@
510 511
 datadir = @datadir@
511 512
 datarootdir = @datarootdir@
512 513
 docdir = @docdir@
... ...
@@ -904,6 +904,7 @@ build_cpu = @build_cpu@
904 904
 build_os = @build_os@
905 905
 build_vendor = @build_vendor@
906 906
 builddir = @builddir@
907
+curl_config = @curl_config@
907 908
 datadir = @datadir@
908 909
 datarootdir = @datarootdir@
909 910
 docdir = @docdir@
... ...
@@ -1076,6 +1076,7 @@ build_cpu = @build_cpu@
1076 1076
 build_os = @build_os@
1077 1077
 build_vendor = @build_vendor@
1078 1078
 builddir = @builddir@
1079
+curl_config = @curl_config@
1079 1080
 datadir = @datadir@
1080 1081
 datarootdir = @datarootdir@
1081 1082
 docdir = @docdir@
... ...
@@ -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 \
... ...
@@ -552,6 +552,7 @@ build_cpu = @build_cpu@
552 552
 build_os = @build_os@
553 553
 build_vendor = @build_vendor@
554 554
 builddir = @builddir@
555
+curl_config = @curl_config@
555 556
 datadir = @datadir@
556 557
 datarootdir = @datarootdir@
557 558
 docdir = @docdir@
... ...
@@ -551,6 +551,7 @@ build_cpu = @build_cpu@
551 551
 build_os = @build_os@
552 552
 build_vendor = @build_vendor@
553 553
 builddir = @builddir@
554
+curl_config = @curl_config@
554 555
 datadir = @datadir@
555 556
 datarootdir = @datarootdir@
556 557
 docdir = @docdir@
... ...
@@ -474,6 +474,7 @@ build_cpu = @build_cpu@
474 474
 build_os = @build_os@
475 475
 build_vendor = @build_vendor@
476 476
 builddir = @builddir@
477
+curl_config = @curl_config@
477 478
 datadir = @datadir@
478 479
 datarootdir = @datarootdir@
479 480
 docdir = @docdir@
... ...
@@ -403,6 +403,7 @@ build_cpu = @build_cpu@
403 403
 build_os = @build_os@
404 404
 build_vendor = @build_vendor@
405 405
 builddir = @builddir@
406
+curl_config = @curl_config@
406 407
 datadir = @datadir@
407 408
 datarootdir = @datarootdir@
408 409
 docdir = @docdir@
... ...
@@ -693,6 +693,7 @@ build_cpu = @build_cpu@
693 693
 build_os = @build_os@
694 694
 build_vendor = @build_vendor@
695 695
 builddir = @builddir@
696
+curl_config = @curl_config@
696 697
 datadir = @datadir@
697 698
 datarootdir = @datarootdir@
698 699
 docdir = @docdir@