Browse code
bb11062 - defaulting build to internal libmspack and creating configure option to specify use of external library
Mickey Sola authored on 2016/11/04 03:23:37Showing 26 changed files
- Makefile.in
- clamav-milter/Makefile.in
- clambc/Makefile.in
- clamconf/Makefile.in
- clamd/Makefile.in
- clamdscan/Makefile.in
- clamdtop/Makefile.in
- clamscan/Makefile.in
- clamsubmit/Makefile.in
- configure
- configure.ac
- database/Makefile.in
- docs/Makefile.in
- etc/Makefile.in
- freshclam/Makefile.in
- libclamav/Makefile.am
- libclamav/Makefile.in
- libclamav/c++/Makefile.in
- libclamav/libmspack-0.5alpha/Makefile.intmspack.in
- libclamav/libmspack-0.5alpha/m4/libmspack-opts.m4
- libfreshclam/Makefile.in
- libltdl/Makefile.in
- m4/reorganization/libmspack.m4
- sigtool/Makefile.in
- test/Makefile.in
- unit_tests/Makefile.in
| ... | ... |
@@ -199,6 +199,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ |
| 199 | 199 |
$(top_srcdir)/m4/reorganization/bsd.m4 \ |
| 200 | 200 |
$(top_srcdir)/m4/reorganization/libs/curl.m4 \ |
| 201 | 201 |
$(top_srcdir)/m4/reorganization/substitutions.m4 \ |
| 202 |
+ $(top_srcdir)/m4/reorganization/libmspack.m4 \ |
|
| 203 |
+ $(top_srcdir)/libclamav/libmspack-0.5alpha/m4/libmspack-opts.m4 \ |
|
| 202 | 204 |
$(top_srcdir)/configure.ac |
| 203 | 205 |
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ |
| 204 | 206 |
$(ACLOCAL_M4) |
| ... | ... |
@@ -174,6 +174,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ |
| 174 | 174 |
$(top_srcdir)/m4/reorganization/bsd.m4 \ |
| 175 | 175 |
$(top_srcdir)/m4/reorganization/libs/curl.m4 \ |
| 176 | 176 |
$(top_srcdir)/m4/reorganization/substitutions.m4 \ |
| 177 |
+ $(top_srcdir)/m4/reorganization/libmspack.m4 \ |
|
| 178 |
+ $(top_srcdir)/libclamav/libmspack-0.5alpha/m4/libmspack-opts.m4 \ |
|
| 177 | 179 |
$(top_srcdir)/configure.ac |
| 178 | 180 |
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ |
| 179 | 181 |
$(ACLOCAL_M4) |
| ... | ... |
@@ -155,6 +155,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ |
| 155 | 155 |
$(top_srcdir)/m4/reorganization/bsd.m4 \ |
| 156 | 156 |
$(top_srcdir)/m4/reorganization/libs/curl.m4 \ |
| 157 | 157 |
$(top_srcdir)/m4/reorganization/substitutions.m4 \ |
| 158 |
+ $(top_srcdir)/m4/reorganization/libmspack.m4 \ |
|
| 159 |
+ $(top_srcdir)/libclamav/libmspack-0.5alpha/m4/libmspack-opts.m4 \ |
|
| 158 | 160 |
$(top_srcdir)/configure.ac |
| 159 | 161 |
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ |
| 160 | 162 |
$(ACLOCAL_M4) |
| ... | ... |
@@ -173,6 +173,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ |
| 173 | 173 |
$(top_srcdir)/m4/reorganization/bsd.m4 \ |
| 174 | 174 |
$(top_srcdir)/m4/reorganization/libs/curl.m4 \ |
| 175 | 175 |
$(top_srcdir)/m4/reorganization/substitutions.m4 \ |
| 176 |
+ $(top_srcdir)/m4/reorganization/libmspack.m4 \ |
|
| 177 |
+ $(top_srcdir)/libclamav/libmspack-0.5alpha/m4/libmspack-opts.m4 \ |
|
| 176 | 178 |
$(top_srcdir)/configure.ac |
| 177 | 179 |
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ |
| 178 | 180 |
$(ACLOCAL_M4) |
| ... | ... |
@@ -175,6 +175,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ |
| 175 | 175 |
$(top_srcdir)/m4/reorganization/bsd.m4 \ |
| 176 | 176 |
$(top_srcdir)/m4/reorganization/libs/curl.m4 \ |
| 177 | 177 |
$(top_srcdir)/m4/reorganization/substitutions.m4 \ |
| 178 |
+ $(top_srcdir)/m4/reorganization/libmspack.m4 \ |
|
| 179 |
+ $(top_srcdir)/libclamav/libmspack-0.5alpha/m4/libmspack-opts.m4 \ |
|
| 178 | 180 |
$(top_srcdir)/configure.ac |
| 179 | 181 |
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ |
| 180 | 182 |
$(ACLOCAL_M4) |
| ... | ... |
@@ -173,6 +173,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ |
| 173 | 173 |
$(top_srcdir)/m4/reorganization/bsd.m4 \ |
| 174 | 174 |
$(top_srcdir)/m4/reorganization/libs/curl.m4 \ |
| 175 | 175 |
$(top_srcdir)/m4/reorganization/substitutions.m4 \ |
| 176 |
+ $(top_srcdir)/m4/reorganization/libmspack.m4 \ |
|
| 177 |
+ $(top_srcdir)/libclamav/libmspack-0.5alpha/m4/libmspack-opts.m4 \ |
|
| 176 | 178 |
$(top_srcdir)/configure.ac |
| 177 | 179 |
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ |
| 178 | 180 |
$(ACLOCAL_M4) |
| ... | ... |
@@ -155,6 +155,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ |
| 155 | 155 |
$(top_srcdir)/m4/reorganization/bsd.m4 \ |
| 156 | 156 |
$(top_srcdir)/m4/reorganization/libs/curl.m4 \ |
| 157 | 157 |
$(top_srcdir)/m4/reorganization/substitutions.m4 \ |
| 158 |
+ $(top_srcdir)/m4/reorganization/libmspack.m4 \ |
|
| 159 |
+ $(top_srcdir)/libclamav/libmspack-0.5alpha/m4/libmspack-opts.m4 \ |
|
| 158 | 160 |
$(top_srcdir)/configure.ac |
| 159 | 161 |
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ |
| 160 | 162 |
$(ACLOCAL_M4) |
| ... | ... |
@@ -174,6 +174,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ |
| 174 | 174 |
$(top_srcdir)/m4/reorganization/bsd.m4 \ |
| 175 | 175 |
$(top_srcdir)/m4/reorganization/libs/curl.m4 \ |
| 176 | 176 |
$(top_srcdir)/m4/reorganization/substitutions.m4 \ |
| 177 |
+ $(top_srcdir)/m4/reorganization/libmspack.m4 \ |
|
| 178 |
+ $(top_srcdir)/libclamav/libmspack-0.5alpha/m4/libmspack-opts.m4 \ |
|
| 177 | 179 |
$(top_srcdir)/configure.ac |
| 178 | 180 |
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ |
| 179 | 181 |
$(ACLOCAL_M4) |
| ... | ... |
@@ -173,6 +173,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ |
| 173 | 173 |
$(top_srcdir)/m4/reorganization/bsd.m4 \ |
| 174 | 174 |
$(top_srcdir)/m4/reorganization/libs/curl.m4 \ |
| 175 | 175 |
$(top_srcdir)/m4/reorganization/substitutions.m4 \ |
| 176 |
+ $(top_srcdir)/m4/reorganization/libmspack.m4 \ |
|
| 177 |
+ $(top_srcdir)/libclamav/libmspack-0.5alpha/m4/libmspack-opts.m4 \ |
|
| 176 | 178 |
$(top_srcdir)/configure.ac |
| 177 | 179 |
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ |
| 178 | 180 |
$(ACLOCAL_M4) |
| ... | ... |
@@ -645,10 +645,10 @@ am__EXEEXT_FALSE |
| 645 | 645 |
am__EXEEXT_TRUE |
| 646 | 646 |
LTLIBOBJS |
| 647 | 647 |
LIBOBJS |
| 648 |
-USE_INTERNAL_MSPACK_FALSE |
|
| 649 |
-USE_INTERNAL_MSPACK_TRUE |
|
| 650 | 648 |
LIBMSPACK_LIBS |
| 651 | 649 |
LIBMSPACK_CFLAGS |
| 650 |
+USE_INTERNAL_MSPACK_FALSE |
|
| 651 |
+USE_INTERNAL_MSPACK_TRUE |
|
| 652 | 652 |
JSON_LDFLAGS |
| 653 | 653 |
JSON_LIBS |
| 654 | 654 |
SSL_LDFLAGS |
| ... | ... |
@@ -960,6 +960,7 @@ enable_libfreshclam |
| 960 | 960 |
enable_prelude |
| 961 | 961 |
with_libprelude_prefix |
| 962 | 962 |
with_libcurl |
| 963 |
+with_system_libmspack |
|
| 963 | 964 |
' |
| 964 | 965 |
ac_precious_vars='build_alias |
| 965 | 966 |
host_alias |
| ... | ... |
@@ -1708,6 +1709,9 @@ Optional Packages: |
| 1708 | 1708 |
--with-libcurl[=DIR] path to directory containing libcurl |
| 1709 | 1709 |
[default=/usr/local or /usr if not found in |
| 1710 | 1710 |
/usr/local] |
| 1711 |
+ --with-system-libmspack Specify system libmspack location or to use internal |
|
| 1712 |
+ package, uses full path to libmspack or bin |
|
| 1713 |
+ directory (default=search PATH environment variable) |
|
| 1711 | 1714 |
|
| 1712 | 1715 |
Some influential environment variables: |
| 1713 | 1716 |
CC C compiler command |
| ... | ... |
@@ -24613,6 +24617,28 @@ else |
| 24613 | 24613 |
ENABLE_CLAMSUBMIT_FALSE= |
| 24614 | 24614 |
fi |
| 24615 | 24615 |
|
| 24616 |
+ |
|
| 24617 |
+# Check whether --with-system-libmspack was given. |
|
| 24618 |
+if test "${with_system_libmspack+set}" = set; then :
|
|
| 24619 |
+ withval=$with_system_libmspack; system_libmspack=$withval |
|
| 24620 |
+else |
|
| 24621 |
+ system_libmspack="no" |
|
| 24622 |
+fi |
|
| 24623 |
+ |
|
| 24624 |
+ |
|
| 24625 |
+ |
|
| 24626 |
+if test "x$system_libmspack" = "xno"; then |
|
| 24627 |
+ use_internal_mspack=yes |
|
| 24628 |
+ if test TRUE; then |
|
| 24629 |
+ USE_INTERNAL_MSPACK_TRUE= |
|
| 24630 |
+ USE_INTERNAL_MSPACK_FALSE='#' |
|
| 24631 |
+else |
|
| 24632 |
+ USE_INTERNAL_MSPACK_TRUE='#' |
|
| 24633 |
+ USE_INTERNAL_MSPACK_FALSE= |
|
| 24634 |
+fi |
|
| 24635 |
+ |
|
| 24636 |
+else |
|
| 24637 |
+ |
|
| 24616 | 24638 |
pkg_failed=no |
| 24617 | 24639 |
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBMSPACK" >&5
|
| 24618 | 24640 |
$as_echo_n "checking for LIBMSPACK... " >&6; } |
| ... | ... |
@@ -24683,8 +24709,7 @@ else |
| 24683 | 24683 |
$as_echo "yes" >&6; } |
| 24684 | 24684 |
use_internal_mspack=no |
| 24685 | 24685 |
fi |
| 24686 |
- |
|
| 24687 |
- if test "x$use_internal_mspack" = "xyes"; then |
|
| 24686 |
+ if test "x$use_internal_mspack" = "xyes"; then |
|
| 24688 | 24687 |
USE_INTERNAL_MSPACK_TRUE= |
| 24689 | 24688 |
USE_INTERNAL_MSPACK_FALSE='#' |
| 24690 | 24689 |
else |
| ... | ... |
@@ -24692,17 +24717,18 @@ else |
| 24692 | 24692 |
USE_INTERNAL_MSPACK_FALSE= |
| 24693 | 24693 |
fi |
| 24694 | 24694 |
|
| 24695 |
+fi |
|
| 24696 |
+ |
|
| 24695 | 24697 |
|
| 24696 | 24698 |
if test "x$use_internal_mspack" = "xyes"; then |
| 24697 |
- mspack_msg="Internal" |
|
| 24698 |
- subdirs="$subdirs libclamav/libmspack-0.5alpha" |
|
| 24699 |
+ mspack_msg="Internal" |
|
| 24700 |
+ subdirs="$subdirs libclamav/libmspack-0.5alpha" |
|
| 24699 | 24701 |
|
| 24700 | 24702 |
else |
| 24701 |
- mspack_msg="External, $LIBMSPACK_CFLAGS $LIBMSPACK_LIBS" |
|
| 24703 |
+ mspack_msg="External, $LIBMSPACK_CFLAGS $LIBMSPACK_LIBS" |
|
| 24702 | 24704 |
fi |
| 24703 | 24705 |
|
| 24704 | 24706 |
|
| 24705 |
- |
|
| 24706 | 24707 |
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" |
| 24707 | 24708 |
|
| 24708 | 24709 |
|
| ... | ... |
@@ -24921,6 +24947,10 @@ if test -z "${USE_INTERNAL_MSPACK_TRUE}" && test -z "${USE_INTERNAL_MSPACK_FALSE
|
| 24921 | 24921 |
as_fn_error $? "conditional \"USE_INTERNAL_MSPACK\" was never defined. |
| 24922 | 24922 |
Usually this means the macro was only invoked conditionally." "$LINENO" 5 |
| 24923 | 24923 |
fi |
| 24924 |
+if test -z "${USE_INTERNAL_MSPACK_TRUE}" && test -z "${USE_INTERNAL_MSPACK_FALSE}"; then
|
|
| 24925 |
+ as_fn_error $? "conditional \"USE_INTERNAL_MSPACK\" was never defined. |
|
| 24926 |
+Usually this means the macro was only invoked conditionally." "$LINENO" 5 |
|
| 24927 |
+fi |
|
| 24924 | 24928 |
|
| 24925 | 24929 |
: "${CONFIG_STATUS=./config.status}"
|
| 24926 | 24930 |
ac_write_fail=0 |
| ... | ... |
@@ -27498,6 +27528,10 @@ if test -z "${USE_INTERNAL_MSPACK_TRUE}" && test -z "${USE_INTERNAL_MSPACK_FALSE
|
| 27498 | 27498 |
as_fn_error $? "conditional \"USE_INTERNAL_MSPACK\" was never defined. |
| 27499 | 27499 |
Usually this means the macro was only invoked conditionally." "$LINENO" 5 |
| 27500 | 27500 |
fi |
| 27501 |
+if test -z "${USE_INTERNAL_MSPACK_TRUE}" && test -z "${USE_INTERNAL_MSPACK_FALSE}"; then
|
|
| 27502 |
+ as_fn_error $? "conditional \"USE_INTERNAL_MSPACK\" was never defined. |
|
| 27503 |
+Usually this means the macro was only invoked conditionally." "$LINENO" 5 |
|
| 27504 |
+fi |
|
| 27501 | 27505 |
if test -z "${am__EXEEXT_TRUE}" && test -z "${am__EXEEXT_FALSE}"; then
|
| 27502 | 27506 |
as_fn_error $? "conditional \"am__EXEEXT\" was never defined. |
| 27503 | 27507 |
Usually this means the macro was only invoked conditionally." "$LINENO" 5 |
| ... | ... |
@@ -136,21 +136,16 @@ m4_include([m4/reorganization/libs/curl.m4]) |
| 136 | 136 |
|
| 137 | 137 |
m4_include([m4/reorganization/substitutions.m4]) |
| 138 | 138 |
|
| 139 |
-AM_CONDITIONAL([ENABLE_CLAMSUBMIT], [test "$have_curl" = "yes"]) |
|
| 140 |
-PKG_CHECK_MODULES([LIBMSPACK], [libmspack], |
|
| 141 |
- use_internal_mspack=no, use_internal_mspack=yes) |
|
| 142 |
- |
|
| 143 |
-AM_CONDITIONAL([USE_INTERNAL_MSPACK], test "x$use_internal_mspack" = "xyes") |
|
| 139 |
+m4_include([m4/reorganization/libmspack.m4]) |
|
| 144 | 140 |
|
| 145 | 141 |
if test "x$use_internal_mspack" = "xyes"; then |
| 146 |
- mspack_msg="Internal" |
|
| 147 |
- AC_CONFIG_SUBDIRS([libclamav/libmspack-0.5alpha]) |
|
| 142 |
+ mspack_msg="Internal" |
|
| 143 |
+ AC_CONFIG_SUBDIRS([libclamav/libmspack-0.5alpha]) |
|
| 148 | 144 |
else |
| 149 |
- mspack_msg="External, $LIBMSPACK_CFLAGS $LIBMSPACK_LIBS" |
|
| 145 |
+ mspack_msg="External, $LIBMSPACK_CFLAGS $LIBMSPACK_LIBS" |
|
| 150 | 146 |
fi |
| 151 | 147 |
|
| 152 | 148 |
|
| 153 |
- |
|
| 154 | 149 |
AC_CONFIG_FILES([ |
| 155 | 150 |
clamscan/Makefile |
| 156 | 151 |
database/Makefile |
| ... | ... |
@@ -171,6 +171,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ |
| 171 | 171 |
$(top_srcdir)/m4/reorganization/bsd.m4 \ |
| 172 | 172 |
$(top_srcdir)/m4/reorganization/libs/curl.m4 \ |
| 173 | 173 |
$(top_srcdir)/m4/reorganization/substitutions.m4 \ |
| 174 |
+ $(top_srcdir)/m4/reorganization/libmspack.m4 \ |
|
| 175 |
+ $(top_srcdir)/libclamav/libmspack-0.5alpha/m4/libmspack-opts.m4 \ |
|
| 174 | 176 |
$(top_srcdir)/configure.ac |
| 175 | 177 |
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ |
| 176 | 178 |
$(ACLOCAL_M4) |
| ... | ... |
@@ -171,6 +171,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ |
| 171 | 171 |
$(top_srcdir)/m4/reorganization/bsd.m4 \ |
| 172 | 172 |
$(top_srcdir)/m4/reorganization/libs/curl.m4 \ |
| 173 | 173 |
$(top_srcdir)/m4/reorganization/substitutions.m4 \ |
| 174 |
+ $(top_srcdir)/m4/reorganization/libmspack.m4 \ |
|
| 175 |
+ $(top_srcdir)/libclamav/libmspack-0.5alpha/m4/libmspack-opts.m4 \ |
|
| 174 | 176 |
$(top_srcdir)/configure.ac |
| 175 | 177 |
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ |
| 176 | 178 |
$(ACLOCAL_M4) |
| ... | ... |
@@ -172,6 +172,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ |
| 172 | 172 |
$(top_srcdir)/m4/reorganization/bsd.m4 \ |
| 173 | 173 |
$(top_srcdir)/m4/reorganization/libs/curl.m4 \ |
| 174 | 174 |
$(top_srcdir)/m4/reorganization/substitutions.m4 \ |
| 175 |
+ $(top_srcdir)/m4/reorganization/libmspack.m4 \ |
|
| 176 |
+ $(top_srcdir)/libclamav/libmspack-0.5alpha/m4/libmspack-opts.m4 \ |
|
| 175 | 177 |
$(top_srcdir)/configure.ac |
| 176 | 178 |
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ |
| 177 | 179 |
$(ACLOCAL_M4) |
| ... | ... |
@@ -176,6 +176,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ |
| 176 | 176 |
$(top_srcdir)/m4/reorganization/bsd.m4 \ |
| 177 | 177 |
$(top_srcdir)/m4/reorganization/libs/curl.m4 \ |
| 178 | 178 |
$(top_srcdir)/m4/reorganization/substitutions.m4 \ |
| 179 |
+ $(top_srcdir)/m4/reorganization/libmspack.m4 \ |
|
| 180 |
+ $(top_srcdir)/libclamav/libmspack-0.5alpha/m4/libmspack-opts.m4 \ |
|
| 179 | 181 |
$(top_srcdir)/configure.ac |
| 180 | 182 |
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ |
| 181 | 183 |
$(ACLOCAL_M4) |
| ... | ... |
@@ -183,6 +183,7 @@ libclamav_la_LIBADD += @top_builddir@/libclamav/libmspack-0.5alpha/.libs/cabc.o |
| 183 | 183 |
else |
| 184 | 184 |
libclamav_la_CFLAGS += $(LIBMSPACK_CFLAGS) |
| 185 | 185 |
libclamav_la_LDFLAGS += $(LIBMSPACK_LIBS) |
| 186 |
+EXTRA_DIST += libmspack-0.5alpha |
|
| 186 | 187 |
libmspack-0.5alpha/Makefile: libmspack-0.5alpha/Makefile.intmspack.in |
| 187 | 188 |
$(AM_V_at) cp $< $@ |
| 188 | 189 |
distclean-recursive distdir maintainer-clean-recursive: libmspack-0.5alpha/Makefile |
| ... | ... |
@@ -136,7 +136,8 @@ target_triplet = @target@ |
| 136 | 136 |
|
| 137 | 137 |
@USE_INTERNAL_MSPACK_FALSE@am__append_11 = $(LIBMSPACK_CFLAGS) |
| 138 | 138 |
@USE_INTERNAL_MSPACK_FALSE@am__append_12 = $(LIBMSPACK_LIBS) |
| 139 |
-@ENABLE_YARA_TRUE@am__append_13 = yara_arena.c \ |
|
| 139 |
+@USE_INTERNAL_MSPACK_FALSE@am__append_13 = libmspack-0.5alpha |
|
| 140 |
+@ENABLE_YARA_TRUE@am__append_14 = yara_arena.c \ |
|
| 140 | 141 |
@ENABLE_YARA_TRUE@ yara_arena.h \ |
| 141 | 142 |
@ENABLE_YARA_TRUE@ yara_compiler.c \ |
| 142 | 143 |
@ENABLE_YARA_TRUE@ yara_compiler.h \ |
| ... | ... |
@@ -228,6 +229,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ |
| 228 | 228 |
$(top_srcdir)/m4/reorganization/bsd.m4 \ |
| 229 | 229 |
$(top_srcdir)/m4/reorganization/libs/curl.m4 \ |
| 230 | 230 |
$(top_srcdir)/m4/reorganization/substitutions.m4 \ |
| 231 |
+ $(top_srcdir)/m4/reorganization/libmspack.m4 \ |
|
| 232 |
+ $(top_srcdir)/libclamav/libmspack-0.5alpha/m4/libmspack-opts.m4 \ |
|
| 231 | 233 |
$(top_srcdir)/configure.ac |
| 232 | 234 |
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ |
| 233 | 235 |
$(ACLOCAL_M4) |
| ... | ... |
@@ -962,7 +965,8 @@ AM_CFLAGS = @WERR_CFLAGS@ |
| 962 | 962 |
lib_LTLIBRARIES = $(am__append_3) libclamav.la |
| 963 | 963 |
EXTRA_DIST = c++/Makefile.nollvm.in \ |
| 964 | 964 |
libmspack-0.5alpha/Makefile.intmspack.in $(am__append_4) \ |
| 965 |
- regex/engine.c tomsfastmath/sqr/fp_sqr_comba.c \ |
|
| 965 |
+ $(am__append_13) regex/engine.c \ |
|
| 966 |
+ tomsfastmath/sqr/fp_sqr_comba.c \ |
|
| 966 | 967 |
tomsfastmath/mul/fp_mul_comba.c libclamav.map \ |
| 967 | 968 |
jsparse/generated/operators.h jsparse/generated/keywords.h \ |
| 968 | 969 |
jsparse/future_reserved_words.list jsparse/keywords.list \ |
| ... | ... |
@@ -1128,7 +1132,7 @@ libclamav_la_SOURCES = matcher-ac.c matcher-ac.h matcher-bm.c \ |
| 1128 | 1128 |
openioc.h msdoc.c msdoc.h matcher-pcre.c matcher-pcre.h \ |
| 1129 | 1129 |
regex_pcre.c regex_pcre.h msxml.c msxml.h msxml_parser.c \ |
| 1130 | 1130 |
msxml_parser.h tiff.c tiff.h hwp.c hwp.h lzw/lzwdec.c \ |
| 1131 |
- lzw/lzwdec.h $(am__append_13) bignum.h bignum_fast.h \ |
|
| 1131 |
+ lzw/lzwdec.h $(am__append_14) bignum.h bignum_fast.h \ |
|
| 1132 | 1132 |
tomsfastmath/addsub/fp_add.c tomsfastmath/addsub/fp_add_d.c \ |
| 1133 | 1133 |
tomsfastmath/addsub/fp_addmod.c tomsfastmath/addsub/fp_cmp.c \ |
| 1134 | 1134 |
tomsfastmath/addsub/fp_cmp_d.c \ |
| ... | ... |
@@ -5755,8 +5755,8 @@ maintainer-clean-generic: |
| 5755 | 5755 |
@echo "This command is intended for maintainers to use" |
| 5756 | 5756 |
@echo "it deletes files that may require special tools to rebuild." |
| 5757 | 5757 |
-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) |
| 5758 |
-@BUILD_EXTERNAL_LLVM_TRUE@clean-local: |
|
| 5759 | 5758 |
@BUILD_EXTERNAL_LLVM_TRUE@distclean-local: |
| 5759 |
+@BUILD_EXTERNAL_LLVM_TRUE@clean-local: |
|
| 5760 | 5760 |
clean: clean-am |
| 5761 | 5761 |
|
| 5762 | 5762 |
clean-am: clean-generic clean-libtool clean-local \ |
| 7 | 7 |
new file mode 100644 |
| ... | ... |
@@ -0,0 +1,8 @@ |
| 0 |
+dnl Act as a single handler point for libmspack options |
|
| 1 |
+dnl Assigns system_libmspack variable |
|
| 2 |
+ |
|
| 3 |
+dnl Determine whether to use the internal libmspack or to use system-specified libmspack |
|
| 4 |
+AC_ARG_WITH([system-libmspack], AC_HELP_STRING([--with-system-libmspack], |
|
| 5 |
+[Specify system libmspack location or to use internal package, uses full path to libmspack or bin directory |
|
| 6 |
+ (default=search PATH environment variable)]), |
|
| 7 |
+[system_libmspack=$withval], [system_libmspack="no"]) |
| ... | ... |
@@ -172,6 +172,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ |
| 172 | 172 |
$(top_srcdir)/m4/reorganization/bsd.m4 \ |
| 173 | 173 |
$(top_srcdir)/m4/reorganization/libs/curl.m4 \ |
| 174 | 174 |
$(top_srcdir)/m4/reorganization/substitutions.m4 \ |
| 175 |
+ $(top_srcdir)/m4/reorganization/libmspack.m4 \ |
|
| 176 |
+ $(top_srcdir)/libclamav/libmspack-0.5alpha/m4/libmspack-opts.m4 \ |
|
| 175 | 177 |
$(top_srcdir)/configure.ac |
| 176 | 178 |
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ |
| 177 | 179 |
$(ACLOCAL_M4) |
| ... | ... |
@@ -161,6 +161,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ |
| 161 | 161 |
$(top_srcdir)/m4/reorganization/bsd.m4 \ |
| 162 | 162 |
$(top_srcdir)/m4/reorganization/libs/curl.m4 \ |
| 163 | 163 |
$(top_srcdir)/m4/reorganization/substitutions.m4 \ |
| 164 |
+ $(top_srcdir)/m4/reorganization/libmspack.m4 \ |
|
| 165 |
+ $(top_srcdir)/libclamav/libmspack-0.5alpha/m4/libmspack-opts.m4 \ |
|
| 164 | 166 |
$(top_srcdir)/configure.ac |
| 165 | 167 |
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ |
| 166 | 168 |
$(ACLOCAL_M4) |
| 167 | 169 |
new file mode 100644 |
| ... | ... |
@@ -0,0 +1,10 @@ |
| 0 |
+m4_include([libclamav/libmspack-0.5alpha/m4/libmspack-opts.m4]) |
|
| 1 |
+ |
|
| 2 |
+if test "x$system_libmspack" = "xno"; then |
|
| 3 |
+ use_internal_mspack=yes |
|
| 4 |
+ AM_CONDITIONAL([USE_INTERNAL_MSPACK], test TRUE) |
|
| 5 |
+else |
|
| 6 |
+ PKG_CHECK_MODULES([LIBMSPACK], [libmspack], |
|
| 7 |
+ use_internal_mspack=no, use_internal_mspack=yes) |
|
| 8 |
+ AM_CONDITIONAL([USE_INTERNAL_MSPACK], test "x$use_internal_mspack" = "xyes") |
|
| 9 |
+fi |
| ... | ... |
@@ -173,6 +173,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ |
| 173 | 173 |
$(top_srcdir)/m4/reorganization/bsd.m4 \ |
| 174 | 174 |
$(top_srcdir)/m4/reorganization/libs/curl.m4 \ |
| 175 | 175 |
$(top_srcdir)/m4/reorganization/substitutions.m4 \ |
| 176 |
+ $(top_srcdir)/m4/reorganization/libmspack.m4 \ |
|
| 177 |
+ $(top_srcdir)/libclamav/libmspack-0.5alpha/m4/libmspack-opts.m4 \ |
|
| 176 | 178 |
$(top_srcdir)/configure.ac |
| 177 | 179 |
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ |
| 178 | 180 |
$(ACLOCAL_M4) |
| ... | ... |
@@ -154,6 +154,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ |
| 154 | 154 |
$(top_srcdir)/m4/reorganization/bsd.m4 \ |
| 155 | 155 |
$(top_srcdir)/m4/reorganization/libs/curl.m4 \ |
| 156 | 156 |
$(top_srcdir)/m4/reorganization/substitutions.m4 \ |
| 157 |
+ $(top_srcdir)/m4/reorganization/libmspack.m4 \ |
|
| 158 |
+ $(top_srcdir)/libclamav/libmspack-0.5alpha/m4/libmspack-opts.m4 \ |
|
| 157 | 159 |
$(top_srcdir)/configure.ac |
| 158 | 160 |
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ |
| 159 | 161 |
$(ACLOCAL_M4) |
| ... | ... |
@@ -156,6 +156,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ |
| 156 | 156 |
$(top_srcdir)/m4/reorganization/bsd.m4 \ |
| 157 | 157 |
$(top_srcdir)/m4/reorganization/libs/curl.m4 \ |
| 158 | 158 |
$(top_srcdir)/m4/reorganization/substitutions.m4 \ |
| 159 |
+ $(top_srcdir)/m4/reorganization/libmspack.m4 \ |
|
| 160 |
+ $(top_srcdir)/libclamav/libmspack-0.5alpha/m4/libmspack-opts.m4 \ |
|
| 159 | 161 |
$(top_srcdir)/configure.ac |
| 160 | 162 |
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ |
| 161 | 163 |
$(ACLOCAL_M4) |