... | ... |
@@ -1,4 +1,4 @@ |
1 |
-# Makefile.in generated by automake 1.14 from Makefile.am. |
|
1 |
+# Makefile.in generated by automake 1.14.1 from Makefile.am. |
|
2 | 2 |
# @configure_input@ |
3 | 3 |
|
4 | 4 |
# Copyright (C) 1994-2013 Free Software Foundation, Inc. |
... | ... |
@@ -150,6 +150,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ |
150 | 150 |
$(top_srcdir)/m4/reorganization/libs/xml.m4 \ |
151 | 151 |
$(top_srcdir)/m4/reorganization/libs/openssl.m4 \ |
152 | 152 |
$(top_srcdir)/m4/reorganization/libs/json.m4 \ |
153 |
+ $(top_srcdir)/m4/reorganization/libs/pcre.m4 \ |
|
153 | 154 |
$(top_srcdir)/m4/reorganization/libs/libz.m4 \ |
154 | 155 |
$(top_srcdir)/m4/reorganization/libs/bzip.m4 \ |
155 | 156 |
$(top_srcdir)/m4/reorganization/libs/unrar.m4 \ |
... | ... |
@@ -451,6 +452,8 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ |
451 | 451 |
PACKAGE_URL = @PACKAGE_URL@ |
452 | 452 |
PACKAGE_VERSION = @PACKAGE_VERSION@ |
453 | 453 |
PATH_SEPARATOR = @PATH_SEPARATOR@ |
454 |
+PCRE_CPPFLAGS = @PCRE_CPPFLAGS@ |
|
455 |
+PCRE_LIBS = @PCRE_LIBS@ |
|
454 | 456 |
RANLIB = @RANLIB@ |
455 | 457 |
SED = @SED@ |
456 | 458 |
SET_MAKE = @SET_MAKE@ |
... | ... |
@@ -947,9 +950,10 @@ distcheck: dist |
947 | 947 |
&& dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ |
948 | 948 |
&& am__cwd=`pwd` \ |
949 | 949 |
&& $(am__cd) $(distdir)/_build \ |
950 |
- && ../configure --srcdir=.. --prefix="$$dc_install_base" \ |
|
950 |
+ && ../configure \ |
|
951 | 951 |
$(AM_DISTCHECK_CONFIGURE_FLAGS) \ |
952 | 952 |
$(DISTCHECK_CONFIGURE_FLAGS) \ |
953 |
+ --srcdir=.. --prefix="$$dc_install_base" \ |
|
953 | 954 |
&& $(MAKE) $(AM_MAKEFLAGS) \ |
954 | 955 |
&& $(MAKE) $(AM_MAKEFLAGS) dvi \ |
955 | 956 |
&& $(MAKE) $(AM_MAKEFLAGS) check \ |
... | ... |
@@ -1,4 +1,4 @@ |
1 |
-# generated automatically by aclocal 1.14 -*- Autoconf -*- |
|
1 |
+# generated automatically by aclocal 1.14.1 -*- Autoconf -*- |
|
2 | 2 |
|
3 | 3 |
# Copyright (C) 1996-2013 Free Software Foundation, Inc. |
4 | 4 |
|
... | ... |
@@ -35,7 +35,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION], |
35 | 35 |
[am__api_version='1.14' |
36 | 36 |
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to |
37 | 37 |
dnl require some minimum version. Point them to the right macro. |
38 |
-m4_if([$1], [1.14], [], |
|
38 |
+m4_if([$1], [1.14.1], [], |
|
39 | 39 |
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl |
40 | 40 |
]) |
41 | 41 |
|
... | ... |
@@ -51,7 +51,7 @@ m4_define([_AM_AUTOCONF_VERSION], []) |
51 | 51 |
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. |
52 | 52 |
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE. |
53 | 53 |
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], |
54 |
-[AM_AUTOMAKE_VERSION([1.14])dnl |
|
54 |
+[AM_AUTOMAKE_VERSION([1.14.1])dnl |
|
55 | 55 |
m4_ifndef([AC_AUTOCONF_VERSION], |
56 | 56 |
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl |
57 | 57 |
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) |
... | ... |
@@ -282,6 +282,9 @@ |
282 | 282 |
/* Define to 1 if you have the `opendir' function. */ |
283 | 283 |
#undef HAVE_OPENDIR |
284 | 284 |
|
285 |
+/* Define to 1 if you have the 'libpcre' library (-lpcre). */ |
|
286 |
+#undef HAVE_PCRE |
|
287 |
+ |
|
285 | 288 |
/* Define to 1 if you have the `poll' function. */ |
286 | 289 |
#undef HAVE_POLL |
287 | 290 |
|
... | ... |
@@ -1,4 +1,4 @@ |
1 |
-# Makefile.in generated by automake 1.14 from Makefile.am. |
|
1 |
+# Makefile.in generated by automake 1.14.1 from Makefile.am. |
|
2 | 2 |
# @configure_input@ |
3 | 3 |
|
4 | 4 |
# Copyright (C) 1994-2013 Free Software Foundation, Inc. |
... | ... |
@@ -126,6 +126,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ |
126 | 126 |
$(top_srcdir)/m4/reorganization/libs/xml.m4 \ |
127 | 127 |
$(top_srcdir)/m4/reorganization/libs/openssl.m4 \ |
128 | 128 |
$(top_srcdir)/m4/reorganization/libs/json.m4 \ |
129 |
+ $(top_srcdir)/m4/reorganization/libs/pcre.m4 \ |
|
129 | 130 |
$(top_srcdir)/m4/reorganization/libs/libz.m4 \ |
130 | 131 |
$(top_srcdir)/m4/reorganization/libs/bzip.m4 \ |
131 | 132 |
$(top_srcdir)/m4/reorganization/libs/unrar.m4 \ |
... | ... |
@@ -406,6 +407,8 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ |
406 | 406 |
PACKAGE_URL = @PACKAGE_URL@ |
407 | 407 |
PACKAGE_VERSION = @PACKAGE_VERSION@ |
408 | 408 |
PATH_SEPARATOR = @PATH_SEPARATOR@ |
409 |
+PCRE_CPPFLAGS = @PCRE_CPPFLAGS@ |
|
410 |
+PCRE_LIBS = @PCRE_LIBS@ |
|
409 | 411 |
RANLIB = @RANLIB@ |
410 | 412 |
SED = @SED@ |
411 | 413 |
SET_MAKE = @SET_MAKE@ |
... | ... |
@@ -504,7 +507,7 @@ top_srcdir = @top_srcdir@ |
504 | 504 |
|
505 | 505 |
@BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@man_MANS = $(top_builddir)/docs/man/clamav-milter.8 |
506 | 506 |
@BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@AM_CFLAGS = @WERR_CFLAGS_MILTER@ |
507 |
-AM_CPPFLAGS = @SSL_CPPFLAGS@ -I$(top_srcdir)/clamd -I$(top_srcdir)/libclamav -I$(top_srcdir)/shared -I$(top_srcdir) @JSON_CPPFLAGS@ |
|
507 |
+AM_CPPFLAGS = @SSL_CPPFLAGS@ -I$(top_srcdir)/clamd -I$(top_srcdir)/libclamav -I$(top_srcdir)/shared -I$(top_srcdir) @JSON_CPPFLAGS@ @PCRE_CPPFLAGS@ |
|
508 | 508 |
CLEANFILES = *.gcda *.gcno |
509 | 509 |
all: all-am |
510 | 510 |
|
... | ... |
@@ -1,4 +1,4 @@ |
1 |
-# Makefile.in generated by automake 1.14 from Makefile.am. |
|
1 |
+# Makefile.in generated by automake 1.14.1 from Makefile.am. |
|
2 | 2 |
# @configure_input@ |
3 | 3 |
|
4 | 4 |
# Copyright (C) 1994-2013 Free Software Foundation, Inc. |
... | ... |
@@ -107,6 +107,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ |
107 | 107 |
$(top_srcdir)/m4/reorganization/libs/xml.m4 \ |
108 | 108 |
$(top_srcdir)/m4/reorganization/libs/openssl.m4 \ |
109 | 109 |
$(top_srcdir)/m4/reorganization/libs/json.m4 \ |
110 |
+ $(top_srcdir)/m4/reorganization/libs/pcre.m4 \ |
|
110 | 111 |
$(top_srcdir)/m4/reorganization/libs/libz.m4 \ |
111 | 112 |
$(top_srcdir)/m4/reorganization/libs/bzip.m4 \ |
112 | 113 |
$(top_srcdir)/m4/reorganization/libs/unrar.m4 \ |
... | ... |
@@ -342,6 +343,8 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ |
342 | 342 |
PACKAGE_URL = @PACKAGE_URL@ |
343 | 343 |
PACKAGE_VERSION = @PACKAGE_VERSION@ |
344 | 344 |
PATH_SEPARATOR = @PATH_SEPARATOR@ |
345 |
+PCRE_CPPFLAGS = @PCRE_CPPFLAGS@ |
|
346 |
+PCRE_LIBS = @PCRE_LIBS@ |
|
345 | 347 |
RANLIB = @RANLIB@ |
346 | 348 |
SED = @SED@ |
347 | 349 |
SET_MAKE = @SET_MAKE@ |
... | ... |
@@ -428,7 +431,7 @@ clambc_SOURCES = \ |
428 | 428 |
$(top_srcdir)/shared/misc.h \ |
429 | 429 |
bcrun.c |
430 | 430 |
|
431 |
-AM_CFLAGS = @WERR_CFLAGS@ @SSL_CPPFLAGS@ @JSON_CPPFLAGS@ |
|
431 |
+AM_CFLAGS = @WERR_CFLAGS@ @SSL_CPPFLAGS@ @JSON_CPPFLAGS@ @PCRE_CPPFLAGS@ |
|
432 | 432 |
AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav |
433 | 433 |
CLEANFILES = *.gcda *.gcno |
434 | 434 |
all: all-am |
... | ... |
@@ -1,4 +1,4 @@ |
1 |
-# Makefile.in generated by automake 1.14 from Makefile.am. |
|
1 |
+# Makefile.in generated by automake 1.14.1 from Makefile.am. |
|
2 | 2 |
# @configure_input@ |
3 | 3 |
|
4 | 4 |
# Copyright (C) 1994-2013 Free Software Foundation, Inc. |
... | ... |
@@ -125,6 +125,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ |
125 | 125 |
$(top_srcdir)/m4/reorganization/libs/xml.m4 \ |
126 | 126 |
$(top_srcdir)/m4/reorganization/libs/openssl.m4 \ |
127 | 127 |
$(top_srcdir)/m4/reorganization/libs/json.m4 \ |
128 |
+ $(top_srcdir)/m4/reorganization/libs/pcre.m4 \ |
|
128 | 129 |
$(top_srcdir)/m4/reorganization/libs/libz.m4 \ |
129 | 130 |
$(top_srcdir)/m4/reorganization/libs/bzip.m4 \ |
130 | 131 |
$(top_srcdir)/m4/reorganization/libs/unrar.m4 \ |
... | ... |
@@ -360,6 +361,8 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ |
360 | 360 |
PACKAGE_URL = @PACKAGE_URL@ |
361 | 361 |
PACKAGE_VERSION = @PACKAGE_VERSION@ |
362 | 362 |
PATH_SEPARATOR = @PATH_SEPARATOR@ |
363 |
+PCRE_CPPFLAGS = @PCRE_CPPFLAGS@ |
|
364 |
+PCRE_LIBS = @PCRE_LIBS@ |
|
363 | 365 |
RANLIB = @RANLIB@ |
364 | 366 |
SED = @SED@ |
365 | 367 |
SET_MAKE = @SET_MAKE@ |
... | ... |
@@ -448,7 +451,7 @@ clamconf_SOURCES = \ |
448 | 448 |
|
449 | 449 |
AM_CFLAGS = @WERR_CFLAGS@ @SSL_CPPFLAGS@ |
450 | 450 |
AM_CPPFLAGS = @CLAMCONF_CPPFLAGS@ -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav\ |
451 |
- @JSON_CPPFLAGS@\ |
|
451 |
+ @JSON_CPPFLAGS@ @PCRE_CPPFLAGS@\ |
|
452 | 452 |
-DBUILD_CPPFLAGS="\"$(CPPFLAGS)\"" -DBUILD_CFLAGS="\"$(CFLAGS)\""\ |
453 | 453 |
-DBUILD_CXXFLAGS="\"$(CXXFLAGS)\"" -DBUILD_LDFLAGS="\"$(LDFLAGS)\""\ |
454 | 454 |
-DBUILD_CONFIGURE_FLAGS="\"$(BUILD_CONFIGURE_FLAGS)\"" |
... | ... |
@@ -1,4 +1,4 @@ |
1 |
-# Makefile.in generated by automake 1.14 from Makefile.am. |
|
1 |
+# Makefile.in generated by automake 1.14.1 from Makefile.am. |
|
2 | 2 |
# @configure_input@ |
3 | 3 |
|
4 | 4 |
# Copyright (C) 1994-2013 Free Software Foundation, Inc. |
... | ... |
@@ -125,6 +125,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ |
125 | 125 |
$(top_srcdir)/m4/reorganization/libs/xml.m4 \ |
126 | 126 |
$(top_srcdir)/m4/reorganization/libs/openssl.m4 \ |
127 | 127 |
$(top_srcdir)/m4/reorganization/libs/json.m4 \ |
128 |
+ $(top_srcdir)/m4/reorganization/libs/pcre.m4 \ |
|
128 | 129 |
$(top_srcdir)/m4/reorganization/libs/libz.m4 \ |
129 | 130 |
$(top_srcdir)/m4/reorganization/libs/bzip.m4 \ |
130 | 131 |
$(top_srcdir)/m4/reorganization/libs/unrar.m4 \ |
... | ... |
@@ -373,6 +374,8 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ |
373 | 373 |
PACKAGE_URL = @PACKAGE_URL@ |
374 | 374 |
PACKAGE_VERSION = @PACKAGE_VERSION@ |
375 | 375 |
PATH_SEPARATOR = @PATH_SEPARATOR@ |
376 |
+PCRE_CPPFLAGS = @PCRE_CPPFLAGS@ |
|
377 |
+PCRE_LIBS = @PCRE_LIBS@ |
|
376 | 378 |
RANLIB = @RANLIB@ |
377 | 379 |
SED = @SED@ |
378 | 380 |
SET_MAKE = @SET_MAKE@ |
... | ... |
@@ -479,7 +482,7 @@ top_srcdir = @top_srcdir@ |
479 | 479 |
@BUILD_CLAMD_TRUE@ fan.h |
480 | 480 |
|
481 | 481 |
@BUILD_CLAMD_TRUE@AM_CFLAGS = @WERR_CFLAGS@ |
482 |
-AM_CPPFLAGS = @SSL_CPPFLAGS@ @JSON_CPPFLAGS@ -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav |
|
482 |
+AM_CPPFLAGS = @SSL_CPPFLAGS@ @JSON_CPPFLAGS@ @PCRE_CPPFLAGS@ -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav |
|
483 | 483 |
|
484 | 484 |
# it does support --help and --version but with the default config file |
485 | 485 |
# it outputs an error message which tells us to edit the config files |
... | ... |
@@ -1,4 +1,4 @@ |
1 |
-# Makefile.in generated by automake 1.14 from Makefile.am. |
|
1 |
+# Makefile.in generated by automake 1.14.1 from Makefile.am. |
|
2 | 2 |
# @configure_input@ |
3 | 3 |
|
4 | 4 |
# Copyright (C) 1994-2013 Free Software Foundation, Inc. |
... | ... |
@@ -125,6 +125,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ |
125 | 125 |
$(top_srcdir)/m4/reorganization/libs/xml.m4 \ |
126 | 126 |
$(top_srcdir)/m4/reorganization/libs/openssl.m4 \ |
127 | 127 |
$(top_srcdir)/m4/reorganization/libs/json.m4 \ |
128 |
+ $(top_srcdir)/m4/reorganization/libs/pcre.m4 \ |
|
128 | 129 |
$(top_srcdir)/m4/reorganization/libs/libz.m4 \ |
129 | 130 |
$(top_srcdir)/m4/reorganization/libs/bzip.m4 \ |
130 | 131 |
$(top_srcdir)/m4/reorganization/libs/unrar.m4 \ |
... | ... |
@@ -371,6 +372,8 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ |
371 | 371 |
PACKAGE_URL = @PACKAGE_URL@ |
372 | 372 |
PACKAGE_VERSION = @PACKAGE_VERSION@ |
373 | 373 |
PATH_SEPARATOR = @PATH_SEPARATOR@ |
374 |
+PCRE_CPPFLAGS = @PCRE_CPPFLAGS@ |
|
375 |
+PCRE_LIBS = @PCRE_LIBS@ |
|
374 | 376 |
RANLIB = @RANLIB@ |
375 | 377 |
SED = @SED@ |
376 | 378 |
SET_MAKE = @SET_MAKE@ |
... | ... |
@@ -468,7 +471,7 @@ top_srcdir = @top_srcdir@ |
468 | 468 |
@BUILD_CLAMD_TRUE@ client.h |
469 | 469 |
|
470 | 470 |
@BUILD_CLAMD_TRUE@AM_CFLAGS = @WERR_CFLAGS@ |
471 |
-AM_CPPFLAGS = @SSL_CPPFLAGS@ @JSON_CPPFLAGS@ -I$(top_srcdir) -I$(top_srcdir)/clamscan -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav @CLAMDSCAN_CPPFLAGS@ |
|
471 |
+AM_CPPFLAGS = @SSL_CPPFLAGS@ @JSON_CPPFLAGS@ @PCRE_CPPFLAGS@ -I$(top_srcdir) -I$(top_srcdir)/clamscan -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav @CLAMDSCAN_CPPFLAGS@ |
|
472 | 472 |
AM_INSTALLCHECK_STD_OPTIONS_EXEMPT = clamdscan$(EXEEXT) |
473 | 473 |
CLEANFILES = *.gcda *.gcno |
474 | 474 |
all: all-am |
... | ... |
@@ -1,4 +1,4 @@ |
1 |
-# Makefile.in generated by automake 1.14 from Makefile.am. |
|
1 |
+# Makefile.in generated by automake 1.14.1 from Makefile.am. |
|
2 | 2 |
# @configure_input@ |
3 | 3 |
|
4 | 4 |
# Copyright (C) 1994-2013 Free Software Foundation, Inc. |
... | ... |
@@ -107,6 +107,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ |
107 | 107 |
$(top_srcdir)/m4/reorganization/libs/xml.m4 \ |
108 | 108 |
$(top_srcdir)/m4/reorganization/libs/openssl.m4 \ |
109 | 109 |
$(top_srcdir)/m4/reorganization/libs/json.m4 \ |
110 |
+ $(top_srcdir)/m4/reorganization/libs/pcre.m4 \ |
|
110 | 111 |
$(top_srcdir)/m4/reorganization/libs/libz.m4 \ |
111 | 112 |
$(top_srcdir)/m4/reorganization/libs/bzip.m4 \ |
112 | 113 |
$(top_srcdir)/m4/reorganization/libs/unrar.m4 \ |
... | ... |
@@ -377,6 +378,8 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ |
377 | 377 |
PACKAGE_URL = @PACKAGE_URL@ |
378 | 378 |
PACKAGE_VERSION = @PACKAGE_VERSION@ |
379 | 379 |
PATH_SEPARATOR = @PATH_SEPARATOR@ |
380 |
+PCRE_CPPFLAGS = @PCRE_CPPFLAGS@ |
|
381 |
+PCRE_LIBS = @PCRE_LIBS@ |
|
380 | 382 |
RANLIB = @RANLIB@ |
381 | 383 |
SED = @SED@ |
382 | 384 |
SET_MAKE = @SET_MAKE@ |
... | ... |
@@ -465,7 +468,7 @@ top_srcdir = @top_srcdir@ |
465 | 465 |
@HAVE_CURSES_TRUE@ clamdtop.c |
466 | 466 |
|
467 | 467 |
@HAVE_CURSES_TRUE@AM_CFLAGS = @WERR_CFLAGS@ |
468 |
-@HAVE_CURSES_TRUE@AM_CPPFLAGS = -I$(top_srcdir) @CURSES_CPPFLAGS@ @SSL_CPPFLAGS@ @JSON_CPPFLAGS@ |
|
468 |
+@HAVE_CURSES_TRUE@AM_CPPFLAGS = -I$(top_srcdir) @CURSES_CPPFLAGS@ @SSL_CPPFLAGS@ @JSON_CPPFLAGS@ @PCRE_CPPFLAGS@ |
|
469 | 469 |
@HAVE_CURSES_TRUE@clamdtop_LDADD = @CURSES_LIBS@ @SSL_LDFLAGS@ @SSL_LIBS@ $(top_builddir)/libclamav/libclamav_internal_utils_nothreads.la |
470 | 470 |
EXTRA_DIST = clamdtop.c |
471 | 471 |
all: all-am |
... | ... |
@@ -1,4 +1,4 @@ |
1 |
-# Makefile.in generated by automake 1.14 from Makefile.am. |
|
1 |
+# Makefile.in generated by automake 1.14.1 from Makefile.am. |
|
2 | 2 |
# @configure_input@ |
3 | 3 |
|
4 | 4 |
# Copyright (C) 1994-2013 Free Software Foundation, Inc. |
... | ... |
@@ -126,6 +126,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ |
126 | 126 |
$(top_srcdir)/m4/reorganization/libs/xml.m4 \ |
127 | 127 |
$(top_srcdir)/m4/reorganization/libs/openssl.m4 \ |
128 | 128 |
$(top_srcdir)/m4/reorganization/libs/json.m4 \ |
129 |
+ $(top_srcdir)/m4/reorganization/libs/pcre.m4 \ |
|
129 | 130 |
$(top_srcdir)/m4/reorganization/libs/libz.m4 \ |
130 | 131 |
$(top_srcdir)/m4/reorganization/libs/bzip.m4 \ |
131 | 132 |
$(top_srcdir)/m4/reorganization/libs/unrar.m4 \ |
... | ... |
@@ -362,6 +363,8 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ |
362 | 362 |
PACKAGE_URL = @PACKAGE_URL@ |
363 | 363 |
PACKAGE_VERSION = @PACKAGE_VERSION@ |
364 | 364 |
PATH_SEPARATOR = @PATH_SEPARATOR@ |
365 |
+PCRE_CPPFLAGS = @PCRE_CPPFLAGS@ |
|
366 |
+PCRE_LIBS = @PCRE_LIBS@ |
|
365 | 367 |
RANLIB = @RANLIB@ |
366 | 368 |
SED = @SED@ |
367 | 369 |
SET_MAKE = @SET_MAKE@ |
... | ... |
@@ -456,7 +459,7 @@ clamscan_SOURCES = \ |
456 | 456 |
manager.h |
457 | 457 |
|
458 | 458 |
AM_CFLAGS = @WERR_CFLAGS@ |
459 |
-AM_CPPFLAGS = @SSL_CPPFLAGS@ @JSON_CPPFLAGS@ -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav @CLAMSCAN_CPPFLAGS@ |
|
459 |
+AM_CPPFLAGS = @SSL_CPPFLAGS@ @JSON_CPPFLAGS@ @PCRE_CPPFLAGS@ -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav @CLAMSCAN_CPPFLAGS@ |
|
460 | 460 |
CLEANFILES = *.gcda *.gcno |
461 | 461 |
all: all-am |
462 | 462 |
|
... | ... |
@@ -1,4 +1,4 @@ |
1 |
-# Makefile.in generated by automake 1.14 from Makefile.am. |
|
1 |
+# Makefile.in generated by automake 1.14.1 from Makefile.am. |
|
2 | 2 |
# @configure_input@ |
3 | 3 |
|
4 | 4 |
# Copyright (C) 1994-2013 Free Software Foundation, Inc. |
... | ... |
@@ -125,6 +125,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ |
125 | 125 |
$(top_srcdir)/m4/reorganization/libs/xml.m4 \ |
126 | 126 |
$(top_srcdir)/m4/reorganization/libs/openssl.m4 \ |
127 | 127 |
$(top_srcdir)/m4/reorganization/libs/json.m4 \ |
128 |
+ $(top_srcdir)/m4/reorganization/libs/pcre.m4 \ |
|
128 | 129 |
$(top_srcdir)/m4/reorganization/libs/libz.m4 \ |
129 | 130 |
$(top_srcdir)/m4/reorganization/libs/bzip.m4 \ |
130 | 131 |
$(top_srcdir)/m4/reorganization/libs/unrar.m4 \ |
... | ... |
@@ -360,6 +361,8 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ |
360 | 360 |
PACKAGE_URL = @PACKAGE_URL@ |
361 | 361 |
PACKAGE_VERSION = @PACKAGE_VERSION@ |
362 | 362 |
PATH_SEPARATOR = @PATH_SEPARATOR@ |
363 |
+PCRE_CPPFLAGS = @PCRE_CPPFLAGS@ |
|
364 |
+PCRE_LIBS = @PCRE_LIBS@ |
|
363 | 365 |
RANLIB = @RANLIB@ |
364 | 366 |
SED = @SED@ |
365 | 367 |
SET_MAKE = @SET_MAKE@ |
... | ... |
@@ -649,6 +649,7 @@ JSON_LDFLAGS |
649 | 649 |
JSON_LIBS |
650 | 650 |
SSL_LDFLAGS |
651 | 651 |
SSL_LIBS |
652 |
+PCRE_LIBS |
|
652 | 653 |
CLAMCONF_LIBS |
653 | 654 |
CLAMBC_LIBS |
654 | 655 |
CLAMDTOP_LIBS |
... | ... |
@@ -661,6 +662,7 @@ CLAMAV_MILTER_LIBS |
661 | 661 |
CLAMMEM_LIBS |
662 | 662 |
CLAMD_LIBS |
663 | 663 |
LIBCLAMAV_LIBS |
664 |
+PCRE_CPPFLAGS |
|
664 | 665 |
JSON_CPPFLAGS |
665 | 666 |
SSL_CPPFLAGS |
666 | 667 |
LIBCLAMSHARED_CPPFLAGS |
... | ... |
@@ -884,6 +886,7 @@ enable_xml |
884 | 884 |
with_xml |
885 | 885 |
with_openssl |
886 | 886 |
with_libjson |
887 |
+with_pcre |
|
887 | 888 |
enable_maintainer_mode |
888 | 889 |
with_zlib |
889 | 890 |
enable_zlib_vcheck |
... | ... |
@@ -1611,6 +1614,8 @@ Optional Packages: |
1611 | 1611 |
/usr/local or /usr if not found in /usr/local) |
1612 | 1612 |
--with-libjson=DIR path to directory containing libjson (default= |
1613 | 1613 |
/usr/local or /usr if not found in /usr/local) |
1614 |
+ --with-pcre=DIR path to directory containing libpcre library (default= |
|
1615 |
+ /usr/local or /usr if not found in /usr/local) |
|
1614 | 1616 |
--with-zlib=DIR path to directory containing zlib library (default= |
1615 | 1617 |
/usr/local or /usr if not found in /usr/local) |
1616 | 1618 |
--with-libbz2-prefix[=DIR] search for libbz2 in DIR/include and DIR/lib |
... | ... |
@@ -17307,6 +17312,148 @@ LIBS="$save_LIBS" |
17307 | 17307 |
|
17308 | 17308 |
|
17309 | 17309 |
|
17310 |
+PCRE_HOME="" |
|
17311 |
+ |
|
17312 |
+# Check whether --with-pcre was given. |
|
17313 |
+if test "${with_pcre+set}" = set; then : |
|
17314 |
+ withval=$with_pcre; |
|
17315 |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libpcre installation" >&5 |
|
17316 |
+$as_echo_n "checking for libpcre installation... " >&6; } |
|
17317 |
+ if test "X$withval" = "Xno"; then |
|
17318 |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
|
17319 |
+$as_echo "no" >&6; } |
|
17320 |
+ else |
|
17321 |
+ if test "X$withval" = "Xyes"; then |
|
17322 |
+ PCRE_HOME=/usr/local |
|
17323 |
+ if test ! -x "$PCRE_HOME/bin/pcre-config"; then |
|
17324 |
+ PCRE_HOME=/usr |
|
17325 |
+ if test ! -x "$PCRE_HOME/bin/pcre-config"; then |
|
17326 |
+ PCRE_HOME="" |
|
17327 |
+ fi |
|
17328 |
+ fi |
|
17329 |
+ elif test "$withval"; then |
|
17330 |
+ PCRE_HOME="$withval" |
|
17331 |
+ if test ! -x "$PCRE_HOME/bin/pcre-config"; then |
|
17332 |
+ PCRE_HOME="" |
|
17333 |
+ as_fn_error $? "cannot locate libpcre at $withval" "$LINENO" 5 |
|
17334 |
+ fi |
|
17335 |
+ else |
|
17336 |
+ as_fn_error $? "cannot assign blank value to --with-pcre" "$LINENO" 5 |
|
17337 |
+ fi |
|
17338 |
+ |
|
17339 |
+ if test "x$PCRE_HOME" != "x"; then |
|
17340 |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: using $PCRE_HOME" >&5 |
|
17341 |
+$as_echo "using $PCRE_HOME" >&6; } |
|
17342 |
+ else |
|
17343 |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 |
|
17344 |
+$as_echo "not found" >&6; } |
|
17345 |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cannot locate libpcre at /usr/local or /usr" >&5 |
|
17346 |
+$as_echo "$as_me: WARNING: cannot locate libpcre at /usr/local or /usr" >&2;} |
|
17347 |
+ fi |
|
17348 |
+ fi |
|
17349 |
+ |
|
17350 |
+else |
|
17351 |
+ |
|
17352 |
+ PCRE_HOME="" |
|
17353 |
+ |
|
17354 |
+fi |
|
17355 |
+ |
|
17356 |
+ |
|
17357 |
+found_pcre="no" |
|
17358 |
+PCRECONF_VERSION="" |
|
17359 |
+PCRE_CPPFLAGS="" |
|
17360 |
+PCRE_LIBS="" |
|
17361 |
+if test "x$PCRE_HOME" != "x"; then |
|
17362 |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking pcre-config version" >&5 |
|
17363 |
+$as_echo_n "checking pcre-config version... " >&6; } |
|
17364 |
+ PCRECONF_VERSION="`$PCRE_HOME/bin/pcre-config --version`" |
|
17365 |
+ if test "x%PCRECONF_VERSION" != "x"; then |
|
17366 |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PCRECONF_VERSION\"" >&5 |
|
17367 |
+$as_echo "$PCRECONF_VERSION\"" >&6; } |
|
17368 |
+ found_pcre="yes" |
|
17369 |
+ PCRE_CPPFLAGS="`$PCRE_HOME/bin/pcre-config --cflags`" |
|
17370 |
+ PCRE_LIBS="`$PCRE_HOME/bin/pcre-config --libs`" |
|
17371 |
+ else |
|
17372 |
+ as_fn_error $? "pcre-config failed" "$LINENO" 5 |
|
17373 |
+ fi |
|
17374 |
+fi |
|
17375 |
+ |
|
17376 |
+have_pcre="no" |
|
17377 |
+if test "x$found_pcre" != "xno"; then |
|
17378 |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pcre.h in $PCRE_HOME" >&5 |
|
17379 |
+$as_echo_n "checking for pcre.h in $PCRE_HOME... " >&6; } |
|
17380 |
+ |
|
17381 |
+ if test ! -f "$XML_HOME/include/pcre.h"; then |
|
17382 |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 |
|
17383 |
+$as_echo "not found" >&6; } |
|
17384 |
+ else |
|
17385 |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5 |
|
17386 |
+$as_echo "found" >&6; } |
|
17387 |
+ save_LIBS="$LIBS" |
|
17388 |
+ save_CPPFLAGS="$CPPFLAGS" |
|
17389 |
+ CPPFLAGS="$CPPFLAGS $PCRE_CPPFLAGS" |
|
17390 |
+ save_LDFLAGS="$LDFLAGS" |
|
17391 |
+ LDFLAGS="$LDFLAGS $PCRE_LIBS" |
|
17392 |
+ |
|
17393 |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pcre_compile in -lpcre" >&5 |
|
17394 |
+$as_echo_n "checking for pcre_compile in -lpcre... " >&6; } |
|
17395 |
+if ${ac_cv_lib_pcre_pcre_compile+:} false; then : |
|
17396 |
+ $as_echo_n "(cached) " >&6 |
|
17397 |
+else |
|
17398 |
+ ac_check_lib_save_LIBS=$LIBS |
|
17399 |
+LIBS="-lpcre $LIBS" |
|
17400 |
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
|
17401 |
+/* end confdefs.h. */ |
|
17402 |
+ |
|
17403 |
+/* Override any GCC internal prototype to avoid an error. |
|
17404 |
+ Use char because int might match the return type of a GCC |
|
17405 |
+ builtin and then its argument prototype would still apply. */ |
|
17406 |
+#ifdef __cplusplus |
|
17407 |
+extern "C" |
|
17408 |
+#endif |
|
17409 |
+char pcre_compile (); |
|
17410 |
+int |
|
17411 |
+main () |
|
17412 |
+{ |
|
17413 |
+return pcre_compile (); |
|
17414 |
+ ; |
|
17415 |
+ return 0; |
|
17416 |
+} |
|
17417 |
+_ACEOF |
|
17418 |
+if ac_fn_c_try_link "$LINENO"; then : |
|
17419 |
+ ac_cv_lib_pcre_pcre_compile=yes |
|
17420 |
+else |
|
17421 |
+ ac_cv_lib_pcre_pcre_compile=no |
|
17422 |
+fi |
|
17423 |
+rm -f core conftest.err conftest.$ac_objext \ |
|
17424 |
+ conftest$ac_exeext conftest.$ac_ext |
|
17425 |
+LIBS=$ac_check_lib_save_LIBS |
|
17426 |
+fi |
|
17427 |
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pcre_pcre_compile" >&5 |
|
17428 |
+$as_echo "$ac_cv_lib_pcre_pcre_compile" >&6; } |
|
17429 |
+if test "x$ac_cv_lib_pcre_pcre_compile" = xyes; then : |
|
17430 |
+ have_pcre="yes" |
|
17431 |
+else |
|
17432 |
+ have_pcre="no" |
|
17433 |
+fi |
|
17434 |
+ |
|
17435 |
+ |
|
17436 |
+ CPPFLAGS="$save_CPPFLAGS" |
|
17437 |
+ LDFLAGS="$save_LDFLAGS" |
|
17438 |
+ LIBS="$save_LIBS" |
|
17439 |
+ fi |
|
17440 |
+fi |
|
17441 |
+ |
|
17442 |
+if test "x$have_pcre" = "xyes"; then |
|
17443 |
+ |
|
17444 |
+$as_echo "#define HAVE_PCRE 1" >>confdefs.h |
|
17445 |
+ |
|
17446 |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Compiling and linking with libpcre from $PCRE_HOME" >&5 |
|
17447 |
+$as_echo "$as_me: Compiling and linking with libpcre from $PCRE_HOME" >&6;} |
|
17448 |
+fi |
|
17449 |
+ |
|
17450 |
+ |
|
17451 |
+ |
|
17310 | 17452 |
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 |
17311 | 17453 |
$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } |
17312 | 17454 |
# Check whether --enable-maintainer-mode was given. |
... | ... |
@@ -22538,6 +22685,9 @@ fi |
22538 | 22538 |
|
22539 | 22539 |
|
22540 | 22540 |
|
22541 |
+ |
|
22542 |
+ |
|
22543 |
+ |
|
22541 | 22544 |
if test "$have_curl" = "yes"; then |
22542 | 22545 |
ENABLE_CLAMSUBMIT_TRUE= |
22543 | 22546 |
ENABLE_CLAMSUBMIT_FALSE='#' |
... | ... |
@@ -28040,6 +28190,7 @@ else |
28040 | 28040 |
$as_echo "$want_unrar ($want_unrar)" |
28041 | 28041 |
fi |
28042 | 28042 |
|
28043 |
+if test "x$LIBJSON_HOME" != "x"; then |
|
28043 | 28044 |
|
28044 | 28045 |
|
28045 | 28046 |
$as_echo_n " preclass : " |
... | ... |
@@ -28053,6 +28204,36 @@ else |
28053 | 28053 |
$as_echo "$LIBJSON_HOME ($have_json)" |
28054 | 28054 |
fi |
28055 | 28055 |
|
28056 |
+fi |
|
28057 |
+if test "x$PCRE_HOME" = "x"; then |
|
28058 |
+ |
|
28059 |
+ |
|
28060 |
+ $as_echo_n " pcre : " |
|
28061 |
+ if test "x$have_pcre" = "xno"; then : |
|
28062 |
+ $as_echo "no (disabled)" |
|
28063 |
+elif test "x$have_pcre" = "xyes"; then : |
|
28064 |
+ $as_echo "no" |
|
28065 |
+elif test "x$have_pcre" = "x"; then : |
|
28066 |
+ $as_echo "no" |
|
28067 |
+else |
|
28068 |
+ $as_echo "no ($have_pcre)" |
|
28069 |
+fi |
|
28070 |
+ |
|
28071 |
+else |
|
28072 |
+ |
|
28073 |
+ |
|
28074 |
+ $as_echo_n " pcre : " |
|
28075 |
+ if test "x$have_pcre" = "xno"; then : |
|
28076 |
+ $as_echo "$PCRE_HOME (disabled)" |
|
28077 |
+elif test "x$have_pcre" = "xyes"; then : |
|
28078 |
+ $as_echo "$PCRE_HOME" |
|
28079 |
+elif test "x$have_pcre" = "x"; then : |
|
28080 |
+ $as_echo "$PCRE_HOME" |
|
28081 |
+else |
|
28082 |
+ $as_echo "$PCRE_HOME ($have_pcre)" |
|
28083 |
+fi |
|
28084 |
+ |
|
28085 |
+fi |
|
28056 | 28086 |
if test "x$XML_LIBS" = "x"; then |
28057 | 28087 |
|
28058 | 28088 |
|
... | ... |
@@ -1,4 +1,4 @@ |
1 |
-# Makefile.in generated by automake 1.14 from Makefile.am. |
|
1 |
+# Makefile.in generated by automake 1.14.1 from Makefile.am. |
|
2 | 2 |
# @configure_input@ |
3 | 3 |
|
4 | 4 |
# Copyright (C) 1994-2013 Free Software Foundation, Inc. |
... | ... |
@@ -123,6 +123,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ |
123 | 123 |
$(top_srcdir)/m4/reorganization/libs/xml.m4 \ |
124 | 124 |
$(top_srcdir)/m4/reorganization/libs/openssl.m4 \ |
125 | 125 |
$(top_srcdir)/m4/reorganization/libs/json.m4 \ |
126 |
+ $(top_srcdir)/m4/reorganization/libs/pcre.m4 \ |
|
126 | 127 |
$(top_srcdir)/m4/reorganization/libs/libz.m4 \ |
127 | 128 |
$(top_srcdir)/m4/reorganization/libs/bzip.m4 \ |
128 | 129 |
$(top_srcdir)/m4/reorganization/libs/unrar.m4 \ |
... | ... |
@@ -308,6 +309,8 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ |
308 | 308 |
PACKAGE_URL = @PACKAGE_URL@ |
309 | 309 |
PACKAGE_VERSION = @PACKAGE_VERSION@ |
310 | 310 |
PATH_SEPARATOR = @PATH_SEPARATOR@ |
311 |
+PCRE_CPPFLAGS = @PCRE_CPPFLAGS@ |
|
312 |
+PCRE_LIBS = @PCRE_LIBS@ |
|
311 | 313 |
RANLIB = @RANLIB@ |
312 | 314 |
SED = @SED@ |
313 | 315 |
SET_MAKE = @SET_MAKE@ |
... | ... |
@@ -1,4 +1,4 @@ |
1 |
-# Makefile.in generated by automake 1.14 from Makefile.am. |
|
1 |
+# Makefile.in generated by automake 1.14.1 from Makefile.am. |
|
2 | 2 |
# @configure_input@ |
3 | 3 |
|
4 | 4 |
# Copyright (C) 1994-2013 Free Software Foundation, Inc. |
... | ... |
@@ -123,6 +123,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ |
123 | 123 |
$(top_srcdir)/m4/reorganization/libs/xml.m4 \ |
124 | 124 |
$(top_srcdir)/m4/reorganization/libs/openssl.m4 \ |
125 | 125 |
$(top_srcdir)/m4/reorganization/libs/json.m4 \ |
126 |
+ $(top_srcdir)/m4/reorganization/libs/pcre.m4 \ |
|
126 | 127 |
$(top_srcdir)/m4/reorganization/libs/libz.m4 \ |
127 | 128 |
$(top_srcdir)/m4/reorganization/libs/bzip.m4 \ |
128 | 129 |
$(top_srcdir)/m4/reorganization/libs/unrar.m4 \ |
... | ... |
@@ -342,6 +343,8 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ |
342 | 342 |
PACKAGE_URL = @PACKAGE_URL@ |
343 | 343 |
PACKAGE_VERSION = @PACKAGE_VERSION@ |
344 | 344 |
PATH_SEPARATOR = @PATH_SEPARATOR@ |
345 |
+PCRE_CPPFLAGS = @PCRE_CPPFLAGS@ |
|
346 |
+PCRE_LIBS = @PCRE_LIBS@ |
|
345 | 347 |
RANLIB = @RANLIB@ |
346 | 348 |
SED = @SED@ |
347 | 349 |
SET_MAKE = @SET_MAKE@ |
... | ... |
@@ -1,4 +1,4 @@ |
1 |
-# Makefile.in generated by automake 1.14 from Makefile.am. |
|
1 |
+# Makefile.in generated by automake 1.14.1 from Makefile.am. |
|
2 | 2 |
# @configure_input@ |
3 | 3 |
|
4 | 4 |
# Copyright (C) 1994-2013 Free Software Foundation, Inc. |
... | ... |
@@ -124,6 +124,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ |
124 | 124 |
$(top_srcdir)/m4/reorganization/libs/xml.m4 \ |
125 | 125 |
$(top_srcdir)/m4/reorganization/libs/openssl.m4 \ |
126 | 126 |
$(top_srcdir)/m4/reorganization/libs/json.m4 \ |
127 |
+ $(top_srcdir)/m4/reorganization/libs/pcre.m4 \ |
|
127 | 128 |
$(top_srcdir)/m4/reorganization/libs/libz.m4 \ |
128 | 129 |
$(top_srcdir)/m4/reorganization/libs/bzip.m4 \ |
129 | 130 |
$(top_srcdir)/m4/reorganization/libs/unrar.m4 \ |
... | ... |
@@ -338,6 +339,8 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ |
338 | 338 |
PACKAGE_URL = @PACKAGE_URL@ |
339 | 339 |
PACKAGE_VERSION = @PACKAGE_VERSION@ |
340 | 340 |
PATH_SEPARATOR = @PATH_SEPARATOR@ |
341 |
+PCRE_CPPFLAGS = @PCRE_CPPFLAGS@ |
|
342 |
+PCRE_LIBS = @PCRE_LIBS@ |
|
341 | 343 |
RANLIB = @RANLIB@ |
342 | 344 |
SED = @SED@ |
343 | 345 |
SET_MAKE = @SET_MAKE@ |
... | ... |
@@ -1,4 +1,4 @@ |
1 |
-# Makefile.in generated by automake 1.14 from Makefile.am. |
|
1 |
+# Makefile.in generated by automake 1.14.1 from Makefile.am. |
|
2 | 2 |
# @configure_input@ |
3 | 3 |
|
4 | 4 |
# Copyright (C) 1994-2013 Free Software Foundation, Inc. |
... | ... |
@@ -126,6 +126,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ |
126 | 126 |
$(top_srcdir)/m4/reorganization/libs/xml.m4 \ |
127 | 127 |
$(top_srcdir)/m4/reorganization/libs/openssl.m4 \ |
128 | 128 |
$(top_srcdir)/m4/reorganization/libs/json.m4 \ |
129 |
+ $(top_srcdir)/m4/reorganization/libs/pcre.m4 \ |
|
129 | 130 |
$(top_srcdir)/m4/reorganization/libs/libz.m4 \ |
130 | 131 |
$(top_srcdir)/m4/reorganization/libs/bzip.m4 \ |
131 | 132 |
$(top_srcdir)/m4/reorganization/libs/unrar.m4 \ |
... | ... |
@@ -364,6 +365,8 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ |
364 | 364 |
PACKAGE_URL = @PACKAGE_URL@ |
365 | 365 |
PACKAGE_VERSION = @PACKAGE_VERSION@ |
366 | 366 |
PATH_SEPARATOR = @PATH_SEPARATOR@ |
367 |
+PCRE_CPPFLAGS = @PCRE_CPPFLAGS@ |
|
368 |
+PCRE_LIBS = @PCRE_LIBS@ |
|
367 | 369 |
RANLIB = @RANLIB@ |
368 | 370 |
SED = @SED@ |
369 | 371 |
SET_MAKE = @SET_MAKE@ |
... | ... |
@@ -472,7 +475,7 @@ freshclam_SOURCES = \ |
472 | 472 |
mirman.h |
473 | 473 |
|
474 | 474 |
AM_CFLAGS = @WERR_CFLAGS@ |
475 |
-AM_CPPFLAGS = @SSL_CPPFLAGS@ -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav @FRESHCLAM_CPPFLAGS@ @JSON_CPPFLAGS@ |
|
475 |
+AM_CPPFLAGS = @SSL_CPPFLAGS@ -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav @FRESHCLAM_CPPFLAGS@ @JSON_CPPFLAGS@ @PCRE_CPPFLAGS@ |
|
476 | 476 |
AM_INSTALLCHECK_STD_OPTIONS_EXEMPT = freshclam$(EXEEXT) |
477 | 477 |
CLEANFILES = *.gcda *.gcno |
478 | 478 |
all: all-am |
... | ... |
@@ -1,4 +1,4 @@ |
1 |
-# Makefile.in generated by automake 1.14 from Makefile.am. |
|
1 |
+# Makefile.in generated by automake 1.14.1 from Makefile.am. |
|
2 | 2 |
# @configure_input@ |
3 | 3 |
|
4 | 4 |
# Copyright (C) 1994-2013 Free Software Foundation, Inc. |
... | ... |
@@ -135,6 +135,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ |
135 | 135 |
$(top_srcdir)/m4/reorganization/libs/xml.m4 \ |
136 | 136 |
$(top_srcdir)/m4/reorganization/libs/openssl.m4 \ |
137 | 137 |
$(top_srcdir)/m4/reorganization/libs/json.m4 \ |
138 |
+ $(top_srcdir)/m4/reorganization/libs/pcre.m4 \ |
|
138 | 139 |
$(top_srcdir)/m4/reorganization/libs/libz.m4 \ |
139 | 140 |
$(top_srcdir)/m4/reorganization/libs/bzip.m4 \ |
140 | 141 |
$(top_srcdir)/m4/reorganization/libs/unrar.m4 \ |
... | ... |
@@ -273,9 +274,10 @@ am_libclamav_la_OBJECTS = libclamav_la-matcher-ac.lo \ |
273 | 273 |
libclamav_la-adc.lo libclamav_la-dmg.lo libclamav_la-xar.lo \ |
274 | 274 |
libclamav_la-xdp.lo libclamav_la-mbr.lo libclamav_la-gpt.lo \ |
275 | 275 |
libclamav_la-apm.lo libclamav_la-prtn_intxn.lo \ |
276 |
- libclamav_la-json_api.lo libclamav_la-xz_iface.lo \ |
|
277 |
- libclamav_la-sf_base64decode.lo libclamav_la-hfsplus.lo \ |
|
278 |
- libclamav_la-swf.lo libclamav_la-jpeg.lo libclamav_la-png.lo \ |
|
276 |
+ libclamav_la-json_api.lo libclamav_la-pcre_api.lo \ |
|
277 |
+ libclamav_la-xz_iface.lo libclamav_la-sf_base64decode.lo \ |
|
278 |
+ libclamav_la-hfsplus.lo libclamav_la-swf.lo \ |
|
279 |
+ libclamav_la-jpeg.lo libclamav_la-png.lo \ |
|
279 | 280 |
libclamav_la-iso9660.lo libclamav_la-arc4.lo \ |
280 | 281 |
libclamav_la-rijndael.lo libclamav_la-crtmgr.lo \ |
281 | 282 |
libclamav_la-asn1.lo libclamav_la-fpu.lo libclamav_la-stats.lo \ |
... | ... |
@@ -645,6 +647,8 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ |
645 | 645 |
PACKAGE_URL = @PACKAGE_URL@ |
646 | 646 |
PACKAGE_VERSION = @PACKAGE_VERSION@ |
647 | 647 |
PATH_SEPARATOR = @PATH_SEPARATOR@ |
648 |
+PCRE_CPPFLAGS = @PCRE_CPPFLAGS@ |
|
649 |
+PCRE_LIBS = @PCRE_LIBS@ |
|
648 | 650 |
RANLIB = @RANLIB@ |
649 | 651 |
SED = @SED@ |
650 | 652 |
SET_MAKE = @SET_MAKE@ |
... | ... |
@@ -787,8 +791,8 @@ libclamav_internal_utils_la_SOURCES = str.c\ |
787 | 787 |
regex/utils.h |
788 | 788 |
|
789 | 789 |
libclamav_internal_utils_la_LDFLAGS = -static @SSL_LDFLAGS@ @JSON_LDFLAGS@ |
790 |
-libclamav_internal_utils_la_CFLAGS = $(AM_CFLAGS) -fPIC -DPIC @SSL_CPPFLAGS@ @JSON_CPPFLAGS@ |
|
791 |
-libclamav_internal_utils_la_LIBADD = @SSL_LIBS@ @JSON_LIBS@ |
|
790 |
+libclamav_internal_utils_la_CFLAGS = $(AM_CFLAGS) -fPIC -DPIC @SSL_CPPFLAGS@ @JSON_CPPFLAGS@ @PCRE_CPPFLAGS@ |
|
791 |
+libclamav_internal_utils_la_LIBADD = @SSL_LIBS@ @JSON_LIBS@ @PCRE_LIBS@ |
|
792 | 792 |
libclamav_internal_utils_nothreads_la_SOURCES = str.c\ |
793 | 793 |
conv.c \ |
794 | 794 |
conv.h \ |
... | ... |
@@ -812,18 +816,18 @@ libclamav_internal_utils_nothreads_la_SOURCES = str.c\ |
812 | 812 |
regex/utils.h |
813 | 813 |
|
814 | 814 |
libclamav_internal_utils_nothreads_la_LDFLAGS = -static @SSL_LDFLAGS@ @JSON_LDFLAGS@ |
815 |
-libclamav_internal_utils_nothreads_la_CFLAGS = $(AM_CFLAGS) -DCL_NOTHREADS @SSL_CPPFLAGS@ @JSON_CPPFLAGS@ |
|
816 |
-libclamav_internal_utils_nothreads_la_LIBADD = @SSL_LIBS@ @JSON_LIBS@ |
|
815 |
+libclamav_internal_utils_nothreads_la_CFLAGS = $(AM_CFLAGS) -DCL_NOTHREADS @SSL_CPPFLAGS@ @JSON_CPPFLAGS@ @PCRE_CPPFLAGS@ |
|
816 |
+libclamav_internal_utils_nothreads_la_LIBADD = @SSL_LIBS@ @JSON_LIBS@ @PCRE_LIBS@ |
|
817 | 817 |
@ENABLE_LLVM_FALSE@LLVMLIBADD = libclamav_nocxx.la |
818 | 818 |
@ENABLE_LLVM_TRUE@LLVMLIBADD = c++/libclamavcxx.la -lstdc++ -lm |
819 | 819 |
@ENABLE_LLVM_FALSE@LLVMDEP = libclamav_nocxx.la |
820 | 820 |
@ENABLE_LLVM_TRUE@LLVMDEP = c++/libclamavcxx.la |
821 | 821 |
@ENABLE_LLVM_TRUE@SUBDIRS = c++ |
822 | 822 |
libclamav_nocxx_la_SOURCES = bytecode_nojit.c |
823 |
-libclamav_nocxx_la_CFLAGS = $(AM_CFLAGS) @SSL_CPPFLAGS@ @JSON_CPPFLAGS@ |
|
824 |
-libclamav_la_LIBADD = @SSL_LIBS@ @JSON_LIBS@ @LIBCLAMAV_LIBS@ @LIBLTDL@ $(IFACELIBADD) $(LLVMLIBADD) libclamav_internal_utils.la @THREAD_LIBS@ @LIBM@ |
|
823 |
+libclamav_nocxx_la_CFLAGS = $(AM_CFLAGS) @SSL_CPPFLAGS@ @JSON_CPPFLAGS@ @PCRE_CPPFLAGS@ |
|
824 |
+libclamav_la_LIBADD = @SSL_LIBS@ @JSON_LIBS@ @PCRE_LIBS@ @LIBCLAMAV_LIBS@ @LIBLTDL@ $(IFACELIBADD) $(LLVMLIBADD) libclamav_internal_utils.la @THREAD_LIBS@ @LIBM@ |
|
825 | 825 |
libclamav_la_DEPENDENCIES = @LTDLDEPS@ $(IFACEDEP) $(LLVMDEP) libclamav_internal_utils.la |
826 |
-libclamav_la_CFLAGS = $(AM_CFLAGS) $(XML_CPPFLAGS) -DSEARCH_LIBDIR=\"$(libdir)\" @LIBCLAMAV_CPPFLAGS@ @SSL_CPPFLAGS@ @JSON_CPPFLAGS@ |
|
826 |
+libclamav_la_CFLAGS = $(AM_CFLAGS) $(XML_CPPFLAGS) -DSEARCH_LIBDIR=\"$(libdir)\" @LIBCLAMAV_CPPFLAGS@ @SSL_CPPFLAGS@ @JSON_CPPFLAGS@ @PCRE_CPPFLAGS@ |
|
827 | 827 |
libclamav_la_LDFLAGS = @SSL_LDFLAGS@ @TH_SAFE@ @JSON_LDFLAGS@ \ |
828 | 828 |
$(XML_LIBS) -version-info @LIBCLAMAV_VERSION@ -no-undefined \ |
829 | 829 |
$(am__append_6) |
... | ... |
@@ -875,15 +879,16 @@ libclamav_la_SOURCES = matcher-ac.c matcher-ac.h matcher-bm.c \ |
875 | 875 |
cache.h bytecode_detect.c bytecode_detect.h \ |
876 | 876 |
builtin_bytecodes.h events.c events.h adc.c adc.h dmg.c dmg.h \ |
877 | 877 |
xar.c xar.h xdp.c xdp.h mbr.c mbr.h gpt.c gpt.h apm.c apm.h \ |
878 |
- prtn_intxn.c prtn_intxn.h json_api.c json_api.h xz_iface.c \ |
|
879 |
- xz_iface.h sf_base64decode.c sf_base64decode.h hfsplus.c \ |
|
880 |
- hfsplus.h swf.c swf.h jpeg.c jpeg.h png.c png.h iso9660.c \ |
|
881 |
- iso9660.h arc4.c arc4.h rijndael.c rijndael.h crtmgr.c \ |
|
882 |
- crtmgr.h asn1.c asn1.h fpu.c fpu.h stats.c stats.h www.c www.h \ |
|
883 |
- stats_json.c stats_json.h hostid.c hostid.h openioc.c \ |
|
884 |
- openioc.h bignum.h bignum_fast.h tomsfastmath/addsub/fp_add.c \ |
|
885 |
- tomsfastmath/addsub/fp_add_d.c tomsfastmath/addsub/fp_addmod.c \ |
|
886 |
- tomsfastmath/addsub/fp_cmp.c tomsfastmath/addsub/fp_cmp_d.c \ |
|
878 |
+ prtn_intxn.c prtn_intxn.h json_api.c json_api.h pcre_api.c \ |
|
879 |
+ pcre_api.h xz_iface.c xz_iface.h sf_base64decode.c \ |
|
880 |
+ sf_base64decode.h hfsplus.c hfsplus.h swf.c swf.h jpeg.c \ |
|
881 |
+ jpeg.h png.c png.h iso9660.c iso9660.h arc4.c arc4.h \ |
|
882 |
+ rijndael.c rijndael.h crtmgr.c crtmgr.h asn1.c asn1.h fpu.c \ |
|
883 |
+ fpu.h stats.c stats.h www.c www.h stats_json.c stats_json.h \ |
|
884 |
+ hostid.c hostid.h openioc.c openioc.h bignum.h bignum_fast.h \ |
|
885 |
+ tomsfastmath/addsub/fp_add.c tomsfastmath/addsub/fp_add_d.c \ |
|
886 |
+ tomsfastmath/addsub/fp_addmod.c tomsfastmath/addsub/fp_cmp.c \ |
|
887 |
+ tomsfastmath/addsub/fp_cmp_d.c \ |
|
887 | 888 |
tomsfastmath/addsub/fp_cmp_mag.c tomsfastmath/addsub/fp_sub.c \ |
888 | 889 |
tomsfastmath/addsub/fp_sub_d.c tomsfastmath/addsub/fp_submod.c \ |
889 | 890 |
tomsfastmath/addsub/s_fp_add.c tomsfastmath/addsub/s_fp_sub.c \ |
... | ... |
@@ -1248,6 +1253,7 @@ distclean-compile: |
1248 | 1248 |
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_la-openioc.Plo@am__quote@ |
1249 | 1249 |
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_la-others.Plo@am__quote@ |
1250 | 1250 |
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_la-packlibs.Plo@am__quote@ |
1251 |
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_la-pcre_api.Plo@am__quote@ |
|
1251 | 1252 |
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_la-pdf.Plo@am__quote@ |
1252 | 1253 |
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_la-pdfng.Plo@am__quote@ |
1253 | 1254 |
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_la-pe.Plo@am__quote@ |
... | ... |
@@ -2168,6 +2174,13 @@ libclamav_la-json_api.lo: json_api.c |
2168 | 2168 |
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ |
2169 | 2169 |
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_la_CFLAGS) $(CFLAGS) -c -o libclamav_la-json_api.lo `test -f 'json_api.c' || echo '$(srcdir)/'`json_api.c |
2170 | 2170 |
|
2171 |
+libclamav_la-pcre_api.lo: pcre_api.c |
|
2172 |
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_la_CFLAGS) $(CFLAGS) -MT libclamav_la-pcre_api.lo -MD -MP -MF $(DEPDIR)/libclamav_la-pcre_api.Tpo -c -o libclamav_la-pcre_api.lo `test -f 'pcre_api.c' || echo '$(srcdir)/'`pcre_api.c |
|
2173 |
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libclamav_la-pcre_api.Tpo $(DEPDIR)/libclamav_la-pcre_api.Plo |
|
2174 |
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pcre_api.c' object='libclamav_la-pcre_api.lo' libtool=yes @AMDEPBACKSLASH@ |
|
2175 |
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ |
|
2176 |
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_la_CFLAGS) $(CFLAGS) -c -o libclamav_la-pcre_api.lo `test -f 'pcre_api.c' || echo '$(srcdir)/'`pcre_api.c |
|
2177 |
+ |
|
2171 | 2178 |
libclamav_la-xz_iface.lo: xz_iface.c |
2172 | 2179 |
@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_la_CFLAGS) $(CFLAGS) -MT libclamav_la-xz_iface.lo -MD -MP -MF $(DEPDIR)/libclamav_la-xz_iface.Tpo -c -o libclamav_la-xz_iface.lo `test -f 'xz_iface.c' || echo '$(srcdir)/'`xz_iface.c |
2173 | 2180 |
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libclamav_la-xz_iface.Tpo $(DEPDIR)/libclamav_la-xz_iface.Plo |
... | ... |
@@ -1,4 +1,4 @@ |
1 |
-# Makefile.in generated by automake 1.14 from Makefile.am. |
|
1 |
+# Makefile.in generated by automake 1.14.1 from Makefile.am. |
|
2 | 2 |
# @configure_input@ |
3 | 3 |
|
4 | 4 |
# Copyright (C) 1994-2013 Free Software Foundation, Inc. |
... | ... |
@@ -1069,12 +1069,12 @@ ACLOCAL_AMFLAGS = -I m4 |
1069 | 1069 |
libclamavcxx_la_SOURCES = bytecode2llvm.cpp ClamBCRTChecks.cpp \ |
1070 | 1070 |
ClamBCModule.h ClamBCDiagnostics.h detect.cpp llvm30_compat.h \ |
1071 | 1071 |
$(am__append_1) |
1072 |
-@BUILD_EXTERNAL_LLVM_FALSE@libclamavcxx_la_CXXFLAGS = $(LLVM_CXXFLAGS) -DLLVM_VERSION=${LLVM_VERSION} @JSON_CPPFLAGS@ |
|
1072 |
+@BUILD_EXTERNAL_LLVM_FALSE@libclamavcxx_la_CXXFLAGS = $(LLVM_CXXFLAGS) -DLLVM_VERSION=${LLVM_VERSION} @JSON_CPPFLAGS@ @PCRE_CPPFLAGS@ |
|
1073 | 1073 |
#$(LLVM_CONFIG): build-llvm |
1074 | 1074 |
# we know this will be built with GNU make, so its safe to use GNU make specific |
1075 | 1075 |
# $(shell ...) |
1076 | 1076 |
#LLVM_DEPS=$(shell $(LLVM_CONFIG) --libfiles jit nativecodegen) |
1077 |
-@BUILD_EXTERNAL_LLVM_TRUE@libclamavcxx_la_CXXFLAGS = $(AM_CPPFLAGS) @LLVMCONFIG_CXXFLAGS@ -fexceptions -DLLVM_VERSION=${LLVM_VERSION} @JSON_CPPFLAGS@ |
|
1077 |
+@BUILD_EXTERNAL_LLVM_TRUE@libclamavcxx_la_CXXFLAGS = $(AM_CPPFLAGS) @LLVMCONFIG_CXXFLAGS@ -fexceptions -DLLVM_VERSION=${LLVM_VERSION} @JSON_CPPFLAGS@ @PCRE_CPPFLAGS@ |
|
1078 | 1078 |
@BUILD_EXTERNAL_LLVM_FALSE@libclamavcxx_la_LDFLAGS = -no-undefined |
1079 | 1079 |
@BUILD_EXTERNAL_LLVM_TRUE@libclamavcxx_la_LDFLAGS = @LLVMCONFIG_LDFLAGS@ @LLVMCONFIG_LIBS@ @LLVMCONFIG_LDFLAGS@ @JSON_LDFLAGS@ |
1080 | 1080 |
@BUILD_EXTERNAL_LLVM_FALSE@libclamavcxx_la_DEPENDENCIES = \ |
... | ... |
@@ -1083,7 +1083,8 @@ libclamavcxx_la_SOURCES = bytecode2llvm.cpp ClamBCRTChecks.cpp \ |
1083 | 1083 |
@BUILD_EXTERNAL_LLVM_FALSE@ $(am__append_7) |
1084 | 1084 |
@BUILD_EXTERNAL_LLVM_TRUE@libclamavcxx_la_DEPENDENCIES = \ |
1085 | 1085 |
@BUILD_EXTERNAL_LLVM_TRUE@ @LLVMCONFIG_LIBFILES@ @JSON_LIBS@ \ |
1086 |
-@BUILD_EXTERNAL_LLVM_TRUE@ $(am__append_4) $(am__append_7) |
|
1086 |
+@BUILD_EXTERNAL_LLVM_TRUE@ @PCRE_LIBS@ $(am__append_4) \ |
|
1087 |
+@BUILD_EXTERNAL_LLVM_TRUE@ $(am__append_7) |
|
1087 | 1088 |
@BUILD_EXTERNAL_LLVM_FALSE@noinst_LTLIBRARIES = libclamavcxx.la \ |
1088 | 1089 |
@BUILD_EXTERNAL_LLVM_FALSE@ libllvmsystem.la libllvmcodegen.la \ |
1089 | 1090 |
@BUILD_EXTERNAL_LLVM_FALSE@ libllvmjit.la $(am__append_5) \ |
... | ... |
@@ -5657,9 +5658,10 @@ distcheck: dist |
5657 | 5657 |
&& dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ |
5658 | 5658 |
&& am__cwd=`pwd` \ |
5659 | 5659 |
&& $(am__cd) $(distdir)/_build \ |
5660 |
- && ../configure --srcdir=.. --prefix="$$dc_install_base" \ |
|
5660 |
+ && ../configure \ |
|
5661 | 5661 |
$(AM_DISTCHECK_CONFIGURE_FLAGS) \ |
5662 | 5662 |
$(DISTCHECK_CONFIGURE_FLAGS) \ |
5663 |
+ --srcdir=.. --prefix="$$dc_install_base" \ |
|
5663 | 5664 |
&& $(MAKE) $(AM_MAKEFLAGS) \ |
5664 | 5665 |
&& $(MAKE) $(AM_MAKEFLAGS) dvi \ |
5665 | 5666 |
&& $(MAKE) $(AM_MAKEFLAGS) check \ |
... | ... |
@@ -5749,8 +5751,8 @@ maintainer-clean-generic: |
5749 | 5749 |
@echo "This command is intended for maintainers to use" |
5750 | 5750 |
@echo "it deletes files that may require special tools to rebuild." |
5751 | 5751 |
-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) |
5752 |
-@BUILD_EXTERNAL_LLVM_TRUE@distclean-local: |
|
5753 | 5752 |
@BUILD_EXTERNAL_LLVM_TRUE@clean-local: |
5753 |
+@BUILD_EXTERNAL_LLVM_TRUE@distclean-local: |
|
5754 | 5754 |
clean: clean-am |
5755 | 5755 |
|
5756 | 5756 |
clean-am: clean-generic clean-libtool clean-local \ |
... | ... |
@@ -1,4 +1,4 @@ |
1 |
-# generated automatically by aclocal 1.14 -*- Autoconf -*- |
|
1 |
+# generated automatically by aclocal 1.14.1 -*- Autoconf -*- |
|
2 | 2 |
|
3 | 3 |
# Copyright (C) 1996-2013 Free Software Foundation, Inc. |
4 | 4 |
|
... | ... |
@@ -35,7 +35,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION], |
35 | 35 |
[am__api_version='1.14' |
36 | 36 |
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to |
37 | 37 |
dnl require some minimum version. Point them to the right macro. |
38 |
-m4_if([$1], [1.14], [], |
|
38 |
+m4_if([$1], [1.14.1], [], |
|
39 | 39 |
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl |
40 | 40 |
]) |
41 | 41 |
|
... | ... |
@@ -51,7 +51,7 @@ m4_define([_AM_AUTOCONF_VERSION], []) |
51 | 51 |
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. |
52 | 52 |
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE. |
53 | 53 |
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], |
54 |
-[AM_AUTOMAKE_VERSION([1.14])dnl |
|
54 |
+[AM_AUTOMAKE_VERSION([1.14.1])dnl |
|
55 | 55 |
m4_ifndef([AC_AUTOCONF_VERSION], |
56 | 56 |
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl |
57 | 57 |
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) |
... | ... |
@@ -1,4 +1,4 @@ |
1 |
-# Makefile.in generated by automake 1.14 from Makefile.am. |
|
1 |
+# Makefile.in generated by automake 1.14.1 from Makefile.am. |
|
2 | 2 |
# @configure_input@ |
3 | 3 |
|
4 | 4 |
# Copyright (C) 1994-2013 Free Software Foundation, Inc. |
... | ... |
@@ -113,6 +113,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ |
113 | 113 |
$(top_srcdir)/m4/reorganization/libs/xml.m4 \ |
114 | 114 |
$(top_srcdir)/m4/reorganization/libs/openssl.m4 \ |
115 | 115 |
$(top_srcdir)/m4/reorganization/libs/json.m4 \ |
116 |
+ $(top_srcdir)/m4/reorganization/libs/pcre.m4 \ |
|
116 | 117 |
$(top_srcdir)/m4/reorganization/libs/libz.m4 \ |
117 | 118 |
$(top_srcdir)/m4/reorganization/libs/bzip.m4 \ |
118 | 119 |
$(top_srcdir)/m4/reorganization/libs/unrar.m4 \ |
... | ... |
@@ -439,6 +440,8 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ |
439 | 439 |
PACKAGE_URL = @PACKAGE_URL@ |
440 | 440 |
PACKAGE_VERSION = @PACKAGE_VERSION@ |
441 | 441 |
PATH_SEPARATOR = @PATH_SEPARATOR@ |
442 |
+PCRE_CPPFLAGS = @PCRE_CPPFLAGS@ |
|
443 |
+PCRE_LIBS = @PCRE_LIBS@ |
|
442 | 444 |
RANLIB = @RANLIB@ |
443 | 445 |
SED = @SED@ |
444 | 446 |
SET_MAKE = @SET_MAKE@ |
... | ... |
@@ -1,4 +1,4 @@ |
1 |
-# Makefile.in generated by automake 1.14 from Makefile.am. |
|
1 |
+# Makefile.in generated by automake 1.14.1 from Makefile.am. |
|
2 | 2 |
# @configure_input@ |
3 | 3 |
|
4 | 4 |
# Copyright (C) 1994-2013 Free Software Foundation, Inc. |
... | ... |
@@ -125,6 +125,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ |
125 | 125 |
$(top_srcdir)/m4/reorganization/libs/xml.m4 \ |
126 | 126 |
$(top_srcdir)/m4/reorganization/libs/openssl.m4 \ |
127 | 127 |
$(top_srcdir)/m4/reorganization/libs/json.m4 \ |
128 |
+ $(top_srcdir)/m4/reorganization/libs/pcre.m4 \ |
|
128 | 129 |
$(top_srcdir)/m4/reorganization/libs/libz.m4 \ |
129 | 130 |
$(top_srcdir)/m4/reorganization/libs/bzip.m4 \ |
130 | 131 |
$(top_srcdir)/m4/reorganization/libs/unrar.m4 \ |
... | ... |
@@ -361,6 +362,8 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ |
361 | 361 |
PACKAGE_URL = @PACKAGE_URL@ |
362 | 362 |
PACKAGE_VERSION = @PACKAGE_VERSION@ |
363 | 363 |
PATH_SEPARATOR = @PATH_SEPARATOR@ |
364 |
+PCRE_CPPFLAGS = @PCRE_CPPFLAGS@ |
|
365 |
+PCRE_LIBS = @PCRE_LIBS@ |
|
364 | 366 |
RANLIB = @RANLIB@ |
365 | 367 |
SED = @SED@ |
366 | 368 |
SET_MAKE = @SET_MAKE@ |
... | ... |
@@ -456,7 +459,7 @@ sigtool_SOURCES = \ |
456 | 456 |
sigtool.c |
457 | 457 |
|
458 | 458 |
AM_CFLAGS = @WERR_CFLAGS@ |
459 |
-AM_CPPFLAGS = @SSL_CPPFLAGS@ @JSON_CPPFLAGS@ -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav @SIGTOOL_CPPFLAGS@ |
|
459 |
+AM_CPPFLAGS = @SSL_CPPFLAGS@ @JSON_CPPFLAGS@ @PCRE_CPPFLAGS@ -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav @SIGTOOL_CPPFLAGS@ |
|
460 | 460 |
CLEANFILES = *.gcda *.gcno |
461 | 461 |
all: all-am |
462 | 462 |
|
... | ... |
@@ -1,4 +1,4 @@ |
1 |
-# Makefile.in generated by automake 1.14 from Makefile.am. |
|
1 |
+# Makefile.in generated by automake 1.14.1 from Makefile.am. |
|
2 | 2 |
# @configure_input@ |
3 | 3 |
|
4 | 4 |
# Copyright (C) 1994-2013 Free Software Foundation, Inc. |
... | ... |
@@ -106,6 +106,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ |
106 | 106 |
$(top_srcdir)/m4/reorganization/libs/xml.m4 \ |
107 | 107 |
$(top_srcdir)/m4/reorganization/libs/openssl.m4 \ |
108 | 108 |
$(top_srcdir)/m4/reorganization/libs/json.m4 \ |
109 |
+ $(top_srcdir)/m4/reorganization/libs/pcre.m4 \ |
|
109 | 110 |
$(top_srcdir)/m4/reorganization/libs/libz.m4 \ |
110 | 111 |
$(top_srcdir)/m4/reorganization/libs/bzip.m4 \ |
111 | 112 |
$(top_srcdir)/m4/reorganization/libs/unrar.m4 \ |
... | ... |
@@ -291,6 +292,8 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ |
291 | 291 |
PACKAGE_URL = @PACKAGE_URL@ |
292 | 292 |
PACKAGE_VERSION = @PACKAGE_VERSION@ |
293 | 293 |
PATH_SEPARATOR = @PATH_SEPARATOR@ |
294 |
+PCRE_CPPFLAGS = @PCRE_CPPFLAGS@ |
|
295 |
+PCRE_LIBS = @PCRE_LIBS@ |
|
294 | 296 |
RANLIB = @RANLIB@ |
295 | 297 |
SED = @SED@ |
296 | 298 |
SET_MAKE = @SET_MAKE@ |
... | ... |
@@ -1,4 +1,4 @@ |
1 |
-# Makefile.in generated by automake 1.14 from Makefile.am. |
|
1 |
+# Makefile.in generated by automake 1.14.1 from Makefile.am. |
|
2 | 2 |
# @configure_input@ |
3 | 3 |
|
4 | 4 |
# Copyright (C) 1994-2013 Free Software Foundation, Inc. |
... | ... |
@@ -108,6 +108,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ |
108 | 108 |
$(top_srcdir)/m4/reorganization/libs/xml.m4 \ |
109 | 109 |
$(top_srcdir)/m4/reorganization/libs/openssl.m4 \ |
110 | 110 |
$(top_srcdir)/m4/reorganization/libs/json.m4 \ |
111 |
+ $(top_srcdir)/m4/reorganization/libs/pcre.m4 \ |
|
111 | 112 |
$(top_srcdir)/m4/reorganization/libs/libz.m4 \ |
112 | 113 |
$(top_srcdir)/m4/reorganization/libs/bzip.m4 \ |
113 | 114 |
$(top_srcdir)/m4/reorganization/libs/unrar.m4 \ |
... | ... |
@@ -581,6 +582,8 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ |
581 | 581 |
PACKAGE_URL = @PACKAGE_URL@ |
582 | 582 |
PACKAGE_VERSION = @PACKAGE_VERSION@ |
583 | 583 |
PATH_SEPARATOR = @PATH_SEPARATOR@ |
584 |
+PCRE_CPPFLAGS = @PCRE_CPPFLAGS@ |
|
585 |
+PCRE_LIBS = @PCRE_LIBS@ |
|
584 | 586 |
RANLIB = @RANLIB@ |
585 | 587 |
SED = @SED@ |
586 | 588 |
SET_MAKE = @SET_MAKE@ |
... | ... |
@@ -675,16 +678,16 @@ AM_CFLAGS = @WERR_CFLAGS@ |
675 | 675 |
@HAVE_LIBCHECK_TRUE@ check_disasm.c check_uniq.c check_matchers.c\ |
676 | 676 |
@HAVE_LIBCHECK_TRUE@ check_htmlnorm.c check_bytecode.c |
677 | 677 |
|
678 |
-@HAVE_LIBCHECK_TRUE@check_clamav_CPPFLAGS = -I$(top_srcdir) @CHECK_CPPFLAGS@ @JSON_CPPFLAGS@ -DSRCDIR=\"$(abs_srcdir)\" -DOBJDIR=\"$(abs_builddir)\" |
|
678 |
+@HAVE_LIBCHECK_TRUE@check_clamav_CPPFLAGS = -I$(top_srcdir) @CHECK_CPPFLAGS@ @JSON_CPPFLAGS@ @PCRE_CPPFLAGS@ -DSRCDIR=\"$(abs_srcdir)\" -DOBJDIR=\"$(abs_builddir)\" |
|
679 | 679 |
@HAVE_LIBCHECK_TRUE@check_clamav_LDADD = $(top_builddir)/libclamav/libclamav.la @THREAD_LIBS@ @CHECK_LIBS@ |
680 | 680 |
@HAVE_LIBCHECK_TRUE@check_clamav_LDFLAGS = $(XML_LIBS) |
681 | 681 |
@HAVE_LIBCHECK_TRUE@check_clamav_CFLAGS = $(AM_CFLAGS) $(XML_CPPFLAGS) |
682 | 682 |
@HAVE_LIBCHECK_FALSE@check_clamd_SOURCES = check_clamav_skip.c |
683 | 683 |
@HAVE_LIBCHECK_TRUE@check_clamd_SOURCES = check_clamd.c checks_common.h |
684 |
-@HAVE_LIBCHECK_TRUE@check_clamd_CPPFLAGS = -I$(top_srcdir) @CHECK_CPPFLAGS@ @JSON_CPPFLAGS@ -DSRCDIR=\"$(abs_srcdir)\" -DBUILDDIR=\"$(abs_builddir)\" |
|
684 |
+@HAVE_LIBCHECK_TRUE@check_clamd_CPPFLAGS = -I$(top_srcdir) @CHECK_CPPFLAGS@ @JSON_CPPFLAGS@ @PCRE_CPPFLAGS@ -DSRCDIR=\"$(abs_srcdir)\" -DBUILDDIR=\"$(abs_builddir)\" |
|
685 | 685 |
@HAVE_LIBCHECK_TRUE@check_clamd_LDADD = @CHECK_LIBS@ @CLAMD_LIBS@ |
686 | 686 |
check_fpu_endian_SOURCES = check_fpu_endian.c |
687 |
-check_fpu_endian_CPPFLAGS = -I$(top_srcdir) @CHECK_CPPFLAGS@ @JSON_CPPFLAGS@ -DSRCDIR=\"$(abs_srcdir)\" -DOBJDIR=\"$(abs_builddir)\" |
|
687 |
+check_fpu_endian_CPPFLAGS = -I$(top_srcdir) @CHECK_CPPFLAGS@ @JSON_CPPFLAGS@ @PCRE_CPPFLAGS@ -DSRCDIR=\"$(abs_srcdir)\" -DOBJDIR=\"$(abs_builddir)\" |
|
688 | 688 |
check_fpu_endian_LDADD = $(top_builddir)/libclamav/libclamav.la |
689 | 689 |
CLEANFILES = lcov.out *.gcno *.gcda *.log $(FILES) test-stderr.log clamscan.log accdenied clamav.hdb $(utils) |
690 | 690 |
EXTRA_DIST = .split $(srcdir)/*.ref input test-freshclam.conf valgrind.supp virusaction-test.sh $(scripts) preload_run.sh check_common.sh |