Browse code

fix clamsubmit autoconf - autoreconf.

Steven Morgan authored on 2016/04/09 03:16:16
Showing 2 changed files
... ...
@@ -645,6 +645,8 @@ am__EXEEXT_FALSE
645 645
 am__EXEEXT_TRUE
646 646
 LTLIBOBJS
647 647
 LIBOBJS
648
+ENABLE_CLAMSUBMIT_FALSE
649
+ENABLE_CLAMSUBMIT_TRUE
648 650
 JSON_LDFLAGS
649 651
 JSON_LIBS
650 652
 SSL_LDFLAGS
... ...
@@ -681,8 +683,6 @@ CLAMSUBMIT_CFLAGS
681 681
 CLAMSUBMIT_LIBS
682 682
 ENABLE_LIBFRESHCLAM_FALSE
683 683
 ENABLE_LIBFRESHCLAM_TRUE
684
-ENABLE_CLAMSUBMIT_FALSE
685
-ENABLE_CLAMSUBMIT_TRUE
686 684
 HAVE_YARA
687 685
 subdirs
688 686
 WERR_CFLAGS_MILTER
... ...
@@ -24041,15 +24041,6 @@ fi
24041 24041
 
24042 24042
 
24043 24043
 
24044
- if test "$have_curl" = "yes"; then
24045
-  ENABLE_CLAMSUBMIT_TRUE=
24046
-  ENABLE_CLAMSUBMIT_FALSE='#'
24047
-else
24048
-  ENABLE_CLAMSUBMIT_TRUE='#'
24049
-  ENABLE_CLAMSUBMIT_FALSE=
24050
-fi
24051
-
24052
-
24053 24044
 # Check whether --enable-libfreshclam was given.
24054 24045
 if test "${enable_libfreshclam+set}" = set; then :
24055 24046
   enableval=$enable_libfreshclam; enable_libfreshclam=$enableval
... ...
@@ -24254,6 +24245,15 @@ fi
24254 24254
 
24255 24255
 
24256 24256
 
24257
+ if test "$have_curl" = "yes"; then
24258
+  ENABLE_CLAMSUBMIT_TRUE=
24259
+  ENABLE_CLAMSUBMIT_FALSE='#'
24260
+else
24261
+  ENABLE_CLAMSUBMIT_TRUE='#'
24262
+  ENABLE_CLAMSUBMIT_FALSE=
24263
+fi
24264
+
24265
+
24257 24266
 ac_config_files="$ac_config_files clamscan/Makefile database/Makefile docs/Makefile clamd/Makefile clamd/clamav-daemon.service clamd/clamav-daemon.socket clamdscan/Makefile clamsubmit/Makefile clamav-milter/Makefile freshclam/clamav-freshclam.service freshclam/Makefile sigtool/Makefile clamconf/Makefile etc/Makefile test/Makefile unit_tests/Makefile clamdtop/Makefile clambc/Makefile libfreshclam/Makefile Makefile clamav-config libclamav.pc platform.h docs/man/clamav-milter.8 docs/man/clamav-milter.conf.5 docs/man/clambc.1 docs/man/clamconf.1 docs/man/clamd.8 docs/man/clamd.conf.5 docs/man/clamdscan.1 docs/man/clamscan.1 docs/man/freshclam.1 docs/man/freshclam.conf.5 docs/man/sigtool.1 docs/man/clamdtop.1 docs/man/clamsubmit.1"
24258 24267
 
24259 24268
 
... ...
@@ -24464,14 +24464,14 @@ if test -z "${HAVE_CURSES_TRUE}" && test -z "${HAVE_CURSES_FALSE}"; then
24464 24464
   as_fn_error $? "conditional \"HAVE_CURSES\" was never defined.
24465 24465
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
24466 24466
 fi
24467
-if test -z "${ENABLE_CLAMSUBMIT_TRUE}" && test -z "${ENABLE_CLAMSUBMIT_FALSE}"; then
24468
-  as_fn_error $? "conditional \"ENABLE_CLAMSUBMIT\" was never defined.
24469
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
24470
-fi
24471 24467
 if test -z "${ENABLE_LIBFRESHCLAM_TRUE}" && test -z "${ENABLE_LIBFRESHCLAM_FALSE}"; then
24472 24468
   as_fn_error $? "conditional \"ENABLE_LIBFRESHCLAM\" was never defined.
24473 24469
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
24474 24470
 fi
24471
+if test -z "${ENABLE_CLAMSUBMIT_TRUE}" && test -z "${ENABLE_CLAMSUBMIT_FALSE}"; then
24472
+  as_fn_error $? "conditional \"ENABLE_CLAMSUBMIT\" was never defined.
24473
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
24474
+fi
24475 24475
 
24476 24476
 : "${CONFIG_STATUS=./config.status}"
24477 24477
 ac_write_fail=0
... ...
@@ -27041,14 +27041,14 @@ if test -z "${HAVE_CURSES_TRUE}" && test -z "${HAVE_CURSES_FALSE}"; then
27041 27041
   as_fn_error $? "conditional \"HAVE_CURSES\" was never defined.
27042 27042
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
27043 27043
 fi
27044
-if test -z "${ENABLE_CLAMSUBMIT_TRUE}" && test -z "${ENABLE_CLAMSUBMIT_FALSE}"; then
27045
-  as_fn_error $? "conditional \"ENABLE_CLAMSUBMIT\" was never defined.
27046
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
27047
-fi
27048 27044
 if test -z "${ENABLE_LIBFRESHCLAM_TRUE}" && test -z "${ENABLE_LIBFRESHCLAM_FALSE}"; then
27049 27045
   as_fn_error $? "conditional \"ENABLE_LIBFRESHCLAM\" was never defined.
27050 27046
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
27051 27047
 fi
27048
+if test -z "${ENABLE_CLAMSUBMIT_TRUE}" && test -z "${ENABLE_CLAMSUBMIT_FALSE}"; then
27049
+  as_fn_error $? "conditional \"ENABLE_CLAMSUBMIT\" was never defined.
27050
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
27051
+fi
27052 27052
 if test -z "${am__EXEEXT_TRUE}" && test -z "${am__EXEEXT_FALSE}"; then
27053 27053
   as_fn_error $? "conditional \"am__EXEEXT\" was never defined.
27054 27054
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
... ...
@@ -5750,8 +5750,8 @@ maintainer-clean-generic:
5750 5750
 	@echo "This command is intended for maintainers to use"
5751 5751
 	@echo "it deletes files that may require special tools to rebuild."
5752 5752
 	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
5753
-@BUILD_EXTERNAL_LLVM_TRUE@clean-local:
5754 5753
 @BUILD_EXTERNAL_LLVM_TRUE@distclean-local:
5754
+@BUILD_EXTERNAL_LLVM_TRUE@clean-local:
5755 5755
 clean: clean-am
5756 5756
 
5757 5757
 clean-am: clean-generic clean-libtool clean-local \