... | ... |
@@ -154,6 +154,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ |
154 | 154 |
$(top_srcdir)/m4/reorganization/libs/libz.m4 \ |
155 | 155 |
$(top_srcdir)/m4/reorganization/libs/bzip.m4 \ |
156 | 156 |
$(top_srcdir)/m4/reorganization/libs/unrar.m4 \ |
157 |
+ $(top_srcdir)/m4/reorganization/libs/systemd.m4 \ |
|
157 | 158 |
$(top_srcdir)/m4/reorganization/code_checks/ipv6.m4 \ |
158 | 159 |
$(top_srcdir)/m4/reorganization/code_checks/dns.m4 \ |
159 | 160 |
$(top_srcdir)/m4/reorganization/code_checks/fanotify.m4 \ |
... | ... |
@@ -472,6 +473,8 @@ SSL_CPPFLAGS = @SSL_CPPFLAGS@ |
472 | 472 |
SSL_LDFLAGS = @SSL_LDFLAGS@ |
473 | 473 |
SSL_LIBS = @SSL_LIBS@ |
474 | 474 |
STRIP = @STRIP@ |
475 |
+SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@ |
|
476 |
+SYSTEMD_LIBS = @SYSTEMD_LIBS@ |
|
475 | 477 |
THREAD_LIBS = @THREAD_LIBS@ |
476 | 478 |
TH_SAFE = @TH_SAFE@ |
477 | 479 |
VERSION = @VERSION@ |
... | ... |
@@ -524,6 +527,7 @@ ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@ |
524 | 524 |
mandir = @mandir@ |
525 | 525 |
mkdir_p = @mkdir_p@ |
526 | 526 |
oldincludedir = @oldincludedir@ |
527 |
+pcreconfig = @pcreconfig@ |
|
527 | 528 |
pdfdir = @pdfdir@ |
528 | 529 |
prefix = @prefix@ |
529 | 530 |
program_transform_name = @program_transform_name@ |
... | ... |
@@ -534,6 +538,7 @@ srcdir = @srcdir@ |
534 | 534 |
subdirs = @subdirs@ |
535 | 535 |
sys_symbol_underscore = @sys_symbol_underscore@ |
536 | 536 |
sysconfdir = @sysconfdir@ |
537 |
+systemdsystemunitdir = @systemdsystemunitdir@ |
|
537 | 538 |
target = @target@ |
538 | 539 |
target_alias = @target_alias@ |
539 | 540 |
target_cpu = @target_cpu@ |
... | ... |
@@ -554,7 +559,7 @@ pkgconfig_DATA = libclamav.pc |
554 | 554 |
# don't complain that configuration files and databases are not removed, this is intended |
555 | 555 |
distuninstallcheck_listfiles = find . -type f ! -name clamd.conf ! -name freshclam.conf ! -name daily.cvd ! -name main.cvd -print |
556 | 556 |
DISTCLEANFILES = target.h |
557 |
-DISTCHECK_CONFIGURE_FLAGS = --enable-milter --disable-clamav --enable-all-jit-targets --enable-llvm=yes |
|
557 |
+DISTCHECK_CONFIGURE_FLAGS = --enable-milter --disable-clamav --enable-all-jit-targets --enable-llvm=yes --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir) |
|
558 | 558 |
all: clamav-config.h |
559 | 559 |
$(MAKE) $(AM_MAKEFLAGS) all-recursive |
560 | 560 |
|
... | ... |
@@ -285,7 +285,7 @@ |
285 | 285 |
/* Define to 1 if you have the `opendir' function. */ |
286 | 286 |
#undef HAVE_OPENDIR |
287 | 287 |
|
288 |
-/* Define to 1 if you have the 'libpcre' library (-lpcre). */ |
|
288 |
+/* Define to 1 if you have a pcre library (-lpcre). */ |
|
289 | 289 |
#undef HAVE_PCRE |
290 | 290 |
|
291 | 291 |
/* Define to 1 if you have the `poll' function. */ |
... | ... |
@@ -384,6 +384,9 @@ |
384 | 384 |
/* Define to 1 if you have the `sysctlbyname' function. */ |
385 | 385 |
#undef HAVE_SYSCTLBYNAME |
386 | 386 |
|
387 |
+/* systemd is supported */ |
|
388 |
+#undef HAVE_SYSTEMD |
|
389 |
+ |
|
387 | 390 |
/* Define to 1 if you have the <sys/cdefs.h> header file. */ |
388 | 391 |
#undef HAVE_SYS_CDEFS_H |
389 | 392 |
|
... | ... |
@@ -567,6 +570,9 @@ |
567 | 567 |
#endif |
568 | 568 |
|
569 | 569 |
|
570 |
+/* Define to 1 if you using the pcre2 library. */ |
|
571 |
+#undef USING_PCRE2 |
|
572 |
+ |
|
570 | 573 |
/* Version number of package */ |
571 | 574 |
#undef VERSION |
572 | 575 |
|
... | ... |
@@ -130,6 +130,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ |
130 | 130 |
$(top_srcdir)/m4/reorganization/libs/libz.m4 \ |
131 | 131 |
$(top_srcdir)/m4/reorganization/libs/bzip.m4 \ |
132 | 132 |
$(top_srcdir)/m4/reorganization/libs/unrar.m4 \ |
133 |
+ $(top_srcdir)/m4/reorganization/libs/systemd.m4 \ |
|
133 | 134 |
$(top_srcdir)/m4/reorganization/code_checks/ipv6.m4 \ |
134 | 135 |
$(top_srcdir)/m4/reorganization/code_checks/dns.m4 \ |
135 | 136 |
$(top_srcdir)/m4/reorganization/code_checks/fanotify.m4 \ |
... | ... |
@@ -427,6 +428,8 @@ SSL_CPPFLAGS = @SSL_CPPFLAGS@ |
427 | 427 |
SSL_LDFLAGS = @SSL_LDFLAGS@ |
428 | 428 |
SSL_LIBS = @SSL_LIBS@ |
429 | 429 |
STRIP = @STRIP@ |
430 |
+SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@ |
|
431 |
+SYSTEMD_LIBS = @SYSTEMD_LIBS@ |
|
430 | 432 |
THREAD_LIBS = @THREAD_LIBS@ |
431 | 433 |
TH_SAFE = @TH_SAFE@ |
432 | 434 |
VERSION = @VERSION@ |
... | ... |
@@ -479,6 +482,7 @@ ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@ |
479 | 479 |
mandir = @mandir@ |
480 | 480 |
mkdir_p = @mkdir_p@ |
481 | 481 |
oldincludedir = @oldincludedir@ |
482 |
+pcreconfig = @pcreconfig@ |
|
482 | 483 |
pdfdir = @pdfdir@ |
483 | 484 |
prefix = @prefix@ |
484 | 485 |
program_transform_name = @program_transform_name@ |
... | ... |
@@ -489,6 +493,7 @@ srcdir = @srcdir@ |
489 | 489 |
subdirs = @subdirs@ |
490 | 490 |
sys_symbol_underscore = @sys_symbol_underscore@ |
491 | 491 |
sysconfdir = @sysconfdir@ |
492 |
+systemdsystemunitdir = @systemdsystemunitdir@ |
|
492 | 493 |
target = @target@ |
493 | 494 |
target_alias = @target_alias@ |
494 | 495 |
target_cpu = @target_cpu@ |
... | ... |
@@ -111,6 +111,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ |
111 | 111 |
$(top_srcdir)/m4/reorganization/libs/libz.m4 \ |
112 | 112 |
$(top_srcdir)/m4/reorganization/libs/bzip.m4 \ |
113 | 113 |
$(top_srcdir)/m4/reorganization/libs/unrar.m4 \ |
114 |
+ $(top_srcdir)/m4/reorganization/libs/systemd.m4 \ |
|
114 | 115 |
$(top_srcdir)/m4/reorganization/code_checks/ipv6.m4 \ |
115 | 116 |
$(top_srcdir)/m4/reorganization/code_checks/dns.m4 \ |
116 | 117 |
$(top_srcdir)/m4/reorganization/code_checks/fanotify.m4 \ |
... | ... |
@@ -363,6 +364,8 @@ SSL_CPPFLAGS = @SSL_CPPFLAGS@ |
363 | 363 |
SSL_LDFLAGS = @SSL_LDFLAGS@ |
364 | 364 |
SSL_LIBS = @SSL_LIBS@ |
365 | 365 |
STRIP = @STRIP@ |
366 |
+SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@ |
|
367 |
+SYSTEMD_LIBS = @SYSTEMD_LIBS@ |
|
366 | 368 |
THREAD_LIBS = @THREAD_LIBS@ |
367 | 369 |
TH_SAFE = @TH_SAFE@ |
368 | 370 |
VERSION = @VERSION@ |
... | ... |
@@ -415,6 +418,7 @@ ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@ |
415 | 415 |
mandir = @mandir@ |
416 | 416 |
mkdir_p = @mkdir_p@ |
417 | 417 |
oldincludedir = @oldincludedir@ |
418 |
+pcreconfig = @pcreconfig@ |
|
418 | 419 |
pdfdir = @pdfdir@ |
419 | 420 |
prefix = @prefix@ |
420 | 421 |
program_transform_name = @program_transform_name@ |
... | ... |
@@ -425,6 +429,7 @@ srcdir = @srcdir@ |
425 | 425 |
subdirs = @subdirs@ |
426 | 426 |
sys_symbol_underscore = @sys_symbol_underscore@ |
427 | 427 |
sysconfdir = @sysconfdir@ |
428 |
+systemdsystemunitdir = @systemdsystemunitdir@ |
|
428 | 429 |
target = @target@ |
429 | 430 |
target_alias = @target_alias@ |
430 | 431 |
target_cpu = @target_cpu@ |
... | ... |
@@ -129,6 +129,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ |
129 | 129 |
$(top_srcdir)/m4/reorganization/libs/libz.m4 \ |
130 | 130 |
$(top_srcdir)/m4/reorganization/libs/bzip.m4 \ |
131 | 131 |
$(top_srcdir)/m4/reorganization/libs/unrar.m4 \ |
132 |
+ $(top_srcdir)/m4/reorganization/libs/systemd.m4 \ |
|
132 | 133 |
$(top_srcdir)/m4/reorganization/code_checks/ipv6.m4 \ |
133 | 134 |
$(top_srcdir)/m4/reorganization/code_checks/dns.m4 \ |
134 | 135 |
$(top_srcdir)/m4/reorganization/code_checks/fanotify.m4 \ |
... | ... |
@@ -381,6 +382,8 @@ SSL_CPPFLAGS = @SSL_CPPFLAGS@ |
381 | 381 |
SSL_LDFLAGS = @SSL_LDFLAGS@ |
382 | 382 |
SSL_LIBS = @SSL_LIBS@ |
383 | 383 |
STRIP = @STRIP@ |
384 |
+SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@ |
|
385 |
+SYSTEMD_LIBS = @SYSTEMD_LIBS@ |
|
384 | 386 |
THREAD_LIBS = @THREAD_LIBS@ |
385 | 387 |
TH_SAFE = @TH_SAFE@ |
386 | 388 |
VERSION = @VERSION@ |
... | ... |
@@ -433,6 +436,7 @@ ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@ |
433 | 433 |
mandir = @mandir@ |
434 | 434 |
mkdir_p = @mkdir_p@ |
435 | 435 |
oldincludedir = @oldincludedir@ |
436 |
+pcreconfig = @pcreconfig@ |
|
436 | 437 |
pdfdir = @pdfdir@ |
437 | 438 |
prefix = @prefix@ |
438 | 439 |
program_transform_name = @program_transform_name@ |
... | ... |
@@ -443,6 +447,7 @@ srcdir = @srcdir@ |
443 | 443 |
subdirs = @subdirs@ |
444 | 444 |
sys_symbol_underscore = @sys_symbol_underscore@ |
445 | 445 |
sysconfdir = @sysconfdir@ |
446 |
+systemdsystemunitdir = @systemdsystemunitdir@ |
|
446 | 447 |
target = @target@ |
447 | 448 |
target_alias = @target_alias@ |
448 | 449 |
target_cpu = @target_cpu@ |
... | ... |
@@ -32,6 +32,7 @@ |
32 | 32 |
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, |
33 | 33 |
# MA 02110-1301, USA. |
34 | 34 |
|
35 |
+ |
|
35 | 36 |
VPATH = @srcdir@ |
36 | 37 |
am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' |
37 | 38 |
am__make_running_with_option = \ |
... | ... |
@@ -100,7 +101,8 @@ target_triplet = @target@ |
100 | 100 |
@BUILD_CLAMD_TRUE@sbin_PROGRAMS = clamd$(EXEEXT) |
101 | 101 |
subdir = clamd |
102 | 102 |
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ |
103 |
- $(top_srcdir)/config/depcomp |
|
103 |
+ $(srcdir)/clamav-daemon.service.in \ |
|
104 |
+ $(srcdir)/clamav-daemon.socket.in $(top_srcdir)/config/depcomp |
|
104 | 105 |
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 |
105 | 106 |
am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ |
106 | 107 |
$(top_srcdir)/m4/argz.m4 \ |
... | ... |
@@ -129,6 +131,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ |
129 | 129 |
$(top_srcdir)/m4/reorganization/libs/libz.m4 \ |
130 | 130 |
$(top_srcdir)/m4/reorganization/libs/bzip.m4 \ |
131 | 131 |
$(top_srcdir)/m4/reorganization/libs/unrar.m4 \ |
132 |
+ $(top_srcdir)/m4/reorganization/libs/systemd.m4 \ |
|
132 | 133 |
$(top_srcdir)/m4/reorganization/code_checks/ipv6.m4 \ |
133 | 134 |
$(top_srcdir)/m4/reorganization/code_checks/dns.m4 \ |
134 | 135 |
$(top_srcdir)/m4/reorganization/code_checks/fanotify.m4 \ |
... | ... |
@@ -174,9 +177,10 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ |
174 | 174 |
$(ACLOCAL_M4) |
175 | 175 |
mkinstalldirs = $(install_sh) -d |
176 | 176 |
CONFIG_HEADER = $(top_builddir)/clamav-config.h |
177 |
-CONFIG_CLEAN_FILES = |
|
177 |
+CONFIG_CLEAN_FILES = clamav-daemon.service clamav-daemon.socket |
|
178 | 178 |
CONFIG_CLEAN_VPATH_FILES = |
179 |
-am__installdirs = "$(DESTDIR)$(sbindir)" |
|
179 |
+am__installdirs = "$(DESTDIR)$(sbindir)" \ |
|
180 |
+ "$(DESTDIR)$(systemdsystemunitdir)" |
|
180 | 181 |
PROGRAMS = $(sbin_PROGRAMS) |
181 | 182 |
am__clamd_SOURCES_DIST = $(top_srcdir)/shared/output.c \ |
182 | 183 |
$(top_srcdir)/shared/output.h $(top_srcdir)/shared/optparser.c \ |
... | ... |
@@ -245,6 +249,34 @@ am__can_run_installinfo = \ |
245 | 245 |
n|no|NO) false;; \ |
246 | 246 |
*) (install-info --version) >/dev/null 2>&1;; \ |
247 | 247 |
esac |
248 |
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; |
|
249 |
+am__vpath_adj = case $$p in \ |
|
250 |
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ |
|
251 |
+ *) f=$$p;; \ |
|
252 |
+ esac; |
|
253 |
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; |
|
254 |
+am__install_max = 40 |
|
255 |
+am__nobase_strip_setup = \ |
|
256 |
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` |
|
257 |
+am__nobase_strip = \ |
|
258 |
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" |
|
259 |
+am__nobase_list = $(am__nobase_strip_setup); \ |
|
260 |
+ for p in $$list; do echo "$$p $$p"; done | \ |
|
261 |
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ |
|
262 |
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ |
|
263 |
+ if (++n[$$2] == $(am__install_max)) \ |
|
264 |
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ |
|
265 |
+ END { for (dir in files) print dir, files[dir] }' |
|
266 |
+am__base_list = \ |
|
267 |
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ |
|
268 |
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' |
|
269 |
+am__uninstall_files_from_dir = { \ |
|
270 |
+ test -z "$$files" \ |
|
271 |
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ |
|
272 |
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ |
|
273 |
+ $(am__cd) "$$dir" && rm -f $$files; }; \ |
|
274 |
+ } |
|
275 |
+DATA = $(systemdsystemunit_DATA) |
|
248 | 276 |
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) |
249 | 277 |
# Read a list of newline-separated strings from the standard input, |
250 | 278 |
# and print each of them once, without duplicates. Input order is |
... | ... |
@@ -399,6 +431,8 @@ SSL_CPPFLAGS = @SSL_CPPFLAGS@ |
399 | 399 |
SSL_LDFLAGS = @SSL_LDFLAGS@ |
400 | 400 |
SSL_LIBS = @SSL_LIBS@ |
401 | 401 |
STRIP = @STRIP@ |
402 |
+SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@ |
|
403 |
+SYSTEMD_LIBS = @SYSTEMD_LIBS@ |
|
402 | 404 |
THREAD_LIBS = @THREAD_LIBS@ |
403 | 405 |
TH_SAFE = @TH_SAFE@ |
404 | 406 |
VERSION = @VERSION@ |
... | ... |
@@ -451,6 +485,7 @@ ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@ |
451 | 451 |
mandir = @mandir@ |
452 | 452 |
mkdir_p = @mkdir_p@ |
453 | 453 |
oldincludedir = @oldincludedir@ |
454 |
+pcreconfig = @pcreconfig@ |
|
454 | 455 |
pdfdir = @pdfdir@ |
455 | 456 |
prefix = @prefix@ |
456 | 457 |
program_transform_name = @program_transform_name@ |
... | ... |
@@ -461,6 +496,7 @@ srcdir = @srcdir@ |
461 | 461 |
subdirs = @subdirs@ |
462 | 462 |
sys_symbol_underscore = @sys_symbol_underscore@ |
463 | 463 |
sysconfdir = @sysconfdir@ |
464 |
+systemdsystemunitdir = @systemdsystemunitdir@ |
|
464 | 465 |
target = @target@ |
465 | 466 |
target_alias = @target_alias@ |
466 | 467 |
target_cpu = @target_cpu@ |
... | ... |
@@ -504,6 +540,7 @@ top_srcdir = @top_srcdir@ |
504 | 504 |
@BUILD_CLAMD_TRUE@ onaccess_scth.h |
505 | 505 |
|
506 | 506 |
@BUILD_CLAMD_TRUE@AM_CFLAGS = @WERR_CFLAGS@ |
507 |
+@BUILD_CLAMD_TRUE@@INSTALL_SYSTEMD_UNITS_TRUE@systemdsystemunit_DATA = clamav-daemon.socket clamav-daemon.service |
|
507 | 508 |
AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav @SSL_CPPFLAGS@ @JSON_CPPFLAGS@ @PCRE_CPPFLAGS@ |
508 | 509 |
|
509 | 510 |
# it does support --help and --version but with the default config file |
... | ... |
@@ -544,6 +581,10 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) |
544 | 544 |
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) |
545 | 545 |
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh |
546 | 546 |
$(am__aclocal_m4_deps): |
547 |
+clamav-daemon.service: $(top_builddir)/config.status $(srcdir)/clamav-daemon.service.in |
|
548 |
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ |
|
549 |
+clamav-daemon.socket: $(top_builddir)/config.status $(srcdir)/clamav-daemon.socket.in |
|
550 |
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ |
|
547 | 551 |
install-sbinPROGRAMS: $(sbin_PROGRAMS) |
548 | 552 |
@$(NORMAL_INSTALL) |
549 | 553 |
@list='$(sbin_PROGRAMS)'; test -n "$(sbindir)" || list=; \ |
... | ... |
@@ -719,6 +760,27 @@ mostlyclean-libtool: |
719 | 719 |
|
720 | 720 |
clean-libtool: |
721 | 721 |
-rm -rf .libs _libs |
722 |
+install-systemdsystemunitDATA: $(systemdsystemunit_DATA) |
|
723 |
+ @$(NORMAL_INSTALL) |
|
724 |
+ @list='$(systemdsystemunit_DATA)'; test -n "$(systemdsystemunitdir)" || list=; \ |
|
725 |
+ if test -n "$$list"; then \ |
|
726 |
+ echo " $(MKDIR_P) '$(DESTDIR)$(systemdsystemunitdir)'"; \ |
|
727 |
+ $(MKDIR_P) "$(DESTDIR)$(systemdsystemunitdir)" || exit 1; \ |
|
728 |
+ fi; \ |
|
729 |
+ for p in $$list; do \ |
|
730 |
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ |
|
731 |
+ echo "$$d$$p"; \ |
|
732 |
+ done | $(am__base_list) | \ |
|
733 |
+ while read files; do \ |
|
734 |
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(systemdsystemunitdir)'"; \ |
|
735 |
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(systemdsystemunitdir)" || exit $$?; \ |
|
736 |
+ done |
|
737 |
+ |
|
738 |
+uninstall-systemdsystemunitDATA: |
|
739 |
+ @$(NORMAL_UNINSTALL) |
|
740 |
+ @list='$(systemdsystemunit_DATA)'; test -n "$(systemdsystemunitdir)" || list=; \ |
|
741 |
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ |
|
742 |
+ dir='$(DESTDIR)$(systemdsystemunitdir)'; $(am__uninstall_files_from_dir) |
|
722 | 743 |
|
723 | 744 |
ID: $(am__tagged_files) |
724 | 745 |
$(am__define_uniq_tagged_files); mkid -fID $$unique |
... | ... |
@@ -804,9 +866,9 @@ distdir: $(DISTFILES) |
804 | 804 |
done |
805 | 805 |
check-am: all-am |
806 | 806 |
check: check-am |
807 |
-all-am: Makefile $(PROGRAMS) |
|
807 |
+all-am: Makefile $(PROGRAMS) $(DATA) |
|
808 | 808 |
installdirs: |
809 |
- for dir in "$(DESTDIR)$(sbindir)"; do \ |
|
809 |
+ for dir in "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(systemdsystemunitdir)"; do \ |
|
810 | 810 |
test -z "$$dir" || $(MKDIR_P) "$$dir"; \ |
811 | 811 |
done |
812 | 812 |
install: install-am |
... | ... |
@@ -863,7 +925,7 @@ info: info-am |
863 | 863 |
|
864 | 864 |
info-am: |
865 | 865 |
|
866 |
-install-data-am: |
|
866 |
+install-data-am: install-systemdsystemunitDATA |
|
867 | 867 |
|
868 | 868 |
install-dvi: install-dvi-am |
869 | 869 |
|
... | ... |
@@ -909,7 +971,7 @@ ps: ps-am |
909 | 909 |
|
910 | 910 |
ps-am: |
911 | 911 |
|
912 |
-uninstall-am: uninstall-sbinPROGRAMS |
|
912 |
+uninstall-am: uninstall-sbinPROGRAMS uninstall-systemdsystemunitDATA |
|
913 | 913 |
|
914 | 914 |
.MAKE: install-am install-strip |
915 | 915 |
|
... | ... |
@@ -922,11 +984,12 @@ uninstall-am: uninstall-sbinPROGRAMS |
922 | 922 |
install-exec-am install-html install-html-am install-info \ |
923 | 923 |
install-info-am install-man install-pdf install-pdf-am \ |
924 | 924 |
install-ps install-ps-am install-sbinPROGRAMS install-strip \ |
925 |
- installcheck installcheck-am installcheck-sbinPROGRAMS \ |
|
926 |
- installdirs maintainer-clean maintainer-clean-generic \ |
|
927 |
- mostlyclean mostlyclean-compile mostlyclean-generic \ |
|
928 |
- mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ |
|
929 |
- uninstall-am uninstall-sbinPROGRAMS |
|
925 |
+ install-systemdsystemunitDATA installcheck installcheck-am \ |
|
926 |
+ installcheck-sbinPROGRAMS installdirs maintainer-clean \ |
|
927 |
+ maintainer-clean-generic mostlyclean mostlyclean-compile \ |
|
928 |
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ |
|
929 |
+ tags tags-am uninstall uninstall-am uninstall-sbinPROGRAMS \ |
|
930 |
+ uninstall-systemdsystemunitDATA |
|
930 | 931 |
|
931 | 932 |
|
932 | 933 |
# Tell versions [3.59,3.63) of GNU make to not export all variables. |
... | ... |
@@ -129,6 +129,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ |
129 | 129 |
$(top_srcdir)/m4/reorganization/libs/libz.m4 \ |
130 | 130 |
$(top_srcdir)/m4/reorganization/libs/bzip.m4 \ |
131 | 131 |
$(top_srcdir)/m4/reorganization/libs/unrar.m4 \ |
132 |
+ $(top_srcdir)/m4/reorganization/libs/systemd.m4 \ |
|
132 | 133 |
$(top_srcdir)/m4/reorganization/code_checks/ipv6.m4 \ |
133 | 134 |
$(top_srcdir)/m4/reorganization/code_checks/dns.m4 \ |
134 | 135 |
$(top_srcdir)/m4/reorganization/code_checks/fanotify.m4 \ |
... | ... |
@@ -392,6 +393,8 @@ SSL_CPPFLAGS = @SSL_CPPFLAGS@ |
392 | 392 |
SSL_LDFLAGS = @SSL_LDFLAGS@ |
393 | 393 |
SSL_LIBS = @SSL_LIBS@ |
394 | 394 |
STRIP = @STRIP@ |
395 |
+SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@ |
|
396 |
+SYSTEMD_LIBS = @SYSTEMD_LIBS@ |
|
395 | 397 |
THREAD_LIBS = @THREAD_LIBS@ |
396 | 398 |
TH_SAFE = @TH_SAFE@ |
397 | 399 |
VERSION = @VERSION@ |
... | ... |
@@ -444,6 +447,7 @@ ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@ |
444 | 444 |
mandir = @mandir@ |
445 | 445 |
mkdir_p = @mkdir_p@ |
446 | 446 |
oldincludedir = @oldincludedir@ |
447 |
+pcreconfig = @pcreconfig@ |
|
447 | 448 |
pdfdir = @pdfdir@ |
448 | 449 |
prefix = @prefix@ |
449 | 450 |
program_transform_name = @program_transform_name@ |
... | ... |
@@ -454,6 +458,7 @@ srcdir = @srcdir@ |
454 | 454 |
subdirs = @subdirs@ |
455 | 455 |
sys_symbol_underscore = @sys_symbol_underscore@ |
456 | 456 |
sysconfdir = @sysconfdir@ |
457 |
+systemdsystemunitdir = @systemdsystemunitdir@ |
|
457 | 458 |
target = @target@ |
458 | 459 |
target_alias = @target_alias@ |
459 | 460 |
target_cpu = @target_cpu@ |
... | ... |
@@ -111,6 +111,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ |
111 | 111 |
$(top_srcdir)/m4/reorganization/libs/libz.m4 \ |
112 | 112 |
$(top_srcdir)/m4/reorganization/libs/bzip.m4 \ |
113 | 113 |
$(top_srcdir)/m4/reorganization/libs/unrar.m4 \ |
114 |
+ $(top_srcdir)/m4/reorganization/libs/systemd.m4 \ |
|
114 | 115 |
$(top_srcdir)/m4/reorganization/code_checks/ipv6.m4 \ |
115 | 116 |
$(top_srcdir)/m4/reorganization/code_checks/dns.m4 \ |
116 | 117 |
$(top_srcdir)/m4/reorganization/code_checks/fanotify.m4 \ |
... | ... |
@@ -398,6 +399,8 @@ SSL_CPPFLAGS = @SSL_CPPFLAGS@ |
398 | 398 |
SSL_LDFLAGS = @SSL_LDFLAGS@ |
399 | 399 |
SSL_LIBS = @SSL_LIBS@ |
400 | 400 |
STRIP = @STRIP@ |
401 |
+SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@ |
|
402 |
+SYSTEMD_LIBS = @SYSTEMD_LIBS@ |
|
401 | 403 |
THREAD_LIBS = @THREAD_LIBS@ |
402 | 404 |
TH_SAFE = @TH_SAFE@ |
403 | 405 |
VERSION = @VERSION@ |
... | ... |
@@ -450,6 +453,7 @@ ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@ |
450 | 450 |
mandir = @mandir@ |
451 | 451 |
mkdir_p = @mkdir_p@ |
452 | 452 |
oldincludedir = @oldincludedir@ |
453 |
+pcreconfig = @pcreconfig@ |
|
453 | 454 |
pdfdir = @pdfdir@ |
454 | 455 |
prefix = @prefix@ |
455 | 456 |
program_transform_name = @program_transform_name@ |
... | ... |
@@ -460,6 +464,7 @@ srcdir = @srcdir@ |
460 | 460 |
subdirs = @subdirs@ |
461 | 461 |
sys_symbol_underscore = @sys_symbol_underscore@ |
462 | 462 |
sysconfdir = @sysconfdir@ |
463 |
+systemdsystemunitdir = @systemdsystemunitdir@ |
|
463 | 464 |
target = @target@ |
464 | 465 |
target_alias = @target_alias@ |
465 | 466 |
target_cpu = @target_cpu@ |
... | ... |
@@ -130,6 +130,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ |
130 | 130 |
$(top_srcdir)/m4/reorganization/libs/libz.m4 \ |
131 | 131 |
$(top_srcdir)/m4/reorganization/libs/bzip.m4 \ |
132 | 132 |
$(top_srcdir)/m4/reorganization/libs/unrar.m4 \ |
133 |
+ $(top_srcdir)/m4/reorganization/libs/systemd.m4 \ |
|
133 | 134 |
$(top_srcdir)/m4/reorganization/code_checks/ipv6.m4 \ |
134 | 135 |
$(top_srcdir)/m4/reorganization/code_checks/dns.m4 \ |
135 | 136 |
$(top_srcdir)/m4/reorganization/code_checks/fanotify.m4 \ |
... | ... |
@@ -383,6 +384,8 @@ SSL_CPPFLAGS = @SSL_CPPFLAGS@ |
383 | 383 |
SSL_LDFLAGS = @SSL_LDFLAGS@ |
384 | 384 |
SSL_LIBS = @SSL_LIBS@ |
385 | 385 |
STRIP = @STRIP@ |
386 |
+SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@ |
|
387 |
+SYSTEMD_LIBS = @SYSTEMD_LIBS@ |
|
386 | 388 |
THREAD_LIBS = @THREAD_LIBS@ |
387 | 389 |
TH_SAFE = @TH_SAFE@ |
388 | 390 |
VERSION = @VERSION@ |
... | ... |
@@ -435,6 +438,7 @@ ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@ |
435 | 435 |
mandir = @mandir@ |
436 | 436 |
mkdir_p = @mkdir_p@ |
437 | 437 |
oldincludedir = @oldincludedir@ |
438 |
+pcreconfig = @pcreconfig@ |
|
438 | 439 |
pdfdir = @pdfdir@ |
439 | 440 |
prefix = @prefix@ |
440 | 441 |
program_transform_name = @program_transform_name@ |
... | ... |
@@ -445,6 +449,7 @@ srcdir = @srcdir@ |
445 | 445 |
subdirs = @subdirs@ |
446 | 446 |
sys_symbol_underscore = @sys_symbol_underscore@ |
447 | 447 |
sysconfdir = @sysconfdir@ |
448 |
+systemdsystemunitdir = @systemdsystemunitdir@ |
|
448 | 449 |
target = @target@ |
449 | 450 |
target_alias = @target_alias@ |
450 | 451 |
target_cpu = @target_cpu@ |
... | ... |
@@ -129,6 +129,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ |
129 | 129 |
$(top_srcdir)/m4/reorganization/libs/libz.m4 \ |
130 | 130 |
$(top_srcdir)/m4/reorganization/libs/bzip.m4 \ |
131 | 131 |
$(top_srcdir)/m4/reorganization/libs/unrar.m4 \ |
132 |
+ $(top_srcdir)/m4/reorganization/libs/systemd.m4 \ |
|
132 | 133 |
$(top_srcdir)/m4/reorganization/code_checks/ipv6.m4 \ |
133 | 134 |
$(top_srcdir)/m4/reorganization/code_checks/dns.m4 \ |
134 | 135 |
$(top_srcdir)/m4/reorganization/code_checks/fanotify.m4 \ |
... | ... |
@@ -381,6 +382,8 @@ SSL_CPPFLAGS = @SSL_CPPFLAGS@ |
381 | 381 |
SSL_LDFLAGS = @SSL_LDFLAGS@ |
382 | 382 |
SSL_LIBS = @SSL_LIBS@ |
383 | 383 |
STRIP = @STRIP@ |
384 |
+SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@ |
|
385 |
+SYSTEMD_LIBS = @SYSTEMD_LIBS@ |
|
384 | 386 |
THREAD_LIBS = @THREAD_LIBS@ |
385 | 387 |
TH_SAFE = @TH_SAFE@ |
386 | 388 |
VERSION = @VERSION@ |
... | ... |
@@ -433,6 +436,7 @@ ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@ |
433 | 433 |
mandir = @mandir@ |
434 | 434 |
mkdir_p = @mkdir_p@ |
435 | 435 |
oldincludedir = @oldincludedir@ |
436 |
+pcreconfig = @pcreconfig@ |
|
436 | 437 |
pdfdir = @pdfdir@ |
437 | 438 |
prefix = @prefix@ |
438 | 439 |
program_transform_name = @program_transform_name@ |
... | ... |
@@ -443,6 +447,7 @@ srcdir = @srcdir@ |
443 | 443 |
subdirs = @subdirs@ |
444 | 444 |
sys_symbol_underscore = @sys_symbol_underscore@ |
445 | 445 |
sysconfdir = @sysconfdir@ |
446 |
+systemdsystemunitdir = @systemdsystemunitdir@ |
|
446 | 447 |
target = @target@ |
447 | 448 |
target_alias = @target_alias@ |
448 | 449 |
target_cpu = @target_cpu@ |
... | ... |
@@ -463,7 +468,7 @@ clamsubmit_SOURCES = \ |
463 | 463 |
clamsubmit.c |
464 | 464 |
|
465 | 465 |
AM_CFLAGS = @WERR_CFLAGS@ @CLAMSUBMIT_CFLAGS@ |
466 |
-AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav @SSL_CPPFLAGS@ @JSON_CPPFLAGS@ |
|
466 |
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav @SSL_CPPFLAGS@ @JSON_CPPFLAGS@ @PCRE_CPPFLAGS@ |
|
467 | 467 |
AM_INSTALLCHECK_STD_OPTIONS_EXEMPT = clamsubmit$(EXEEXT) |
468 | 468 |
CLEANFILES = *.gcda *.gcno |
469 | 469 |
all: all-am |
... | ... |
@@ -127,6 +127,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ |
127 | 127 |
$(top_srcdir)/m4/reorganization/libs/libz.m4 \ |
128 | 128 |
$(top_srcdir)/m4/reorganization/libs/bzip.m4 \ |
129 | 129 |
$(top_srcdir)/m4/reorganization/libs/unrar.m4 \ |
130 |
+ $(top_srcdir)/m4/reorganization/libs/systemd.m4 \ |
|
130 | 131 |
$(top_srcdir)/m4/reorganization/code_checks/ipv6.m4 \ |
131 | 132 |
$(top_srcdir)/m4/reorganization/code_checks/dns.m4 \ |
132 | 133 |
$(top_srcdir)/m4/reorganization/code_checks/fanotify.m4 \ |
... | ... |
@@ -329,6 +330,8 @@ SSL_CPPFLAGS = @SSL_CPPFLAGS@ |
329 | 329 |
SSL_LDFLAGS = @SSL_LDFLAGS@ |
330 | 330 |
SSL_LIBS = @SSL_LIBS@ |
331 | 331 |
STRIP = @STRIP@ |
332 |
+SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@ |
|
333 |
+SYSTEMD_LIBS = @SYSTEMD_LIBS@ |
|
332 | 334 |
THREAD_LIBS = @THREAD_LIBS@ |
333 | 335 |
TH_SAFE = @TH_SAFE@ |
334 | 336 |
VERSION = @VERSION@ |
... | ... |
@@ -381,6 +384,7 @@ ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@ |
381 | 381 |
mandir = @mandir@ |
382 | 382 |
mkdir_p = @mkdir_p@ |
383 | 383 |
oldincludedir = @oldincludedir@ |
384 |
+pcreconfig = @pcreconfig@ |
|
384 | 385 |
pdfdir = @pdfdir@ |
385 | 386 |
prefix = @prefix@ |
386 | 387 |
program_transform_name = @program_transform_name@ |
... | ... |
@@ -391,6 +395,7 @@ srcdir = @srcdir@ |
391 | 391 |
subdirs = @subdirs@ |
392 | 392 |
sys_symbol_underscore = @sys_symbol_underscore@ |
393 | 393 |
sysconfdir = @sysconfdir@ |
394 |
+systemdsystemunitdir = @systemdsystemunitdir@ |
|
394 | 395 |
target = @target@ |
395 | 396 |
target_alias = @target_alias@ |
396 | 397 |
target_cpu = @target_cpu@ |
... | ... |
@@ -127,6 +127,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ |
127 | 127 |
$(top_srcdir)/m4/reorganization/libs/libz.m4 \ |
128 | 128 |
$(top_srcdir)/m4/reorganization/libs/bzip.m4 \ |
129 | 129 |
$(top_srcdir)/m4/reorganization/libs/unrar.m4 \ |
130 |
+ $(top_srcdir)/m4/reorganization/libs/systemd.m4 \ |
|
130 | 131 |
$(top_srcdir)/m4/reorganization/code_checks/ipv6.m4 \ |
131 | 132 |
$(top_srcdir)/m4/reorganization/code_checks/dns.m4 \ |
132 | 133 |
$(top_srcdir)/m4/reorganization/code_checks/fanotify.m4 \ |
... | ... |
@@ -363,6 +364,8 @@ SSL_CPPFLAGS = @SSL_CPPFLAGS@ |
363 | 363 |
SSL_LDFLAGS = @SSL_LDFLAGS@ |
364 | 364 |
SSL_LIBS = @SSL_LIBS@ |
365 | 365 |
STRIP = @STRIP@ |
366 |
+SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@ |
|
367 |
+SYSTEMD_LIBS = @SYSTEMD_LIBS@ |
|
366 | 368 |
THREAD_LIBS = @THREAD_LIBS@ |
367 | 369 |
TH_SAFE = @TH_SAFE@ |
368 | 370 |
VERSION = @VERSION@ |
... | ... |
@@ -415,6 +418,7 @@ ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@ |
415 | 415 |
mandir = @mandir@ |
416 | 416 |
mkdir_p = @mkdir_p@ |
417 | 417 |
oldincludedir = @oldincludedir@ |
418 |
+pcreconfig = @pcreconfig@ |
|
418 | 419 |
pdfdir = @pdfdir@ |
419 | 420 |
prefix = @prefix@ |
420 | 421 |
program_transform_name = @program_transform_name@ |
... | ... |
@@ -425,6 +429,7 @@ srcdir = @srcdir@ |
425 | 425 |
subdirs = @subdirs@ |
426 | 426 |
sys_symbol_underscore = @sys_symbol_underscore@ |
427 | 427 |
sysconfdir = @sysconfdir@ |
428 |
+systemdsystemunitdir = @systemdsystemunitdir@ |
|
428 | 429 |
target = @target@ |
429 | 430 |
target_alias = @target_alias@ |
430 | 431 |
target_cpu = @target_cpu@ |
... | ... |
@@ -128,6 +128,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ |
128 | 128 |
$(top_srcdir)/m4/reorganization/libs/libz.m4 \ |
129 | 129 |
$(top_srcdir)/m4/reorganization/libs/bzip.m4 \ |
130 | 130 |
$(top_srcdir)/m4/reorganization/libs/unrar.m4 \ |
131 |
+ $(top_srcdir)/m4/reorganization/libs/systemd.m4 \ |
|
131 | 132 |
$(top_srcdir)/m4/reorganization/code_checks/ipv6.m4 \ |
132 | 133 |
$(top_srcdir)/m4/reorganization/code_checks/dns.m4 \ |
133 | 134 |
$(top_srcdir)/m4/reorganization/code_checks/fanotify.m4 \ |
... | ... |
@@ -359,6 +360,8 @@ SSL_CPPFLAGS = @SSL_CPPFLAGS@ |
359 | 359 |
SSL_LDFLAGS = @SSL_LDFLAGS@ |
360 | 360 |
SSL_LIBS = @SSL_LIBS@ |
361 | 361 |
STRIP = @STRIP@ |
362 |
+SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@ |
|
363 |
+SYSTEMD_LIBS = @SYSTEMD_LIBS@ |
|
362 | 364 |
THREAD_LIBS = @THREAD_LIBS@ |
363 | 365 |
TH_SAFE = @TH_SAFE@ |
364 | 366 |
VERSION = @VERSION@ |
... | ... |
@@ -411,6 +414,7 @@ ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@ |
411 | 411 |
mandir = @mandir@ |
412 | 412 |
mkdir_p = @mkdir_p@ |
413 | 413 |
oldincludedir = @oldincludedir@ |
414 |
+pcreconfig = @pcreconfig@ |
|
414 | 415 |
pdfdir = @pdfdir@ |
415 | 416 |
prefix = @prefix@ |
416 | 417 |
program_transform_name = @program_transform_name@ |
... | ... |
@@ -421,6 +425,7 @@ srcdir = @srcdir@ |
421 | 421 |
subdirs = @subdirs@ |
422 | 422 |
sys_symbol_underscore = @sys_symbol_underscore@ |
423 | 423 |
sysconfdir = @sysconfdir@ |
424 |
+systemdsystemunitdir = @systemdsystemunitdir@ |
|
424 | 425 |
target = @target@ |
425 | 426 |
target_alias = @target_alias@ |
426 | 427 |
target_cpu = @target_cpu@ |
... | ... |
@@ -33,6 +33,7 @@ |
33 | 33 |
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, |
34 | 34 |
# MA 02110-1301, USA. |
35 | 35 |
|
36 |
+ |
|
36 | 37 |
VPATH = @srcdir@ |
37 | 38 |
am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' |
38 | 39 |
am__make_running_with_option = \ |
... | ... |
@@ -101,6 +102,7 @@ target_triplet = @target@ |
101 | 101 |
bin_PROGRAMS = freshclam$(EXEEXT) |
102 | 102 |
subdir = freshclam |
103 | 103 |
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ |
104 |
+ $(srcdir)/clamav-freshclam.service.in \ |
|
104 | 105 |
$(top_srcdir)/config/depcomp |
105 | 106 |
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 |
106 | 107 |
am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ |
... | ... |
@@ -130,6 +132,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ |
130 | 130 |
$(top_srcdir)/m4/reorganization/libs/libz.m4 \ |
131 | 131 |
$(top_srcdir)/m4/reorganization/libs/bzip.m4 \ |
132 | 132 |
$(top_srcdir)/m4/reorganization/libs/unrar.m4 \ |
133 |
+ $(top_srcdir)/m4/reorganization/libs/systemd.m4 \ |
|
133 | 134 |
$(top_srcdir)/m4/reorganization/code_checks/ipv6.m4 \ |
134 | 135 |
$(top_srcdir)/m4/reorganization/code_checks/dns.m4 \ |
135 | 136 |
$(top_srcdir)/m4/reorganization/code_checks/fanotify.m4 \ |
... | ... |
@@ -175,9 +178,10 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ |
175 | 175 |
$(ACLOCAL_M4) |
176 | 176 |
mkinstalldirs = $(install_sh) -d |
177 | 177 |
CONFIG_HEADER = $(top_builddir)/clamav-config.h |
178 |
-CONFIG_CLEAN_FILES = |
|
178 |
+CONFIG_CLEAN_FILES = clamav-freshclam.service |
|
179 | 179 |
CONFIG_CLEAN_VPATH_FILES = |
180 |
-am__installdirs = "$(DESTDIR)$(bindir)" |
|
180 |
+am__installdirs = "$(DESTDIR)$(bindir)" \ |
|
181 |
+ "$(DESTDIR)$(systemdsystemunitdir)" |
|
181 | 182 |
PROGRAMS = $(bin_PROGRAMS) |
182 | 183 |
am_freshclam_OBJECTS = output.$(OBJEXT) optparser.$(OBJEXT) \ |
183 | 184 |
getopt.$(OBJEXT) misc.$(OBJEXT) cdiff.$(OBJEXT) tar.$(OBJEXT) \ |
... | ... |
@@ -231,6 +235,34 @@ am__can_run_installinfo = \ |
231 | 231 |
n|no|NO) false;; \ |
232 | 232 |
*) (install-info --version) >/dev/null 2>&1;; \ |
233 | 233 |
esac |
234 |
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; |
|
235 |
+am__vpath_adj = case $$p in \ |
|
236 |
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ |
|
237 |
+ *) f=$$p;; \ |
|
238 |
+ esac; |
|
239 |
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; |
|
240 |
+am__install_max = 40 |
|
241 |
+am__nobase_strip_setup = \ |
|
242 |
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` |
|
243 |
+am__nobase_strip = \ |
|
244 |
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" |
|
245 |
+am__nobase_list = $(am__nobase_strip_setup); \ |
|
246 |
+ for p in $$list; do echo "$$p $$p"; done | \ |
|
247 |
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ |
|
248 |
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ |
|
249 |
+ if (++n[$$2] == $(am__install_max)) \ |
|
250 |
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ |
|
251 |
+ END { for (dir in files) print dir, files[dir] }' |
|
252 |
+am__base_list = \ |
|
253 |
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ |
|
254 |
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' |
|
255 |
+am__uninstall_files_from_dir = { \ |
|
256 |
+ test -z "$$files" \ |
|
257 |
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ |
|
258 |
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ |
|
259 |
+ $(am__cd) "$$dir" && rm -f $$files; }; \ |
|
260 |
+ } |
|
261 |
+DATA = $(systemdsystemunit_DATA) |
|
234 | 262 |
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) |
235 | 263 |
# Read a list of newline-separated strings from the standard input, |
236 | 264 |
# and print each of them once, without duplicates. Input order is |
... | ... |
@@ -385,6 +417,8 @@ SSL_CPPFLAGS = @SSL_CPPFLAGS@ |
385 | 385 |
SSL_LDFLAGS = @SSL_LDFLAGS@ |
386 | 386 |
SSL_LIBS = @SSL_LIBS@ |
387 | 387 |
STRIP = @STRIP@ |
388 |
+SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@ |
|
389 |
+SYSTEMD_LIBS = @SYSTEMD_LIBS@ |
|
388 | 390 |
THREAD_LIBS = @THREAD_LIBS@ |
389 | 391 |
TH_SAFE = @TH_SAFE@ |
390 | 392 |
VERSION = @VERSION@ |
... | ... |
@@ -437,6 +471,7 @@ ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@ |
437 | 437 |
mandir = @mandir@ |
438 | 438 |
mkdir_p = @mkdir_p@ |
439 | 439 |
oldincludedir = @oldincludedir@ |
440 |
+pcreconfig = @pcreconfig@ |
|
440 | 441 |
pdfdir = @pdfdir@ |
441 | 442 |
prefix = @prefix@ |
442 | 443 |
program_transform_name = @program_transform_name@ |
... | ... |
@@ -447,6 +482,7 @@ srcdir = @srcdir@ |
447 | 447 |
subdirs = @subdirs@ |
448 | 448 |
sys_symbol_underscore = @sys_symbol_underscore@ |
449 | 449 |
sysconfdir = @sysconfdir@ |
450 |
+systemdsystemunitdir = @systemdsystemunitdir@ |
|
450 | 451 |
target = @target@ |
451 | 452 |
target_alias = @target_alias@ |
452 | 453 |
target_cpu = @target_cpu@ |
... | ... |
@@ -485,6 +521,7 @@ freshclam_SOURCES = \ |
485 | 485 |
mirman.c \ |
486 | 486 |
mirman.h |
487 | 487 |
|
488 |
+@INSTALL_SYSTEMD_UNITS_TRUE@systemdsystemunit_DATA = clamav-freshclam.service |
|
488 | 489 |
AM_CFLAGS = @WERR_CFLAGS@ |
489 | 490 |
AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav @SSL_CPPFLAGS@ @FRESHCLAM_CPPFLAGS@ @JSON_CPPFLAGS@ @PCRE_CPPFLAGS@ |
490 | 491 |
AM_INSTALLCHECK_STD_OPTIONS_EXEMPT = freshclam$(EXEEXT) |
... | ... |
@@ -523,6 +560,8 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) |
523 | 523 |
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) |
524 | 524 |
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh |
525 | 525 |
$(am__aclocal_m4_deps): |
526 |
+clamav-freshclam.service: $(top_builddir)/config.status $(srcdir)/clamav-freshclam.service.in |
|
527 |
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ |
|
526 | 528 |
install-binPROGRAMS: $(bin_PROGRAMS) |
527 | 529 |
@$(NORMAL_INSTALL) |
528 | 530 |
@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ |
... | ... |
@@ -738,6 +777,27 @@ mostlyclean-libtool: |
738 | 738 |
|
739 | 739 |
clean-libtool: |
740 | 740 |
-rm -rf .libs _libs |
741 |
+install-systemdsystemunitDATA: $(systemdsystemunit_DATA) |
|
742 |
+ @$(NORMAL_INSTALL) |
|
743 |
+ @list='$(systemdsystemunit_DATA)'; test -n "$(systemdsystemunitdir)" || list=; \ |
|
744 |
+ if test -n "$$list"; then \ |
|
745 |
+ echo " $(MKDIR_P) '$(DESTDIR)$(systemdsystemunitdir)'"; \ |
|
746 |
+ $(MKDIR_P) "$(DESTDIR)$(systemdsystemunitdir)" || exit 1; \ |
|
747 |
+ fi; \ |
|
748 |
+ for p in $$list; do \ |
|
749 |
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ |
|
750 |
+ echo "$$d$$p"; \ |
|
751 |
+ done | $(am__base_list) | \ |
|
752 |
+ while read files; do \ |
|
753 |
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(systemdsystemunitdir)'"; \ |
|
754 |
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(systemdsystemunitdir)" || exit $$?; \ |
|
755 |
+ done |
|
756 |
+ |
|
757 |
+uninstall-systemdsystemunitDATA: |
|
758 |
+ @$(NORMAL_UNINSTALL) |
|
759 |
+ @list='$(systemdsystemunit_DATA)'; test -n "$(systemdsystemunitdir)" || list=; \ |
|
760 |
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ |
|
761 |
+ dir='$(DESTDIR)$(systemdsystemunitdir)'; $(am__uninstall_files_from_dir) |
|
741 | 762 |
|
742 | 763 |
ID: $(am__tagged_files) |
743 | 764 |
$(am__define_uniq_tagged_files); mkid -fID $$unique |
... | ... |
@@ -823,9 +883,9 @@ distdir: $(DISTFILES) |
823 | 823 |
done |
824 | 824 |
check-am: all-am |
825 | 825 |
check: check-am |
826 |
-all-am: Makefile $(PROGRAMS) |
|
826 |
+all-am: Makefile $(PROGRAMS) $(DATA) |
|
827 | 827 |
installdirs: |
828 |
- for dir in "$(DESTDIR)$(bindir)"; do \ |
|
828 |
+ for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(systemdsystemunitdir)"; do \ |
|
829 | 829 |
test -z "$$dir" || $(MKDIR_P) "$$dir"; \ |
830 | 830 |
done |
831 | 831 |
install: install-am |
... | ... |
@@ -881,7 +941,7 @@ info: info-am |
881 | 881 |
|
882 | 882 |
info-am: |
883 | 883 |
|
884 |
-install-data-am: |
|
884 |
+install-data-am: install-systemdsystemunitDATA |
|
885 | 885 |
|
886 | 886 |
install-dvi: install-dvi-am |
887 | 887 |
|
... | ... |
@@ -927,7 +987,7 @@ ps: ps-am |
927 | 927 |
|
928 | 928 |
ps-am: |
929 | 929 |
|
930 |
-uninstall-am: uninstall-binPROGRAMS |
|
930 |
+uninstall-am: uninstall-binPROGRAMS uninstall-systemdsystemunitDATA |
|
931 | 931 |
|
932 | 932 |
.MAKE: install-am install-strip |
933 | 933 |
|
... | ... |
@@ -940,11 +1000,12 @@ uninstall-am: uninstall-binPROGRAMS |
940 | 940 |
install-exec install-exec-am install-html install-html-am \ |
941 | 941 |
install-info install-info-am install-man install-pdf \ |
942 | 942 |
install-pdf-am install-ps install-ps-am install-strip \ |
943 |
- installcheck installcheck-am installcheck-binPROGRAMS \ |
|
944 |
- installdirs maintainer-clean maintainer-clean-generic \ |
|
945 |
- mostlyclean mostlyclean-compile mostlyclean-generic \ |
|
946 |
- mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ |
|
947 |
- uninstall-am uninstall-binPROGRAMS |
|
943 |
+ install-systemdsystemunitDATA installcheck installcheck-am \ |
|
944 |
+ installcheck-binPROGRAMS installdirs maintainer-clean \ |
|
945 |
+ maintainer-clean-generic mostlyclean mostlyclean-compile \ |
|
946 |
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ |
|
947 |
+ tags tags-am uninstall uninstall-am uninstall-binPROGRAMS \ |
|
948 |
+ uninstall-systemdsystemunitDATA |
|
948 | 949 |
|
949 | 950 |
|
950 | 951 |
# Tell versions [3.59,3.63) of GNU make to not export all variables. |
... | ... |
@@ -156,6 +156,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ |
156 | 156 |
$(top_srcdir)/m4/reorganization/libs/libz.m4 \ |
157 | 157 |
$(top_srcdir)/m4/reorganization/libs/bzip.m4 \ |
158 | 158 |
$(top_srcdir)/m4/reorganization/libs/unrar.m4 \ |
159 |
+ $(top_srcdir)/m4/reorganization/libs/systemd.m4 \ |
|
159 | 160 |
$(top_srcdir)/m4/reorganization/code_checks/ipv6.m4 \ |
160 | 161 |
$(top_srcdir)/m4/reorganization/code_checks/dns.m4 \ |
161 | 162 |
$(top_srcdir)/m4/reorganization/code_checks/fanotify.m4 \ |
... | ... |
@@ -836,6 +837,8 @@ SSL_CPPFLAGS = @SSL_CPPFLAGS@ |
836 | 836 |
SSL_LDFLAGS = @SSL_LDFLAGS@ |
837 | 837 |
SSL_LIBS = @SSL_LIBS@ |
838 | 838 |
STRIP = @STRIP@ |
839 |
+SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@ |
|
840 |
+SYSTEMD_LIBS = @SYSTEMD_LIBS@ |
|
839 | 841 |
THREAD_LIBS = @THREAD_LIBS@ |
840 | 842 |
TH_SAFE = @TH_SAFE@ |
841 | 843 |
VERSION = @VERSION@ |
... | ... |
@@ -888,6 +891,7 @@ ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@ |
888 | 888 |
mandir = @mandir@ |
889 | 889 |
mkdir_p = @mkdir_p@ |
890 | 890 |
oldincludedir = @oldincludedir@ |
891 |
+pcreconfig = @pcreconfig@ |
|
891 | 892 |
pdfdir = @pdfdir@ |
892 | 893 |
prefix = @prefix@ |
893 | 894 |
program_transform_name = @program_transform_name@ |
... | ... |
@@ -898,6 +902,7 @@ srcdir = @srcdir@ |
898 | 898 |
subdirs = @subdirs@ |
899 | 899 |
sys_symbol_underscore = @sys_symbol_underscore@ |
900 | 900 |
sysconfdir = @sysconfdir@ |
901 |
+systemdsystemunitdir = @systemdsystemunitdir@ |
|
901 | 902 |
target = @target@ |
902 | 903 |
target_alias = @target_alias@ |
903 | 904 |
target_cpu = @target_cpu@ |
... | ... |
@@ -123,7 +123,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/check_gnu_make.m4 \ |
123 | 123 |
$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ |
124 | 124 |
$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ |
125 | 125 |
$(top_srcdir)/../../m4/reorganization/libs/openssl.m4 \ |
126 |
- $(top_srcdir)/configure.ac |
|
126 |
+ $(top_srcdir)/m4/llvm-flags.m4 $(top_srcdir)/configure.ac |
|
127 | 127 |
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ |
128 | 128 |
$(ACLOCAL_M4) |
129 | 129 |
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ |
... | ... |
@@ -1033,6 +1033,7 @@ infodir = @infodir@ |
1033 | 1033 |
install_sh = @install_sh@ |
1034 | 1034 |
libdir = @libdir@ |
1035 | 1035 |
libexecdir = @libexecdir@ |
1036 |
+llvmconfig = @llvmconfig@ |
|
1036 | 1037 |
localedir = @localedir@ |
1037 | 1038 |
localstatedir = @localstatedir@ |
1038 | 1039 |
mandir = @mandir@ |
... | ... |
@@ -648,11 +648,12 @@ THREAD_LIBS |
648 | 648 |
DEBUG_BUILD_FALSE |
649 | 649 |
DEBUG_BUILD_TRUE |
650 | 650 |
LLVM_VERSION |
651 |
+subdirs |
|
651 | 652 |
LLVMCONFIG_LIBFILES |
652 | 653 |
LLVMCONFIG_LIBS |
653 | 654 |
LLVMCONFIG_LDFLAGS |
654 | 655 |
LLVMCONFIG_CXXFLAGS |
655 |
-subdirs |
|
656 |
+llvmconfig |
|
656 | 657 |
GMAKE |
657 | 658 |
ifGNUmake |
658 | 659 |
CXXCPP |
... | ... |
@@ -796,9 +797,9 @@ enable_fast_install |
796 | 796 |
with_gnu_ld |
797 | 797 |
with_sysroot |
798 | 798 |
enable_libtool_lock |
799 |
+enable_llvm |
|
799 | 800 |
with_system_llvm |
800 | 801 |
with_llvm_linking |
801 |
-enable_llvm |
|
802 | 802 |
enable_optimized |
803 | 803 |
enable_all_jit_targets |
804 | 804 |
' |
... | ... |
@@ -1448,6 +1449,7 @@ Optional Features: |
1448 | 1448 |
--enable-fast-install[=PKGS] |
1449 | 1449 |
optimize for fast installation [default=yes] |
1450 | 1450 |
--disable-libtool-lock avoid locking (might break parallel builds) |
1451 |
+ --enable-llvm enable 'llvm' JIT/verifier support [default=auto] |
|
1451 | 1452 |
-enable-llvm Enable 'llvm' JIT/verifier support [default=auto] |
1452 | 1453 |
-enable-optimized Compile with optimizations enabled (default is YES) |
1453 | 1454 |
-enable-all-jit-targets Build all the targets that support JIT for testing |
... | ... |
@@ -1465,8 +1467,8 @@ Optional Packages: |
1465 | 1465 |
--with-sysroot=DIR Search for dependent libraries within DIR |
1466 | 1466 |
(or the compiler's sysroot if not specified). |
1467 | 1467 |
--with-system-llvm Use system llvm instead of built-in, uses full path |
1468 |
- to llvm-config (default= search /usr/local or /usr |
|
1469 |
- if not found in /usr/local) |
|
1468 |
+ to llvm-config or bin directory (default=search PATH |
|
1469 |
+ environment variable) |
|
1470 | 1470 |
--with-llvm-linking specifies method to linking llvm [static|dynamic], |
1471 | 1471 |
only valid with --with-system-llvm |
1472 | 1472 |
|
... | ... |
@@ -15790,70 +15792,152 @@ $as_echo "\"Not found\"" >&6; }; |
15790 | 15790 |
GMAKE="$llvm_cv_gnu_make_command" |
15791 | 15791 |
|
15792 | 15792 |
|
15793 |
-llvmconfig= |
|
15793 |
+ |
|
15794 |
+# Check whether --enable-llvm was given. |
|
15795 |
+if test "${enable_llvm+set}" = set; then : |
|
15796 |
+ enableval=$enable_llvm; enable_llvm=$enableval |
|
15797 |
+else |
|
15798 |
+ enable_llvm="auto" |
|
15799 |
+fi |
|
15800 |
+ |
|
15801 |
+ |
|
15794 | 15802 |
|
15795 | 15803 |
# Check whether --with-system-llvm was given. |
15796 | 15804 |
if test "${with_system_llvm+set}" = set; then : |
15797 | 15805 |
withval=$with_system_llvm; case "$withval" in |
15798 | 15806 |
yes) |
15799 |
- llvmconfig="/usr/local/bin/llvm-config" |
|
15800 |
- if test ! -x "$llvmconfig"; then |
|
15801 |
- llvmconfig="/usr/bin/llvm-config" |
|
15802 |
- if test ! -x "$llvmconfig"; then |
|
15803 |
- as_fn_error $? "llvm-config cannot be found within defaults" "$LINENO" 5 |
|
15804 |
- fi |
|
15807 |
+ # Extract the first word of "llvm-config", so it can be a program name with args. |
|
15808 |
+set dummy llvm-config; ac_word=$2 |
|
15809 |
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
|
15810 |
+$as_echo_n "checking for $ac_word... " >&6; } |
|
15811 |
+if ${ac_cv_path_llvmconfig+:} false; then : |
|
15812 |
+ $as_echo_n "(cached) " >&6 |
|
15813 |
+else |
|
15814 |
+ case $llvmconfig in |
|
15815 |
+ [\\/]* | ?:[\\/]*) |
|
15816 |
+ ac_cv_path_llvmconfig="$llvmconfig" # Let the user override the test with a path. |
|
15817 |
+ ;; |
|
15818 |
+ *) |
|
15819 |
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
|
15820 |
+for as_dir in $PATH |
|
15821 |
+do |
|
15822 |
+ IFS=$as_save_IFS |
|
15823 |
+ test -z "$as_dir" && as_dir=. |
|
15824 |
+ for ac_exec_ext in '' $ac_executable_extensions; do |
|
15825 |
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
|
15826 |
+ ac_cv_path_llvmconfig="$as_dir/$ac_word$ac_exec_ext" |
|
15827 |
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
|
15828 |
+ break 2 |
|
15829 |
+ fi |
|
15830 |
+done |
|
15831 |
+ done |
|
15832 |
+IFS=$as_save_IFS |
|
15833 |
+ |
|
15834 |
+ ;; |
|
15835 |
+esac |
|
15836 |
+fi |
|
15837 |
+llvmconfig=$ac_cv_path_llvmconfig |
|
15838 |
+if test -n "$llvmconfig"; then |
|
15839 |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $llvmconfig" >&5 |
|
15840 |
+$as_echo "$llvmconfig" >&6; } |
|
15841 |
+else |
|
15842 |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
|
15843 |
+$as_echo "no" >&6; } |
|
15844 |
+fi |
|
15845 |
+ |
|
15846 |
+ |
|
15847 |
+ if test "x$llvmconfig" = "x"; then |
|
15848 |
+ as_fn_error $? "llvm-config cannot be found within PATH" "$LINENO" 5 |
|
15805 | 15849 |
fi |
15806 | 15850 |
;; |
15807 | 15851 |
no) ;; |
15808 | 15852 |
*) |
15809 |
- llvmconfig="$withval" |
|
15810 |
- if test ! -x "$llvmconfig"; then |
|
15811 |
- as_fn_error $? "llvm-config does not exist at $llvmconfig" "$LINENO" 5 |
|
15853 |
+ if test -d "$withval"; then |
|
15854 |
+ # Extract the first word of "llvm-config", so it can be a program name with args. |
|
15855 |
+set dummy llvm-config; ac_word=$2 |
|
15856 |
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
|
15857 |
+$as_echo_n "checking for $ac_word... " >&6; } |
|
15858 |
+if ${ac_cv_path_llvmconfig+:} false; then : |
|
15859 |
+ $as_echo_n "(cached) " >&6 |
|
15860 |
+else |
|
15861 |
+ case $llvmconfig in |
|
15862 |
+ [\\/]* | ?:[\\/]*) |
|
15863 |
+ ac_cv_path_llvmconfig="$llvmconfig" # Let the user override the test with a path. |
|
15864 |
+ ;; |
|
15865 |
+ *) |
|
15866 |
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
|
15867 |
+for as_dir in $withval/bin |
|
15868 |
+do |
|
15869 |
+ IFS=$as_save_IFS |
|
15870 |
+ test -z "$as_dir" && as_dir=. |
|
15871 |
+ for ac_exec_ext in '' $ac_executable_extensions; do |
|
15872 |
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
|
15873 |
+ ac_cv_path_llvmconfig="$as_dir/$ac_word$ac_exec_ext" |
|
15874 |
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
|
15875 |
+ break 2 |
|
15876 |
+ fi |
|
15877 |
+done |
|
15878 |
+ done |
|
15879 |
+IFS=$as_save_IFS |
|
15880 |
+ |
|
15881 |
+ ;; |
|
15882 |
+esac |
|
15883 |
+fi |
|
15884 |
+llvmconfig=$ac_cv_path_llvmconfig |
|
15885 |
+if test -n "$llvmconfig"; then |
|
15886 |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $llvmconfig" >&5 |
|
15887 |
+$as_echo "$llvmconfig" >&6; } |
|
15888 |
+else |
|
15889 |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
|
15890 |
+$as_echo "no" >&6; } |
|
15891 |
+fi |
|
15892 |
+ |
|
15893 |
+ |
|
15894 |
+ else |
|
15895 |
+ llvmconfig=$withval |
|
15896 |
+ if test ! -x "$llvmconfig"; then |
|
15897 |
+ llvmconfig="" |
|
15898 |
+ fi |
|
15899 |
+ fi |
|
15900 |
+ |
|
15901 |
+ if test "x$llvmconfig" = "x"; then |
|
15902 |
+ as_fn_error $? "llvm-config does not exist at $withval" "$LINENO" 5 |
|
15812 | 15903 |
fi |
15813 | 15904 |
;; |
15814 | 15905 |
esac |
15815 | 15906 |
|
15816 |
- if test "x$llvmconfig" != "x"; then |
|
15817 |
- llvmver=`$llvmconfig --version` |
|
15818 |
- |
|
15819 |
- { $as_echo "$as_me:${as_lineno-$LINENO}: Using external LLVM" >&5 |
|
15820 |
-$as_echo "$as_me: Using external LLVM" >&6;} |
|
15821 |
- fi |
|
15822 |
- |
|
15823 | 15907 |
fi |
15824 | 15908 |
|
15825 | 15909 |
|
15826 |
-llvm_linking= |
|
15827 | 15910 |
|
15828 | 15911 |
# Check whether --with-llvm-linking was given. |
15829 | 15912 |
if test "${with_llvm_linking+set}" = set; then : |
15830 |
- withval=$with_llvm_linking; |
|
15831 |
-if test "x$llvmconfig" = "x"; then |
|
15913 |
+ withval=$with_llvm_linking; if test "x$llvmconfig" = "x"; then |
|
15832 | 15914 |
as_fn_error $? "Failed to configure LLVM, and LLVM linking was specified without valid llvm-config" "$LINENO" 5 |
15833 | 15915 |
else |
15834 |
-case "$withval" in |
|
15835 |
- static) |
|
15836 |
- llvm_linking="static" |
|
15837 |
- ;; |
|
15838 |
- dynamic) |
|
15839 |
- llvm_linking="dynamic" |
|
15840 |
- ;; |
|
15841 |
- *) |
|
15842 |
- as_fn_error $? "Invalid argument to --with-llvm-linking" "$LINENO" 5 |
|
15843 |
-esac |
|
15916 |
+ case "$withval" in |
|
15917 |
+ static) |
|
15918 |
+ llvm_linking="static" |
|
15919 |
+ ;; |
|
15920 |
+ dynamic) |
|
15921 |
+ llvm_linking="dynamic" |
|
15922 |
+ ;; |
|
15923 |
+ *) |
|
15924 |
+ as_fn_error $? "Invalid argument to --with-llvm-linking" "$LINENO" 5 |
|
15925 |
+ esac |
|
15844 | 15926 |
fi |
15845 | 15927 |
|
15928 |
+else |
|
15929 |
+ llvm_linking="" |
|
15846 | 15930 |
fi |
15847 | 15931 |
|
15848 | 15932 |
|
15849 |
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for supported LLVM version" >&5 |
|
15850 |
-$as_echo_n "checking for supported LLVM version... " >&6; } |
|
15851 |
-if test "x$llvmconfig" = "x"; then |
|
15852 |
- |
|
15853 |
- |
|
15854 |
-subdirs="$subdirs llvm" |
|
15855 |
- |
|
15856 |
- llvmver="2.8" |
|
15933 |
+if test "x$llvmconfig" != "x"; then |
|
15934 |
+ llvmver=`$llvmconfig --version` |
|
15935 |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Using external LLVM" >&5 |
|
15936 |
+$as_echo "$as_me: Using external LLVM" >&6;} |
|
15937 |
+else |
|
15938 |
+ llvmver="2.8" |
|
15857 | 15939 |
packaged_llvm="yes" |
15858 | 15940 |
fi |
15859 | 15941 |
|
... | ... |
@@ -15866,6 +15950,8 @@ if test "x$llvmver_patch" = "x"; then |
15866 | 15866 |
llvmver_patch=0 |
15867 | 15867 |
fi |
15868 | 15868 |
|
15869 |
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for supported LLVM version" >&5 |
|
15870 |
+$as_echo_n "checking for supported LLVM version... " >&6; } |
|
15869 | 15871 |
llvmver_test=${llvmver_major}${llvmver_minor}${llvmver_patch} |
15870 | 15872 |
if test "x$packaged_llvm" = "xyes"; then |
15871 | 15873 |
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ok ($llvmver)" >&5 |
... | ... |
@@ -15923,6 +16009,14 @@ $as_echo "$as_me: LIBS from llvm-config: $LLVMCONFIG_LIBS" >&6;} |
15923 | 15923 |
fi |
15924 | 15924 |
llvmver_int=${llvmver_major}${llvmver_minor} |
15925 | 15925 |
|
15926 |
+ |
|
15927 |
+if test "x$llvmconfig" = "x"; then |
|
15928 |
+ |
|
15929 |
+ |
|
15930 |
+subdirs="$subdirs llvm" |
|
15931 |
+ |
|
15932 |
+fi |
|
15933 |
+ |
|
15926 | 15934 |
LLVM_VERSION=$llvmver_int |
15927 | 15935 |
|
15928 | 15936 |
|
... | ... |
@@ -117,6 +117,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ |
117 | 117 |
$(top_srcdir)/m4/reorganization/libs/libz.m4 \ |
118 | 118 |
$(top_srcdir)/m4/reorganization/libs/bzip.m4 \ |
119 | 119 |
$(top_srcdir)/m4/reorganization/libs/unrar.m4 \ |
120 |
+ $(top_srcdir)/m4/reorganization/libs/systemd.m4 \ |
|
120 | 121 |
$(top_srcdir)/m4/reorganization/code_checks/ipv6.m4 \ |
121 | 122 |
$(top_srcdir)/m4/reorganization/code_checks/dns.m4 \ |
122 | 123 |
$(top_srcdir)/m4/reorganization/code_checks/fanotify.m4 \ |
... | ... |
@@ -460,6 +461,8 @@ SSL_CPPFLAGS = @SSL_CPPFLAGS@ |
460 | 460 |
SSL_LDFLAGS = @SSL_LDFLAGS@ |
461 | 461 |
SSL_LIBS = @SSL_LIBS@ |
462 | 462 |
STRIP = @STRIP@ |
463 |
+SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@ |
|
464 |
+SYSTEMD_LIBS = @SYSTEMD_LIBS@ |
|
463 | 465 |
THREAD_LIBS = @THREAD_LIBS@ |
464 | 466 |
TH_SAFE = @TH_SAFE@ |
465 | 467 |
VERSION = @VERSION@ |
... | ... |
@@ -512,6 +515,7 @@ ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@ |
512 | 512 |
mandir = @mandir@ |
513 | 513 |
mkdir_p = @mkdir_p@ |
514 | 514 |
oldincludedir = @oldincludedir@ |
515 |
+pcreconfig = @pcreconfig@ |
|
515 | 516 |
pdfdir = @pdfdir@ |
516 | 517 |
prefix = @prefix@ |
517 | 518 |
program_transform_name = @program_transform_name@ |
... | ... |
@@ -522,6 +526,7 @@ srcdir = @srcdir@ |
522 | 522 |
subdirs = @subdirs@ |
523 | 523 |
sys_symbol_underscore = @sys_symbol_underscore@ |
524 | 524 |
sysconfdir = @sysconfdir@ |
525 |
+systemdsystemunitdir = @systemdsystemunitdir@ |
|
525 | 526 |
target = @target@ |
526 | 527 |
target_alias = @target_alias@ |
527 | 528 |
target_cpu = @target_cpu@ |
... | ... |
@@ -129,6 +129,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ |
129 | 129 |
$(top_srcdir)/m4/reorganization/libs/libz.m4 \ |
130 | 130 |
$(top_srcdir)/m4/reorganization/libs/bzip.m4 \ |
131 | 131 |
$(top_srcdir)/m4/reorganization/libs/unrar.m4 \ |
132 |
+ $(top_srcdir)/m4/reorganization/libs/systemd.m4 \ |
|
132 | 133 |
$(top_srcdir)/m4/reorganization/code_checks/ipv6.m4 \ |
133 | 134 |
$(top_srcdir)/m4/reorganization/code_checks/dns.m4 \ |
134 | 135 |
$(top_srcdir)/m4/reorganization/code_checks/fanotify.m4 \ |
... | ... |
@@ -382,6 +383,8 @@ SSL_CPPFLAGS = @SSL_CPPFLAGS@ |
382 | 382 |
SSL_LDFLAGS = @SSL_LDFLAGS@ |
383 | 383 |
SSL_LIBS = @SSL_LIBS@ |
384 | 384 |
STRIP = @STRIP@ |
385 |
+SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@ |
|
386 |
+SYSTEMD_LIBS = @SYSTEMD_LIBS@ |
|
385 | 387 |
THREAD_LIBS = @THREAD_LIBS@ |
386 | 388 |
TH_SAFE = @TH_SAFE@ |
387 | 389 |
VERSION = @VERSION@ |
... | ... |
@@ -434,6 +437,7 @@ ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@ |
434 | 434 |
mandir = @mandir@ |
435 | 435 |
mkdir_p = @mkdir_p@ |
436 | 436 |
oldincludedir = @oldincludedir@ |
437 |
+pcreconfig = @pcreconfig@ |
|
437 | 438 |
pdfdir = @pdfdir@ |
438 | 439 |
prefix = @prefix@ |
439 | 440 |
program_transform_name = @program_transform_name@ |
... | ... |
@@ -444,6 +448,7 @@ srcdir = @srcdir@ |
444 | 444 |
subdirs = @subdirs@ |
445 | 445 |
sys_symbol_underscore = @sys_symbol_underscore@ |
446 | 446 |
sysconfdir = @sysconfdir@ |
447 |
+systemdsystemunitdir = @systemdsystemunitdir@ |
|
447 | 448 |
target = @target@ |
448 | 449 |
target_alias = @target_alias@ |
449 | 450 |
target_cpu = @target_cpu@ |
... | ... |
@@ -110,6 +110,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ |
110 | 110 |
$(top_srcdir)/m4/reorganization/libs/libz.m4 \ |
111 | 111 |
$(top_srcdir)/m4/reorganization/libs/bzip.m4 \ |
112 | 112 |
$(top_srcdir)/m4/reorganization/libs/unrar.m4 \ |
113 |
+ $(top_srcdir)/m4/reorganization/libs/systemd.m4 \ |
|
113 | 114 |
$(top_srcdir)/m4/reorganization/code_checks/ipv6.m4 \ |
114 | 115 |
$(top_srcdir)/m4/reorganization/code_checks/dns.m4 \ |
115 | 116 |
$(top_srcdir)/m4/reorganization/code_checks/fanotify.m4 \ |
... | ... |
@@ -312,6 +313,8 @@ SSL_CPPFLAGS = @SSL_CPPFLAGS@ |
312 | 312 |
SSL_LDFLAGS = @SSL_LDFLAGS@ |
313 | 313 |
SSL_LIBS = @SSL_LIBS@ |
314 | 314 |
STRIP = @STRIP@ |
315 |
+SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@ |
|
316 |
+SYSTEMD_LIBS = @SYSTEMD_LIBS@ |
|
315 | 317 |
THREAD_LIBS = @THREAD_LIBS@ |
316 | 318 |
TH_SAFE = @TH_SAFE@ |
317 | 319 |
VERSION = @VERSION@ |
... | ... |
@@ -364,6 +367,7 @@ ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@ |
364 | 364 |
mandir = @mandir@ |
365 | 365 |
mkdir_p = @mkdir_p@ |
366 | 366 |
oldincludedir = @oldincludedir@ |
367 |
+pcreconfig = @pcreconfig@ |
|
367 | 368 |
pdfdir = @pdfdir@ |
368 | 369 |
prefix = @prefix@ |
369 | 370 |
program_transform_name = @program_transform_name@ |
... | ... |
@@ -374,6 +378,7 @@ srcdir = @srcdir@ |
374 | 374 |
subdirs = @subdirs@ |
375 | 375 |
sys_symbol_underscore = @sys_symbol_underscore@ |
376 | 376 |
sysconfdir = @sysconfdir@ |
377 |
+systemdsystemunitdir = @systemdsystemunitdir@ |
|
377 | 378 |
target = @target@ |
378 | 379 |
target_alias = @target_alias@ |
379 | 380 |
target_cpu = @target_cpu@ |
... | ... |
@@ -112,6 +112,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ |
112 | 112 |
$(top_srcdir)/m4/reorganization/libs/libz.m4 \ |
113 | 113 |
$(top_srcdir)/m4/reorganization/libs/bzip.m4 \ |
114 | 114 |
$(top_srcdir)/m4/reorganization/libs/unrar.m4 \ |
115 |
+ $(top_srcdir)/m4/reorganization/libs/systemd.m4 \ |
|
115 | 116 |
$(top_srcdir)/m4/reorganization/code_checks/ipv6.m4 \ |
116 | 117 |
$(top_srcdir)/m4/reorganization/code_checks/dns.m4 \ |
117 | 118 |
$(top_srcdir)/m4/reorganization/code_checks/fanotify.m4 \ |
... | ... |
@@ -602,6 +603,8 @@ SSL_CPPFLAGS = @SSL_CPPFLAGS@ |
602 | 602 |
SSL_LDFLAGS = @SSL_LDFLAGS@ |
603 | 603 |
SSL_LIBS = @SSL_LIBS@ |
604 | 604 |
STRIP = @STRIP@ |
605 |
+SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@ |
|
606 |
+SYSTEMD_LIBS = @SYSTEMD_LIBS@ |
|
605 | 607 |
THREAD_LIBS = @THREAD_LIBS@ |
606 | 608 |
TH_SAFE = @TH_SAFE@ |
607 | 609 |
VERSION = @VERSION@ |
... | ... |
@@ -654,6 +657,7 @@ ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@ |
654 | 654 |
mandir = @mandir@ |
655 | 655 |
mkdir_p = @mkdir_p@ |
656 | 656 |
oldincludedir = @oldincludedir@ |
657 |
+pcreconfig = @pcreconfig@ |
|
657 | 658 |
pdfdir = @pdfdir@ |
658 | 659 |
prefix = @prefix@ |
659 | 660 |
program_transform_name = @program_transform_name@ |
... | ... |
@@ -664,6 +668,7 @@ srcdir = @srcdir@ |
664 | 664 |
subdirs = @subdirs@ |
665 | 665 |
sys_symbol_underscore = @sys_symbol_underscore@ |
666 | 666 |
sysconfdir = @sysconfdir@ |
667 |
+systemdsystemunitdir = @systemdsystemunitdir@ |
|
667 | 668 |
target = @target@ |
668 | 669 |
target_alias = @target_alias@ |
669 | 670 |
target_cpu = @target_cpu@ |