Browse code

Add build support for libjson and initial json work for properties file.

Steven Morgan authored on 2014/04/17 05:40:56
Showing 31 changed files
... ...
@@ -1,8 +1,9 @@
1
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
1
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
2 2
 # @configure_input@
3 3
 
4
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
5
-
4
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
5
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
6
+# Foundation, Inc.
6 7
 # This Makefile.in is free software; the Free Software Foundation
7 8
 # gives unlimited permission to copy and/or distribute it,
8 9
 # with or without modifications, as long as this notice is preserved.
... ...
@@ -34,51 +35,6 @@
34 34
 
35 35
 
36 36
 VPATH = @srcdir@
37
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
38
-am__make_running_with_option = \
39
-  case $${target_option-} in \
40
-      ?) ;; \
41
-      *) echo "am__make_running_with_option: internal error: invalid" \
42
-              "target option '$${target_option-}' specified" >&2; \
43
-         exit 1;; \
44
-  esac; \
45
-  has_opt=no; \
46
-  sane_makeflags=$$MAKEFLAGS; \
47
-  if $(am__is_gnu_make); then \
48
-    sane_makeflags=$$MFLAGS; \
49
-  else \
50
-    case $$MAKEFLAGS in \
51
-      *\\[\ \	]*) \
52
-        bs=\\; \
53
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
54
-          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
55
-    esac; \
56
-  fi; \
57
-  skip_next=no; \
58
-  strip_trailopt () \
59
-  { \
60
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
61
-  }; \
62
-  for flg in $$sane_makeflags; do \
63
-    test $$skip_next = yes && { skip_next=no; continue; }; \
64
-    case $$flg in \
65
-      *=*|--*) continue;; \
66
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
67
-      -*I?*) strip_trailopt 'I';; \
68
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
69
-      -*O?*) strip_trailopt 'O';; \
70
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
71
-      -*l?*) strip_trailopt 'l';; \
72
-      -[dEDm]) skip_next=yes;; \
73
-      -[JT]) skip_next=yes;; \
74
-    esac; \
75
-    case $$flg in \
76
-      *$$target_option*) has_opt=yes; break;; \
77
-    esac; \
78
-  done; \
79
-  test $$has_opt = yes
80
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
81
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
82 37
 pkgdatadir = $(datadir)/@PACKAGE@
83 38
 pkgincludedir = $(includedir)/@PACKAGE@
84 39
 pkglibdir = $(libdir)/@PACKAGE@
... ...
@@ -100,10 +56,10 @@ host_triplet = @host@
100 100
 target_triplet = @target@
101 101
 @ENABLE_CLAMSUBMIT_TRUE@am__append_1 = clamsubmit
102 102
 subdir = .
103
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
104
-	$(top_srcdir)/configure $(am__configure_deps) \
105
-	$(srcdir)/clamav-config.h.in $(srcdir)/clamav-config.in \
106
-	$(srcdir)/libclamav.pc.in $(srcdir)/platform.h.in \
103
+DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
104
+	$(srcdir)/Makefile.in $(srcdir)/clamav-config.h.in \
105
+	$(srcdir)/clamav-config.in $(srcdir)/libclamav.pc.in \
106
+	$(srcdir)/platform.h.in $(top_srcdir)/configure \
107 107
 	$(top_srcdir)/docs/man/clamav-milter.8.in \
108 108
 	$(top_srcdir)/docs/man/clamav-milter.conf.5.in \
109 109
 	$(top_srcdir)/docs/man/clambc.1.in \
... ...
@@ -111,21 +67,15 @@ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
111 111
 	$(top_srcdir)/docs/man/clamd.8.in \
112 112
 	$(top_srcdir)/docs/man/clamd.conf.5.in \
113 113
 	$(top_srcdir)/docs/man/clamdscan.1.in \
114
+	$(top_srcdir)/docs/man/clamdtop.1.in \
114 115
 	$(top_srcdir)/docs/man/clamscan.1.in \
116
+	$(top_srcdir)/docs/man/clamsubmit.1.in \
115 117
 	$(top_srcdir)/docs/man/freshclam.1.in \
116 118
 	$(top_srcdir)/docs/man/freshclam.conf.5.in \
117
-	$(top_srcdir)/docs/man/sigtool.1.in \
118
-	$(top_srcdir)/docs/man/clamdtop.1.in \
119
-	$(top_srcdir)/docs/man/clamsubmit.1.in AUTHORS COPYING \
120
-	ChangeLog INSTALL NEWS README config/compile \
121
-	config/config.guess config/config.rpath config/config.sub \
122
-	config/depcomp config/install-sh config/missing \
123
-	config/ltmain.sh $(top_srcdir)/config/compile \
124
-	$(top_srcdir)/config/config.guess \
125
-	$(top_srcdir)/config/config.rpath \
126
-	$(top_srcdir)/config/config.sub \
127
-	$(top_srcdir)/config/install-sh $(top_srcdir)/config/ltmain.sh \
128
-	$(top_srcdir)/config/missing
119
+	$(top_srcdir)/docs/man/sigtool.1.in AUTHORS COPYING ChangeLog \
120
+	INSTALL NEWS config/compile config/config.guess \
121
+	config/config.rpath config/config.sub config/depcomp \
122
+	config/install-sh config/ltmain.sh config/missing
129 123
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
130 124
 am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
131 125
 	$(top_srcdir)/m4/argz.m4 \
... ...
@@ -149,6 +99,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
149 149
 	$(top_srcdir)/m4/reorganization/code_checks/coverage.m4 \
150 150
 	$(top_srcdir)/m4/reorganization/libs/xml.m4 \
151 151
 	$(top_srcdir)/m4/reorganization/libs/openssl.m4 \
152
+	$(top_srcdir)/m4/reorganization/libs/json.m4 \
152 153
 	$(top_srcdir)/m4/reorganization/libs/libz.m4 \
153 154
 	$(top_srcdir)/m4/reorganization/libs/bzip.m4 \
154 155
 	$(top_srcdir)/m4/reorganization/libs/unrar.m4 \
... ...
@@ -234,63 +185,29 @@ am__uninstall_files_from_dir = { \
234 234
   }
235 235
 am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pkgconfigdir)"
236 236
 SCRIPTS = $(bin_SCRIPTS)
237
-AM_V_P = $(am__v_P_@AM_V@)
238
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
239
-am__v_P_0 = false
240
-am__v_P_1 = :
241 237
 AM_V_GEN = $(am__v_GEN_@AM_V@)
242 238
 am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
243
-am__v_GEN_0 = @echo "  GEN     " $@;
244
-am__v_GEN_1 = 
239
+am__v_GEN_0 = @echo "  GEN   " $@;
245 240
 AM_V_at = $(am__v_at_@AM_V@)
246 241
 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
247 242
 am__v_at_0 = @
248
-am__v_at_1 = 
249 243
 SOURCES =
250 244
 DIST_SOURCES =
251
-RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
252
-	ctags-recursive dvi-recursive html-recursive info-recursive \
253
-	install-data-recursive install-dvi-recursive \
254
-	install-exec-recursive install-html-recursive \
255
-	install-info-recursive install-pdf-recursive \
256
-	install-ps-recursive install-recursive installcheck-recursive \
257
-	installdirs-recursive pdf-recursive ps-recursive \
258
-	tags-recursive uninstall-recursive
259
-am__can_run_installinfo = \
260
-  case $$AM_UPDATE_INFO_DIR in \
261
-    n|no|NO) false;; \
262
-    *) (install-info --version) >/dev/null 2>&1;; \
263
-  esac
245
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
246
+	html-recursive info-recursive install-data-recursive \
247
+	install-dvi-recursive install-exec-recursive \
248
+	install-html-recursive install-info-recursive \
249
+	install-pdf-recursive install-ps-recursive install-recursive \
250
+	installcheck-recursive installdirs-recursive pdf-recursive \
251
+	ps-recursive uninstall-recursive
264 252
 DATA = $(pkgconfig_DATA)
265 253
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
266 254
   distclean-recursive maintainer-clean-recursive
267
-am__recursive_targets = \
268
-  $(RECURSIVE_TARGETS) \
269
-  $(RECURSIVE_CLEAN_TARGETS) \
270
-  $(am__extra_recursive_targets)
271
-AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
272
-	cscope distdir dist dist-all distcheck
273
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \
274
-	$(LISP)clamav-config.h.in
275
-# Read a list of newline-separated strings from the standard input,
276
-# and print each of them once, without duplicates.  Input order is
277
-# *not* preserved.
278
-am__uniquify_input = $(AWK) '\
279
-  BEGIN { nonempty = 0; } \
280
-  { items[$$0] = 1; nonempty = 1; } \
281
-  END { if (nonempty) { for (i in items) print i; }; } \
282
-'
283
-# Make sure the list of sources is unique.  This is necessary because,
284
-# e.g., the same source file might be shared among _SOURCES variables
285
-# for different programs/libraries.
286
-am__define_uniq_tagged_files = \
287
-  list='$(am__tagged_files)'; \
288
-  unique=`for i in $$list; do \
289
-    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
290
-  done | $(am__uniquify_input)`
255
+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
256
+	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
257
+	distdir dist dist-all distcheck
291 258
 ETAGS = etags
292 259
 CTAGS = ctags
293
-CSCOPE = cscope
294 260
 DIST_SUBDIRS = libltdl libclamav clamscan clamd clamdscan freshclam \
295 261
 	sigtool clamconf database docs etc clamav-milter test clamdtop \
296 262
 	clambc unit_tests clamsubmit
... ...
@@ -303,7 +220,6 @@ am__remove_distdir = \
303 303
       && rm -rf "$(distdir)" \
304 304
       || { sleep 5 && rm -rf "$(distdir)"; }; \
305 305
   else :; fi
306
-am__post_remove_distdir = $(am__remove_distdir)
307 306
 am__relativize = \
308 307
   dir0=`pwd`; \
309 308
   sed_first='s,^\([^/]*\)/.*$$,\1,'; \
... ...
@@ -331,7 +247,6 @@ am__relativize = \
331 331
   reldir="$$dir2"
332 332
 DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2
333 333
 GZIP_ENV = --best
334
-DIST_TARGETS = dist-bzip2 dist-gzip
335 334
 am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
336 335
   | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
337 336
 distcleancheck_listfiles = find . -type f -print
... ...
@@ -401,6 +316,9 @@ INSTALL_DATA = @INSTALL_DATA@
401 401
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
402 402
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
403 403
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
404
+JSON_CPPFLAGS = @JSON_CPPFLAGS@
405
+JSON_LDFLAGS = @JSON_LDFLAGS@
406
+JSON_LIBS = @JSON_LIBS@
404 407
 LCOV = @LCOV@
405 408
 LD = @LD@
406 409
 LDFLAGS = @LDFLAGS@
... ...
@@ -577,8 +495,8 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
577 577
 $(am__aclocal_m4_deps):
578 578
 
579 579
 clamav-config.h: stamp-h1
580
-	@test -f $@ || rm -f stamp-h1
581
-	@test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1
580
+	@if test ! -f $@; then rm -f stamp-h1; else :; fi
581
+	@if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi
582 582
 
583 583
 stamp-h1: $(srcdir)/clamav-config.h.in $(top_builddir)/config.status
584 584
 	@rm -f stamp-h1
... ...
@@ -624,11 +542,8 @@ docs/man/clamsubmit.1: $(top_builddir)/config.status $(top_srcdir)/docs/man/clam
624 624
 	cd $(top_builddir) && $(SHELL) ./config.status $@
625 625
 install-binSCRIPTS: $(bin_SCRIPTS)
626 626
 	@$(NORMAL_INSTALL)
627
+	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
627 628
 	@list='$(bin_SCRIPTS)'; test -n "$(bindir)" || list=; \
628
-	if test -n "$$list"; then \
629
-	  echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
630
-	  $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
631
-	fi; \
632 629
 	for p in $$list; do \
633 630
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
634 631
 	  if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
... ...
@@ -683,11 +598,8 @@ distclean-libtool:
683 683
 	-rm -f libtool config.lt
684 684
 install-pkgconfigDATA: $(pkgconfig_DATA)
685 685
 	@$(NORMAL_INSTALL)
686
+	test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)"
686 687
 	@list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
687
-	if test -n "$$list"; then \
688
-	  echo " $(MKDIR_P) '$(DESTDIR)$(pkgconfigdir)'"; \
689
-	  $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" || exit 1; \
690
-	fi; \
691 688
 	for p in $$list; do \
692 689
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
693 690
 	  echo "$$d$$p"; \
... ...
@@ -704,25 +616,22 @@ uninstall-pkgconfigDATA:
704 704
 	dir='$(DESTDIR)$(pkgconfigdir)'; $(am__uninstall_files_from_dir)
705 705
 
706 706
 # This directory's subdirectories are mostly independent; you can cd
707
-# into them and run 'make' without going through this Makefile.
708
-# To change the values of 'make' variables: instead of editing Makefiles,
709
-# (1) if the variable is set in 'config.status', edit 'config.status'
710
-#     (which will cause the Makefiles to be regenerated when you run 'make');
711
-# (2) otherwise, pass the desired values on the 'make' command line.
712
-$(am__recursive_targets):
713
-	@fail=; \
714
-	if $(am__make_keepgoing); then \
715
-	  failcom='fail=yes'; \
716
-	else \
717
-	  failcom='exit 1'; \
718
-	fi; \
707
+# into them and run `make' without going through this Makefile.
708
+# To change the values of `make' variables: instead of editing Makefiles,
709
+# (1) if the variable is set in `config.status', edit `config.status'
710
+#     (which will cause the Makefiles to be regenerated when you run `make');
711
+# (2) otherwise, pass the desired values on the `make' command line.
712
+$(RECURSIVE_TARGETS):
713
+	@fail= failcom='exit 1'; \
714
+	for f in x $$MAKEFLAGS; do \
715
+	  case $$f in \
716
+	    *=* | --[!k]*);; \
717
+	    *k*) failcom='fail=yes';; \
718
+	  esac; \
719
+	done; \
719 720
 	dot_seen=no; \
720 721
 	target=`echo $@ | sed s/-recursive//`; \
721
-	case "$@" in \
722
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
723
-	  *) list='$(SUBDIRS)' ;; \
724
-	esac; \
725
-	for subdir in $$list; do \
722
+	list='$(SUBDIRS)'; for subdir in $$list; do \
726 723
 	  echo "Making $$target in $$subdir"; \
727 724
 	  if test "$$subdir" = "."; then \
728 725
 	    dot_seen=yes; \
... ...
@@ -737,12 +646,57 @@ $(am__recursive_targets):
737 737
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
738 738
 	fi; test -z "$$fail"
739 739
 
740
-ID: $(am__tagged_files)
741
-	$(am__define_uniq_tagged_files); mkid -fID $$unique
742
-tags: tags-recursive
743
-TAGS: tags
740
+$(RECURSIVE_CLEAN_TARGETS):
741
+	@fail= failcom='exit 1'; \
742
+	for f in x $$MAKEFLAGS; do \
743
+	  case $$f in \
744
+	    *=* | --[!k]*);; \
745
+	    *k*) failcom='fail=yes';; \
746
+	  esac; \
747
+	done; \
748
+	dot_seen=no; \
749
+	case "$@" in \
750
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
751
+	  *) list='$(SUBDIRS)' ;; \
752
+	esac; \
753
+	rev=''; for subdir in $$list; do \
754
+	  if test "$$subdir" = "."; then :; else \
755
+	    rev="$$subdir $$rev"; \
756
+	  fi; \
757
+	done; \
758
+	rev="$$rev ."; \
759
+	target=`echo $@ | sed s/-recursive//`; \
760
+	for subdir in $$rev; do \
761
+	  echo "Making $$target in $$subdir"; \
762
+	  if test "$$subdir" = "."; then \
763
+	    local_target="$$target-am"; \
764
+	  else \
765
+	    local_target="$$target"; \
766
+	  fi; \
767
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
768
+	  || eval $$failcom; \
769
+	done && test -z "$$fail"
770
+tags-recursive:
771
+	list='$(SUBDIRS)'; for subdir in $$list; do \
772
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
773
+	done
774
+ctags-recursive:
775
+	list='$(SUBDIRS)'; for subdir in $$list; do \
776
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
777
+	done
744 778
 
745
-tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
779
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
780
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
781
+	unique=`for i in $$list; do \
782
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
783
+	  done | \
784
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
785
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
786
+	mkid -fID $$unique
787
+tags: TAGS
788
+
789
+TAGS: tags-recursive $(HEADERS) $(SOURCES) clamav-config.h.in $(TAGS_DEPENDENCIES) \
790
+		$(TAGS_FILES) $(LISP)
746 791
 	set x; \
747 792
 	here=`pwd`; \
748 793
 	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
... ...
@@ -758,7 +712,12 @@ tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
758 758
 	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
759 759
 	  fi; \
760 760
 	done; \
761
-	$(am__define_uniq_tagged_files); \
761
+	list='$(SOURCES) $(HEADERS) clamav-config.h.in $(LISP) $(TAGS_FILES)'; \
762
+	unique=`for i in $$list; do \
763
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
764
+	  done | \
765
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
766
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
762 767
 	shift; \
763 768
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
764 769
 	  test -n "$$unique" || unique=$$empty_fix; \
... ...
@@ -770,11 +729,15 @@ tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
770 770
 	      $$unique; \
771 771
 	  fi; \
772 772
 	fi
773
-ctags: ctags-recursive
774
-
775
-CTAGS: ctags
776
-ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
777
-	$(am__define_uniq_tagged_files); \
773
+ctags: CTAGS
774
+CTAGS: ctags-recursive $(HEADERS) $(SOURCES) clamav-config.h.in $(TAGS_DEPENDENCIES) \
775
+		$(TAGS_FILES) $(LISP)
776
+	list='$(SOURCES) $(HEADERS) clamav-config.h.in $(LISP) $(TAGS_FILES)'; \
777
+	unique=`for i in $$list; do \
778
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
779
+	  done | \
780
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
781
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
778 782
 	test -z "$(CTAGS_ARGS)$$unique" \
779 783
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
780 784
 	     $$unique
... ...
@@ -783,31 +746,9 @@ GTAGS:
783 783
 	here=`$(am__cd) $(top_builddir) && pwd` \
784 784
 	  && $(am__cd) $(top_srcdir) \
785 785
 	  && gtags -i $(GTAGS_ARGS) "$$here"
786
-cscope: cscope.files
787
-	test ! -s cscope.files \
788
-	  || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS)
789
-clean-cscope:
790
-	-rm -f cscope.files
791
-cscope.files: clean-cscope cscopelist
792
-cscopelist: cscopelist-recursive
793
-
794
-cscopelist-am: $(am__tagged_files)
795
-	list='$(am__tagged_files)'; \
796
-	case "$(srcdir)" in \
797
-	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
798
-	  *) sdir=$(subdir)/$(srcdir) ;; \
799
-	esac; \
800
-	for i in $$list; do \
801
-	  if test -f "$$i"; then \
802
-	    echo "$(subdir)/$$i"; \
803
-	  else \
804
-	    echo "$$sdir/$$i"; \
805
-	  fi; \
806
-	done >> $(top_builddir)/cscope.files
807 786
 
808 787
 distclean-tags:
809 788
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
810
-	-rm -f cscope.out cscope.in.out cscope.po.out cscope.files
811 789
 
812 790
 distdir: $(DISTFILES)
813 791
 	$(am__remove_distdir)
... ...
@@ -843,10 +784,13 @@ distdir: $(DISTFILES)
843 843
 	done
844 844
 	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
845 845
 	  if test "$$subdir" = .; then :; else \
846
-	    $(am__make_dryrun) \
847
-	      || test -d "$(distdir)/$$subdir" \
848
-	      || $(MKDIR_P) "$(distdir)/$$subdir" \
849
-	      || exit 1; \
846
+	    test -d "$(distdir)/$$subdir" \
847
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
848
+	    || exit 1; \
849
+	  fi; \
850
+	done
851
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
852
+	  if test "$$subdir" = .; then :; else \
850 853
 	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
851 854
 	    $(am__relativize); \
852 855
 	    new_distdir=$$reldir; \
... ...
@@ -878,41 +822,40 @@ distdir: $(DISTFILES)
878 878
 	|| chmod -R a+r "$(distdir)"
879 879
 dist-gzip: distdir
880 880
 	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
881
-	$(am__post_remove_distdir)
881
+	$(am__remove_distdir)
882 882
 dist-bzip2: distdir
883 883
 	tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
884
-	$(am__post_remove_distdir)
884
+	$(am__remove_distdir)
885 885
 
886 886
 dist-lzip: distdir
887 887
 	tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
888
-	$(am__post_remove_distdir)
888
+	$(am__remove_distdir)
889
+
890
+dist-lzma: distdir
891
+	tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
892
+	$(am__remove_distdir)
889 893
 
890 894
 dist-xz: distdir
891 895
 	tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
892
-	$(am__post_remove_distdir)
896
+	$(am__remove_distdir)
893 897
 
894 898
 dist-tarZ: distdir
895
-	@echo WARNING: "Support for shar distribution archives is" \
896
-	               "deprecated." >&2
897
-	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
898 899
 	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
899
-	$(am__post_remove_distdir)
900
+	$(am__remove_distdir)
900 901
 
901 902
 dist-shar: distdir
902
-	@echo WARNING: "Support for distribution archives compressed with" \
903
-		       "legacy program 'compress' is deprecated." >&2
904
-	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
905 903
 	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
906
-	$(am__post_remove_distdir)
904
+	$(am__remove_distdir)
907 905
 
908 906
 dist-zip: distdir
909 907
 	-rm -f $(distdir).zip
910 908
 	zip -rq $(distdir).zip $(distdir)
911
-	$(am__post_remove_distdir)
909
+	$(am__remove_distdir)
912 910
 
913
-dist dist-all:
914
-	$(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:'
915
-	$(am__post_remove_distdir)
911
+dist dist-all: distdir
912
+	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
913
+	tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
914
+	$(am__remove_distdir)
916 915
 
917 916
 # This target untars the dist file and tries a VPATH configuration.  Then
918 917
 # it guarantees that the distribution is self-contained by making another
... ...
@@ -923,6 +866,8 @@ distcheck: dist
923 923
 	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
924 924
 	*.tar.bz2*) \
925 925
 	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
926
+	*.tar.lzma*) \
927
+	  lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
926 928
 	*.tar.lz*) \
927 929
 	  lzip -dc $(distdir).tar.lz | $(am__untar) ;;\
928 930
 	*.tar.xz*) \
... ...
@@ -934,19 +879,18 @@ distcheck: dist
934 934
 	*.zip*) \
935 935
 	  unzip $(distdir).zip ;;\
936 936
 	esac
937
-	chmod -R a-w $(distdir)
938
-	chmod u+w $(distdir)
939
-	mkdir $(distdir)/_build $(distdir)/_inst
937
+	chmod -R a-w $(distdir); chmod a+w $(distdir)
938
+	mkdir $(distdir)/_build
939
+	mkdir $(distdir)/_inst
940 940
 	chmod a-w $(distdir)
941 941
 	test -d $(distdir)/_build || exit 0; \
942 942
 	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
943 943
 	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
944 944
 	  && am__cwd=`pwd` \
945 945
 	  && $(am__cd) $(distdir)/_build \
946
-	  && ../configure \
946
+	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
947 947
 	    $(AM_DISTCHECK_CONFIGURE_FLAGS) \
948 948
 	    $(DISTCHECK_CONFIGURE_FLAGS) \
949
-	    --srcdir=.. --prefix="$$dc_install_base" \
950 949
 	  && $(MAKE) $(AM_MAKEFLAGS) \
951 950
 	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
952 951
 	  && $(MAKE) $(AM_MAKEFLAGS) check \
... ...
@@ -969,7 +913,7 @@ distcheck: dist
969 969
 	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
970 970
 	  && cd "$$am__cwd" \
971 971
 	  || exit 1
972
-	$(am__post_remove_distdir)
972
+	$(am__remove_distdir)
973 973
 	@(echo "$(distdir) archives ready for distribution: "; \
974 974
 	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
975 975
 	  sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
... ...
@@ -1108,25 +1052,26 @@ ps-am:
1108 1108
 
1109 1109
 uninstall-am: uninstall-binSCRIPTS uninstall-pkgconfigDATA
1110 1110
 
1111
-.MAKE: $(am__recursive_targets) all install-am install-strip
1112
-
1113
-.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \
1114
-	am--refresh check check-am clean clean-cscope clean-generic \
1115
-	clean-libtool cscope cscopelist-am ctags ctags-am dist \
1116
-	dist-all dist-bzip2 dist-gzip dist-hook dist-lzip dist-shar \
1117
-	dist-tarZ dist-xz dist-zip distcheck distclean \
1118
-	distclean-generic distclean-hdr distclean-libtool \
1119
-	distclean-tags distcleancheck distdir distuninstallcheck dvi \
1120
-	dvi-am html html-am info info-am install install-am \
1121
-	install-binSCRIPTS install-data install-data-am install-dvi \
1122
-	install-dvi-am install-exec install-exec-am install-html \
1123
-	install-html-am install-info install-info-am install-man \
1124
-	install-pdf install-pdf-am install-pkgconfigDATA install-ps \
1125
-	install-ps-am install-strip installcheck installcheck-am \
1126
-	installcheck-binSCRIPTS installdirs installdirs-am \
1127
-	maintainer-clean maintainer-clean-generic mostlyclean \
1128
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
1129
-	tags tags-am uninstall uninstall-am uninstall-binSCRIPTS \
1111
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \
1112
+	ctags-recursive install-am install-strip tags-recursive
1113
+
1114
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
1115
+	all all-am am--refresh check check-am clean clean-generic \
1116
+	clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \
1117
+	dist-gzip dist-hook dist-lzip dist-lzma dist-shar dist-tarZ \
1118
+	dist-xz dist-zip distcheck distclean distclean-generic \
1119
+	distclean-hdr distclean-libtool distclean-tags distcleancheck \
1120
+	distdir distuninstallcheck dvi dvi-am html html-am info \
1121
+	info-am install install-am install-binSCRIPTS install-data \
1122
+	install-data-am install-dvi install-dvi-am install-exec \
1123
+	install-exec-am install-html install-html-am install-info \
1124
+	install-info-am install-man install-pdf install-pdf-am \
1125
+	install-pkgconfigDATA install-ps install-ps-am install-strip \
1126
+	installcheck installcheck-am installcheck-binSCRIPTS \
1127
+	installdirs installdirs-am maintainer-clean \
1128
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
1129
+	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
1130
+	uninstall uninstall-am uninstall-binSCRIPTS \
1130 1131
 	uninstall-pkgconfigDATA
1131 1132
 
1132 1133
 lcov:
... ...
@@ -1,7 +1,8 @@
1
-# generated automatically by aclocal 1.14.1 -*- Autoconf -*-
2
-
3
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
1
+# generated automatically by aclocal 1.11.3 -*- Autoconf -*-
4 2
 
3
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
4
+# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
5
+# Inc.
5 6
 # This file is free software; the Free Software Foundation
6 7
 # gives unlimited permission to copy and/or distribute it,
7 8
 # with or without modifications, as long as this notice is preserved.
... ...
@@ -11,31 +12,33 @@
11 11
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
12 12
 # PARTICULAR PURPOSE.
13 13
 
14
-m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])
15 14
 m4_ifndef([AC_AUTOCONF_VERSION],
16 15
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
17
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],,
18
-[m4_warning([this file was generated for autoconf 2.69.
16
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],,
17
+[m4_warning([this file was generated for autoconf 2.68.
19 18
 You have another version of autoconf.  It may work, but is not guaranteed to.
20 19
 If you have problems, you may need to regenerate the build system entirely.
21
-To do so, use the procedure documented by the package, typically 'autoreconf'.])])
20
+To do so, use the procedure documented by the package, typically `autoreconf'.])])
22 21
 
23
-# Copyright (C) 2002-2013 Free Software Foundation, Inc.
22
+# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software
23
+# Foundation, Inc.
24 24
 #
25 25
 # This file is free software; the Free Software Foundation
26 26
 # gives unlimited permission to copy and/or distribute it,
27 27
 # with or without modifications, as long as this notice is preserved.
28 28
 
29
+# serial 1
30
+
29 31
 # AM_AUTOMAKE_VERSION(VERSION)
30 32
 # ----------------------------
31 33
 # Automake X.Y traces this macro to ensure aclocal.m4 has been
32 34
 # generated from the m4 files accompanying Automake X.Y.
33 35
 # (This private macro should not be called outside this file.)
34 36
 AC_DEFUN([AM_AUTOMAKE_VERSION],
35
-[am__api_version='1.14'
37
+[am__api_version='1.11'
36 38
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
37 39
 dnl require some minimum version.  Point them to the right macro.
38
-m4_if([$1], [1.14.1], [],
40
+m4_if([$1], [1.11.3], [],
39 41
       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
40 42
 ])
41 43
 
... ...
@@ -51,22 +54,24 @@ 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.1])dnl
54
+[AM_AUTOMAKE_VERSION([1.11.3])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]))])
58 58
 
59 59
 # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
60 60
 
61
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
61
+# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
62 62
 #
63 63
 # This file is free software; the Free Software Foundation
64 64
 # gives unlimited permission to copy and/or distribute it,
65 65
 # with or without modifications, as long as this notice is preserved.
66 66
 
67
+# serial 1
68
+
67 69
 # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
68
-# $ac_aux_dir to '$srcdir/foo'.  In other projects, it is set to
69
-# '$srcdir', '$srcdir/..', or '$srcdir/../..'.
70
+# $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to
71
+# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
70 72
 #
71 73
 # Of course, Automake must honor this variable whenever it calls a
72 74
 # tool from the auxiliary directory.  The problem is that $srcdir (and
... ...
@@ -85,7 +90,7 @@ _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
85 85
 #
86 86
 # The reason of the latter failure is that $top_srcdir and $ac_aux_dir
87 87
 # are both prefixed by $srcdir.  In an in-source build this is usually
88
-# harmless because $srcdir is '.', but things will broke when you
88
+# harmless because $srcdir is `.', but things will broke when you
89 89
 # start a VPATH build or use an absolute $srcdir.
90 90
 #
91 91
 # So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
... ...
@@ -111,19 +116,22 @@ am_aux_dir=`cd $ac_aux_dir && pwd`
111 111
 
112 112
 # AM_CONDITIONAL                                            -*- Autoconf -*-
113 113
 
114
-# Copyright (C) 1997-2013 Free Software Foundation, Inc.
114
+# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008
115
+# Free Software Foundation, Inc.
115 116
 #
116 117
 # This file is free software; the Free Software Foundation
117 118
 # gives unlimited permission to copy and/or distribute it,
118 119
 # with or without modifications, as long as this notice is preserved.
119 120
 
121
+# serial 9
122
+
120 123
 # AM_CONDITIONAL(NAME, SHELL-CONDITION)
121 124
 # -------------------------------------
122 125
 # Define a conditional.
123 126
 AC_DEFUN([AM_CONDITIONAL],
124
-[AC_PREREQ([2.52])dnl
125
- m4_if([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
126
-       [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
127
+[AC_PREREQ(2.52)dnl
128
+ ifelse([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
129
+	[$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
127 130
 AC_SUBST([$1_TRUE])dnl
128 131
 AC_SUBST([$1_FALSE])dnl
129 132
 _AM_SUBST_NOTMAKE([$1_TRUE])dnl
... ...
@@ -142,14 +150,16 @@ AC_CONFIG_COMMANDS_PRE(
142 142
 Usually this means the macro was only invoked conditionally.]])
143 143
 fi])])
144 144
 
145
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
145
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009,
146
+# 2010, 2011 Free Software Foundation, Inc.
146 147
 #
147 148
 # This file is free software; the Free Software Foundation
148 149
 # gives unlimited permission to copy and/or distribute it,
149 150
 # with or without modifications, as long as this notice is preserved.
150 151
 
152
+# serial 12
151 153
 
152
-# There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be
154
+# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
153 155
 # written in clear, in which case automake, when reading aclocal.m4,
154 156
 # will think it sees a *use*, and therefore will trigger all it's
155 157
 # C support machinery.  Also note that it means that autoscan, seeing
... ...
@@ -159,7 +169,7 @@ fi])])
159 159
 # _AM_DEPENDENCIES(NAME)
160 160
 # ----------------------
161 161
 # See how the compiler implements dependency checking.
162
-# NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC".
162
+# NAME is "CC", "CXX", "GCJ", or "OBJC".
163 163
 # We try a few techniques and use that to set a single cache variable.
164 164
 #
165 165
 # We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
... ...
@@ -172,13 +182,12 @@ AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
172 172
 AC_REQUIRE([AM_MAKE_INCLUDE])dnl
173 173
 AC_REQUIRE([AM_DEP_TRACK])dnl
174 174
 
175
-m4_if([$1], [CC],   [depcc="$CC"   am_compiler_list=],
176
-      [$1], [CXX],  [depcc="$CXX"  am_compiler_list=],
177
-      [$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
178
-      [$1], [OBJCXX], [depcc="$OBJCXX" am_compiler_list='gcc3 gcc'],
179
-      [$1], [UPC],  [depcc="$UPC"  am_compiler_list=],
180
-      [$1], [GCJ],  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
181
-                    [depcc="$$1"   am_compiler_list=])
175
+ifelse([$1], CC,   [depcc="$CC"   am_compiler_list=],
176
+       [$1], CXX,  [depcc="$CXX"  am_compiler_list=],
177
+       [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
178
+       [$1], UPC,  [depcc="$UPC"  am_compiler_list=],
179
+       [$1], GCJ,  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
180
+                   [depcc="$$1"   am_compiler_list=])
182 181
 
183 182
 AC_CACHE_CHECK([dependency style of $depcc],
184 183
                [am_cv_$1_dependencies_compiler_type],
... ...
@@ -186,8 +195,8 @@ AC_CACHE_CHECK([dependency style of $depcc],
186 186
   # We make a subdir and do the tests there.  Otherwise we can end up
187 187
   # making bogus files that we don't know about and never remove.  For
188 188
   # instance it was reported that on HP-UX the gcc test will end up
189
-  # making a dummy file named 'D' -- because '-MD' means "put the output
190
-  # in D".
189
+  # making a dummy file named `D' -- because `-MD' means `put the output
190
+  # in D'.
191 191
   rm -rf conftest.dir
192 192
   mkdir conftest.dir
193 193
   # Copy depcomp to subdir because otherwise we won't find it if we're
... ...
@@ -227,16 +236,16 @@ AC_CACHE_CHECK([dependency style of $depcc],
227 227
     : > sub/conftest.c
228 228
     for i in 1 2 3 4 5 6; do
229 229
       echo '#include "conftst'$i'.h"' >> sub/conftest.c
230
-      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
231
-      # Solaris 10 /bin/sh.
232
-      echo '/* dummy */' > sub/conftst$i.h
230
+      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
231
+      # Solaris 8's {/usr,}/bin/sh.
232
+      touch sub/conftst$i.h
233 233
     done
234 234
     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
235 235
 
236
-    # We check with '-c' and '-o' for the sake of the "dashmstdout"
236
+    # We check with `-c' and `-o' for the sake of the "dashmstdout"
237 237
     # mode.  It turns out that the SunPro C++ compiler does not properly
238
-    # handle '-M -o', and we need to detect this.  Also, some Intel
239
-    # versions had trouble with output in subdirs.
238
+    # handle `-M -o', and we need to detect this.  Also, some Intel
239
+    # versions had trouble with output in subdirs
240 240
     am__obj=sub/conftest.${OBJEXT-o}
241 241
     am__minus_obj="-o $am__obj"
242 242
     case $depmode in
... ...
@@ -245,8 +254,8 @@ AC_CACHE_CHECK([dependency style of $depcc],
245 245
       test "$am__universal" = false || continue
246 246
       ;;
247 247
     nosideeffect)
248
-      # After this tag, mechanisms are not by side-effect, so they'll
249
-      # only be used when explicitly requested.
248
+      # after this tag, mechanisms are not by side-effect, so they'll
249
+      # only be used when explicitly requested
250 250
       if test "x$enable_dependency_tracking" = xyes; then
251 251
 	continue
252 252
       else
... ...
@@ -254,7 +263,7 @@ AC_CACHE_CHECK([dependency style of $depcc],
254 254
       fi
255 255
       ;;
256 256
     msvc7 | msvc7msys | msvisualcpp | msvcmsys)
257
-      # This compiler won't grok '-c -o', but also, the minuso test has
257
+      # This compiler won't grok `-c -o', but also, the minuso test has
258 258
       # not run yet.  These depmodes are late enough in the game, and
259 259
       # so weak that their functioning should not be impacted.
260 260
       am__obj=conftest.${OBJEXT-o}
... ...
@@ -302,7 +311,7 @@ AM_CONDITIONAL([am__fastdep$1], [
302 302
 # AM_SET_DEPDIR
303 303
 # -------------
304 304
 # Choose a directory name for dependency files.
305
-# This macro is AC_REQUIREd in _AM_DEPENDENCIES.
305
+# This macro is AC_REQUIREd in _AM_DEPENDENCIES
306 306
 AC_DEFUN([AM_SET_DEPDIR],
307 307
 [AC_REQUIRE([AM_SET_LEADING_DOT])dnl
308 308
 AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
... ...
@@ -312,13 +321,9 @@ AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
312 312
 # AM_DEP_TRACK
313 313
 # ------------
314 314
 AC_DEFUN([AM_DEP_TRACK],
315
-[AC_ARG_ENABLE([dependency-tracking], [dnl
316
-AS_HELP_STRING(
317
-  [--enable-dependency-tracking],
318
-  [do not reject slow dependency extractors])
319
-AS_HELP_STRING(
320
-  [--disable-dependency-tracking],
321
-  [speeds up one-time build])])
315
+[AC_ARG_ENABLE(dependency-tracking,
316
+[  --disable-dependency-tracking  speeds up one-time build
317
+  --enable-dependency-tracking   do not reject slow dependency extractors])
322 318
 if test "x$enable_dependency_tracking" != xno; then
323 319
   am_depcomp="$ac_aux_dir/depcomp"
324 320
   AMDEPBACKSLASH='\'
... ...
@@ -333,18 +338,20 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl
333 333
 
334 334
 # Generate code to set up dependency tracking.              -*- Autoconf -*-
335 335
 
336
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
336
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008
337
+# Free Software Foundation, Inc.
337 338
 #
338 339
 # This file is free software; the Free Software Foundation
339 340
 # gives unlimited permission to copy and/or distribute it,
340 341
 # with or without modifications, as long as this notice is preserved.
341 342
 
343
+#serial 5
342 344
 
343 345
 # _AM_OUTPUT_DEPENDENCY_COMMANDS
344 346
 # ------------------------------
345 347
 AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
346 348
 [{
347
-  # Older Autoconf quotes --file arguments for eval, but not when files
349
+  # Autoconf 2.62 quotes --file arguments for eval, but not when files
348 350
   # are listed without --file.  Let's play safe and only enable the eval
349 351
   # if we detect the quoting.
350 352
   case $CONFIG_FILES in
... ...
@@ -357,7 +364,7 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
357 357
     # Strip MF so we end up with the name of the file.
358 358
     mf=`echo "$mf" | sed -e 's/:.*$//'`
359 359
     # Check whether this is an Automake generated Makefile or not.
360
-    # We used to match only the files named 'Makefile.in', but
360
+    # We used to match only the files named `Makefile.in', but
361 361
     # some people rename them; so instead we look at the file content.
362 362
     # Grep'ing the first line is not enough: some people post-process
363 363
     # each Makefile.in and add a new line on top of each file to say so.
... ...
@@ -369,19 +376,21 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
369 369
       continue
370 370
     fi
371 371
     # Extract the definition of DEPDIR, am__include, and am__quote
372
-    # from the Makefile without running 'make'.
372
+    # from the Makefile without running `make'.
373 373
     DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
374 374
     test -z "$DEPDIR" && continue
375 375
     am__include=`sed -n 's/^am__include = //p' < "$mf"`
376
-    test -z "$am__include" && continue
376
+    test -z "am__include" && continue
377 377
     am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
378
+    # When using ansi2knr, U may be empty or an underscore; expand it
379
+    U=`sed -n 's/^U = //p' < "$mf"`
378 380
     # Find all dependency output files, they are included files with
379 381
     # $(DEPDIR) in their names.  We invoke sed twice because it is the
380 382
     # simplest approach to changing $(DEPDIR) to its actual value in the
381 383
     # expansion.
382 384
     for file in `sed -n "
383 385
       s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
384
-	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
386
+	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
385 387
       # Make sure the directory exists.
386 388
       test -f "$dirpart/$file" && continue
387 389
       fdir=`AS_DIRNAME(["$file"])`
... ...
@@ -399,7 +408,7 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
399 399
 # This macro should only be invoked once -- use via AC_REQUIRE.
400 400
 #
401 401
 # This code is only required when automatic dependency tracking
402
-# is enabled.  FIXME.  This creates each '.P' file that we will
402
+# is enabled.  FIXME.  This creates each `.P' file that we will
403 403
 # need in order to bootstrap the dependency handling code.
404 404
 AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
405 405
 [AC_CONFIG_COMMANDS([depfiles],
... ...
@@ -409,21 +418,18 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
409 409
 
410 410
 # Do all the work for Automake.                             -*- Autoconf -*-
411 411
 
412
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
412
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
413
+# 2005, 2006, 2008, 2009 Free Software Foundation, Inc.
413 414
 #
414 415
 # This file is free software; the Free Software Foundation
415 416
 # gives unlimited permission to copy and/or distribute it,
416 417
 # with or without modifications, as long as this notice is preserved.
417 418
 
419
+# serial 16
420
+
418 421
 # This macro actually does too much.  Some checks are only needed if
419 422
 # your package does certain things.  But this isn't really a big deal.
420 423
 
421
-dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O.
422
-m4_define([AC_PROG_CC],
423
-m4_defn([AC_PROG_CC])
424
-[_AM_PROG_CC_C_O
425
-])
426
-
427 424
 # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
428 425
 # AM_INIT_AUTOMAKE([OPTIONS])
429 426
 # -----------------------------------------------
... ...
@@ -436,7 +442,7 @@ m4_defn([AC_PROG_CC])
436 436
 # arguments mandatory, and then we can depend on a new Autoconf
437 437
 # release and drop the old call support.
438 438
 AC_DEFUN([AM_INIT_AUTOMAKE],
439
-[AC_PREREQ([2.65])dnl
439
+[AC_PREREQ([2.62])dnl
440 440
 dnl Autoconf wants to disallow AM_ names.  We explicitly allow
441 441
 dnl the ones we care about.
442 442
 m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
... ...
@@ -465,40 +471,31 @@ AC_SUBST([CYGPATH_W])
465 465
 # Define the identity of the package.
466 466
 dnl Distinguish between old-style and new-style calls.
467 467
 m4_ifval([$2],
468
-[AC_DIAGNOSE([obsolete],
469
-             [$0: two- and three-arguments forms are deprecated.])
470
-m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
468
+[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
471 469
  AC_SUBST([PACKAGE], [$1])dnl
472 470
  AC_SUBST([VERSION], [$2])],
473 471
 [_AM_SET_OPTIONS([$1])dnl
474 472
 dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
475
-m4_if(
476
-  m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]),
477
-  [ok:ok],,
473
+m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
478 474
   [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
479 475
  AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
480 476
  AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
481 477
 
482 478
 _AM_IF_OPTION([no-define],,
483
-[AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package])
484
- AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl
479
+[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
480
+ AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
485 481
 
486 482
 # Some tools Automake needs.
487 483
 AC_REQUIRE([AM_SANITY_CHECK])dnl
488 484
 AC_REQUIRE([AC_ARG_PROGRAM])dnl
489
-AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}])
490
-AM_MISSING_PROG([AUTOCONF], [autoconf])
491
-AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}])
492
-AM_MISSING_PROG([AUTOHEADER], [autoheader])
493
-AM_MISSING_PROG([MAKEINFO], [makeinfo])
485
+AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
486
+AM_MISSING_PROG(AUTOCONF, autoconf)
487
+AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
488
+AM_MISSING_PROG(AUTOHEADER, autoheader)
489
+AM_MISSING_PROG(MAKEINFO, makeinfo)
494 490
 AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
495 491
 AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
496
-AC_REQUIRE([AC_PROG_MKDIR_P])dnl
497
-# For better backward compatibility.  To be removed once Automake 1.9.x
498
-# dies out for good.  For more background, see:
499
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
500
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
501
-AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
492
+AC_REQUIRE([AM_PROG_MKDIR_P])dnl
502 493
 # We need awk for the "check" target.  The system "awk" is bad on
503 494
 # some platforms.
504 495
 AC_REQUIRE([AC_PROG_AWK])dnl
... ...
@@ -509,78 +506,34 @@ _AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
509 509
 			     [_AM_PROG_TAR([v7])])])
510 510
 _AM_IF_OPTION([no-dependencies],,
511 511
 [AC_PROVIDE_IFELSE([AC_PROG_CC],
512
-		  [_AM_DEPENDENCIES([CC])],
513
-		  [m4_define([AC_PROG_CC],
514
-			     m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl
512
+		  [_AM_DEPENDENCIES(CC)],
513
+		  [define([AC_PROG_CC],
514
+			  defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
515 515
 AC_PROVIDE_IFELSE([AC_PROG_CXX],
516
-		  [_AM_DEPENDENCIES([CXX])],
517
-		  [m4_define([AC_PROG_CXX],
518
-			     m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl
516
+		  [_AM_DEPENDENCIES(CXX)],
517
+		  [define([AC_PROG_CXX],
518
+			  defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
519 519
 AC_PROVIDE_IFELSE([AC_PROG_OBJC],
520
-		  [_AM_DEPENDENCIES([OBJC])],
521
-		  [m4_define([AC_PROG_OBJC],
522
-			     m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl
523
-AC_PROVIDE_IFELSE([AC_PROG_OBJCXX],
524
-		  [_AM_DEPENDENCIES([OBJCXX])],
525
-		  [m4_define([AC_PROG_OBJCXX],
526
-			     m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl
520
+		  [_AM_DEPENDENCIES(OBJC)],
521
+		  [define([AC_PROG_OBJC],
522
+			  defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
527 523
 ])
528
-AC_REQUIRE([AM_SILENT_RULES])dnl
529
-dnl The testsuite driver may need to know about EXEEXT, so add the
530
-dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen.  This
531
-dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below.
524
+_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl
525
+dnl The `parallel-tests' driver may need to know about EXEEXT, so add the
526
+dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen.  This macro
527
+dnl is hooked onto _AC_COMPILER_EXEEXT early, see below.
532 528
 AC_CONFIG_COMMANDS_PRE(dnl
533 529
 [m4_provide_if([_AM_COMPILER_EXEEXT],
534 530
   [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
531
+])
535 532
 
536
-# POSIX will say in a future version that running "rm -f" with no argument
537
-# is OK; and we want to be able to make that assumption in our Makefile
538
-# recipes.  So use an aggressive probe to check that the usage we want is
539
-# actually supported "in the wild" to an acceptable degree.
540
-# See automake bug#10828.
541
-# To make any issue more visible, cause the running configure to be aborted
542
-# by default if the 'rm' program in use doesn't match our expectations; the
543
-# user can still override this though.
544
-if rm -f && rm -fr && rm -rf; then : OK; else
545
-  cat >&2 <<'END'
546
-Oops!
547
-
548
-Your 'rm' program seems unable to run without file operands specified
549
-on the command line, even when the '-f' option is present.  This is contrary
550
-to the behaviour of most rm programs out there, and not conforming with
551
-the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
552
-
553
-Please tell bug-automake@gnu.org about your system, including the value
554
-of your $PATH and any error possibly output before this message.  This
555
-can help us improve future automake versions.
556
-
557
-END
558
-  if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
559
-    echo 'Configuration will proceed anyway, since you have set the' >&2
560
-    echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
561
-    echo >&2
562
-  else
563
-    cat >&2 <<'END'
564
-Aborting the configuration process, to ensure you take notice of the issue.
565
-
566
-You can download and install GNU coreutils to get an 'rm' implementation
567
-that behaves properly: <http://www.gnu.org/software/coreutils/>.
568
-
569
-If you want to complete the configuration process using your problematic
570
-'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
571
-to "yes", and re-run configure.
572
-
573
-END
574
-    AC_MSG_ERROR([Your 'rm' program is bad, sorry.])
575
-  fi
576
-fi])
577
-
578
-dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion.  Do not
533
+dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion.  Do not
579 534
 dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
580 535
 dnl mangled by Autoconf and run in a shell conditional statement.
581 536
 m4_define([_AC_COMPILER_EXEEXT],
582 537
 m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
583 538
 
539
+
584 540
 # When config.status generates a header, we must update the stamp-h file.
585 541
 # This file resides in the same directory as the config header
586 542
 # that is generated.  The stamp files are numbered to have different names.
... ...
@@ -602,12 +555,15 @@ for _am_header in $config_headers :; do
602 602
 done
603 603
 echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
604 604
 
605
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
605
+# Copyright (C) 2001, 2003, 2005, 2008, 2011 Free Software Foundation,
606
+# Inc.
606 607
 #
607 608
 # This file is free software; the Free Software Foundation
608 609
 # gives unlimited permission to copy and/or distribute it,
609 610
 # with or without modifications, as long as this notice is preserved.
610 611
 
612
+# serial 1
613
+
611 614
 # AM_PROG_INSTALL_SH
612 615
 # ------------------
613 616
 # Define $install_sh.
... ...
@@ -621,14 +577,16 @@ if test x"${install_sh}" != xset; then
621 621
     install_sh="\${SHELL} $am_aux_dir/install-sh"
622 622
   esac
623 623
 fi
624
-AC_SUBST([install_sh])])
624
+AC_SUBST(install_sh)])
625 625
 
626
-# Copyright (C) 2003-2013 Free Software Foundation, Inc.
626
+# Copyright (C) 2003, 2005  Free Software Foundation, Inc.
627 627
 #
628 628
 # This file is free software; the Free Software Foundation
629 629
 # gives unlimited permission to copy and/or distribute it,
630 630
 # with or without modifications, as long as this notice is preserved.
631 631
 
632
+# serial 2
633
+
632 634
 # Check whether the underlying file-system supports filenames
633 635
 # with a leading dot.  For instance MS-DOS doesn't.
634 636
 AC_DEFUN([AM_SET_LEADING_DOT],
... ...
@@ -644,12 +602,14 @@ AC_SUBST([am__leading_dot])])
644 644
 
645 645
 # Check to see how 'make' treats includes.	            -*- Autoconf -*-
646 646
 
647
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
647
+# Copyright (C) 2001, 2002, 2003, 2005, 2009  Free Software Foundation, Inc.
648 648
 #
649 649
 # This file is free software; the Free Software Foundation
650 650
 # gives unlimited permission to copy and/or distribute it,
651 651
 # with or without modifications, as long as this notice is preserved.
652 652
 
653
+# serial 4
654
+
653 655
 # AM_MAKE_INCLUDE()
654 656
 # -----------------
655 657
 # Check to see how make treats includes.
... ...
@@ -667,7 +627,7 @@ am__quote=
667 667
 _am_result=none
668 668
 # First try GNU make style include.
669 669
 echo "include confinc" > confmf
670
-# Ignore all kinds of additional output from 'make'.
670
+# Ignore all kinds of additional output from `make'.
671 671
 case `$am_make -s -f confmf 2> /dev/null` in #(
672 672
 *the\ am__doit\ target*)
673 673
   am__include=include
... ...
@@ -694,12 +654,15 @@ rm -f confinc confmf
694 694
 
695 695
 # Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
696 696
 
697
-# Copyright (C) 1997-2013 Free Software Foundation, Inc.
697
+# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008
698
+# Free Software Foundation, Inc.
698 699
 #
699 700
 # This file is free software; the Free Software Foundation
700 701
 # gives unlimited permission to copy and/or distribute it,
701 702
 # with or without modifications, as long as this notice is preserved.
702 703
 
704
+# serial 6
705
+
703 706
 # AM_MISSING_PROG(NAME, PROGRAM)
704 707
 # ------------------------------
705 708
 AC_DEFUN([AM_MISSING_PROG],
... ...
@@ -707,10 +670,11 @@ AC_DEFUN([AM_MISSING_PROG],
707 707
 $1=${$1-"${am_missing_run}$2"}
708 708
 AC_SUBST($1)])
709 709
 
710
+
710 711
 # AM_MISSING_HAS_RUN
711 712
 # ------------------
712
-# Define MISSING if not defined so far and test if it is modern enough.
713
-# If it is, set am_missing_run to use it, otherwise, to nothing.
713
+# Define MISSING if not defined so far and test if it supports --run.
714
+# If it does, set am_missing_run to use it, otherwise, to nothing.
714 715
 AC_DEFUN([AM_MISSING_HAS_RUN],
715 716
 [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
716 717
 AC_REQUIRE_AUX_FILE([missing])dnl
... ...
@@ -723,22 +687,54 @@ if test x"${MISSING+set}" != xset; then
723 723
   esac
724 724
 fi
725 725
 # Use eval to expand $SHELL
726
-if eval "$MISSING --is-lightweight"; then
727
-  am_missing_run="$MISSING "
726
+if eval "$MISSING --run true"; then
727
+  am_missing_run="$MISSING --run "
728 728
 else
729 729
   am_missing_run=
730
-  AC_MSG_WARN(['missing' script is too old or missing])
730
+  AC_MSG_WARN([`missing' script is too old or missing])
731 731
 fi
732 732
 ])
733 733
 
734
+# Copyright (C) 2003, 2004, 2005, 2006, 2011 Free Software Foundation,
735
+# Inc.
736
+#
737
+# This file is free software; the Free Software Foundation
738
+# gives unlimited permission to copy and/or distribute it,
739
+# with or without modifications, as long as this notice is preserved.
740
+
741
+# serial 1
742
+
743
+# AM_PROG_MKDIR_P
744
+# ---------------
745
+# Check for `mkdir -p'.
746
+AC_DEFUN([AM_PROG_MKDIR_P],
747
+[AC_PREREQ([2.60])dnl
748
+AC_REQUIRE([AC_PROG_MKDIR_P])dnl
749
+dnl Automake 1.8 to 1.9.6 used to define mkdir_p.  We now use MKDIR_P,
750
+dnl while keeping a definition of mkdir_p for backward compatibility.
751
+dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
752
+dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
753
+dnl Makefile.ins that do not define MKDIR_P, so we do our own
754
+dnl adjustment using top_builddir (which is defined more often than
755
+dnl MKDIR_P).
756
+AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
757
+case $mkdir_p in
758
+  [[\\/$]]* | ?:[[\\/]]*) ;;
759
+  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
760
+esac
761
+])
762
+
734 763
 # Helper functions for option handling.                     -*- Autoconf -*-
735 764
 
736
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
765
+# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 Free Software
766
+# Foundation, Inc.
737 767
 #
738 768
 # This file is free software; the Free Software Foundation
739 769
 # gives unlimited permission to copy and/or distribute it,
740 770
 # with or without modifications, as long as this notice is preserved.
741 771
 
772
+# serial 5
773
+
742 774
 # _AM_MANGLE_OPTION(NAME)
743 775
 # -----------------------
744 776
 AC_DEFUN([_AM_MANGLE_OPTION],
... ...
@@ -748,7 +744,7 @@ AC_DEFUN([_AM_MANGLE_OPTION],
748 748
 # --------------------
749 749
 # Set option NAME.  Presently that only means defining a flag for this option.
750 750
 AC_DEFUN([_AM_SET_OPTION],
751
-[m4_define(_AM_MANGLE_OPTION([$1]), [1])])
751
+[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
752 752
 
753 753
 # _AM_SET_OPTIONS(OPTIONS)
754 754
 # ------------------------
... ...
@@ -762,58 +758,13 @@ AC_DEFUN([_AM_SET_OPTIONS],
762 762
 AC_DEFUN([_AM_IF_OPTION],
763 763
 [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
764 764
 
765
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
765
+# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
766 766
 #
767 767
 # This file is free software; the Free Software Foundation
768 768
 # gives unlimited permission to copy and/or distribute it,
769 769
 # with or without modifications, as long as this notice is preserved.
770 770
 
771
-# _AM_PROG_CC_C_O
772
-# ---------------
773
-# Like AC_PROG_CC_C_O, but changed for automake.  We rewrite AC_PROG_CC
774
-# to automatically call this.
775
-AC_DEFUN([_AM_PROG_CC_C_O],
776
-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
777
-AC_REQUIRE_AUX_FILE([compile])dnl
778
-AC_LANG_PUSH([C])dnl
779
-AC_CACHE_CHECK(
780
-  [whether $CC understands -c and -o together],
781
-  [am_cv_prog_cc_c_o],
782
-  [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])])
783
-  # Make sure it works both with $CC and with simple cc.
784
-  # Following AC_PROG_CC_C_O, we do the test twice because some
785
-  # compilers refuse to overwrite an existing .o file with -o,
786
-  # though they will create one.
787
-  am_cv_prog_cc_c_o=yes
788
-  for am_i in 1 2; do
789
-    if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \
790
-         && test -f conftest2.$ac_objext; then
791
-      : OK
792
-    else
793
-      am_cv_prog_cc_c_o=no
794
-      break
795
-    fi
796
-  done
797
-  rm -f core conftest*
798
-  unset am_i])
799
-if test "$am_cv_prog_cc_c_o" != yes; then
800
-   # Losing compiler, so override with the script.
801
-   # FIXME: It is wrong to rewrite CC.
802
-   # But if we don't then we get into trouble of one sort or another.
803
-   # A longer-term fix would be to have automake use am__CC in this case,
804
-   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
805
-   CC="$am_aux_dir/compile $CC"
806
-fi
807
-AC_LANG_POP([C])])
808
-
809
-# For backward compatibility.
810
-AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
811
-
812
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
813
-#
814
-# This file is free software; the Free Software Foundation
815
-# gives unlimited permission to copy and/or distribute it,
816
-# with or without modifications, as long as this notice is preserved.
771
+# serial 1
817 772
 
818 773
 # AM_RUN_LOG(COMMAND)
819 774
 # -------------------
... ...
@@ -828,16 +779,22 @@ AC_DEFUN([AM_RUN_LOG],
828 828
 
829 829
 # Check to make sure that the build environment is sane.    -*- Autoconf -*-
830 830
 
831
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
831
+# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008
832
+# Free Software Foundation, Inc.
832 833
 #
833 834
 # This file is free software; the Free Software Foundation
834 835
 # gives unlimited permission to copy and/or distribute it,
835 836
 # with or without modifications, as long as this notice is preserved.
836 837
 
838
+# serial 5
839
+
837 840
 # AM_SANITY_CHECK
838 841
 # ---------------
839 842
 AC_DEFUN([AM_SANITY_CHECK],
840 843
 [AC_MSG_CHECKING([whether build environment is sane])
844
+# Just in case
845
+sleep 1
846
+echo timestamp > conftest.file
841 847
 # Reject unsafe characters in $srcdir or the absolute working directory
842 848
 # name.  Accept space and tab only in the latter.
843 849
 am_lf='
... ...
@@ -848,40 +805,32 @@ case `pwd` in
848 848
 esac
849 849
 case $srcdir in
850 850
   *[[\\\"\#\$\&\'\`$am_lf\ \	]]*)
851
-    AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);;
851
+    AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);;
852 852
 esac
853 853
 
854
-# Do 'set' in a subshell so we don't clobber the current shell's
854
+# Do `set' in a subshell so we don't clobber the current shell's
855 855
 # arguments.  Must try -L first in case configure is actually a
856 856
 # symlink; some systems play weird games with the mod time of symlinks
857 857
 # (eg FreeBSD returns the mod time of the symlink's containing
858 858
 # directory).
859 859
 if (
860
-   am_has_slept=no
861
-   for am_try in 1 2; do
862
-     echo "timestamp, slept: $am_has_slept" > conftest.file
863
-     set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
864
-     if test "$[*]" = "X"; then
865
-	# -L didn't work.
866
-	set X `ls -t "$srcdir/configure" conftest.file`
867
-     fi
868
-     if test "$[*]" != "X $srcdir/configure conftest.file" \
869
-	&& test "$[*]" != "X conftest.file $srcdir/configure"; then
870
-
871
-	# If neither matched, then we have a broken ls.  This can happen
872
-	# if, for instance, CONFIG_SHELL is bash and it inherits a
873
-	# broken ls alias from the environment.  This has actually
874
-	# happened.  Such a system could not be considered "sane".
875
-	AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
876
-  alias in your environment])
877
-     fi
878
-     if test "$[2]" = conftest.file || test $am_try -eq 2; then
879
-       break
880
-     fi
881
-     # Just in case.
882
-     sleep 1
883
-     am_has_slept=yes
884
-   done
860
+   set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
861
+   if test "$[*]" = "X"; then
862
+      # -L didn't work.
863
+      set X `ls -t "$srcdir/configure" conftest.file`
864
+   fi
865
+   rm -f conftest.file
866
+   if test "$[*]" != "X $srcdir/configure conftest.file" \
867
+      && test "$[*]" != "X conftest.file $srcdir/configure"; then
868
+
869
+      # If neither matched, then we have a broken ls.  This can happen
870
+      # if, for instance, CONFIG_SHELL is bash and it inherits a
871
+      # broken ls alias from the environment.  This has actually
872
+      # happened.  Such a system could not be considered "sane".
873
+      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
874
+alias in your environment])
875
+   fi
876
+
885 877
    test "$[2]" = conftest.file
886 878
    )
887 879
 then
... ...
@@ -891,50 +840,31 @@ else
891 891
    AC_MSG_ERROR([newly created file is older than distributed files!
892 892
 Check your system clock])
893 893
 fi
894
-AC_MSG_RESULT([yes])
895
-# If we didn't sleep, we still need to ensure time stamps of config.status and
896
-# generated files are strictly newer.
897
-am_sleep_pid=
898
-if grep 'slept: no' conftest.file >/dev/null 2>&1; then
899
-  ( sleep 1 ) &
900
-  am_sleep_pid=$!
901
-fi
902
-AC_CONFIG_COMMANDS_PRE(
903
-  [AC_MSG_CHECKING([that generated files are newer than configure])
904
-   if test -n "$am_sleep_pid"; then
905
-     # Hide warnings about reused PIDs.
906
-     wait $am_sleep_pid 2>/dev/null
907
-   fi
908
-   AC_MSG_RESULT([done])])
909
-rm -f conftest.file
910
-])
894
+AC_MSG_RESULT(yes)])
911 895
 
912
-# Copyright (C) 2009-2013 Free Software Foundation, Inc.
896
+# Copyright (C) 2009, 2011  Free Software Foundation, Inc.
913 897
 #
914 898
 # This file is free software; the Free Software Foundation
915 899
 # gives unlimited permission to copy and/or distribute it,
916 900
 # with or without modifications, as long as this notice is preserved.
917 901
 
902
+# serial 2
903
+
918 904
 # AM_SILENT_RULES([DEFAULT])
919 905
 # --------------------------
920 906
 # Enable less verbose build rules; with the default set to DEFAULT
921
-# ("yes" being less verbose, "no" or empty being verbose).
907
+# (`yes' being less verbose, `no' or empty being verbose).
922 908
 AC_DEFUN([AM_SILENT_RULES],
923
-[AC_ARG_ENABLE([silent-rules], [dnl
924
-AS_HELP_STRING(
925
-  [--enable-silent-rules],
926
-  [less verbose build output (undo: "make V=1")])
927
-AS_HELP_STRING(
928
-  [--disable-silent-rules],
929
-  [verbose build output (undo: "make V=0")])dnl
930
-])
931
-case $enable_silent_rules in @%:@ (((
932
-  yes) AM_DEFAULT_VERBOSITY=0;;
933
-   no) AM_DEFAULT_VERBOSITY=1;;
934
-    *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);;
909
+[AC_ARG_ENABLE([silent-rules],
910
+[  --enable-silent-rules          less verbose build output (undo: `make V=1')
911
+  --disable-silent-rules         verbose build output (undo: `make V=0')])
912
+case $enable_silent_rules in
913
+yes) AM_DEFAULT_VERBOSITY=0;;
914
+no)  AM_DEFAULT_VERBOSITY=1;;
915
+*)   AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);;
935 916
 esac
936 917
 dnl
937
-dnl A few 'make' implementations (e.g., NonStop OS and NextStep)
918
+dnl A few `make' implementations (e.g., NonStop OS and NextStep)
938 919
 dnl do not support nested variable expansions.
939 920
 dnl See automake bug#9928 and bug#10237.
940 921
 am_make=${MAKE-make}
... ...
@@ -952,7 +882,7 @@ else
952 952
   am_cv_make_support_nested_variables=no
953 953
 fi])
954 954
 if test $am_cv_make_support_nested_variables = yes; then
955
-  dnl Using '$V' instead of '$(V)' breaks IRIX make.
955
+  dnl Using `$V' instead of `$(V)' breaks IRIX make.
956 956
   AM_V='$(V)'
957 957
   AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
958 958
 else
... ...
@@ -969,40 +899,44 @@ AC_SUBST([AM_BACKSLASH])dnl
969 969
 _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
970 970
 ])
971 971
 
972
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
972
+# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
973 973
 #
974 974
 # This file is free software; the Free Software Foundation
975 975
 # gives unlimited permission to copy and/or distribute it,
976 976
 # with or without modifications, as long as this notice is preserved.
977 977
 
978
+# serial 1
979
+
978 980
 # AM_PROG_INSTALL_STRIP
979 981
 # ---------------------
980
-# One issue with vendor 'install' (even GNU) is that you can't
982
+# One issue with vendor `install' (even GNU) is that you can't
981 983
 # specify the program used to strip binaries.  This is especially
982 984
 # annoying in cross-compiling environments, where the build's strip
983 985
 # is unlikely to handle the host's binaries.
984 986
 # Fortunately install-sh will honor a STRIPPROG variable, so we
985
-# always use install-sh in "make install-strip", and initialize
987
+# always use install-sh in `make install-strip', and initialize
986 988
 # STRIPPROG with the value of the STRIP variable (set by the user).
987 989
 AC_DEFUN([AM_PROG_INSTALL_STRIP],
988 990
 [AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
989
-# Installed binaries are usually stripped using 'strip' when the user
990
-# run "make install-strip".  However 'strip' might not be the right
991
+# Installed binaries are usually stripped using `strip' when the user
992
+# run `make install-strip'.  However `strip' might not be the right
991 993
 # tool to use in cross-compilation environments, therefore Automake
992
-# will honor the 'STRIP' environment variable to overrule this program.
993
-dnl Don't test for $cross_compiling = yes, because it might be 'maybe'.
994
+# will honor the `STRIP' environment variable to overrule this program.
995
+dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
994 996
 if test "$cross_compiling" != no; then
995 997
   AC_CHECK_TOOL([STRIP], [strip], :)
996 998
 fi
997 999
 INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
998 1000
 AC_SUBST([INSTALL_STRIP_PROGRAM])])
999 1001
 
1000
-# Copyright (C) 2006-2013 Free Software Foundation, Inc.
1002
+# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc.
1001 1003
 #
1002 1004
 # This file is free software; the Free Software Foundation
1003 1005
 # gives unlimited permission to copy and/or distribute it,
1004 1006
 # with or without modifications, as long as this notice is preserved.
1005 1007
 
1008
+# serial 3
1009
+
1006 1010
 # _AM_SUBST_NOTMAKE(VARIABLE)
1007 1011
 # ---------------------------
1008 1012
 # Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
... ...
@@ -1016,16 +950,18 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
1016 1016
 
1017 1017
 # Check how to create a tarball.                            -*- Autoconf -*-
1018 1018
 
1019
-# Copyright (C) 2004-2013 Free Software Foundation, Inc.
1019
+# Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc.
1020 1020
 #
1021 1021
 # This file is free software; the Free Software Foundation
1022 1022
 # gives unlimited permission to copy and/or distribute it,
1023 1023
 # with or without modifications, as long as this notice is preserved.
1024 1024
 
1025
+# serial 2
1026
+
1025 1027
 # _AM_PROG_TAR(FORMAT)
1026 1028
 # --------------------
1027 1029
 # Check how to create a tarball in format FORMAT.
1028
-# FORMAT should be one of 'v7', 'ustar', or 'pax'.
1030
+# FORMAT should be one of `v7', `ustar', or `pax'.
1029 1031
 #
1030 1032
 # Substitute a variable $(am__tar) that is a command
1031 1033
 # writing to stdout a FORMAT-tarball containing the directory
... ...
@@ -1035,114 +971,76 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
1035 1035
 # Substitute a variable $(am__untar) that extract such
1036 1036
 # a tarball read from stdin.
1037 1037
 #     $(am__untar) < result.tar
1038
-#
1039 1038
 AC_DEFUN([_AM_PROG_TAR],
1040 1039
 [# Always define AMTAR for backward compatibility.  Yes, it's still used
1041 1040
 # in the wild :-(  We should find a proper way to deprecate it ...
1042 1041
 AC_SUBST([AMTAR], ['$${TAR-tar}'])
1043
-
1044
-# We'll loop over all known methods to create a tar archive until one works.
1042
+m4_if([$1], [v7],
1043
+     [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
1044
+     [m4_case([$1], [ustar],, [pax],,
1045
+              [m4_fatal([Unknown tar format])])
1046
+AC_MSG_CHECKING([how to create a $1 tar archive])
1047
+# Loop over all known methods to create a tar archive until one works.
1045 1048
 _am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
1049
+_am_tools=${am_cv_prog_tar_$1-$_am_tools}
1050
+# Do not fold the above two line into one, because Tru64 sh and
1051
+# Solaris sh will not grok spaces in the rhs of `-'.
1052
+for _am_tool in $_am_tools
1053
+do
1054
+  case $_am_tool in
1055
+  gnutar)
1056
+    for _am_tar in tar gnutar gtar;
1057
+    do
1058
+      AM_RUN_LOG([$_am_tar --version]) && break
1059
+    done
1060
+    am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
1061
+    am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
1062
+    am__untar="$_am_tar -xf -"
1063
+    ;;
1064
+  plaintar)
1065
+    # Must skip GNU tar: if it does not support --format= it doesn't create
1066
+    # ustar tarball either.
1067
+    (tar --version) >/dev/null 2>&1 && continue
1068
+    am__tar='tar chf - "$$tardir"'
1069
+    am__tar_='tar chf - "$tardir"'
1070
+    am__untar='tar xf -'
1071
+    ;;
1072
+  pax)
1073
+    am__tar='pax -L -x $1 -w "$$tardir"'
1074
+    am__tar_='pax -L -x $1 -w "$tardir"'
1075
+    am__untar='pax -r'
1076
+    ;;
1077
+  cpio)
1078
+    am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
1079
+    am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
1080
+    am__untar='cpio -i -H $1 -d'
1081
+    ;;
1082
+  none)
1083
+    am__tar=false
1084
+    am__tar_=false
1085
+    am__untar=false
1086
+    ;;
1087
+  esac
1046 1088
 
1047
-m4_if([$1], [v7],
1048
-  [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
1049
-
1050
-  [m4_case([$1],
1051
-    [ustar],
1052
-     [# The POSIX 1988 'ustar' format is defined with fixed-size fields.
1053
-      # There is notably a 21 bits limit for the UID and the GID.  In fact,
1054
-      # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343
1055
-      # and bug#13588).
1056
-      am_max_uid=2097151 # 2^21 - 1
1057
-      am_max_gid=$am_max_uid
1058
-      # The $UID and $GID variables are not portable, so we need to resort
1059
-      # to the POSIX-mandated id(1) utility.  Errors in the 'id' calls
1060
-      # below are definitely unexpected, so allow the users to see them
1061
-      # (that is, avoid stderr redirection).
1062
-      am_uid=`id -u || echo unknown`
1063
-      am_gid=`id -g || echo unknown`
1064
-      AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format])
1065
-      if test $am_uid -le $am_max_uid; then
1066
-         AC_MSG_RESULT([yes])
1067
-      else
1068
-         AC_MSG_RESULT([no])
1069
-         _am_tools=none
1070
-      fi
1071
-      AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format])
1072
-      if test $am_gid -le $am_max_gid; then
1073
-         AC_MSG_RESULT([yes])
1074
-      else
1075
-        AC_MSG_RESULT([no])
1076
-        _am_tools=none
1077
-      fi],
1078
-
1079
-  [pax],
1080
-    [],
1081
-
1082
-  [m4_fatal([Unknown tar format])])
1083
-
1084
-  AC_MSG_CHECKING([how to create a $1 tar archive])
1085
-
1086
-  # Go ahead even if we have the value already cached.  We do so because we
1087
-  # need to set the values for the 'am__tar' and 'am__untar' variables.
1088
-  _am_tools=${am_cv_prog_tar_$1-$_am_tools}
1089
-
1090
-  for _am_tool in $_am_tools; do
1091
-    case $_am_tool in
1092
-    gnutar)
1093
-      for _am_tar in tar gnutar gtar; do
1094
-        AM_RUN_LOG([$_am_tar --version]) && break
1095
-      done
1096
-      am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
1097
-      am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
1098
-      am__untar="$_am_tar -xf -"
1099
-      ;;
1100
-    plaintar)
1101
-      # Must skip GNU tar: if it does not support --format= it doesn't create
1102
-      # ustar tarball either.
1103
-      (tar --version) >/dev/null 2>&1 && continue
1104
-      am__tar='tar chf - "$$tardir"'
1105
-      am__tar_='tar chf - "$tardir"'
1106
-      am__untar='tar xf -'
1107
-      ;;
1108
-    pax)
1109
-      am__tar='pax -L -x $1 -w "$$tardir"'
1110
-      am__tar_='pax -L -x $1 -w "$tardir"'
1111
-      am__untar='pax -r'
1112
-      ;;
1113
-    cpio)
1114
-      am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
1115
-      am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
1116
-      am__untar='cpio -i -H $1 -d'
1117
-      ;;
1118
-    none)
1119
-      am__tar=false
1120
-      am__tar_=false
1121
-      am__untar=false
1122
-      ;;
1123
-    esac
1089
+  # If the value was cached, stop now.  We just wanted to have am__tar
1090
+  # and am__untar set.
1091
+  test -n "${am_cv_prog_tar_$1}" && break
1124 1092
 
1125
-    # If the value was cached, stop now.  We just wanted to have am__tar
1126
-    # and am__untar set.
1127
-    test -n "${am_cv_prog_tar_$1}" && break
1128
-
1129
-    # tar/untar a dummy directory, and stop if the command works.
1130
-    rm -rf conftest.dir
1131
-    mkdir conftest.dir
1132
-    echo GrepMe > conftest.dir/file
1133
-    AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
1134
-    rm -rf conftest.dir
1135
-    if test -s conftest.tar; then
1136
-      AM_RUN_LOG([$am__untar <conftest.tar])
1137
-      AM_RUN_LOG([cat conftest.dir/file])
1138
-      grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
1139
-    fi
1140
-  done
1093
+  # tar/untar a dummy directory, and stop if the command works
1141 1094
   rm -rf conftest.dir
1095
+  mkdir conftest.dir
1096
+  echo GrepMe > conftest.dir/file
1097
+  AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
1098
+  rm -rf conftest.dir
1099
+  if test -s conftest.tar; then
1100
+    AM_RUN_LOG([$am__untar <conftest.tar])
1101
+    grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
1102
+  fi
1103
+done
1104
+rm -rf conftest.dir
1142 1105
 
1143
-  AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
1144
-  AC_MSG_RESULT([$am_cv_prog_tar_$1])])
1145
-
1106
+AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
1107
+AC_MSG_RESULT([$am_cv_prog_tar_$1])])
1146 1108
 AC_SUBST([am__tar])
1147 1109
 AC_SUBST([am__untar])
1148 1110
 ]) # _AM_PROG_TAR
... ...
@@ -211,6 +211,9 @@
211 211
 /* in_port_t is defined */
212 212
 #undef HAVE_IN_PORT_T
213 213
 
214
+/* Define to 1 if you have the 'libjson' library (-ljson). */
215
+#undef HAVE_JSON
216
+
214 217
 /* Define to '1' if you have the check.h library */
215 218
 #undef HAVE_LIBCHECK
216 219
 
... ...
@@ -1,8 +1,9 @@
1
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
1
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
2 2
 # @configure_input@
3 3
 
4
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
5
-
4
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
5
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
6
+# Foundation, Inc.
6 7
 # This Makefile.in is free software; the Free Software Foundation
7 8
 # gives unlimited permission to copy and/or distribute it,
8 9
 # with or without modifications, as long as this notice is preserved.
... ...
@@ -33,51 +34,6 @@
33 33
 #  MA 02110-1301, USA.
34 34
 
35 35
 VPATH = @srcdir@
36
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
37
-am__make_running_with_option = \
38
-  case $${target_option-} in \
39
-      ?) ;; \
40
-      *) echo "am__make_running_with_option: internal error: invalid" \
41
-              "target option '$${target_option-}' specified" >&2; \
42
-         exit 1;; \
43
-  esac; \
44
-  has_opt=no; \
45
-  sane_makeflags=$$MAKEFLAGS; \
46
-  if $(am__is_gnu_make); then \
47
-    sane_makeflags=$$MFLAGS; \
48
-  else \
49
-    case $$MAKEFLAGS in \
50
-      *\\[\ \	]*) \
51
-        bs=\\; \
52
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
53
-          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
54
-    esac; \
55
-  fi; \
56
-  skip_next=no; \
57
-  strip_trailopt () \
58
-  { \
59
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
60
-  }; \
61
-  for flg in $$sane_makeflags; do \
62
-    test $$skip_next = yes && { skip_next=no; continue; }; \
63
-    case $$flg in \
64
-      *=*|--*) continue;; \
65
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
66
-      -*I?*) strip_trailopt 'I';; \
67
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
68
-      -*O?*) strip_trailopt 'O';; \
69
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
70
-      -*l?*) strip_trailopt 'l';; \
71
-      -[dEDm]) skip_next=yes;; \
72
-      -[JT]) skip_next=yes;; \
73
-    esac; \
74
-    case $$flg in \
75
-      *$$target_option*) has_opt=yes; break;; \
76
-    esac; \
77
-  done; \
78
-  test $$has_opt = yes
79
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
80
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
81 36
 pkgdatadir = $(datadir)/@PACKAGE@
82 37
 pkgincludedir = $(includedir)/@PACKAGE@
83 38
 pkglibdir = $(libdir)/@PACKAGE@
... ...
@@ -100,8 +56,7 @@ target_triplet = @target@
100 100
 @BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@sbin_PROGRAMS =  \
101 101
 @BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@	clamav-milter$(EXEEXT)
102 102
 subdir = clamav-milter
103
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
104
-	$(top_srcdir)/config/depcomp
103
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
105 104
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
106 105
 am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
107 106
 	$(top_srcdir)/m4/argz.m4 \
... ...
@@ -125,6 +80,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
125 125
 	$(top_srcdir)/m4/reorganization/code_checks/coverage.m4 \
126 126
 	$(top_srcdir)/m4/reorganization/libs/xml.m4 \
127 127
 	$(top_srcdir)/m4/reorganization/libs/openssl.m4 \
128
+	$(top_srcdir)/m4/reorganization/libs/json.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 \
... ...
@@ -198,19 +154,6 @@ clamav_milter_LDADD = $(LDADD)
198 198
 AM_V_lt = $(am__v_lt_@AM_V@)
199 199
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
200 200
 am__v_lt_0 = --silent
201
-am__v_lt_1 = 
202
-AM_V_P = $(am__v_P_@AM_V@)
203
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
204
-am__v_P_0 = false
205
-am__v_P_1 = :
206
-AM_V_GEN = $(am__v_GEN_@AM_V@)
207
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
208
-am__v_GEN_0 = @echo "  GEN     " $@;
209
-am__v_GEN_1 = 
210
-AM_V_at = $(am__v_at_@AM_V@)
211
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
212
-am__v_at_0 = @
213
-am__v_at_1 = 
214 201
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
215 202
 depcomp = $(SHELL) $(top_srcdir)/config/depcomp
216 203
 am__depfiles_maybe = depfiles
... ...
@@ -223,23 +166,22 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
223 223
 	$(AM_CFLAGS) $(CFLAGS)
224 224
 AM_V_CC = $(am__v_CC_@AM_V@)
225 225
 am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
226
-am__v_CC_0 = @echo "  CC      " $@;
227
-am__v_CC_1 = 
226
+am__v_CC_0 = @echo "  CC    " $@;
227
+AM_V_at = $(am__v_at_@AM_V@)
228
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
229
+am__v_at_0 = @
228 230
 CCLD = $(CC)
229 231
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
230 232
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
231 233
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
232 234
 AM_V_CCLD = $(am__v_CCLD_@AM_V@)
233 235
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
234
-am__v_CCLD_0 = @echo "  CCLD    " $@;
235
-am__v_CCLD_1 = 
236
+am__v_CCLD_0 = @echo "  CCLD  " $@;
237
+AM_V_GEN = $(am__v_GEN_@AM_V@)
238
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
239
+am__v_GEN_0 = @echo "  GEN   " $@;
236 240
 SOURCES = $(clamav_milter_SOURCES)
237 241
 DIST_SOURCES = $(am__clamav_milter_SOURCES_DIST)
238
-am__can_run_installinfo = \
239
-  case $$AM_UPDATE_INFO_DIR in \
240
-    n|no|NO) false;; \
241
-    *) (install-info --version) >/dev/null 2>&1;; \
242
-  esac
243 242
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
244 243
 am__vpath_adj = case $$p in \
245 244
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
... ...
@@ -270,23 +212,6 @@ am__uninstall_files_from_dir = { \
270 270
 man8dir = $(mandir)/man8
271 271
 NROFF = nroff
272 272
 MANS = $(man_MANS)
273
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
274
-# Read a list of newline-separated strings from the standard input,
275
-# and print each of them once, without duplicates.  Input order is
276
-# *not* preserved.
277
-am__uniquify_input = $(AWK) '\
278
-  BEGIN { nonempty = 0; } \
279
-  { items[$$0] = 1; nonempty = 1; } \
280
-  END { if (nonempty) { for (i in items) print i; }; } \
281
-'
282
-# Make sure the list of sources is unique.  This is necessary because,
283
-# e.g., the same source file might be shared among _SOURCES variables
284
-# for different programs/libraries.
285
-am__define_uniq_tagged_files = \
286
-  list='$(am__tagged_files)'; \
287
-  unique=`for i in $$list; do \
288
-    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
289
-  done | $(am__uniquify_input)`
290 273
 ETAGS = etags
291 274
 CTAGS = ctags
292 275
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
... ...
@@ -356,6 +281,9 @@ INSTALL_DATA = @INSTALL_DATA@
356 356
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
357 357
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
358 358
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
359
+JSON_CPPFLAGS = @JSON_CPPFLAGS@
360
+JSON_LDFLAGS = @JSON_LDFLAGS@
361
+JSON_LIBS = @JSON_LIBS@
359 362
 LCOV = @LCOV@
360 363
 LD = @LD@
361 364
 LDFLAGS = @LDFLAGS@
... ...
@@ -538,19 +466,14 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
538 538
 $(am__aclocal_m4_deps):
539 539
 install-sbinPROGRAMS: $(sbin_PROGRAMS)
540 540
 	@$(NORMAL_INSTALL)
541
+	test -z "$(sbindir)" || $(MKDIR_P) "$(DESTDIR)$(sbindir)"
541 542
 	@list='$(sbin_PROGRAMS)'; test -n "$(sbindir)" || list=; \
542
-	if test -n "$$list"; then \
543
-	  echo " $(MKDIR_P) '$(DESTDIR)$(sbindir)'"; \
544
-	  $(MKDIR_P) "$(DESTDIR)$(sbindir)" || exit 1; \
545
-	fi; \
546 543
 	for p in $$list; do echo "$$p $$p"; done | \
547 544
 	sed 's/$(EXEEXT)$$//' | \
548
-	while read p p1; do if test -f $$p \
549
-	 || test -f $$p1 \
550
-	  ; then echo "$$p"; echo "$$p"; else :; fi; \
545
+	while read p p1; do if test -f $$p || test -f $$p1; \
546
+	  then echo "$$p"; echo "$$p"; else :; fi; \
551 547
 	done | \
552
-	sed -e 'p;s,.*/,,;n;h' \
553
-	    -e 's|.*|.|' \
548
+	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
554 549
 	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
555 550
 	sed 'N;N;N;s,\n, ,g' | \
556 551
 	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
... ...
@@ -571,8 +494,7 @@ uninstall-sbinPROGRAMS:
571 571
 	@list='$(sbin_PROGRAMS)'; test -n "$(sbindir)" || list=; \
572 572
 	files=`for p in $$list; do echo "$$p"; done | \
573 573
 	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
574
-	      -e 's/$$/$(EXEEXT)/' \
575
-	`; \
574
+	      -e 's/$$/$(EXEEXT)/' `; \
576 575
 	test -n "$$list" || exit 0; \
577 576
 	echo " ( cd '$(DESTDIR)$(sbindir)' && rm -f" $$files ")"; \
578 577
 	cd "$(DESTDIR)$(sbindir)" && rm -f $$files
... ...
@@ -601,7 +523,6 @@ installcheck-sbinPROGRAMS: $(sbin_PROGRAMS)
601 601
 	    else echo "$$f does not support $$opt" 1>&2; bad=1; fi; \
602 602
 	  done; \
603 603
 	done; rm -f c$${pid}_.???; exit $$bad
604
-
605 604
 clamav-milter$(EXEEXT): $(clamav_milter_OBJECTS) $(clamav_milter_DEPENDENCIES) $(EXTRA_clamav_milter_DEPENDENCIES) 
606 605
 	@rm -f clamav-milter$(EXEEXT)
607 606
 	$(AM_V_CCLD)$(LINK) $(clamav_milter_OBJECTS) $(clamav_milter_LDADD) $(LIBS)
... ...
@@ -627,14 +548,14 @@ distclean-compile:
627 627
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
628 628
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
629 629
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
630
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
630
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
631 631
 
632 632
 .c.obj:
633 633
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
634 634
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
635 635
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
636 636
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
637
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
637
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
638 638
 
639 639
 .c.lo:
640 640
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
... ...
@@ -706,18 +627,11 @@ clean-libtool:
706 706
 	-rm -rf .libs _libs
707 707
 install-man8: $(man_MANS)
708 708
 	@$(NORMAL_INSTALL)
709
-	@list1=''; \
710
-	list2='$(man_MANS)'; \
711
-	test -n "$(man8dir)" \
712
-	  && test -n "`echo $$list1$$list2`" \
713
-	  || exit 0; \
714
-	echo " $(MKDIR_P) '$(DESTDIR)$(man8dir)'"; \
715
-	$(MKDIR_P) "$(DESTDIR)$(man8dir)" || exit 1; \
716
-	{ for i in $$list1; do echo "$$i"; done;  \
717
-	if test -n "$$list2"; then \
718
-	  for i in $$list2; do echo "$$i"; done \
719
-	    | sed -n '/\.8[a-z]*$$/p'; \
720
-	fi; \
709
+	test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)"
710
+	@list=''; test -n "$(man8dir)" || exit 0; \
711
+	{ for i in $$list; do echo "$$i"; done; \
712
+	l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
713
+	  sed -n '/\.8[a-z]*$$/p'; \
721 714
 	} | while read p; do \
722 715
 	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
723 716
 	  echo "$$d$$p"; echo "$$p"; \
... ...
@@ -748,15 +662,26 @@ uninstall-man8:
748 748
 	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
749 749
 	dir='$(DESTDIR)$(man8dir)'; $(am__uninstall_files_from_dir)
750 750
 
751
-ID: $(am__tagged_files)
752
-	$(am__define_uniq_tagged_files); mkid -fID $$unique
753
-tags: tags-am
754
-TAGS: tags
755
-
756
-tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
751
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
752
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
753
+	unique=`for i in $$list; do \
754
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
755
+	  done | \
756
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
757
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
758
+	mkid -fID $$unique
759
+tags: TAGS
760
+
761
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
762
+		$(TAGS_FILES) $(LISP)
757 763
 	set x; \
758 764
 	here=`pwd`; \
759
-	$(am__define_uniq_tagged_files); \
765
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
766
+	unique=`for i in $$list; do \
767
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
768
+	  done | \
769
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
770
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
760 771
 	shift; \
761 772
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
762 773
 	  test -n "$$unique" || unique=$$empty_fix; \
... ...
@@ -768,11 +693,15 @@ tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
768 768
 	      $$unique; \
769 769
 	  fi; \
770 770
 	fi
771
-ctags: ctags-am
772
-
773
-CTAGS: ctags
774
-ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
775
-	$(am__define_uniq_tagged_files); \
771
+ctags: CTAGS
772
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
773
+		$(TAGS_FILES) $(LISP)
774
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
775
+	unique=`for i in $$list; do \
776
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
777
+	  done | \
778
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
779
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
776 780
 	test -z "$(CTAGS_ARGS)$$unique" \
777 781
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
778 782
 	     $$unique
... ...
@@ -781,26 +710,24 @@ GTAGS:
781 781
 	here=`$(am__cd) $(top_builddir) && pwd` \
782 782
 	  && $(am__cd) $(top_srcdir) \
783 783
 	  && gtags -i $(GTAGS_ARGS) "$$here"
784
-cscopelist: cscopelist-am
785
-
786
-cscopelist-am: $(am__tagged_files)
787
-	list='$(am__tagged_files)'; \
788
-	case "$(srcdir)" in \
789
-	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
790
-	  *) sdir=$(subdir)/$(srcdir) ;; \
791
-	esac; \
792
-	for i in $$list; do \
793
-	  if test -f "$$i"; then \
794
-	    echo "$(subdir)/$$i"; \
795
-	  else \
796
-	    echo "$$sdir/$$i"; \
797
-	  fi; \
798
-	done >> $(top_builddir)/cscope.files
799 784
 
800 785
 distclean-tags:
801 786
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
802 787
 
803 788
 distdir: $(DISTFILES)
789
+	@list='$(MANS)'; if test -n "$$list"; then \
790
+	  list=`for p in $$list; do \
791
+	    if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
792
+	    if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \
793
+	  if test -n "$$list" && \
794
+	    grep 'ab help2man is required to generate this page' $$list >/dev/null; then \
795
+	    echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \
796
+	    grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/         /' >&2; \
797
+	    echo "       to fix them, install help2man, remove and regenerate the man pages;" >&2; \
798
+	    echo "       typically \`make maintainer-clean' will remove them" >&2; \
799
+	    exit 1; \
800
+	  else :; fi; \
801
+	else :; fi
804 802
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
805 803
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
806 804
 	list='$(DISTFILES)'; \
... ...
@@ -943,20 +870,19 @@ uninstall-man: uninstall-man8
943 943
 
944 944
 .MAKE: install-am install-strip
945 945
 
946
-.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
947
-	clean-libtool clean-sbinPROGRAMS cscopelist-am ctags ctags-am \
948
-	distclean distclean-compile distclean-generic \
949
-	distclean-libtool distclean-tags distdir dvi dvi-am html \
950
-	html-am info info-am install install-am install-data \
951
-	install-data-am install-dvi install-dvi-am install-exec \
952
-	install-exec-am install-html install-html-am install-info \
953
-	install-info-am install-man install-man8 install-pdf \
954
-	install-pdf-am install-ps install-ps-am install-sbinPROGRAMS \
955
-	install-strip installcheck installcheck-am \
956
-	installcheck-sbinPROGRAMS installdirs maintainer-clean \
957
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
958
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
959
-	tags tags-am uninstall uninstall-am uninstall-man \
946
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
947
+	clean-libtool clean-sbinPROGRAMS ctags distclean \
948
+	distclean-compile distclean-generic distclean-libtool \
949
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
950
+	install install-am install-data install-data-am install-dvi \
951
+	install-dvi-am install-exec install-exec-am install-html \
952
+	install-html-am install-info install-info-am install-man \
953
+	install-man8 install-pdf install-pdf-am install-ps \
954
+	install-ps-am install-sbinPROGRAMS install-strip installcheck \
955
+	installcheck-am installcheck-sbinPROGRAMS installdirs \
956
+	maintainer-clean maintainer-clean-generic mostlyclean \
957
+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
958
+	pdf pdf-am ps ps-am tags uninstall uninstall-am uninstall-man \
960 959
 	uninstall-man8 uninstall-sbinPROGRAMS
961 960
 
962 961
 
... ...
@@ -1,8 +1,9 @@
1
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
1
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
2 2
 # @configure_input@
3 3
 
4
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
5
-
4
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
5
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
6
+# Foundation, Inc.
6 7
 # This Makefile.in is free software; the Free Software Foundation
7 8
 # gives unlimited permission to copy and/or distribute it,
8 9
 # with or without modifications, as long as this notice is preserved.
... ...
@@ -15,51 +16,6 @@
15 15
 @SET_MAKE@
16 16
 
17 17
 VPATH = @srcdir@
18
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
19
-am__make_running_with_option = \
20
-  case $${target_option-} in \
21
-      ?) ;; \
22
-      *) echo "am__make_running_with_option: internal error: invalid" \
23
-              "target option '$${target_option-}' specified" >&2; \
24
-         exit 1;; \
25
-  esac; \
26
-  has_opt=no; \
27
-  sane_makeflags=$$MAKEFLAGS; \
28
-  if $(am__is_gnu_make); then \
29
-    sane_makeflags=$$MFLAGS; \
30
-  else \
31
-    case $$MAKEFLAGS in \
32
-      *\\[\ \	]*) \
33
-        bs=\\; \
34
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
35
-          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
36
-    esac; \
37
-  fi; \
38
-  skip_next=no; \
39
-  strip_trailopt () \
40
-  { \
41
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
42
-  }; \
43
-  for flg in $$sane_makeflags; do \
44
-    test $$skip_next = yes && { skip_next=no; continue; }; \
45
-    case $$flg in \
46
-      *=*|--*) continue;; \
47
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
48
-      -*I?*) strip_trailopt 'I';; \
49
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
50
-      -*O?*) strip_trailopt 'O';; \
51
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
52
-      -*l?*) strip_trailopt 'l';; \
53
-      -[dEDm]) skip_next=yes;; \
54
-      -[JT]) skip_next=yes;; \
55
-    esac; \
56
-    case $$flg in \
57
-      *$$target_option*) has_opt=yes; break;; \
58
-    esac; \
59
-  done; \
60
-  test $$has_opt = yes
61
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
62
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
63 18
 pkgdatadir = $(datadir)/@PACKAGE@
64 19
 pkgincludedir = $(includedir)/@PACKAGE@
65 20
 pkglibdir = $(libdir)/@PACKAGE@
... ...
@@ -81,8 +37,7 @@ host_triplet = @host@
81 81
 target_triplet = @target@
82 82
 bin_PROGRAMS = clambc$(EXEEXT)
83 83
 subdir = clambc
84
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
85
-	$(top_srcdir)/config/depcomp
84
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
86 85
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
87 86
 am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
88 87
 	$(top_srcdir)/m4/argz.m4 \
... ...
@@ -106,6 +61,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
106 106
 	$(top_srcdir)/m4/reorganization/code_checks/coverage.m4 \
107 107
 	$(top_srcdir)/m4/reorganization/libs/xml.m4 \
108 108
 	$(top_srcdir)/m4/reorganization/libs/openssl.m4 \
109
+	$(top_srcdir)/m4/reorganization/libs/json.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 \
... ...
@@ -164,19 +120,6 @@ clambc_LDADD = $(LDADD)
164 164
 AM_V_lt = $(am__v_lt_@AM_V@)
165 165
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
166 166
 am__v_lt_0 = --silent
167
-am__v_lt_1 = 
168
-AM_V_P = $(am__v_P_@AM_V@)
169
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
170
-am__v_P_0 = false
171
-am__v_P_1 = :
172
-AM_V_GEN = $(am__v_GEN_@AM_V@)
173
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
174
-am__v_GEN_0 = @echo "  GEN     " $@;
175
-am__v_GEN_1 = 
176
-AM_V_at = $(am__v_at_@AM_V@)
177
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
178
-am__v_at_0 = @
179
-am__v_at_1 = 
180 167
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
181 168
 depcomp = $(SHELL) $(top_srcdir)/config/depcomp
182 169
 am__depfiles_maybe = depfiles
... ...
@@ -189,40 +132,22 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
189 189
 	$(AM_CFLAGS) $(CFLAGS)
190 190
 AM_V_CC = $(am__v_CC_@AM_V@)
191 191
 am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
192
-am__v_CC_0 = @echo "  CC      " $@;
193
-am__v_CC_1 = 
192
+am__v_CC_0 = @echo "  CC    " $@;
193
+AM_V_at = $(am__v_at_@AM_V@)
194
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
195
+am__v_at_0 = @
194 196
 CCLD = $(CC)
195 197
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
196 198
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
197 199
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
198 200
 AM_V_CCLD = $(am__v_CCLD_@AM_V@)
199 201
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
200
-am__v_CCLD_0 = @echo "  CCLD    " $@;
201
-am__v_CCLD_1 = 
202
+am__v_CCLD_0 = @echo "  CCLD  " $@;
203
+AM_V_GEN = $(am__v_GEN_@AM_V@)
204
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
205
+am__v_GEN_0 = @echo "  GEN   " $@;
202 206
 SOURCES = $(clambc_SOURCES)
203 207
 DIST_SOURCES = $(clambc_SOURCES)
204
-am__can_run_installinfo = \
205
-  case $$AM_UPDATE_INFO_DIR in \
206
-    n|no|NO) false;; \
207
-    *) (install-info --version) >/dev/null 2>&1;; \
208
-  esac
209
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
210
-# Read a list of newline-separated strings from the standard input,
211
-# and print each of them once, without duplicates.  Input order is
212
-# *not* preserved.
213
-am__uniquify_input = $(AWK) '\
214
-  BEGIN { nonempty = 0; } \
215
-  { items[$$0] = 1; nonempty = 1; } \
216
-  END { if (nonempty) { for (i in items) print i; }; } \
217
-'
218
-# Make sure the list of sources is unique.  This is necessary because,
219
-# e.g., the same source file might be shared among _SOURCES variables
220
-# for different programs/libraries.
221
-am__define_uniq_tagged_files = \
222
-  list='$(am__tagged_files)'; \
223
-  unique=`for i in $$list; do \
224
-    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
225
-  done | $(am__uniquify_input)`
226 208
 ETAGS = etags
227 209
 CTAGS = ctags
228 210
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
... ...
@@ -292,6 +217,9 @@ INSTALL_DATA = @INSTALL_DATA@
292 292
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
293 293
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
294 294
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
295
+JSON_CPPFLAGS = @JSON_CPPFLAGS@
296
+JSON_LDFLAGS = @JSON_LDFLAGS@
297
+JSON_LIBS = @JSON_LIBS@
295 298
 LCOV = @LCOV@
296 299
 LD = @LD@
297 300
 LDFLAGS = @LDFLAGS@
... ...
@@ -463,19 +391,14 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
463 463
 $(am__aclocal_m4_deps):
464 464
 install-binPROGRAMS: $(bin_PROGRAMS)
465 465
 	@$(NORMAL_INSTALL)
466
+	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
466 467
 	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
467
-	if test -n "$$list"; then \
468
-	  echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
469
-	  $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
470
-	fi; \
471 468
 	for p in $$list; do echo "$$p $$p"; done | \
472 469
 	sed 's/$(EXEEXT)$$//' | \
473
-	while read p p1; do if test -f $$p \
474
-	 || test -f $$p1 \
475
-	  ; then echo "$$p"; echo "$$p"; else :; fi; \
470
+	while read p p1; do if test -f $$p || test -f $$p1; \
471
+	  then echo "$$p"; echo "$$p"; else :; fi; \
476 472
 	done | \
477
-	sed -e 'p;s,.*/,,;n;h' \
478
-	    -e 's|.*|.|' \
473
+	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
479 474
 	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
480 475
 	sed 'N;N;N;s,\n, ,g' | \
481 476
 	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
... ...
@@ -496,8 +419,7 @@ uninstall-binPROGRAMS:
496 496
 	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
497 497
 	files=`for p in $$list; do echo "$$p"; done | \
498 498
 	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
499
-	      -e 's/$$/$(EXEEXT)/' \
500
-	`; \
499
+	      -e 's/$$/$(EXEEXT)/' `; \
501 500
 	test -n "$$list" || exit 0; \
502 501
 	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
503 502
 	cd "$(DESTDIR)$(bindir)" && rm -f $$files
... ...
@@ -526,7 +448,6 @@ installcheck-binPROGRAMS: $(bin_PROGRAMS)
526 526
 	    else echo "$$f does not support $$opt" 1>&2; bad=1; fi; \
527 527
 	  done; \
528 528
 	done; rm -f c$${pid}_.???; exit $$bad
529
-
530 529
 clambc$(EXEEXT): $(clambc_OBJECTS) $(clambc_DEPENDENCIES) $(EXTRA_clambc_DEPENDENCIES) 
531 530
 	@rm -f clambc$(EXEEXT)
532 531
 	$(AM_V_CCLD)$(LINK) $(clambc_OBJECTS) $(clambc_LDADD) $(LIBS)
... ...
@@ -547,14 +468,14 @@ distclean-compile:
547 547
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
548 548
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
549 549
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
550
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
550
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
551 551
 
552 552
 .c.obj:
553 553
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
554 554
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
555 555
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
556 556
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
557
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
557
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
558 558
 
559 559
 .c.lo:
560 560
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
... ...
@@ -611,15 +532,26 @@ mostlyclean-libtool:
611 611
 clean-libtool:
612 612
 	-rm -rf .libs _libs
613 613
 
614
-ID: $(am__tagged_files)
615
-	$(am__define_uniq_tagged_files); mkid -fID $$unique
616
-tags: tags-am
617
-TAGS: tags
618
-
619
-tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
614
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
615
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
616
+	unique=`for i in $$list; do \
617
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
618
+	  done | \
619
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
620
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
621
+	mkid -fID $$unique
622
+tags: TAGS
623
+
624
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
625
+		$(TAGS_FILES) $(LISP)
620 626
 	set x; \
621 627
 	here=`pwd`; \
622
-	$(am__define_uniq_tagged_files); \
628
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
629
+	unique=`for i in $$list; do \
630
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
631
+	  done | \
632
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
633
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
623 634
 	shift; \
624 635
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
625 636
 	  test -n "$$unique" || unique=$$empty_fix; \
... ...
@@ -631,11 +563,15 @@ tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
631 631
 	      $$unique; \
632 632
 	  fi; \
633 633
 	fi
634
-ctags: ctags-am
635
-
636
-CTAGS: ctags
637
-ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
638
-	$(am__define_uniq_tagged_files); \
634
+ctags: CTAGS
635
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
636
+		$(TAGS_FILES) $(LISP)
637
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
638
+	unique=`for i in $$list; do \
639
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
640
+	  done | \
641
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
642
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
639 643
 	test -z "$(CTAGS_ARGS)$$unique" \
640 644
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
641 645
 	     $$unique
... ...
@@ -644,21 +580,6 @@ GTAGS:
644 644
 	here=`$(am__cd) $(top_builddir) && pwd` \
645 645
 	  && $(am__cd) $(top_srcdir) \
646 646
 	  && gtags -i $(GTAGS_ARGS) "$$here"
647
-cscopelist: cscopelist-am
648
-
649
-cscopelist-am: $(am__tagged_files)
650
-	list='$(am__tagged_files)'; \
651
-	case "$(srcdir)" in \
652
-	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
653
-	  *) sdir=$(subdir)/$(srcdir) ;; \
654
-	esac; \
655
-	for i in $$list; do \
656
-	  if test -f "$$i"; then \
657
-	    echo "$(subdir)/$$i"; \
658
-	  else \
659
-	    echo "$$sdir/$$i"; \
660
-	  fi; \
661
-	done >> $(top_builddir)/cscope.files
662 647
 
663 648
 distclean-tags:
664 649
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
... ...
@@ -803,20 +724,19 @@ uninstall-am: uninstall-binPROGRAMS
803 803
 
804 804
 .MAKE: install-am install-strip
805 805
 
806
-.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \
807
-	clean-binPROGRAMS clean-generic clean-libtool cscopelist-am \
808
-	ctags ctags-am distclean distclean-compile distclean-generic \
809
-	distclean-libtool distclean-tags distdir dvi dvi-am html \
810
-	html-am info info-am install install-am install-binPROGRAMS \
811
-	install-data install-data-am install-dvi install-dvi-am \
812
-	install-exec install-exec-am install-html install-html-am \
813
-	install-info install-info-am install-man install-pdf \
814
-	install-pdf-am install-ps install-ps-am install-strip \
815
-	installcheck installcheck-am installcheck-binPROGRAMS \
816
-	installdirs maintainer-clean maintainer-clean-generic \
817
-	mostlyclean mostlyclean-compile mostlyclean-generic \
818
-	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
819
-	uninstall-am uninstall-binPROGRAMS
806
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
807
+	clean-generic clean-libtool ctags distclean distclean-compile \
808
+	distclean-generic distclean-libtool distclean-tags distdir dvi \
809
+	dvi-am html html-am info info-am install install-am \
810
+	install-binPROGRAMS install-data install-data-am install-dvi \
811
+	install-dvi-am install-exec install-exec-am install-html \
812
+	install-html-am install-info install-info-am install-man \
813
+	install-pdf install-pdf-am install-ps install-ps-am \
814
+	install-strip installcheck installcheck-am \
815
+	installcheck-binPROGRAMS installdirs maintainer-clean \
816
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
817
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
818
+	tags uninstall uninstall-am uninstall-binPROGRAMS
820 819
 
821 820
 
822 821
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
... ...
@@ -1,8 +1,9 @@
1
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
1
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
2 2
 # @configure_input@
3 3
 
4
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
5
-
4
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
5
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
6
+# Foundation, Inc.
6 7
 # This Makefile.in is free software; the Free Software Foundation
7 8
 # gives unlimited permission to copy and/or distribute it,
8 9
 # with or without modifications, as long as this notice is preserved.
... ...
@@ -33,51 +34,6 @@
33 33
 #  MA 02110-1301, USA.
34 34
 
35 35
 VPATH = @srcdir@
36
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
37
-am__make_running_with_option = \
38
-  case $${target_option-} in \
39
-      ?) ;; \
40
-      *) echo "am__make_running_with_option: internal error: invalid" \
41
-              "target option '$${target_option-}' specified" >&2; \
42
-         exit 1;; \
43
-  esac; \
44
-  has_opt=no; \
45
-  sane_makeflags=$$MAKEFLAGS; \
46
-  if $(am__is_gnu_make); then \
47
-    sane_makeflags=$$MFLAGS; \
48
-  else \
49
-    case $$MAKEFLAGS in \
50
-      *\\[\ \	]*) \
51
-        bs=\\; \
52
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
53
-          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
54
-    esac; \
55
-  fi; \
56
-  skip_next=no; \
57
-  strip_trailopt () \
58
-  { \
59
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
60
-  }; \
61
-  for flg in $$sane_makeflags; do \
62
-    test $$skip_next = yes && { skip_next=no; continue; }; \
63
-    case $$flg in \
64
-      *=*|--*) continue;; \
65
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
66
-      -*I?*) strip_trailopt 'I';; \
67
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
68
-      -*O?*) strip_trailopt 'O';; \
69
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
70
-      -*l?*) strip_trailopt 'l';; \
71
-      -[dEDm]) skip_next=yes;; \
72
-      -[JT]) skip_next=yes;; \
73
-    esac; \
74
-    case $$flg in \
75
-      *$$target_option*) has_opt=yes; break;; \
76
-    esac; \
77
-  done; \
78
-  test $$has_opt = yes
79
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
80
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
81 36
 pkgdatadir = $(datadir)/@PACKAGE@
82 37
 pkgincludedir = $(includedir)/@PACKAGE@
83 38
 pkglibdir = $(libdir)/@PACKAGE@
... ...
@@ -99,8 +55,7 @@ host_triplet = @host@
99 99
 target_triplet = @target@
100 100
 bin_PROGRAMS = clamconf$(EXEEXT)
101 101
 subdir = clamconf
102
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
103
-	$(top_srcdir)/config/depcomp
102
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
104 103
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
105 104
 am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
106 105
 	$(top_srcdir)/m4/argz.m4 \
... ...
@@ -124,6 +79,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
124 124
 	$(top_srcdir)/m4/reorganization/code_checks/coverage.m4 \
125 125
 	$(top_srcdir)/m4/reorganization/libs/xml.m4 \
126 126
 	$(top_srcdir)/m4/reorganization/libs/openssl.m4 \
127
+	$(top_srcdir)/m4/reorganization/libs/json.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 \
... ...
@@ -182,19 +138,6 @@ clamconf_LDADD = $(LDADD)
182 182
 AM_V_lt = $(am__v_lt_@AM_V@)
183 183
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
184 184
 am__v_lt_0 = --silent
185
-am__v_lt_1 = 
186
-AM_V_P = $(am__v_P_@AM_V@)
187
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
188
-am__v_P_0 = false
189
-am__v_P_1 = :
190
-AM_V_GEN = $(am__v_GEN_@AM_V@)
191
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
192
-am__v_GEN_0 = @echo "  GEN     " $@;
193
-am__v_GEN_1 = 
194
-AM_V_at = $(am__v_at_@AM_V@)
195
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
196
-am__v_at_0 = @
197
-am__v_at_1 = 
198 185
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
199 186
 depcomp = $(SHELL) $(top_srcdir)/config/depcomp
200 187
 am__depfiles_maybe = depfiles
... ...
@@ -207,40 +150,22 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
207 207
 	$(AM_CFLAGS) $(CFLAGS)
208 208
 AM_V_CC = $(am__v_CC_@AM_V@)
209 209
 am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
210
-am__v_CC_0 = @echo "  CC      " $@;
211
-am__v_CC_1 = 
210
+am__v_CC_0 = @echo "  CC    " $@;
211
+AM_V_at = $(am__v_at_@AM_V@)
212
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
213
+am__v_at_0 = @
212 214
 CCLD = $(CC)
213 215
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
214 216
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
215 217
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
216 218
 AM_V_CCLD = $(am__v_CCLD_@AM_V@)
217 219
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
218
-am__v_CCLD_0 = @echo "  CCLD    " $@;
219
-am__v_CCLD_1 = 
220
+am__v_CCLD_0 = @echo "  CCLD  " $@;
221
+AM_V_GEN = $(am__v_GEN_@AM_V@)
222
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
223
+am__v_GEN_0 = @echo "  GEN   " $@;
220 224
 SOURCES = $(clamconf_SOURCES)
221 225
 DIST_SOURCES = $(clamconf_SOURCES)
222
-am__can_run_installinfo = \
223
-  case $$AM_UPDATE_INFO_DIR in \
224
-    n|no|NO) false;; \
225
-    *) (install-info --version) >/dev/null 2>&1;; \
226
-  esac
227
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
228
-# Read a list of newline-separated strings from the standard input,
229
-# and print each of them once, without duplicates.  Input order is
230
-# *not* preserved.
231
-am__uniquify_input = $(AWK) '\
232
-  BEGIN { nonempty = 0; } \
233
-  { items[$$0] = 1; nonempty = 1; } \
234
-  END { if (nonempty) { for (i in items) print i; }; } \
235
-'
236
-# Make sure the list of sources is unique.  This is necessary because,
237
-# e.g., the same source file might be shared among _SOURCES variables
238
-# for different programs/libraries.
239
-am__define_uniq_tagged_files = \
240
-  list='$(am__tagged_files)'; \
241
-  unique=`for i in $$list; do \
242
-    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
243
-  done | $(am__uniquify_input)`
244 226
 ETAGS = etags
245 227
 CTAGS = ctags
246 228
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
... ...
@@ -310,6 +235,9 @@ INSTALL_DATA = @INSTALL_DATA@
310 310
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
311 311
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
312 312
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
313
+JSON_CPPFLAGS = @JSON_CPPFLAGS@
314
+JSON_LDFLAGS = @JSON_LDFLAGS@
315
+JSON_LIBS = @JSON_LIBS@
313 316
 LCOV = @LCOV@
314 317
 LD = @LD@
315 318
 LDFLAGS = @LDFLAGS@
... ...
@@ -485,19 +413,14 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
485 485
 $(am__aclocal_m4_deps):
486 486
 install-binPROGRAMS: $(bin_PROGRAMS)
487 487
 	@$(NORMAL_INSTALL)
488
+	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
488 489
 	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
489
-	if test -n "$$list"; then \
490
-	  echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
491
-	  $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
492
-	fi; \
493 490
 	for p in $$list; do echo "$$p $$p"; done | \
494 491
 	sed 's/$(EXEEXT)$$//' | \
495
-	while read p p1; do if test -f $$p \
496
-	 || test -f $$p1 \
497
-	  ; then echo "$$p"; echo "$$p"; else :; fi; \
492
+	while read p p1; do if test -f $$p || test -f $$p1; \
493
+	  then echo "$$p"; echo "$$p"; else :; fi; \
498 494
 	done | \
499
-	sed -e 'p;s,.*/,,;n;h' \
500
-	    -e 's|.*|.|' \
495
+	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
501 496
 	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
502 497
 	sed 'N;N;N;s,\n, ,g' | \
503 498
 	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
... ...
@@ -518,8 +441,7 @@ uninstall-binPROGRAMS:
518 518
 	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
519 519
 	files=`for p in $$list; do echo "$$p"; done | \
520 520
 	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
521
-	      -e 's/$$/$(EXEEXT)/' \
522
-	`; \
521
+	      -e 's/$$/$(EXEEXT)/' `; \
523 522
 	test -n "$$list" || exit 0; \
524 523
 	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
525 524
 	cd "$(DESTDIR)$(bindir)" && rm -f $$files
... ...
@@ -548,7 +470,6 @@ installcheck-binPROGRAMS: $(bin_PROGRAMS)
548 548
 	    else echo "$$f does not support $$opt" 1>&2; bad=1; fi; \
549 549
 	  done; \
550 550
 	done; rm -f c$${pid}_.???; exit $$bad
551
-
552 551
 clamconf$(EXEEXT): $(clamconf_OBJECTS) $(clamconf_DEPENDENCIES) $(EXTRA_clamconf_DEPENDENCIES) 
553 552
 	@rm -f clamconf$(EXEEXT)
554 553
 	$(AM_V_CCLD)$(LINK) $(clamconf_OBJECTS) $(clamconf_LDADD) $(LIBS)
... ...
@@ -569,14 +490,14 @@ distclean-compile:
569 569
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
570 570
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
571 571
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
572
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
572
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
573 573
 
574 574
 .c.obj:
575 575
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
576 576
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
577 577
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
578 578
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
579
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
579
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
580 580
 
581 581
 .c.lo:
582 582
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
... ...
@@ -633,15 +554,26 @@ mostlyclean-libtool:
633 633
 clean-libtool:
634 634
 	-rm -rf .libs _libs
635 635
 
636
-ID: $(am__tagged_files)
637
-	$(am__define_uniq_tagged_files); mkid -fID $$unique
638
-tags: tags-am
639
-TAGS: tags
640
-
641
-tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
636
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
637
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
638
+	unique=`for i in $$list; do \
639
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
640
+	  done | \
641
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
642
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
643
+	mkid -fID $$unique
644
+tags: TAGS
645
+
646
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
647
+		$(TAGS_FILES) $(LISP)
642 648
 	set x; \
643 649
 	here=`pwd`; \
644
-	$(am__define_uniq_tagged_files); \
650
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
651
+	unique=`for i in $$list; do \
652
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
653
+	  done | \
654
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
655
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
645 656
 	shift; \
646 657
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
647 658
 	  test -n "$$unique" || unique=$$empty_fix; \
... ...
@@ -653,11 +585,15 @@ tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
653 653
 	      $$unique; \
654 654
 	  fi; \
655 655
 	fi
656
-ctags: ctags-am
657
-
658
-CTAGS: ctags
659
-ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
660
-	$(am__define_uniq_tagged_files); \
656
+ctags: CTAGS
657
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
658
+		$(TAGS_FILES) $(LISP)
659
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
660
+	unique=`for i in $$list; do \
661
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
662
+	  done | \
663
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
664
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
661 665
 	test -z "$(CTAGS_ARGS)$$unique" \
662 666
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
663 667
 	     $$unique
... ...
@@ -666,21 +602,6 @@ GTAGS:
666 666
 	here=`$(am__cd) $(top_builddir) && pwd` \
667 667
 	  && $(am__cd) $(top_srcdir) \
668 668
 	  && gtags -i $(GTAGS_ARGS) "$$here"
669
-cscopelist: cscopelist-am
670
-
671
-cscopelist-am: $(am__tagged_files)
672
-	list='$(am__tagged_files)'; \
673
-	case "$(srcdir)" in \
674
-	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
675
-	  *) sdir=$(subdir)/$(srcdir) ;; \
676
-	esac; \
677
-	for i in $$list; do \
678
-	  if test -f "$$i"; then \
679
-	    echo "$(subdir)/$$i"; \
680
-	  else \
681
-	    echo "$$sdir/$$i"; \
682
-	  fi; \
683
-	done >> $(top_builddir)/cscope.files
684 669
 
685 670
 distclean-tags:
686 671
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
... ...
@@ -825,20 +746,19 @@ uninstall-am: uninstall-binPROGRAMS
825 825
 
826 826
 .MAKE: install-am install-strip
827 827
 
828
-.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \
829
-	clean-binPROGRAMS clean-generic clean-libtool cscopelist-am \
830
-	ctags ctags-am distclean distclean-compile distclean-generic \
831
-	distclean-libtool distclean-tags distdir dvi dvi-am html \
832
-	html-am info info-am install install-am install-binPROGRAMS \
833
-	install-data install-data-am install-dvi install-dvi-am \
834
-	install-exec install-exec-am install-html install-html-am \
835
-	install-info install-info-am install-man install-pdf \
836
-	install-pdf-am install-ps install-ps-am install-strip \
837
-	installcheck installcheck-am installcheck-binPROGRAMS \
838
-	installdirs maintainer-clean maintainer-clean-generic \
839
-	mostlyclean mostlyclean-compile mostlyclean-generic \
840
-	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
841
-	uninstall-am uninstall-binPROGRAMS
828
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
829
+	clean-generic clean-libtool ctags distclean distclean-compile \
830
+	distclean-generic distclean-libtool distclean-tags distdir dvi \
831
+	dvi-am html html-am info info-am install install-am \
832
+	install-binPROGRAMS install-data install-data-am install-dvi \
833
+	install-dvi-am install-exec install-exec-am install-html \
834
+	install-html-am install-info install-info-am install-man \
835
+	install-pdf install-pdf-am install-ps install-ps-am \
836
+	install-strip installcheck installcheck-am \
837
+	installcheck-binPROGRAMS installdirs maintainer-clean \
838
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
839
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
840
+	tags uninstall uninstall-am uninstall-binPROGRAMS
842 841
 
843 842
 
844 843
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
... ...
@@ -1,8 +1,9 @@
1
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
1
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
2 2
 # @configure_input@
3 3
 
4
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
5
-
4
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
5
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
6
+# Foundation, Inc.
6 7
 # This Makefile.in is free software; the Free Software Foundation
7 8
 # gives unlimited permission to copy and/or distribute it,
8 9
 # with or without modifications, as long as this notice is preserved.
... ...
@@ -33,51 +34,6 @@
33 33
 #  MA 02110-1301, USA.
34 34
 
35 35
 VPATH = @srcdir@
36
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
37
-am__make_running_with_option = \
38
-  case $${target_option-} in \
39
-      ?) ;; \
40
-      *) echo "am__make_running_with_option: internal error: invalid" \
41
-              "target option '$${target_option-}' specified" >&2; \
42
-         exit 1;; \
43
-  esac; \
44
-  has_opt=no; \
45
-  sane_makeflags=$$MAKEFLAGS; \
46
-  if $(am__is_gnu_make); then \
47
-    sane_makeflags=$$MFLAGS; \
48
-  else \
49
-    case $$MAKEFLAGS in \
50
-      *\\[\ \	]*) \
51
-        bs=\\; \
52
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
53
-          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
54
-    esac; \
55
-  fi; \
56
-  skip_next=no; \
57
-  strip_trailopt () \
58
-  { \
59
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
60
-  }; \
61
-  for flg in $$sane_makeflags; do \
62
-    test $$skip_next = yes && { skip_next=no; continue; }; \
63
-    case $$flg in \
64
-      *=*|--*) continue;; \
65
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
66
-      -*I?*) strip_trailopt 'I';; \
67
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
68
-      -*O?*) strip_trailopt 'O';; \
69
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
70
-      -*l?*) strip_trailopt 'l';; \
71
-      -[dEDm]) skip_next=yes;; \
72
-      -[JT]) skip_next=yes;; \
73
-    esac; \
74
-    case $$flg in \
75
-      *$$target_option*) has_opt=yes; break;; \
76
-    esac; \
77
-  done; \
78
-  test $$has_opt = yes
79
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
80
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
81 36
 pkgdatadir = $(datadir)/@PACKAGE@
82 37
 pkgincludedir = $(includedir)/@PACKAGE@
83 38
 pkglibdir = $(libdir)/@PACKAGE@
... ...
@@ -99,8 +55,7 @@ host_triplet = @host@
99 99
 target_triplet = @target@
100 100
 @BUILD_CLAMD_TRUE@sbin_PROGRAMS = clamd$(EXEEXT)
101 101
 subdir = clamd
102
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
103
-	$(top_srcdir)/config/depcomp
102
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
104 103
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
105 104
 am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
106 105
 	$(top_srcdir)/m4/argz.m4 \
... ...
@@ -124,6 +79,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
124 124
 	$(top_srcdir)/m4/reorganization/code_checks/coverage.m4 \
125 125
 	$(top_srcdir)/m4/reorganization/libs/xml.m4 \
126 126
 	$(top_srcdir)/m4/reorganization/libs/openssl.m4 \
127
+	$(top_srcdir)/m4/reorganization/libs/json.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 \
... ...
@@ -195,19 +151,6 @@ clamd_LDADD = $(LDADD)
195 195
 AM_V_lt = $(am__v_lt_@AM_V@)
196 196
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
197 197
 am__v_lt_0 = --silent
198
-am__v_lt_1 = 
199
-AM_V_P = $(am__v_P_@AM_V@)
200
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
201
-am__v_P_0 = false
202
-am__v_P_1 = :
203
-AM_V_GEN = $(am__v_GEN_@AM_V@)
204
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
205
-am__v_GEN_0 = @echo "  GEN     " $@;
206
-am__v_GEN_1 = 
207
-AM_V_at = $(am__v_at_@AM_V@)
208
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
209
-am__v_at_0 = @
210
-am__v_at_1 = 
211 198
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
212 199
 depcomp = $(SHELL) $(top_srcdir)/config/depcomp
213 200
 am__depfiles_maybe = depfiles
... ...
@@ -220,40 +163,22 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
220 220
 	$(AM_CFLAGS) $(CFLAGS)
221 221
 AM_V_CC = $(am__v_CC_@AM_V@)
222 222
 am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
223
-am__v_CC_0 = @echo "  CC      " $@;
224
-am__v_CC_1 = 
223
+am__v_CC_0 = @echo "  CC    " $@;
224
+AM_V_at = $(am__v_at_@AM_V@)
225
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
226
+am__v_at_0 = @
225 227
 CCLD = $(CC)
226 228
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
227 229
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
228 230
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
229 231
 AM_V_CCLD = $(am__v_CCLD_@AM_V@)
230 232
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
231
-am__v_CCLD_0 = @echo "  CCLD    " $@;
232
-am__v_CCLD_1 = 
233
+am__v_CCLD_0 = @echo "  CCLD  " $@;
234
+AM_V_GEN = $(am__v_GEN_@AM_V@)
235
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
236
+am__v_GEN_0 = @echo "  GEN   " $@;
233 237
 SOURCES = $(clamd_SOURCES)
234 238
 DIST_SOURCES = $(am__clamd_SOURCES_DIST)
235
-am__can_run_installinfo = \
236
-  case $$AM_UPDATE_INFO_DIR in \
237
-    n|no|NO) false;; \
238
-    *) (install-info --version) >/dev/null 2>&1;; \
239
-  esac
240
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
241
-# Read a list of newline-separated strings from the standard input,
242
-# and print each of them once, without duplicates.  Input order is
243
-# *not* preserved.
244
-am__uniquify_input = $(AWK) '\
245
-  BEGIN { nonempty = 0; } \
246
-  { items[$$0] = 1; nonempty = 1; } \
247
-  END { if (nonempty) { for (i in items) print i; }; } \
248
-'
249
-# Make sure the list of sources is unique.  This is necessary because,
250
-# e.g., the same source file might be shared among _SOURCES variables
251
-# for different programs/libraries.
252
-am__define_uniq_tagged_files = \
253
-  list='$(am__tagged_files)'; \
254
-  unique=`for i in $$list; do \
255
-    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
256
-  done | $(am__uniquify_input)`
257 239
 ETAGS = etags
258 240
 CTAGS = ctags
259 241
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
... ...
@@ -323,6 +248,9 @@ INSTALL_DATA = @INSTALL_DATA@
323 323
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
324 324
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
325 325
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
326
+JSON_CPPFLAGS = @JSON_CPPFLAGS@
327
+JSON_LDFLAGS = @JSON_LDFLAGS@
328
+JSON_LIBS = @JSON_LIBS@
326 329
 LCOV = @LCOV@
327 330
 LD = @LD@
328 331
 LDFLAGS = @LDFLAGS@
... ...
@@ -517,19 +445,14 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
517 517
 $(am__aclocal_m4_deps):
518 518
 install-sbinPROGRAMS: $(sbin_PROGRAMS)
519 519
 	@$(NORMAL_INSTALL)
520
+	test -z "$(sbindir)" || $(MKDIR_P) "$(DESTDIR)$(sbindir)"
520 521
 	@list='$(sbin_PROGRAMS)'; test -n "$(sbindir)" || list=; \
521
-	if test -n "$$list"; then \
522
-	  echo " $(MKDIR_P) '$(DESTDIR)$(sbindir)'"; \
523
-	  $(MKDIR_P) "$(DESTDIR)$(sbindir)" || exit 1; \
524
-	fi; \
525 522
 	for p in $$list; do echo "$$p $$p"; done | \
526 523
 	sed 's/$(EXEEXT)$$//' | \
527
-	while read p p1; do if test -f $$p \
528
-	 || test -f $$p1 \
529
-	  ; then echo "$$p"; echo "$$p"; else :; fi; \
524
+	while read p p1; do if test -f $$p || test -f $$p1; \
525
+	  then echo "$$p"; echo "$$p"; else :; fi; \
530 526
 	done | \
531
-	sed -e 'p;s,.*/,,;n;h' \
532
-	    -e 's|.*|.|' \
527
+	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
533 528
 	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
534 529
 	sed 'N;N;N;s,\n, ,g' | \
535 530
 	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
... ...
@@ -550,8 +473,7 @@ uninstall-sbinPROGRAMS:
550 550
 	@list='$(sbin_PROGRAMS)'; test -n "$(sbindir)" || list=; \
551 551
 	files=`for p in $$list; do echo "$$p"; done | \
552 552
 	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
553
-	      -e 's/$$/$(EXEEXT)/' \
554
-	`; \
553
+	      -e 's/$$/$(EXEEXT)/' `; \
555 554
 	test -n "$$list" || exit 0; \
556 555
 	echo " ( cd '$(DESTDIR)$(sbindir)' && rm -f" $$files ")"; \
557 556
 	cd "$(DESTDIR)$(sbindir)" && rm -f $$files
... ...
@@ -580,7 +502,6 @@ installcheck-sbinPROGRAMS: $(sbin_PROGRAMS)
580 580
 	    else echo "$$f does not support $$opt" 1>&2; bad=1; fi; \
581 581
 	  done; \
582 582
 	done; rm -f c$${pid}_.???; exit $$bad
583
-
584 583
 clamd$(EXEEXT): $(clamd_OBJECTS) $(clamd_DEPENDENCIES) $(EXTRA_clamd_DEPENDENCIES) 
585 584
 	@rm -f clamd$(EXEEXT)
586 585
 	$(AM_V_CCLD)$(LINK) $(clamd_OBJECTS) $(clamd_LDADD) $(LIBS)
... ...
@@ -610,14 +531,14 @@ distclean-compile:
610 610
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
611 611
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
612 612
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
613
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
613
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
614 614
 
615 615
 .c.obj:
616 616
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
617 617
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
618 618
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
619 619
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
620
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
620
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
621 621
 
622 622
 .c.lo:
623 623
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
... ...
@@ -688,15 +609,26 @@ mostlyclean-libtool:
688 688
 clean-libtool:
689 689
 	-rm -rf .libs _libs
690 690
 
691
-ID: $(am__tagged_files)
692
-	$(am__define_uniq_tagged_files); mkid -fID $$unique
693
-tags: tags-am
694
-TAGS: tags
695
-
696
-tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
691
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
692
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
693
+	unique=`for i in $$list; do \
694
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
695
+	  done | \
696
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
697
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
698
+	mkid -fID $$unique
699
+tags: TAGS
700
+
701
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
702
+		$(TAGS_FILES) $(LISP)
697 703
 	set x; \
698 704
 	here=`pwd`; \
699
-	$(am__define_uniq_tagged_files); \
705
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
706
+	unique=`for i in $$list; do \
707
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
708
+	  done | \
709
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
710
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
700 711
 	shift; \
701 712
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
702 713
 	  test -n "$$unique" || unique=$$empty_fix; \
... ...
@@ -708,11 +640,15 @@ tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
708 708
 	      $$unique; \
709 709
 	  fi; \
710 710
 	fi
711
-ctags: ctags-am
712
-
713
-CTAGS: ctags
714
-ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
715
-	$(am__define_uniq_tagged_files); \
711
+ctags: CTAGS
712
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
713
+		$(TAGS_FILES) $(LISP)
714
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
715
+	unique=`for i in $$list; do \
716
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
717
+	  done | \
718
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
719
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
716 720
 	test -z "$(CTAGS_ARGS)$$unique" \
717 721
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
718 722
 	     $$unique
... ...
@@ -721,21 +657,6 @@ GTAGS:
721 721
 	here=`$(am__cd) $(top_builddir) && pwd` \
722 722
 	  && $(am__cd) $(top_srcdir) \
723 723
 	  && gtags -i $(GTAGS_ARGS) "$$here"
724
-cscopelist: cscopelist-am
725
-
726
-cscopelist-am: $(am__tagged_files)
727
-	list='$(am__tagged_files)'; \
728
-	case "$(srcdir)" in \
729
-	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
730
-	  *) sdir=$(subdir)/$(srcdir) ;; \
731
-	esac; \
732
-	for i in $$list; do \
733
-	  if test -f "$$i"; then \
734
-	    echo "$(subdir)/$$i"; \
735
-	  else \
736
-	    echo "$$sdir/$$i"; \
737
-	  fi; \
738
-	done >> $(top_builddir)/cscope.files
739 724
 
740 725
 distclean-tags:
741 726
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
... ...
@@ -881,20 +802,20 @@ uninstall-am: uninstall-sbinPROGRAMS
881 881
 
882 882
 .MAKE: install-am install-strip
883 883
 
884
-.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
885
-	clean-libtool clean-sbinPROGRAMS cscopelist-am ctags ctags-am \
886
-	distclean distclean-compile distclean-generic \
887
-	distclean-libtool distclean-tags distdir dvi dvi-am html \
888
-	html-am info info-am install install-am install-data \
889
-	install-data-am install-dvi install-dvi-am install-exec \
890
-	install-exec-am install-html install-html-am install-info \
891
-	install-info-am install-man install-pdf install-pdf-am \
892
-	install-ps install-ps-am install-sbinPROGRAMS install-strip \
893
-	installcheck installcheck-am installcheck-sbinPROGRAMS \
894
-	installdirs maintainer-clean maintainer-clean-generic \
895
-	mostlyclean mostlyclean-compile mostlyclean-generic \
896
-	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
897
-	uninstall-am uninstall-sbinPROGRAMS
884
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
885
+	clean-libtool clean-sbinPROGRAMS ctags distclean \
886
+	distclean-compile distclean-generic distclean-libtool \
887
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
888
+	install install-am install-data install-data-am install-dvi \
889
+	install-dvi-am install-exec install-exec-am install-html \
890
+	install-html-am install-info install-info-am install-man \
891
+	install-pdf install-pdf-am install-ps install-ps-am \
892
+	install-sbinPROGRAMS install-strip installcheck \
893
+	installcheck-am installcheck-sbinPROGRAMS installdirs \
894
+	maintainer-clean maintainer-clean-generic mostlyclean \
895
+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
896
+	pdf pdf-am ps ps-am tags uninstall uninstall-am \
897
+	uninstall-sbinPROGRAMS
898 898
 
899 899
 
900 900
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
... ...
@@ -1,8 +1,9 @@
1
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
1
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
2 2
 # @configure_input@
3 3
 
4
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
5
-
4
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
5
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
6
+# Foundation, Inc.
6 7
 # This Makefile.in is free software; the Free Software Foundation
7 8
 # gives unlimited permission to copy and/or distribute it,
8 9
 # with or without modifications, as long as this notice is preserved.
... ...
@@ -33,51 +34,6 @@
33 33
 #  MA 02110-1301, USA.
34 34
 
35 35
 VPATH = @srcdir@
36
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
37
-am__make_running_with_option = \
38
-  case $${target_option-} in \
39
-      ?) ;; \
40
-      *) echo "am__make_running_with_option: internal error: invalid" \
41
-              "target option '$${target_option-}' specified" >&2; \
42
-         exit 1;; \
43
-  esac; \
44
-  has_opt=no; \
45
-  sane_makeflags=$$MAKEFLAGS; \
46
-  if $(am__is_gnu_make); then \
47
-    sane_makeflags=$$MFLAGS; \
48
-  else \
49
-    case $$MAKEFLAGS in \
50
-      *\\[\ \	]*) \
51
-        bs=\\; \
52
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
53
-          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
54
-    esac; \
55
-  fi; \
56
-  skip_next=no; \
57
-  strip_trailopt () \
58
-  { \
59
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
60
-  }; \
61
-  for flg in $$sane_makeflags; do \
62
-    test $$skip_next = yes && { skip_next=no; continue; }; \
63
-    case $$flg in \
64
-      *=*|--*) continue;; \
65
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
66
-      -*I?*) strip_trailopt 'I';; \
67
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
68
-      -*O?*) strip_trailopt 'O';; \
69
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
70
-      -*l?*) strip_trailopt 'l';; \
71
-      -[dEDm]) skip_next=yes;; \
72
-      -[JT]) skip_next=yes;; \
73
-    esac; \
74
-    case $$flg in \
75
-      *$$target_option*) has_opt=yes; break;; \
76
-    esac; \
77
-  done; \
78
-  test $$has_opt = yes
79
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
80
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
81 36
 pkgdatadir = $(datadir)/@PACKAGE@
82 37
 pkgincludedir = $(includedir)/@PACKAGE@
83 38
 pkglibdir = $(libdir)/@PACKAGE@
... ...
@@ -99,8 +55,7 @@ host_triplet = @host@
99 99
 target_triplet = @target@
100 100
 @BUILD_CLAMD_TRUE@bin_PROGRAMS = clamdscan$(EXEEXT)
101 101
 subdir = clamdscan
102
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
103
-	$(top_srcdir)/config/depcomp
102
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
104 103
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
105 104
 am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
106 105
 	$(top_srcdir)/m4/argz.m4 \
... ...
@@ -124,6 +79,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
124 124
 	$(top_srcdir)/m4/reorganization/code_checks/coverage.m4 \
125 125
 	$(top_srcdir)/m4/reorganization/libs/xml.m4 \
126 126
 	$(top_srcdir)/m4/reorganization/libs/openssl.m4 \
127
+	$(top_srcdir)/m4/reorganization/libs/json.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 \
... ...
@@ -193,19 +149,6 @@ clamdscan_LDADD = $(LDADD)
193 193
 AM_V_lt = $(am__v_lt_@AM_V@)
194 194
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
195 195
 am__v_lt_0 = --silent
196
-am__v_lt_1 = 
197
-AM_V_P = $(am__v_P_@AM_V@)
198
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
199
-am__v_P_0 = false
200
-am__v_P_1 = :
201
-AM_V_GEN = $(am__v_GEN_@AM_V@)
202
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
203
-am__v_GEN_0 = @echo "  GEN     " $@;
204
-am__v_GEN_1 = 
205
-AM_V_at = $(am__v_at_@AM_V@)
206
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
207
-am__v_at_0 = @
208
-am__v_at_1 = 
209 196
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
210 197
 depcomp = $(SHELL) $(top_srcdir)/config/depcomp
211 198
 am__depfiles_maybe = depfiles
... ...
@@ -218,40 +161,22 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
218 218
 	$(AM_CFLAGS) $(CFLAGS)
219 219
 AM_V_CC = $(am__v_CC_@AM_V@)
220 220
 am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
221
-am__v_CC_0 = @echo "  CC      " $@;
222
-am__v_CC_1 = 
221
+am__v_CC_0 = @echo "  CC    " $@;
222
+AM_V_at = $(am__v_at_@AM_V@)
223
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
224
+am__v_at_0 = @
223 225
 CCLD = $(CC)
224 226
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
225 227
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
226 228
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
227 229
 AM_V_CCLD = $(am__v_CCLD_@AM_V@)
228 230
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
229
-am__v_CCLD_0 = @echo "  CCLD    " $@;
230
-am__v_CCLD_1 = 
231
+am__v_CCLD_0 = @echo "  CCLD  " $@;
232
+AM_V_GEN = $(am__v_GEN_@AM_V@)
233
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
234
+am__v_GEN_0 = @echo "  GEN   " $@;
231 235
 SOURCES = $(clamdscan_SOURCES)
232 236
 DIST_SOURCES = $(am__clamdscan_SOURCES_DIST)
233
-am__can_run_installinfo = \
234
-  case $$AM_UPDATE_INFO_DIR in \
235
-    n|no|NO) false;; \
236
-    *) (install-info --version) >/dev/null 2>&1;; \
237
-  esac
238
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
239
-# Read a list of newline-separated strings from the standard input,
240
-# and print each of them once, without duplicates.  Input order is
241
-# *not* preserved.
242
-am__uniquify_input = $(AWK) '\
243
-  BEGIN { nonempty = 0; } \
244
-  { items[$$0] = 1; nonempty = 1; } \
245
-  END { if (nonempty) { for (i in items) print i; }; } \
246
-'
247
-# Make sure the list of sources is unique.  This is necessary because,
248
-# e.g., the same source file might be shared among _SOURCES variables
249
-# for different programs/libraries.
250
-am__define_uniq_tagged_files = \
251
-  list='$(am__tagged_files)'; \
252
-  unique=`for i in $$list; do \
253
-    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
254
-  done | $(am__uniquify_input)`
255 237
 ETAGS = etags
256 238
 CTAGS = ctags
257 239
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
... ...
@@ -321,6 +246,9 @@ INSTALL_DATA = @INSTALL_DATA@
321 321
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
322 322
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
323 323
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
324
+JSON_CPPFLAGS = @JSON_CPPFLAGS@
325
+JSON_LDFLAGS = @JSON_LDFLAGS@
326
+JSON_LIBS = @JSON_LIBS@
324 327
 LCOV = @LCOV@
325 328
 LD = @LD@
326 329
 LDFLAGS = @LDFLAGS@
... ...
@@ -503,19 +431,14 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
503 503
 $(am__aclocal_m4_deps):
504 504
 install-binPROGRAMS: $(bin_PROGRAMS)
505 505
 	@$(NORMAL_INSTALL)
506
+	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
506 507
 	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
507
-	if test -n "$$list"; then \
508
-	  echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
509
-	  $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
510
-	fi; \
511 508
 	for p in $$list; do echo "$$p $$p"; done | \
512 509
 	sed 's/$(EXEEXT)$$//' | \
513
-	while read p p1; do if test -f $$p \
514
-	 || test -f $$p1 \
515
-	  ; then echo "$$p"; echo "$$p"; else :; fi; \
510
+	while read p p1; do if test -f $$p || test -f $$p1; \
511
+	  then echo "$$p"; echo "$$p"; else :; fi; \
516 512
 	done | \
517
-	sed -e 'p;s,.*/,,;n;h' \
518
-	    -e 's|.*|.|' \
513
+	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
519 514
 	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
520 515
 	sed 'N;N;N;s,\n, ,g' | \
521 516
 	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
... ...
@@ -536,8 +459,7 @@ uninstall-binPROGRAMS:
536 536
 	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
537 537
 	files=`for p in $$list; do echo "$$p"; done | \
538 538
 	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
539
-	      -e 's/$$/$(EXEEXT)/' \
540
-	`; \
539
+	      -e 's/$$/$(EXEEXT)/' `; \
541 540
 	test -n "$$list" || exit 0; \
542 541
 	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
543 542
 	cd "$(DESTDIR)$(bindir)" && rm -f $$files
... ...
@@ -566,7 +488,6 @@ installcheck-binPROGRAMS: $(bin_PROGRAMS)
566 566
 	    else echo "$$f does not support $$opt" 1>&2; bad=1; fi; \
567 567
 	  done; \
568 568
 	done; rm -f c$${pid}_.???; exit $$bad
569
-
570 569
 clamdscan$(EXEEXT): $(clamdscan_OBJECTS) $(clamdscan_DEPENDENCIES) $(EXTRA_clamdscan_DEPENDENCIES) 
571 570
 	@rm -f clamdscan$(EXEEXT)
572 571
 	$(AM_V_CCLD)$(LINK) $(clamdscan_OBJECTS) $(clamdscan_LDADD) $(LIBS)
... ...
@@ -592,14 +513,14 @@ distclean-compile:
592 592
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
593 593
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
594 594
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
595
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
595
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
596 596
 
597 597
 .c.obj:
598 598
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
599 599
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
600 600
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
601 601
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
602
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
602
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
603 603
 
604 604
 .c.lo:
605 605
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
... ...
@@ -698,15 +619,26 @@ mostlyclean-libtool:
698 698
 clean-libtool:
699 699
 	-rm -rf .libs _libs
700 700
 
701
-ID: $(am__tagged_files)
702
-	$(am__define_uniq_tagged_files); mkid -fID $$unique
703
-tags: tags-am
704
-TAGS: tags
705
-
706
-tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
701
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
702
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
703
+	unique=`for i in $$list; do \
704
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
705
+	  done | \
706
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
707
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
708
+	mkid -fID $$unique
709
+tags: TAGS
710
+
711
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
712
+		$(TAGS_FILES) $(LISP)
707 713
 	set x; \
708 714
 	here=`pwd`; \
709
-	$(am__define_uniq_tagged_files); \
715
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
716
+	unique=`for i in $$list; do \
717
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
718
+	  done | \
719
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
720
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
710 721
 	shift; \
711 722
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
712 723
 	  test -n "$$unique" || unique=$$empty_fix; \
... ...
@@ -718,11 +650,15 @@ tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
718 718
 	      $$unique; \
719 719
 	  fi; \
720 720
 	fi
721
-ctags: ctags-am
722
-
723
-CTAGS: ctags
724
-ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
725
-	$(am__define_uniq_tagged_files); \
721
+ctags: CTAGS
722
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
723
+		$(TAGS_FILES) $(LISP)
724
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
725
+	unique=`for i in $$list; do \
726
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
727
+	  done | \
728
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
729
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
726 730
 	test -z "$(CTAGS_ARGS)$$unique" \
727 731
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
728 732
 	     $$unique
... ...
@@ -731,21 +667,6 @@ GTAGS:
731 731
 	here=`$(am__cd) $(top_builddir) && pwd` \
732 732
 	  && $(am__cd) $(top_srcdir) \
733 733
 	  && gtags -i $(GTAGS_ARGS) "$$here"
734
-cscopelist: cscopelist-am
735
-
736
-cscopelist-am: $(am__tagged_files)
737
-	list='$(am__tagged_files)'; \
738
-	case "$(srcdir)" in \
739
-	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
740
-	  *) sdir=$(subdir)/$(srcdir) ;; \
741
-	esac; \
742
-	for i in $$list; do \
743
-	  if test -f "$$i"; then \
744
-	    echo "$(subdir)/$$i"; \
745
-	  else \
746
-	    echo "$$sdir/$$i"; \
747
-	  fi; \
748
-	done >> $(top_builddir)/cscope.files
749 734
 
750 735
 distclean-tags:
751 736
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
... ...
@@ -890,20 +811,19 @@ uninstall-am: uninstall-binPROGRAMS
890 890
 
891 891
 .MAKE: install-am install-strip
892 892
 
893
-.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \
894
-	clean-binPROGRAMS clean-generic clean-libtool cscopelist-am \
895
-	ctags ctags-am distclean distclean-compile distclean-generic \
896
-	distclean-libtool distclean-tags distdir dvi dvi-am html \
897
-	html-am info info-am install install-am install-binPROGRAMS \
898
-	install-data install-data-am install-dvi install-dvi-am \
899
-	install-exec install-exec-am install-html install-html-am \
900
-	install-info install-info-am install-man install-pdf \
901
-	install-pdf-am install-ps install-ps-am install-strip \
902
-	installcheck installcheck-am installcheck-binPROGRAMS \
903
-	installdirs maintainer-clean maintainer-clean-generic \
904
-	mostlyclean mostlyclean-compile mostlyclean-generic \
905
-	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
906
-	uninstall-am uninstall-binPROGRAMS
893
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
894
+	clean-generic clean-libtool ctags distclean distclean-compile \
895
+	distclean-generic distclean-libtool distclean-tags distdir dvi \
896
+	dvi-am html html-am info info-am install install-am \
897
+	install-binPROGRAMS install-data install-data-am install-dvi \
898
+	install-dvi-am install-exec install-exec-am install-html \
899
+	install-html-am install-info install-info-am install-man \
900
+	install-pdf install-pdf-am install-ps install-ps-am \
901
+	install-strip installcheck installcheck-am \
902
+	installcheck-binPROGRAMS installdirs maintainer-clean \
903
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
904
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
905
+	tags uninstall uninstall-am uninstall-binPROGRAMS
907 906
 
908 907
 
909 908
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
... ...
@@ -1,8 +1,9 @@
1
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
1
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
2 2
 # @configure_input@
3 3
 
4
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
5
-
4
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
5
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
6
+# Foundation, Inc.
6 7
 # This Makefile.in is free software; the Free Software Foundation
7 8
 # gives unlimited permission to copy and/or distribute it,
8 9
 # with or without modifications, as long as this notice is preserved.
... ...
@@ -15,51 +16,6 @@
15 15
 @SET_MAKE@
16 16
 
17 17
 VPATH = @srcdir@
18
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
19
-am__make_running_with_option = \
20
-  case $${target_option-} in \
21
-      ?) ;; \
22
-      *) echo "am__make_running_with_option: internal error: invalid" \
23
-              "target option '$${target_option-}' specified" >&2; \
24
-         exit 1;; \
25
-  esac; \
26
-  has_opt=no; \
27
-  sane_makeflags=$$MAKEFLAGS; \
28
-  if $(am__is_gnu_make); then \
29
-    sane_makeflags=$$MFLAGS; \
30
-  else \
31
-    case $$MAKEFLAGS in \
32
-      *\\[\ \	]*) \
33
-        bs=\\; \
34
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
35
-          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
36
-    esac; \
37
-  fi; \
38
-  skip_next=no; \
39
-  strip_trailopt () \
40
-  { \
41
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
42
-  }; \
43
-  for flg in $$sane_makeflags; do \
44
-    test $$skip_next = yes && { skip_next=no; continue; }; \
45
-    case $$flg in \
46
-      *=*|--*) continue;; \
47
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
48
-      -*I?*) strip_trailopt 'I';; \
49
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
50
-      -*O?*) strip_trailopt 'O';; \
51
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
52
-      -*l?*) strip_trailopt 'l';; \
53
-      -[dEDm]) skip_next=yes;; \
54
-      -[JT]) skip_next=yes;; \
55
-    esac; \
56
-    case $$flg in \
57
-      *$$target_option*) has_opt=yes; break;; \
58
-    esac; \
59
-  done; \
60
-  test $$has_opt = yes
61
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
62
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
63 18
 pkgdatadir = $(datadir)/@PACKAGE@
64 19
 pkgincludedir = $(includedir)/@PACKAGE@
65 20
 pkglibdir = $(libdir)/@PACKAGE@
... ...
@@ -81,8 +37,7 @@ host_triplet = @host@
81 81
 target_triplet = @target@
82 82
 @HAVE_CURSES_TRUE@bin_PROGRAMS = clamdtop$(EXEEXT)
83 83
 subdir = clamdtop
84
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
85
-	$(top_srcdir)/config/depcomp
84
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
86 85
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
87 86
 am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
88 87
 	$(top_srcdir)/m4/argz.m4 \
... ...
@@ -106,6 +61,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
106 106
 	$(top_srcdir)/m4/reorganization/code_checks/coverage.m4 \
107 107
 	$(top_srcdir)/m4/reorganization/libs/xml.m4 \
108 108
 	$(top_srcdir)/m4/reorganization/libs/openssl.m4 \
109
+	$(top_srcdir)/m4/reorganization/libs/json.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 \
... ...
@@ -169,19 +125,6 @@ clamdtop_OBJECTS = $(am_clamdtop_OBJECTS)
169 169
 AM_V_lt = $(am__v_lt_@AM_V@)
170 170
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
171 171
 am__v_lt_0 = --silent
172
-am__v_lt_1 = 
173
-AM_V_P = $(am__v_P_@AM_V@)
174
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
175
-am__v_P_0 = false
176
-am__v_P_1 = :
177
-AM_V_GEN = $(am__v_GEN_@AM_V@)
178
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
179
-am__v_GEN_0 = @echo "  GEN     " $@;
180
-am__v_GEN_1 = 
181
-AM_V_at = $(am__v_at_@AM_V@)
182
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
183
-am__v_at_0 = @
184
-am__v_at_1 = 
185 172
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
186 173
 depcomp = $(SHELL) $(top_srcdir)/config/depcomp
187 174
 am__depfiles_maybe = depfiles
... ...
@@ -194,23 +137,22 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
194 194
 	$(AM_CFLAGS) $(CFLAGS)
195 195
 AM_V_CC = $(am__v_CC_@AM_V@)
196 196
 am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
197
-am__v_CC_0 = @echo "  CC      " $@;
198
-am__v_CC_1 = 
197
+am__v_CC_0 = @echo "  CC    " $@;
198
+AM_V_at = $(am__v_at_@AM_V@)
199
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
200
+am__v_at_0 = @
199 201
 CCLD = $(CC)
200 202
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
201 203
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
202 204
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
203 205
 AM_V_CCLD = $(am__v_CCLD_@AM_V@)
204 206
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
205
-am__v_CCLD_0 = @echo "  CCLD    " $@;
206
-am__v_CCLD_1 = 
207
+am__v_CCLD_0 = @echo "  CCLD  " $@;
208
+AM_V_GEN = $(am__v_GEN_@AM_V@)
209
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
210
+am__v_GEN_0 = @echo "  GEN   " $@;
207 211
 SOURCES = $(clamdtop_SOURCES)
208 212
 DIST_SOURCES = $(am__clamdtop_SOURCES_DIST)
209
-am__can_run_installinfo = \
210
-  case $$AM_UPDATE_INFO_DIR in \
211
-    n|no|NO) false;; \
212
-    *) (install-info --version) >/dev/null 2>&1;; \
213
-  esac
214 213
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
215 214
 am__vpath_adj = case $$p in \
216 215
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
... ...
@@ -241,23 +183,6 @@ am__uninstall_files_from_dir = { \
241 241
 man1dir = $(mandir)/man1
242 242
 NROFF = nroff
243 243
 MANS = $(man_MANS)
244
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
245
-# Read a list of newline-separated strings from the standard input,
246
-# and print each of them once, without duplicates.  Input order is
247
-# *not* preserved.
248
-am__uniquify_input = $(AWK) '\
249
-  BEGIN { nonempty = 0; } \
250
-  { items[$$0] = 1; nonempty = 1; } \
251
-  END { if (nonempty) { for (i in items) print i; }; } \
252
-'
253
-# Make sure the list of sources is unique.  This is necessary because,
254
-# e.g., the same source file might be shared among _SOURCES variables
255
-# for different programs/libraries.
256
-am__define_uniq_tagged_files = \
257
-  list='$(am__tagged_files)'; \
258
-  unique=`for i in $$list; do \
259
-    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
260
-  done | $(am__uniquify_input)`
261 244
 ETAGS = etags
262 245
 CTAGS = ctags
263 246
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
... ...
@@ -327,6 +252,9 @@ INSTALL_DATA = @INSTALL_DATA@
327 327
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
328 328
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
329 329
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
330
+JSON_CPPFLAGS = @JSON_CPPFLAGS@
331
+JSON_LDFLAGS = @JSON_LDFLAGS@
332
+JSON_LIBS = @JSON_LIBS@
330 333
 LCOV = @LCOV@
331 334
 LD = @LD@
332 335
 LDFLAGS = @LDFLAGS@
... ...
@@ -500,19 +428,14 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
500 500
 $(am__aclocal_m4_deps):
501 501
 install-binPROGRAMS: $(bin_PROGRAMS)
502 502
 	@$(NORMAL_INSTALL)
503
+	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
503 504
 	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
504
-	if test -n "$$list"; then \
505
-	  echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
506
-	  $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
507
-	fi; \
508 505
 	for p in $$list; do echo "$$p $$p"; done | \
509 506
 	sed 's/$(EXEEXT)$$//' | \
510
-	while read p p1; do if test -f $$p \
511
-	 || test -f $$p1 \
512
-	  ; then echo "$$p"; echo "$$p"; else :; fi; \
507
+	while read p p1; do if test -f $$p || test -f $$p1; \
508
+	  then echo "$$p"; echo "$$p"; else :; fi; \
513 509
 	done | \
514
-	sed -e 'p;s,.*/,,;n;h' \
515
-	    -e 's|.*|.|' \
510
+	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
516 511
 	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
517 512
 	sed 'N;N;N;s,\n, ,g' | \
518 513
 	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
... ...
@@ -533,8 +456,7 @@ uninstall-binPROGRAMS:
533 533
 	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
534 534
 	files=`for p in $$list; do echo "$$p"; done | \
535 535
 	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
536
-	      -e 's/$$/$(EXEEXT)/' \
537
-	`; \
536
+	      -e 's/$$/$(EXEEXT)/' `; \
538 537
 	test -n "$$list" || exit 0; \
539 538
 	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
540 539
 	cd "$(DESTDIR)$(bindir)" && rm -f $$files
... ...
@@ -563,7 +485,6 @@ installcheck-binPROGRAMS: $(bin_PROGRAMS)
563 563
 	    else echo "$$f does not support $$opt" 1>&2; bad=1; fi; \
564 564
 	  done; \
565 565
 	done; rm -f c$${pid}_.???; exit $$bad
566
-
567 566
 clamdtop$(EXEEXT): $(clamdtop_OBJECTS) $(clamdtop_DEPENDENCIES) $(EXTRA_clamdtop_DEPENDENCIES) 
568 567
 	@rm -f clamdtop$(EXEEXT)
569 568
 	$(AM_V_CCLD)$(LINK) $(clamdtop_OBJECTS) $(clamdtop_LDADD) $(LIBS)
... ...
@@ -584,14 +505,14 @@ distclean-compile:
584 584
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
585 585
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
586 586
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
587
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
587
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
588 588
 
589 589
 .c.obj:
590 590
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
591 591
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
592 592
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
593 593
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
594
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
594
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
595 595
 
596 596
 .c.lo:
597 597
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
... ...
@@ -649,18 +570,11 @@ clean-libtool:
649 649
 	-rm -rf .libs _libs
650 650
 install-man1: $(man_MANS)
651 651
 	@$(NORMAL_INSTALL)
652
-	@list1=''; \
653
-	list2='$(man_MANS)'; \
654
-	test -n "$(man1dir)" \
655
-	  && test -n "`echo $$list1$$list2`" \
656
-	  || exit 0; \
657
-	echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \
658
-	$(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \
659
-	{ for i in $$list1; do echo "$$i"; done;  \
660
-	if test -n "$$list2"; then \
661
-	  for i in $$list2; do echo "$$i"; done \
662
-	    | sed -n '/\.1[a-z]*$$/p'; \
663
-	fi; \
652
+	test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
653
+	@list=''; test -n "$(man1dir)" || exit 0; \
654
+	{ for i in $$list; do echo "$$i"; done; \
655
+	l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
656
+	  sed -n '/\.1[a-z]*$$/p'; \
664 657
 	} | while read p; do \
665 658
 	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
666 659
 	  echo "$$d$$p"; echo "$$p"; \
... ...
@@ -691,15 +605,26 @@ uninstall-man1:
691 691
 	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
692 692
 	dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
693 693
 
694
-ID: $(am__tagged_files)
695
-	$(am__define_uniq_tagged_files); mkid -fID $$unique
696
-tags: tags-am
697
-TAGS: tags
698
-
699
-tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
694
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
695
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
696
+	unique=`for i in $$list; do \
697
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
698
+	  done | \
699
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
700
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
701
+	mkid -fID $$unique
702
+tags: TAGS
703
+
704
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
705
+		$(TAGS_FILES) $(LISP)
700 706
 	set x; \
701 707
 	here=`pwd`; \
702
-	$(am__define_uniq_tagged_files); \
708
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
709
+	unique=`for i in $$list; do \
710
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
711
+	  done | \
712
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
713
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
703 714
 	shift; \
704 715
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
705 716
 	  test -n "$$unique" || unique=$$empty_fix; \
... ...
@@ -711,11 +636,15 @@ tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
711 711
 	      $$unique; \
712 712
 	  fi; \
713 713
 	fi
714
-ctags: ctags-am
715
-
716
-CTAGS: ctags
717
-ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
718
-	$(am__define_uniq_tagged_files); \
714
+ctags: CTAGS
715
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
716
+		$(TAGS_FILES) $(LISP)
717
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
718
+	unique=`for i in $$list; do \
719
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
720
+	  done | \
721
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
722
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
719 723
 	test -z "$(CTAGS_ARGS)$$unique" \
720 724
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
721 725
 	     $$unique
... ...
@@ -724,26 +653,24 @@ GTAGS:
724 724
 	here=`$(am__cd) $(top_builddir) && pwd` \
725 725
 	  && $(am__cd) $(top_srcdir) \
726 726
 	  && gtags -i $(GTAGS_ARGS) "$$here"
727
-cscopelist: cscopelist-am
728
-
729
-cscopelist-am: $(am__tagged_files)
730
-	list='$(am__tagged_files)'; \
731
-	case "$(srcdir)" in \
732
-	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
733
-	  *) sdir=$(subdir)/$(srcdir) ;; \
734
-	esac; \
735
-	for i in $$list; do \
736
-	  if test -f "$$i"; then \
737
-	    echo "$(subdir)/$$i"; \
738
-	  else \
739
-	    echo "$$sdir/$$i"; \
740
-	  fi; \
741
-	done >> $(top_builddir)/cscope.files
742 727
 
743 728
 distclean-tags:
744 729
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
745 730
 
746 731
 distdir: $(DISTFILES)
732
+	@list='$(MANS)'; if test -n "$$list"; then \
733
+	  list=`for p in $$list; do \
734
+	    if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
735
+	    if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \
736
+	  if test -n "$$list" && \
737
+	    grep 'ab help2man is required to generate this page' $$list >/dev/null; then \
738
+	    echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \
739
+	    grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/         /' >&2; \
740
+	    echo "       to fix them, install help2man, remove and regenerate the man pages;" >&2; \
741
+	    echo "       typically \`make maintainer-clean' will remove them" >&2; \
742
+	    exit 1; \
743
+	  else :; fi; \
744
+	else :; fi
747 745
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
748 746
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
749 747
 	list='$(DISTFILES)'; \
... ...
@@ -884,20 +811,19 @@ uninstall-man: uninstall-man1
884 884
 
885 885
 .MAKE: install-am install-strip
886 886
 
887
-.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \
888
-	clean-binPROGRAMS clean-generic clean-libtool cscopelist-am \
889
-	ctags ctags-am distclean distclean-compile distclean-generic \
890
-	distclean-libtool distclean-tags distdir dvi dvi-am html \
891
-	html-am info info-am install install-am install-binPROGRAMS \
892
-	install-data install-data-am install-dvi install-dvi-am \
893
-	install-exec install-exec-am install-html install-html-am \
894
-	install-info install-info-am install-man install-man1 \
895
-	install-pdf install-pdf-am install-ps install-ps-am \
896
-	install-strip installcheck installcheck-am \
887
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
888
+	clean-generic clean-libtool ctags distclean distclean-compile \
889
+	distclean-generic distclean-libtool distclean-tags distdir dvi \
890
+	dvi-am html html-am info info-am install install-am \
891
+	install-binPROGRAMS install-data install-data-am install-dvi \
892
+	install-dvi-am install-exec install-exec-am install-html \
893
+	install-html-am install-info install-info-am install-man \
894
+	install-man1 install-pdf install-pdf-am install-ps \
895
+	install-ps-am install-strip installcheck installcheck-am \
897 896
 	installcheck-binPROGRAMS installdirs maintainer-clean \
898 897
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
899 898
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
900
-	tags tags-am uninstall uninstall-am uninstall-binPROGRAMS \
899
+	tags uninstall uninstall-am uninstall-binPROGRAMS \
901 900
 	uninstall-man uninstall-man1
902 901
 
903 902
 
... ...
@@ -1,8 +1,9 @@
1
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
1
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
2 2
 # @configure_input@
3 3
 
4
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
5
-
4
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
5
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
6
+# Foundation, Inc.
6 7
 # This Makefile.in is free software; the Free Software Foundation
7 8
 # gives unlimited permission to copy and/or distribute it,
8 9
 # with or without modifications, as long as this notice is preserved.
... ...
@@ -34,51 +35,6 @@
34 34
 #  MA 02110-1301, USA.
35 35
 
36 36
 VPATH = @srcdir@
37
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
38
-am__make_running_with_option = \
39
-  case $${target_option-} in \
40
-      ?) ;; \
41
-      *) echo "am__make_running_with_option: internal error: invalid" \
42
-              "target option '$${target_option-}' specified" >&2; \
43
-         exit 1;; \
44
-  esac; \
45
-  has_opt=no; \
46
-  sane_makeflags=$$MAKEFLAGS; \
47
-  if $(am__is_gnu_make); then \
48
-    sane_makeflags=$$MFLAGS; \
49
-  else \
50
-    case $$MAKEFLAGS in \
51
-      *\\[\ \	]*) \
52
-        bs=\\; \
53
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
54
-          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
55
-    esac; \
56
-  fi; \
57
-  skip_next=no; \
58
-  strip_trailopt () \
59
-  { \
60
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
61
-  }; \
62
-  for flg in $$sane_makeflags; do \
63
-    test $$skip_next = yes && { skip_next=no; continue; }; \
64
-    case $$flg in \
65
-      *=*|--*) continue;; \
66
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
67
-      -*I?*) strip_trailopt 'I';; \
68
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
69
-      -*O?*) strip_trailopt 'O';; \
70
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
71
-      -*l?*) strip_trailopt 'l';; \
72
-      -[dEDm]) skip_next=yes;; \
73
-      -[JT]) skip_next=yes;; \
74
-    esac; \
75
-    case $$flg in \
76
-      *$$target_option*) has_opt=yes; break;; \
77
-    esac; \
78
-  done; \
79
-  test $$has_opt = yes
80
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
81
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
82 37
 pkgdatadir = $(datadir)/@PACKAGE@
83 38
 pkgincludedir = $(includedir)/@PACKAGE@
84 39
 pkglibdir = $(libdir)/@PACKAGE@
... ...
@@ -100,8 +56,7 @@ host_triplet = @host@
100 100
 target_triplet = @target@
101 101
 bin_PROGRAMS = clamscan$(EXEEXT)
102 102
 subdir = clamscan
103
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
104
-	$(top_srcdir)/config/depcomp
103
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
105 104
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
106 105
 am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
107 106
 	$(top_srcdir)/m4/argz.m4 \
... ...
@@ -125,6 +80,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
125 125
 	$(top_srcdir)/m4/reorganization/code_checks/coverage.m4 \
126 126
 	$(top_srcdir)/m4/reorganization/libs/xml.m4 \
127 127
 	$(top_srcdir)/m4/reorganization/libs/openssl.m4 \
128
+	$(top_srcdir)/m4/reorganization/libs/json.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 \
... ...
@@ -184,19 +140,6 @@ clamscan_LDADD = $(LDADD)
184 184
 AM_V_lt = $(am__v_lt_@AM_V@)
185 185
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
186 186
 am__v_lt_0 = --silent
187
-am__v_lt_1 = 
188
-AM_V_P = $(am__v_P_@AM_V@)
189
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
190
-am__v_P_0 = false
191
-am__v_P_1 = :
192
-AM_V_GEN = $(am__v_GEN_@AM_V@)
193
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
194
-am__v_GEN_0 = @echo "  GEN     " $@;
195
-am__v_GEN_1 = 
196
-AM_V_at = $(am__v_at_@AM_V@)
197
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
198
-am__v_at_0 = @
199
-am__v_at_1 = 
200 187
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
201 188
 depcomp = $(SHELL) $(top_srcdir)/config/depcomp
202 189
 am__depfiles_maybe = depfiles
... ...
@@ -209,40 +152,22 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
209 209
 	$(AM_CFLAGS) $(CFLAGS)
210 210
 AM_V_CC = $(am__v_CC_@AM_V@)
211 211
 am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
212
-am__v_CC_0 = @echo "  CC      " $@;
213
-am__v_CC_1 = 
212
+am__v_CC_0 = @echo "  CC    " $@;
213
+AM_V_at = $(am__v_at_@AM_V@)
214
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
215
+am__v_at_0 = @
214 216
 CCLD = $(CC)
215 217
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
216 218
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
217 219
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
218 220
 AM_V_CCLD = $(am__v_CCLD_@AM_V@)
219 221
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
220
-am__v_CCLD_0 = @echo "  CCLD    " $@;
221
-am__v_CCLD_1 = 
222
+am__v_CCLD_0 = @echo "  CCLD  " $@;
223
+AM_V_GEN = $(am__v_GEN_@AM_V@)
224
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
225
+am__v_GEN_0 = @echo "  GEN   " $@;
222 226
 SOURCES = $(clamscan_SOURCES)
223 227
 DIST_SOURCES = $(clamscan_SOURCES)
224
-am__can_run_installinfo = \
225
-  case $$AM_UPDATE_INFO_DIR in \
226
-    n|no|NO) false;; \
227
-    *) (install-info --version) >/dev/null 2>&1;; \
228
-  esac
229
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
230
-# Read a list of newline-separated strings from the standard input,
231
-# and print each of them once, without duplicates.  Input order is
232
-# *not* preserved.
233
-am__uniquify_input = $(AWK) '\
234
-  BEGIN { nonempty = 0; } \
235
-  { items[$$0] = 1; nonempty = 1; } \
236
-  END { if (nonempty) { for (i in items) print i; }; } \
237
-'
238
-# Make sure the list of sources is unique.  This is necessary because,
239
-# e.g., the same source file might be shared among _SOURCES variables
240
-# for different programs/libraries.
241
-am__define_uniq_tagged_files = \
242
-  list='$(am__tagged_files)'; \
243
-  unique=`for i in $$list; do \
244
-    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
245
-  done | $(am__uniquify_input)`
246 228
 ETAGS = etags
247 229
 CTAGS = ctags
248 230
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
... ...
@@ -312,6 +237,9 @@ INSTALL_DATA = @INSTALL_DATA@
312 312
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
313 313
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
314 314
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
315
+JSON_CPPFLAGS = @JSON_CPPFLAGS@
316
+JSON_LDFLAGS = @JSON_LDFLAGS@
317
+JSON_LIBS = @JSON_LIBS@
315 318
 LCOV = @LCOV@
316 319
 LD = @LD@
317 320
 LDFLAGS = @LDFLAGS@
... ...
@@ -490,19 +418,14 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
490 490
 $(am__aclocal_m4_deps):
491 491
 install-binPROGRAMS: $(bin_PROGRAMS)
492 492
 	@$(NORMAL_INSTALL)
493
+	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
493 494
 	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
494
-	if test -n "$$list"; then \
495
-	  echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
496
-	  $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
497
-	fi; \
498 495
 	for p in $$list; do echo "$$p $$p"; done | \
499 496
 	sed 's/$(EXEEXT)$$//' | \
500
-	while read p p1; do if test -f $$p \
501
-	 || test -f $$p1 \
502
-	  ; then echo "$$p"; echo "$$p"; else :; fi; \
497
+	while read p p1; do if test -f $$p || test -f $$p1; \
498
+	  then echo "$$p"; echo "$$p"; else :; fi; \
503 499
 	done | \
504
-	sed -e 'p;s,.*/,,;n;h' \
505
-	    -e 's|.*|.|' \
500
+	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
506 501
 	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
507 502
 	sed 'N;N;N;s,\n, ,g' | \
508 503
 	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
... ...
@@ -523,8 +446,7 @@ uninstall-binPROGRAMS:
523 523
 	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
524 524
 	files=`for p in $$list; do echo "$$p"; done | \
525 525
 	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
526
-	      -e 's/$$/$(EXEEXT)/' \
527
-	`; \
526
+	      -e 's/$$/$(EXEEXT)/' `; \
528 527
 	test -n "$$list" || exit 0; \
529 528
 	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
530 529
 	cd "$(DESTDIR)$(bindir)" && rm -f $$files
... ...
@@ -553,7 +475,6 @@ installcheck-binPROGRAMS: $(bin_PROGRAMS)
553 553
 	    else echo "$$f does not support $$opt" 1>&2; bad=1; fi; \
554 554
 	  done; \
555 555
 	done; rm -f c$${pid}_.???; exit $$bad
556
-
557 556
 clamscan$(EXEEXT): $(clamscan_OBJECTS) $(clamscan_DEPENDENCIES) $(EXTRA_clamscan_DEPENDENCIES) 
558 557
 	@rm -f clamscan$(EXEEXT)
559 558
 	$(AM_V_CCLD)$(LINK) $(clamscan_OBJECTS) $(clamscan_LDADD) $(LIBS)
... ...
@@ -577,14 +498,14 @@ distclean-compile:
577 577
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
578 578
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
579 579
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
580
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
580
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
581 581
 
582 582
 .c.obj:
583 583
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
584 584
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
585 585
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
586 586
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
587
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
587
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
588 588
 
589 589
 .c.lo:
590 590
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
... ...
@@ -669,15 +590,26 @@ mostlyclean-libtool:
669 669
 clean-libtool:
670 670
 	-rm -rf .libs _libs
671 671
 
672
-ID: $(am__tagged_files)
673
-	$(am__define_uniq_tagged_files); mkid -fID $$unique
674
-tags: tags-am
675
-TAGS: tags
676
-
677
-tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
672
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
673
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
674
+	unique=`for i in $$list; do \
675
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
676
+	  done | \
677
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
678
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
679
+	mkid -fID $$unique
680
+tags: TAGS
681
+
682
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
683
+		$(TAGS_FILES) $(LISP)
678 684
 	set x; \
679 685
 	here=`pwd`; \
680
-	$(am__define_uniq_tagged_files); \
686
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
687
+	unique=`for i in $$list; do \
688
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
689
+	  done | \
690
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
691
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
681 692
 	shift; \
682 693
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
683 694
 	  test -n "$$unique" || unique=$$empty_fix; \
... ...
@@ -689,11 +621,15 @@ tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
689 689
 	      $$unique; \
690 690
 	  fi; \
691 691
 	fi
692
-ctags: ctags-am
693
-
694
-CTAGS: ctags
695
-ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
696
-	$(am__define_uniq_tagged_files); \
692
+ctags: CTAGS
693
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
694
+		$(TAGS_FILES) $(LISP)
695
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
696
+	unique=`for i in $$list; do \
697
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
698
+	  done | \
699
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
700
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
697 701
 	test -z "$(CTAGS_ARGS)$$unique" \
698 702
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
699 703
 	     $$unique
... ...
@@ -702,21 +638,6 @@ GTAGS:
702 702
 	here=`$(am__cd) $(top_builddir) && pwd` \
703 703
 	  && $(am__cd) $(top_srcdir) \
704 704
 	  && gtags -i $(GTAGS_ARGS) "$$here"
705
-cscopelist: cscopelist-am
706
-
707
-cscopelist-am: $(am__tagged_files)
708
-	list='$(am__tagged_files)'; \
709
-	case "$(srcdir)" in \
710
-	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
711
-	  *) sdir=$(subdir)/$(srcdir) ;; \
712
-	esac; \
713
-	for i in $$list; do \
714
-	  if test -f "$$i"; then \
715
-	    echo "$(subdir)/$$i"; \
716
-	  else \
717
-	    echo "$$sdir/$$i"; \
718
-	  fi; \
719
-	done >> $(top_builddir)/cscope.files
720 705
 
721 706
 distclean-tags:
722 707
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
... ...
@@ -861,20 +782,19 @@ uninstall-am: uninstall-binPROGRAMS
861 861
 
862 862
 .MAKE: install-am install-strip
863 863
 
864
-.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \
865
-	clean-binPROGRAMS clean-generic clean-libtool cscopelist-am \
866
-	ctags ctags-am distclean distclean-compile distclean-generic \
867
-	distclean-libtool distclean-tags distdir dvi dvi-am html \
868
-	html-am info info-am install install-am install-binPROGRAMS \
869
-	install-data install-data-am install-dvi install-dvi-am \
870
-	install-exec install-exec-am install-html install-html-am \
871
-	install-info install-info-am install-man install-pdf \
872
-	install-pdf-am install-ps install-ps-am install-strip \
873
-	installcheck installcheck-am installcheck-binPROGRAMS \
874
-	installdirs maintainer-clean maintainer-clean-generic \
875
-	mostlyclean mostlyclean-compile mostlyclean-generic \
876
-	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
877
-	uninstall-am uninstall-binPROGRAMS
864
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
865
+	clean-generic clean-libtool ctags distclean distclean-compile \
866
+	distclean-generic distclean-libtool distclean-tags distdir dvi \
867
+	dvi-am html html-am info info-am install install-am \
868
+	install-binPROGRAMS install-data install-data-am install-dvi \
869
+	install-dvi-am install-exec install-exec-am install-html \
870
+	install-html-am install-info install-info-am install-man \
871
+	install-pdf install-pdf-am install-ps install-ps-am \
872
+	install-strip installcheck installcheck-am \
873
+	installcheck-binPROGRAMS installdirs maintainer-clean \
874
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
875
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
876
+	tags uninstall uninstall-am uninstall-binPROGRAMS
878 877
 
879 878
 
880 879
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
... ...
@@ -1,8 +1,9 @@
1
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
1
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
2 2
 # @configure_input@
3 3
 
4
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
5
-
4
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
5
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
6
+# Foundation, Inc.
6 7
 # This Makefile.in is free software; the Free Software Foundation
7 8
 # gives unlimited permission to copy and/or distribute it,
8 9
 # with or without modifications, as long as this notice is preserved.
... ...
@@ -33,51 +34,6 @@
33 33
 #  MA 02110-1301, USA.
34 34
 
35 35
 VPATH = @srcdir@
36
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
37
-am__make_running_with_option = \
38
-  case $${target_option-} in \
39
-      ?) ;; \
40
-      *) echo "am__make_running_with_option: internal error: invalid" \
41
-              "target option '$${target_option-}' specified" >&2; \
42
-         exit 1;; \
43
-  esac; \
44
-  has_opt=no; \
45
-  sane_makeflags=$$MAKEFLAGS; \
46
-  if $(am__is_gnu_make); then \
47
-    sane_makeflags=$$MFLAGS; \
48
-  else \
49
-    case $$MAKEFLAGS in \
50
-      *\\[\ \	]*) \
51
-        bs=\\; \
52
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
53
-          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
54
-    esac; \
55
-  fi; \
56
-  skip_next=no; \
57
-  strip_trailopt () \
58
-  { \
59
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
60
-  }; \
61
-  for flg in $$sane_makeflags; do \
62
-    test $$skip_next = yes && { skip_next=no; continue; }; \
63
-    case $$flg in \
64
-      *=*|--*) continue;; \
65
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
66
-      -*I?*) strip_trailopt 'I';; \
67
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
68
-      -*O?*) strip_trailopt 'O';; \
69
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
70
-      -*l?*) strip_trailopt 'l';; \
71
-      -[dEDm]) skip_next=yes;; \
72
-      -[JT]) skip_next=yes;; \
73
-    esac; \
74
-    case $$flg in \
75
-      *$$target_option*) has_opt=yes; break;; \
76
-    esac; \
77
-  done; \
78
-  test $$has_opt = yes
79
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
80
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
81 36
 pkgdatadir = $(datadir)/@PACKAGE@
82 37
 pkgincludedir = $(includedir)/@PACKAGE@
83 38
 pkglibdir = $(libdir)/@PACKAGE@
... ...
@@ -99,8 +55,7 @@ host_triplet = @host@
99 99
 target_triplet = @target@
100 100
 bin_PROGRAMS = clamsubmit$(EXEEXT)
101 101
 subdir = clamsubmit
102
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
103
-	$(top_srcdir)/config/depcomp
102
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
104 103
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
105 104
 am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
106 105
 	$(top_srcdir)/m4/argz.m4 \
... ...
@@ -124,6 +79,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
124 124
 	$(top_srcdir)/m4/reorganization/code_checks/coverage.m4 \
125 125
 	$(top_srcdir)/m4/reorganization/libs/xml.m4 \
126 126
 	$(top_srcdir)/m4/reorganization/libs/openssl.m4 \
127
+	$(top_srcdir)/m4/reorganization/libs/json.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 \
... ...
@@ -182,19 +138,6 @@ clamsubmit_LDADD = $(LDADD)
182 182
 AM_V_lt = $(am__v_lt_@AM_V@)
183 183
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
184 184
 am__v_lt_0 = --silent
185
-am__v_lt_1 = 
186
-AM_V_P = $(am__v_P_@AM_V@)
187
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
188
-am__v_P_0 = false
189
-am__v_P_1 = :
190
-AM_V_GEN = $(am__v_GEN_@AM_V@)
191
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
192
-am__v_GEN_0 = @echo "  GEN     " $@;
193
-am__v_GEN_1 = 
194
-AM_V_at = $(am__v_at_@AM_V@)
195
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
196
-am__v_at_0 = @
197
-am__v_at_1 = 
198 185
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
199 186
 depcomp = $(SHELL) $(top_srcdir)/config/depcomp
200 187
 am__depfiles_maybe = depfiles
... ...
@@ -207,40 +150,22 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
207 207
 	$(AM_CFLAGS) $(CFLAGS)
208 208
 AM_V_CC = $(am__v_CC_@AM_V@)
209 209
 am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
210
-am__v_CC_0 = @echo "  CC      " $@;
211
-am__v_CC_1 = 
210
+am__v_CC_0 = @echo "  CC    " $@;
211
+AM_V_at = $(am__v_at_@AM_V@)
212
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
213
+am__v_at_0 = @
212 214
 CCLD = $(CC)
213 215
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
214 216
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
215 217
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
216 218
 AM_V_CCLD = $(am__v_CCLD_@AM_V@)
217 219
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
218
-am__v_CCLD_0 = @echo "  CCLD    " $@;
219
-am__v_CCLD_1 = 
220
+am__v_CCLD_0 = @echo "  CCLD  " $@;
221
+AM_V_GEN = $(am__v_GEN_@AM_V@)
222
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
223
+am__v_GEN_0 = @echo "  GEN   " $@;
220 224
 SOURCES = $(clamsubmit_SOURCES)
221 225
 DIST_SOURCES = $(clamsubmit_SOURCES)
222
-am__can_run_installinfo = \
223
-  case $$AM_UPDATE_INFO_DIR in \
224
-    n|no|NO) false;; \
225
-    *) (install-info --version) >/dev/null 2>&1;; \
226
-  esac
227
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
228
-# Read a list of newline-separated strings from the standard input,
229
-# and print each of them once, without duplicates.  Input order is
230
-# *not* preserved.
231
-am__uniquify_input = $(AWK) '\
232
-  BEGIN { nonempty = 0; } \
233
-  { items[$$0] = 1; nonempty = 1; } \
234
-  END { if (nonempty) { for (i in items) print i; }; } \
235
-'
236
-# Make sure the list of sources is unique.  This is necessary because,
237
-# e.g., the same source file might be shared among _SOURCES variables
238
-# for different programs/libraries.
239
-am__define_uniq_tagged_files = \
240
-  list='$(am__tagged_files)'; \
241
-  unique=`for i in $$list; do \
242
-    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
243
-  done | $(am__uniquify_input)`
244 226
 ETAGS = etags
245 227
 CTAGS = ctags
246 228
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
... ...
@@ -310,6 +235,9 @@ INSTALL_DATA = @INSTALL_DATA@
310 310
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
311 311
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
312 312
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
313
+JSON_CPPFLAGS = @JSON_CPPFLAGS@
314
+JSON_LDFLAGS = @JSON_LDFLAGS@
315
+JSON_LIBS = @JSON_LIBS@
313 316
 LCOV = @LCOV@
314 317
 LD = @LD@
315 318
 LDFLAGS = @LDFLAGS@
... ...
@@ -484,19 +412,14 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
484 484
 $(am__aclocal_m4_deps):
485 485
 install-binPROGRAMS: $(bin_PROGRAMS)
486 486
 	@$(NORMAL_INSTALL)
487
+	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
487 488
 	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
488
-	if test -n "$$list"; then \
489
-	  echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
490
-	  $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
491
-	fi; \
492 489
 	for p in $$list; do echo "$$p $$p"; done | \
493 490
 	sed 's/$(EXEEXT)$$//' | \
494
-	while read p p1; do if test -f $$p \
495
-	 || test -f $$p1 \
496
-	  ; then echo "$$p"; echo "$$p"; else :; fi; \
491
+	while read p p1; do if test -f $$p || test -f $$p1; \
492
+	  then echo "$$p"; echo "$$p"; else :; fi; \
497 493
 	done | \
498
-	sed -e 'p;s,.*/,,;n;h' \
499
-	    -e 's|.*|.|' \
494
+	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
500 495
 	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
501 496
 	sed 'N;N;N;s,\n, ,g' | \
502 497
 	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
... ...
@@ -517,8 +440,7 @@ uninstall-binPROGRAMS:
517 517
 	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
518 518
 	files=`for p in $$list; do echo "$$p"; done | \
519 519
 	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
520
-	      -e 's/$$/$(EXEEXT)/' \
521
-	`; \
520
+	      -e 's/$$/$(EXEEXT)/' `; \
522 521
 	test -n "$$list" || exit 0; \
523 522
 	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
524 523
 	cd "$(DESTDIR)$(bindir)" && rm -f $$files
... ...
@@ -547,7 +469,6 @@ installcheck-binPROGRAMS: $(bin_PROGRAMS)
547 547
 	    else echo "$$f does not support $$opt" 1>&2; bad=1; fi; \
548 548
 	  done; \
549 549
 	done; rm -f c$${pid}_.???; exit $$bad
550
-
551 550
 clamsubmit$(EXEEXT): $(clamsubmit_OBJECTS) $(clamsubmit_DEPENDENCIES) $(EXTRA_clamsubmit_DEPENDENCIES) 
552 551
 	@rm -f clamsubmit$(EXEEXT)
553 552
 	$(AM_V_CCLD)$(LINK) $(clamsubmit_OBJECTS) $(clamsubmit_LDADD) $(LIBS)
... ...
@@ -569,14 +490,14 @@ distclean-compile:
569 569
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
570 570
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
571 571
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
572
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
572
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
573 573
 
574 574
 .c.obj:
575 575
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
576 576
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
577 577
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
578 578
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
579
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
579
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
580 580
 
581 581
 .c.lo:
582 582
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
... ...
@@ -647,15 +568,26 @@ mostlyclean-libtool:
647 647
 clean-libtool:
648 648
 	-rm -rf .libs _libs
649 649
 
650
-ID: $(am__tagged_files)
651
-	$(am__define_uniq_tagged_files); mkid -fID $$unique
652
-tags: tags-am
653
-TAGS: tags
654
-
655
-tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
650
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
651
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
652
+	unique=`for i in $$list; do \
653
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
654
+	  done | \
655
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
656
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
657
+	mkid -fID $$unique
658
+tags: TAGS
659
+
660
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
661
+		$(TAGS_FILES) $(LISP)
656 662
 	set x; \
657 663
 	here=`pwd`; \
658
-	$(am__define_uniq_tagged_files); \
664
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
665
+	unique=`for i in $$list; do \
666
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
667
+	  done | \
668
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
669
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
659 670
 	shift; \
660 671
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
661 672
 	  test -n "$$unique" || unique=$$empty_fix; \
... ...
@@ -667,11 +599,15 @@ tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
667 667
 	      $$unique; \
668 668
 	  fi; \
669 669
 	fi
670
-ctags: ctags-am
671
-
672
-CTAGS: ctags
673
-ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
674
-	$(am__define_uniq_tagged_files); \
670
+ctags: CTAGS
671
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
672
+		$(TAGS_FILES) $(LISP)
673
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
674
+	unique=`for i in $$list; do \
675
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
676
+	  done | \
677
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
678
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
675 679
 	test -z "$(CTAGS_ARGS)$$unique" \
676 680
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
677 681
 	     $$unique
... ...
@@ -680,21 +616,6 @@ GTAGS:
680 680
 	here=`$(am__cd) $(top_builddir) && pwd` \
681 681
 	  && $(am__cd) $(top_srcdir) \
682 682
 	  && gtags -i $(GTAGS_ARGS) "$$here"
683
-cscopelist: cscopelist-am
684
-
685
-cscopelist-am: $(am__tagged_files)
686
-	list='$(am__tagged_files)'; \
687
-	case "$(srcdir)" in \
688
-	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
689
-	  *) sdir=$(subdir)/$(srcdir) ;; \
690
-	esac; \
691
-	for i in $$list; do \
692
-	  if test -f "$$i"; then \
693
-	    echo "$(subdir)/$$i"; \
694
-	  else \
695
-	    echo "$$sdir/$$i"; \
696
-	  fi; \
697
-	done >> $(top_builddir)/cscope.files
698 683
 
699 684
 distclean-tags:
700 685
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
... ...
@@ -839,20 +760,19 @@ uninstall-am: uninstall-binPROGRAMS
839 839
 
840 840
 .MAKE: install-am install-strip
841 841
 
842
-.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \
843
-	clean-binPROGRAMS clean-generic clean-libtool cscopelist-am \
844
-	ctags ctags-am distclean distclean-compile distclean-generic \
845
-	distclean-libtool distclean-tags distdir dvi dvi-am html \
846
-	html-am info info-am install install-am install-binPROGRAMS \
847
-	install-data install-data-am install-dvi install-dvi-am \
848
-	install-exec install-exec-am install-html install-html-am \
849
-	install-info install-info-am install-man install-pdf \
850
-	install-pdf-am install-ps install-ps-am install-strip \
851
-	installcheck installcheck-am installcheck-binPROGRAMS \
852
-	installdirs maintainer-clean maintainer-clean-generic \
853
-	mostlyclean mostlyclean-compile mostlyclean-generic \
854
-	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
855
-	uninstall-am uninstall-binPROGRAMS
842
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
843
+	clean-generic clean-libtool ctags distclean distclean-compile \
844
+	distclean-generic distclean-libtool distclean-tags distdir dvi \
845
+	dvi-am html html-am info info-am install install-am \
846
+	install-binPROGRAMS install-data install-data-am install-dvi \
847
+	install-dvi-am install-exec install-exec-am install-html \
848
+	install-html-am install-info install-info-am install-man \
849
+	install-pdf install-pdf-am install-ps install-ps-am \
850
+	install-strip installcheck installcheck-am \
851
+	installcheck-binPROGRAMS installdirs maintainer-clean \
852
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
853
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
854
+	tags uninstall uninstall-am uninstall-binPROGRAMS
856 855
 
857 856
 
858 857
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
... ...
@@ -1,11 +1,13 @@
1 1
 #! /bin/sh
2 2
 # Guess values for system-dependent variables and create Makefiles.
3
-# Generated by GNU Autoconf 2.69 for ClamAV devel.
3
+# Generated by GNU Autoconf 2.68 for ClamAV devel.
4 4
 #
5 5
 # Report bugs to <http://bugs.clamav.net/>.
6 6
 #
7 7
 #
8
-# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
8
+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
9
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
10
+# Foundation, Inc.
9 11
 #
10 12
 #
11 13
 # This configure script is free software; the Free Software Foundation
... ...
@@ -134,31 +136,6 @@ export LANGUAGE
134 134
 # CDPATH.
135 135
 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
136 136
 
137
-# Use a proper internal environment variable to ensure we don't fall
138
-  # into an infinite loop, continuously re-executing ourselves.
139
-  if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
140
-    _as_can_reexec=no; export _as_can_reexec;
141
-    # We cannot yet assume a decent shell, so we have to provide a
142
-# neutralization value for shells without unset; and this also
143
-# works around shells that cannot unset nonexistent variables.
144
-# Preserve -v and -x to the replacement shell.
145
-BASH_ENV=/dev/null
146
-ENV=/dev/null
147
-(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
148
-case $- in # ((((
149
-  *v*x* | *x*v* ) as_opts=-vx ;;
150
-  *v* ) as_opts=-v ;;
151
-  *x* ) as_opts=-x ;;
152
-  * ) as_opts= ;;
153
-esac
154
-exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
155
-# Admittedly, this is quite paranoid, since all the known shells bail
156
-# out after a failed `exec'.
157
-$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
158
-as_fn_exit 255
159
-  fi
160
-  # We don't want this to propagate to other subprocesses.
161
-          { _as_can_reexec=; unset _as_can_reexec;}
162 137
 if test "x$CONFIG_SHELL" = x; then
163 138
   as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
164 139
   emulate sh
... ...
@@ -192,8 +169,7 @@ if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
192 192
 else
193 193
   exitcode=1; echo positional parameters were not saved.
194 194
 fi
195
-test x\$exitcode = x0 || exit 1
196
-test -x / || exit 1"
195
+test x\$exitcode = x0 || exit 1"
197 196
   as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
198 197
   as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
199 198
   eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
... ...
@@ -246,25 +222,21 @@ IFS=$as_save_IFS
246 246
 
247 247
 
248 248
       if test "x$CONFIG_SHELL" != x; then :
249
-  export CONFIG_SHELL
250
-             # We cannot yet assume a decent shell, so we have to provide a
251
-# neutralization value for shells without unset; and this also
252
-# works around shells that cannot unset nonexistent variables.
253
-# Preserve -v and -x to the replacement shell.
254
-BASH_ENV=/dev/null
255
-ENV=/dev/null
256
-(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
257
-case $- in # ((((
258
-  *v*x* | *x*v* ) as_opts=-vx ;;
259
-  *v* ) as_opts=-v ;;
260
-  *x* ) as_opts=-x ;;
261
-  * ) as_opts= ;;
262
-esac
263
-exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
264
-# Admittedly, this is quite paranoid, since all the known shells bail
265
-# out after a failed `exec'.
266
-$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
267
-exit 255
249
+  # We cannot yet assume a decent shell, so we have to provide a
250
+	# neutralization value for shells without unset; and this also
251
+	# works around shells that cannot unset nonexistent variables.
252
+	# Preserve -v and -x to the replacement shell.
253
+	BASH_ENV=/dev/null
254
+	ENV=/dev/null
255
+	(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
256
+	export CONFIG_SHELL
257
+	case $- in # ((((
258
+	  *v*x* | *x*v* ) as_opts=-vx ;;
259
+	  *v* ) as_opts=-v ;;
260
+	  *x* ) as_opts=-x ;;
261
+	  * ) as_opts= ;;
262
+	esac
263
+	exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
268 264
 fi
269 265
 
270 266
     if test x$as_have_required = xno; then :
... ...
@@ -367,14 +339,6 @@ $as_echo X"$as_dir" |
367 367
 
368 368
 
369 369
 } # as_fn_mkdir_p
370
-
371
-# as_fn_executable_p FILE
372
-# -----------------------
373
-# Test if FILE is an executable regular file.
374
-as_fn_executable_p ()
375
-{
376
-  test -f "$1" && test -x "$1"
377
-} # as_fn_executable_p
378 370
 # as_fn_append VAR VALUE
379 371
 # ----------------------
380 372
 # Append the text in VALUE to the end of the definition contained in VAR. Take
... ...
@@ -496,10 +460,6 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits
496 496
   chmod +x "$as_me.lineno" ||
497 497
     { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
498 498
 
499
-  # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
500
-  # already done that, so ensure we don't try to do so again and fall
501
-  # in an infinite loop.  This has already happened in practice.
502
-  _as_can_reexec=no; export _as_can_reexec
503 499
   # Don't try to exec as it changes $[0], causing all sort of problems
504 500
   # (the dirname of $[0] is not the place where we might find the
505 501
   # original and so on.  Autoconf is especially sensitive to this).
... ...
@@ -534,16 +494,16 @@ if (echo >conf$$.file) 2>/dev/null; then
534 534
     # ... but there are two gotchas:
535 535
     # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
536 536
     # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
537
-    # In both cases, we have to default to `cp -pR'.
537
+    # In both cases, we have to default to `cp -p'.
538 538
     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
539
-      as_ln_s='cp -pR'
539
+      as_ln_s='cp -p'
540 540
   elif ln conf$$.file conf$$ 2>/dev/null; then
541 541
     as_ln_s=ln
542 542
   else
543
-    as_ln_s='cp -pR'
543
+    as_ln_s='cp -p'
544 544
   fi
545 545
 else
546
-  as_ln_s='cp -pR'
546
+  as_ln_s='cp -p'
547 547
 fi
548 548
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
549 549
 rmdir conf$$.dir 2>/dev/null
... ...
@@ -555,8 +515,28 @@ else
555 555
   as_mkdir_p=false
556 556
 fi
557 557
 
558
-as_test_x='test -x'
559
-as_executable_p=as_fn_executable_p
558
+if test -x / >/dev/null 2>&1; then
559
+  as_test_x='test -x'
560
+else
561
+  if ls -dL / >/dev/null 2>&1; then
562
+    as_ls_L_option=L
563
+  else
564
+    as_ls_L_option=
565
+  fi
566
+  as_test_x='
567
+    eval sh -c '\''
568
+      if test -d "$1"; then
569
+	test -d "$1/.";
570
+      else
571
+	case $1 in #(
572
+	-*)set "./$1";;
573
+	esac;
574
+	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
575
+	???[sx]*):;;*)false;;esac;fi
576
+    '\'' sh
577
+  '
578
+fi
579
+as_executable_p=$as_test_x
560 580
 
561 581
 # Sed expression to map a string onto a valid CPP name.
562 582
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
... ...
@@ -645,6 +625,8 @@ LTLIBOBJS
645 645
 LIBOBJS
646 646
 ENABLE_CLAMSUBMIT_FALSE
647 647
 ENABLE_CLAMSUBMIT_TRUE
648
+JSON_LDFLAGS
649
+JSON_LIBS
648 650
 SSL_LDFLAGS
649 651
 SSL_LIBS
650 652
 CLAMCONF_LIBS
... ...
@@ -659,6 +641,7 @@ CLAMAV_MILTER_LIBS
659 659
 CLAMMEM_LIBS
660 660
 CLAMD_LIBS
661 661
 LIBCLAMAV_LIBS
662
+JSON_CPPFLAGS
662 663
 SSL_CPPFLAGS
663 664
 LIBCLAMSHARED_CPPFLAGS
664 665
 CLAMBC_CPPFLAGS
... ...
@@ -880,6 +863,7 @@ enable_coverage
880 880
 enable_xml
881 881
 with_xml
882 882
 with_openssl
883
+with_libjson
883 884
 enable_maintainer_mode
884 885
 with_zlib
885 886
 enable_zlib_vcheck
... ...
@@ -1378,6 +1362,8 @@ target=$target_alias
1378 1378
 if test "x$host_alias" != x; then
1379 1379
   if test "x$build_alias" = x; then
1380 1380
     cross_compiling=maybe
1381
+    $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
1382
+    If a cross compiler is detected then cross compile mode will be used" >&2
1381 1383
   elif test "x$build_alias" != "x$host_alias"; then
1382 1384
     cross_compiling=yes
1383 1385
   fi
... ...
@@ -1542,16 +1528,14 @@ Optional Features:
1542 1542
   --disable-option-checking  ignore unrecognized --enable/--with options
1543 1543
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
1544 1544
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
1545
-  --enable-silent-rules   less verbose build output (undo: "make V=1")
1546
-  --disable-silent-rules  verbose build output (undo: "make V=0")
1545
+  --enable-silent-rules          less verbose build output (undo: `make V=1')
1546
+  --disable-silent-rules         verbose build output (undo: `make V=0')
1547 1547
   --enable-static[=PKGS]  build static libraries [default=no]
1548 1548
   --enable-shared[=PKGS]  build shared libraries [default=yes]
1549 1549
   --enable-fast-install[=PKGS]
1550 1550
                           optimize for fast installation [default=yes]
1551
-  --enable-dependency-tracking
1552
-                          do not reject slow dependency extractors
1553
-  --disable-dependency-tracking
1554
-                          speeds up one-time build
1551
+  --disable-dependency-tracking  speeds up one-time build
1552
+  --enable-dependency-tracking   do not reject slow dependency extractors
1555 1553
   --disable-libtool-lock  avoid locking (might break parallel builds)
1556 1554
   --enable-ltdl-install   install libltdl
1557 1555
   --disable-gcc-vcheck	  do not check for buggy gcc version
... ...
@@ -1605,6 +1589,8 @@ Optional Packages:
1605 1605
 			  /usr/local or /usr if not found in /usr/local)
1606 1606
   --with-openssl=DIR   path to directory containing openssl (default=
1607 1607
     /usr/local or /usr if not found in /usr/local)
1608
+  --with-libjson=DIR   path to directory containing libjson (default=
1609
+    /usr/local or /usr if not found in /usr/local)
1608 1610
   --with-zlib=DIR	  path to directory containing zlib library (default=
1609 1611
 			  /usr/local or /usr if not found in /usr/local)
1610 1612
   --with-libbz2-prefix[=DIR]  search for libbz2 in DIR/include and DIR/lib
... ...
@@ -1699,9 +1685,9 @@ test -n "$ac_init_help" && exit $ac_status
1699 1699
 if $ac_init_version; then
1700 1700
   cat <<\_ACEOF
1701 1701
 ClamAV configure devel
1702
-generated by GNU Autoconf 2.69
1702
+generated by GNU Autoconf 2.68
1703 1703
 
1704
-Copyright (C) 2012 Free Software Foundation, Inc.
1704
+Copyright (C) 2010 Free Software Foundation, Inc.
1705 1705
 This configure script is free software; the Free Software Foundation
1706 1706
 gives unlimited permission to copy, distribute and modify it.
1707 1707
 _ACEOF
... ...
@@ -1777,7 +1763,7 @@ $as_echo "$ac_try_echo"; } >&5
1777 1777
 	 test ! -s conftest.err
1778 1778
        } && test -s conftest$ac_exeext && {
1779 1779
 	 test "$cross_compiling" = yes ||
1780
-	 test -x conftest$ac_exeext
1780
+	 $as_test_x conftest$ac_exeext
1781 1781
        }; then :
1782 1782
   ac_retval=0
1783 1783
 else
... ...
@@ -2168,7 +2154,7 @@ This file contains any messages produced by compilers while
2168 2168
 running configure, to aid debugging if configure makes a mistake.
2169 2169
 
2170 2170
 It was created by ClamAV $as_me devel, which was
2171
-generated by GNU Autoconf 2.69.  Invocation command line was
2171
+generated by GNU Autoconf 2.68.  Invocation command line was
2172 2172
 
2173 2173
   $ $0 $@
2174 2174
 
... ...
@@ -2850,7 +2836,7 @@ done
2850 2850
 
2851 2851
 
2852 2852
 
2853
-am__api_version='1.14'
2853
+am__api_version='1.11'
2854 2854
 
2855 2855
 # Find a good install program.  We prefer a C program (faster),
2856 2856
 # so one script is as good as another.  But avoid the broken or
... ...
@@ -2889,7 +2875,7 @@ case $as_dir/ in #((
2889 2889
     # by default.
2890 2890
     for ac_prog in ginstall scoinst install; do
2891 2891
       for ac_exec_ext in '' $ac_executable_extensions; do
2892
-	if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
2892
+	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
2893 2893
 	  if test $ac_prog = install &&
2894 2894
 	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
2895 2895
 	    # AIX install.  It has an incompatible calling convention.
... ...
@@ -2947,6 +2933,9 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
2947 2947
 
2948 2948
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
2949 2949
 $as_echo_n "checking whether build environment is sane... " >&6; }
2950
+# Just in case
2951
+sleep 1
2952
+echo timestamp > conftest.file
2950 2953
 # Reject unsafe characters in $srcdir or the absolute working directory
2951 2954
 # name.  Accept space and tab only in the latter.
2952 2955
 am_lf='
... ...
@@ -2957,40 +2946,32 @@ case `pwd` in
2957 2957
 esac
2958 2958
 case $srcdir in
2959 2959
   *[\\\"\#\$\&\'\`$am_lf\ \	]*)
2960
-    as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;;
2960
+    as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
2961 2961
 esac
2962 2962
 
2963
-# Do 'set' in a subshell so we don't clobber the current shell's
2963
+# Do `set' in a subshell so we don't clobber the current shell's
2964 2964
 # arguments.  Must try -L first in case configure is actually a
2965 2965
 # symlink; some systems play weird games with the mod time of symlinks
2966 2966
 # (eg FreeBSD returns the mod time of the symlink's containing
2967 2967
 # directory).
2968 2968
 if (
2969
-   am_has_slept=no
2970
-   for am_try in 1 2; do
2971
-     echo "timestamp, slept: $am_has_slept" > conftest.file
2972
-     set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
2973
-     if test "$*" = "X"; then
2974
-	# -L didn't work.
2975
-	set X `ls -t "$srcdir/configure" conftest.file`
2976
-     fi
2977
-     if test "$*" != "X $srcdir/configure conftest.file" \
2978
-	&& test "$*" != "X conftest.file $srcdir/configure"; then
2979
-
2980
-	# If neither matched, then we have a broken ls.  This can happen
2981
-	# if, for instance, CONFIG_SHELL is bash and it inherits a
2982
-	# broken ls alias from the environment.  This has actually
2983
-	# happened.  Such a system could not be considered "sane".
2984
-	as_fn_error $? "ls -t appears to fail.  Make sure there is not a broken
2985
-  alias in your environment" "$LINENO" 5
2986
-     fi
2987
-     if test "$2" = conftest.file || test $am_try -eq 2; then
2988
-       break
2989
-     fi
2990
-     # Just in case.
2991
-     sleep 1
2992
-     am_has_slept=yes
2993
-   done
2969
+   set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
2970
+   if test "$*" = "X"; then
2971
+      # -L didn't work.
2972
+      set X `ls -t "$srcdir/configure" conftest.file`
2973
+   fi
2974
+   rm -f conftest.file
2975
+   if test "$*" != "X $srcdir/configure conftest.file" \
2976
+      && test "$*" != "X conftest.file $srcdir/configure"; then
2977
+
2978
+      # If neither matched, then we have a broken ls.  This can happen
2979
+      # if, for instance, CONFIG_SHELL is bash and it inherits a
2980
+      # broken ls alias from the environment.  This has actually
2981
+      # happened.  Such a system could not be considered "sane".
2982
+      as_fn_error $? "ls -t appears to fail.  Make sure there is not a broken
2983
+alias in your environment" "$LINENO" 5
2984
+   fi
2985
+
2994 2986
    test "$2" = conftest.file
2995 2987
    )
2996 2988
 then
... ...
@@ -3002,16 +2983,6 @@ Check your system clock" "$LINENO" 5
3002 3002
 fi
3003 3003
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
3004 3004
 $as_echo "yes" >&6; }
3005
-# If we didn't sleep, we still need to ensure time stamps of config.status and
3006
-# generated files are strictly newer.
3007
-am_sleep_pid=
3008
-if grep 'slept: no' conftest.file >/dev/null 2>&1; then
3009
-  ( sleep 1 ) &
3010
-  am_sleep_pid=$!
3011
-fi
3012
-
3013
-rm -f conftest.file
3014
-
3015 3005
 test "$program_prefix" != NONE &&
3016 3006
   program_transform_name="s&^&$program_prefix&;$program_transform_name"
3017 3007
 # Use a double $ so make ignores it.
... ...
@@ -3034,12 +3005,12 @@ if test x"${MISSING+set}" != xset; then
3034 3034
   esac
3035 3035
 fi
3036 3036
 # Use eval to expand $SHELL
3037
-if eval "$MISSING --is-lightweight"; then
3038
-  am_missing_run="$MISSING "
3037
+if eval "$MISSING --run true"; then
3038
+  am_missing_run="$MISSING --run "
3039 3039
 else
3040 3040
   am_missing_run=
3041
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5
3042
-$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
3041
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5
3042
+$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
3043 3043
 fi
3044 3044
 
3045 3045
 if test x"${install_sh}" != xset; then
... ...
@@ -3051,10 +3022,10 @@ if test x"${install_sh}" != xset; then
3051 3051
   esac
3052 3052
 fi
3053 3053
 
3054
-# Installed binaries are usually stripped using 'strip' when the user
3055
-# run "make install-strip".  However 'strip' might not be the right
3054
+# Installed binaries are usually stripped using `strip' when the user
3055
+# run `make install-strip'.  However `strip' might not be the right
3056 3056
 # tool to use in cross-compilation environments, therefore Automake
3057
-# will honor the 'STRIP' environment variable to overrule this program.
3057
+# will honor the `STRIP' environment variable to overrule this program.
3058 3058
 if test "$cross_compiling" != no; then
3059 3059
   if test -n "$ac_tool_prefix"; then
3060 3060
   # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
... ...
@@ -3073,7 +3044,7 @@ do
3073 3073
   IFS=$as_save_IFS
3074 3074
   test -z "$as_dir" && as_dir=.
3075 3075
     for ac_exec_ext in '' $ac_executable_extensions; do
3076
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
3076
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
3077 3077
     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
3078 3078
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
3079 3079
     break 2
... ...
@@ -3113,7 +3084,7 @@ do
3113 3113
   IFS=$as_save_IFS
3114 3114
   test -z "$as_dir" && as_dir=.
3115 3115
     for ac_exec_ext in '' $ac_executable_extensions; do
3116
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
3116
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
3117 3117
     ac_cv_prog_ac_ct_STRIP="strip"
3118 3118
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
3119 3119
     break 2
... ...
@@ -3164,7 +3135,7 @@ do
3164 3164
   test -z "$as_dir" && as_dir=.
3165 3165
     for ac_prog in mkdir gmkdir; do
3166 3166
 	 for ac_exec_ext in '' $ac_executable_extensions; do
3167
-	   as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue
3167
+	   { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
3168 3168
 	   case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
3169 3169
 	     'mkdir (GNU coreutils) '* | \
3170 3170
 	     'mkdir (coreutils) '* | \
... ...
@@ -3193,6 +3164,12 @@ fi
3193 3193
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
3194 3194
 $as_echo "$MKDIR_P" >&6; }
3195 3195
 
3196
+mkdir_p="$MKDIR_P"
3197
+case $mkdir_p in
3198
+  [\\/$]* | ?:[\\/]*) ;;
3199
+  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
3200
+esac
3201
+
3196 3202
 for ac_prog in gawk mawk nawk awk
3197 3203
 do
3198 3204
   # Extract the first word of "$ac_prog", so it can be a program name with args.
... ...
@@ -3211,7 +3188,7 @@ do
3211 3211
   IFS=$as_save_IFS
3212 3212
   test -z "$as_dir" && as_dir=.
3213 3213
     for ac_exec_ext in '' $ac_executable_extensions; do
3214
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
3214
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
3215 3215
     ac_cv_prog_AWK="$ac_prog"
3216 3216
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
3217 3217
     break 2
... ...
@@ -3275,45 +3252,6 @@ else
3275 3275
 fi
3276 3276
 rmdir .tst 2>/dev/null
3277 3277
 
3278
-# Check whether --enable-silent-rules was given.
3279
-if test "${enable_silent_rules+set}" = set; then :
3280
-  enableval=$enable_silent_rules;
3281
-fi
3282
-
3283
-case $enable_silent_rules in # (((
3284
-  yes) AM_DEFAULT_VERBOSITY=0;;
3285
-   no) AM_DEFAULT_VERBOSITY=1;;
3286
-    *) AM_DEFAULT_VERBOSITY=1;;
3287
-esac
3288
-am_make=${MAKE-make}
3289
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
3290
-$as_echo_n "checking whether $am_make supports nested variables... " >&6; }
3291
-if ${am_cv_make_support_nested_variables+:} false; then :
3292
-  $as_echo_n "(cached) " >&6
3293
-else
3294
-  if $as_echo 'TRUE=$(BAR$(V))
3295
-BAR0=false
3296
-BAR1=true
3297
-V=1
3298
-am__doit:
3299
-	@$(TRUE)
3300
-.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then
3301
-  am_cv_make_support_nested_variables=yes
3302
-else
3303
-  am_cv_make_support_nested_variables=no
3304
-fi
3305
-fi
3306
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
3307
-$as_echo "$am_cv_make_support_nested_variables" >&6; }
3308
-if test $am_cv_make_support_nested_variables = yes; then
3309
-    AM_V='$(V)'
3310
-  AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
3311
-else
3312
-  AM_V=$AM_DEFAULT_VERBOSITY
3313
-  AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
3314
-fi
3315
-AM_BACKSLASH='\'
3316
-
3317 3278
 if test "`cd $srcdir && pwd`" != "`pwd`"; then
3318 3279
   # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
3319 3280
   # is not polluted with repeated "-I."
... ...
@@ -3355,12 +3293,6 @@ AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
3355 3355
 
3356 3356
 MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
3357 3357
 
3358
-# For better backward compatibility.  To be removed once Automake 1.9.x
3359
-# dies out for good.  For more background, see:
3360
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
3361
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
3362
-mkdir_p='$(MKDIR_P)'
3363
-
3364 3358
 # We need awk for the "check" target.  The system "awk" is bad on
3365 3359
 # some platforms.
3366 3360
 # Always define AMTAR for backward compatibility.  Yes, it's still used
... ...
@@ -3368,182 +3300,101 @@ mkdir_p='$(MKDIR_P)'
3368 3368
 AMTAR='$${TAR-tar}'
3369 3369
 
3370 3370
 
3371
-# We'll loop over all known methods to create a tar archive until one works.
3372
-_am_tools='gnutar plaintar pax cpio none'
3373
-
3374
-# The POSIX 1988 'ustar' format is defined with fixed-size fields.
3375
-      # There is notably a 21 bits limit for the UID and the GID.  In fact,
3376
-      # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343
3377
-      # and bug#13588).
3378
-      am_max_uid=2097151 # 2^21 - 1
3379
-      am_max_gid=$am_max_uid
3380
-      # The $UID and $GID variables are not portable, so we need to resort
3381
-      # to the POSIX-mandated id(1) utility.  Errors in the 'id' calls
3382
-      # below are definitely unexpected, so allow the users to see them
3383
-      # (that is, avoid stderr redirection).
3384
-      am_uid=`id -u || echo unknown`
3385
-      am_gid=`id -g || echo unknown`
3386
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether UID '$am_uid' is supported by ustar format" >&5
3387
-$as_echo_n "checking whether UID '$am_uid' is supported by ustar format... " >&6; }
3388
-      if test $am_uid -le $am_max_uid; then
3389
-         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
3390
-$as_echo "yes" >&6; }
3391
-      else
3392
-         { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
3393
-$as_echo "no" >&6; }
3394
-         _am_tools=none
3395
-      fi
3396
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether GID '$am_gid' is supported by ustar format" >&5
3397
-$as_echo_n "checking whether GID '$am_gid' is supported by ustar format... " >&6; }
3398
-      if test $am_gid -le $am_max_gid; then
3399
-         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
3400
-$as_echo "yes" >&6; }
3401
-      else
3402
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
3403
-$as_echo "no" >&6; }
3404
-        _am_tools=none
3405
-      fi
3406
-
3407
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to create a ustar tar archive" >&5
3371
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to create a ustar tar archive" >&5
3408 3372
 $as_echo_n "checking how to create a ustar tar archive... " >&6; }
3409
-
3410
-  # Go ahead even if we have the value already cached.  We do so because we
3411
-  # need to set the values for the 'am__tar' and 'am__untar' variables.
3412
-  _am_tools=${am_cv_prog_tar_ustar-$_am_tools}
3413
-
3414
-  for _am_tool in $_am_tools; do
3415
-    case $_am_tool in
3416
-    gnutar)
3417
-      for _am_tar in tar gnutar gtar; do
3418
-        { echo "$as_me:$LINENO: $_am_tar --version" >&5
3373
+# Loop over all known methods to create a tar archive until one works.
3374
+_am_tools='gnutar plaintar pax cpio none'
3375
+_am_tools=${am_cv_prog_tar_ustar-$_am_tools}
3376
+# Do not fold the above two line into one, because Tru64 sh and
3377
+# Solaris sh will not grok spaces in the rhs of `-'.
3378
+for _am_tool in $_am_tools
3379
+do
3380
+  case $_am_tool in
3381
+  gnutar)
3382
+    for _am_tar in tar gnutar gtar;
3383
+    do
3384
+      { echo "$as_me:$LINENO: $_am_tar --version" >&5
3419 3385
    ($_am_tar --version) >&5 2>&5
3420 3386
    ac_status=$?
3421 3387
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
3422 3388
    (exit $ac_status); } && break
3423
-      done
3424
-      am__tar="$_am_tar --format=ustar -chf - "'"$$tardir"'
3425
-      am__tar_="$_am_tar --format=ustar -chf - "'"$tardir"'
3426
-      am__untar="$_am_tar -xf -"
3427
-      ;;
3428
-    plaintar)
3429
-      # Must skip GNU tar: if it does not support --format= it doesn't create
3430
-      # ustar tarball either.
3431
-      (tar --version) >/dev/null 2>&1 && continue
3432
-      am__tar='tar chf - "$$tardir"'
3433
-      am__tar_='tar chf - "$tardir"'
3434
-      am__untar='tar xf -'
3435
-      ;;
3436
-    pax)
3437
-      am__tar='pax -L -x ustar -w "$$tardir"'
3438
-      am__tar_='pax -L -x ustar -w "$tardir"'
3439
-      am__untar='pax -r'
3440
-      ;;
3441
-    cpio)
3442
-      am__tar='find "$$tardir" -print | cpio -o -H ustar -L'
3443
-      am__tar_='find "$tardir" -print | cpio -o -H ustar -L'
3444
-      am__untar='cpio -i -H ustar -d'
3445
-      ;;
3446
-    none)
3447
-      am__tar=false
3448
-      am__tar_=false
3449
-      am__untar=false
3450
-      ;;
3451
-    esac
3389
+    done
3390
+    am__tar="$_am_tar --format=ustar -chf - "'"$$tardir"'
3391
+    am__tar_="$_am_tar --format=ustar -chf - "'"$tardir"'
3392
+    am__untar="$_am_tar -xf -"
3393
+    ;;
3394
+  plaintar)
3395
+    # Must skip GNU tar: if it does not support --format= it doesn't create
3396
+    # ustar tarball either.
3397
+    (tar --version) >/dev/null 2>&1 && continue
3398
+    am__tar='tar chf - "$$tardir"'
3399
+    am__tar_='tar chf - "$tardir"'
3400
+    am__untar='tar xf -'
3401
+    ;;
3402
+  pax)
3403
+    am__tar='pax -L -x ustar -w "$$tardir"'
3404
+    am__tar_='pax -L -x ustar -w "$tardir"'
3405
+    am__untar='pax -r'
3406
+    ;;
3407
+  cpio)
3408
+    am__tar='find "$$tardir" -print | cpio -o -H ustar -L'
3409
+    am__tar_='find "$tardir" -print | cpio -o -H ustar -L'
3410
+    am__untar='cpio -i -H ustar -d'
3411
+    ;;
3412
+  none)
3413
+    am__tar=false
3414
+    am__tar_=false
3415
+    am__untar=false
3416
+    ;;
3417
+  esac
3452 3418
 
3453
-    # If the value was cached, stop now.  We just wanted to have am__tar
3454
-    # and am__untar set.
3455
-    test -n "${am_cv_prog_tar_ustar}" && break
3419
+  # If the value was cached, stop now.  We just wanted to have am__tar
3420
+  # and am__untar set.
3421
+  test -n "${am_cv_prog_tar_ustar}" && break
3456 3422
 
3457
-    # tar/untar a dummy directory, and stop if the command works.
3458
-    rm -rf conftest.dir
3459
-    mkdir conftest.dir
3460
-    echo GrepMe > conftest.dir/file
3461
-    { echo "$as_me:$LINENO: tardir=conftest.dir && eval $am__tar_ >conftest.tar" >&5
3423
+  # tar/untar a dummy directory, and stop if the command works
3424
+  rm -rf conftest.dir
3425
+  mkdir conftest.dir
3426
+  echo GrepMe > conftest.dir/file
3427
+  { echo "$as_me:$LINENO: tardir=conftest.dir && eval $am__tar_ >conftest.tar" >&5
3462 3428
    (tardir=conftest.dir && eval $am__tar_ >conftest.tar) >&5 2>&5
3463 3429
    ac_status=$?
3464 3430
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
3465 3431
    (exit $ac_status); }
3466
-    rm -rf conftest.dir
3467
-    if test -s conftest.tar; then
3468
-      { echo "$as_me:$LINENO: $am__untar <conftest.tar" >&5
3432
+  rm -rf conftest.dir
3433
+  if test -s conftest.tar; then
3434
+    { echo "$as_me:$LINENO: $am__untar <conftest.tar" >&5
3469 3435
    ($am__untar <conftest.tar) >&5 2>&5
3470 3436
    ac_status=$?
3471 3437
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
3472 3438
    (exit $ac_status); }
3473
-      { echo "$as_me:$LINENO: cat conftest.dir/file" >&5
3474
-   (cat conftest.dir/file) >&5 2>&5
3475
-   ac_status=$?
3476
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
3477
-   (exit $ac_status); }
3478
-      grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
3479
-    fi
3480
-  done
3481
-  rm -rf conftest.dir
3439
+    grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
3440
+  fi
3441
+done
3442
+rm -rf conftest.dir
3482 3443
 
3483
-  if ${am_cv_prog_tar_ustar+:} false; then :
3444
+if ${am_cv_prog_tar_ustar+:} false; then :
3484 3445
   $as_echo_n "(cached) " >&6
3485 3446
 else
3486 3447
   am_cv_prog_tar_ustar=$_am_tool
3487 3448
 fi
3488 3449
 
3489
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_tar_ustar" >&5
3450
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_tar_ustar" >&5
3490 3451
 $as_echo "$am_cv_prog_tar_ustar" >&6; }
3491 3452
 
3492 3453
 
3493 3454
 
3494 3455
 
3495 3456
 
3496
-
3497
-# POSIX will say in a future version that running "rm -f" with no argument
3498
-# is OK; and we want to be able to make that assumption in our Makefile
3499
-# recipes.  So use an aggressive probe to check that the usage we want is
3500
-# actually supported "in the wild" to an acceptable degree.
3501
-# See automake bug#10828.
3502
-# To make any issue more visible, cause the running configure to be aborted
3503
-# by default if the 'rm' program in use doesn't match our expectations; the
3504
-# user can still override this though.
3505
-if rm -f && rm -fr && rm -rf; then : OK; else
3506
-  cat >&2 <<'END'
3507
-Oops!
3508
-
3509
-Your 'rm' program seems unable to run without file operands specified
3510
-on the command line, even when the '-f' option is present.  This is contrary
3511
-to the behaviour of most rm programs out there, and not conforming with
3512
-the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
3513
-
3514
-Please tell bug-automake@gnu.org about your system, including the value
3515
-of your $PATH and any error possibly output before this message.  This
3516
-can help us improve future automake versions.
3517
-
3518
-END
3519
-  if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
3520
-    echo 'Configuration will proceed anyway, since you have set the' >&2
3521
-    echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
3522
-    echo >&2
3523
-  else
3524
-    cat >&2 <<'END'
3525
-Aborting the configuration process, to ensure you take notice of the issue.
3526
-
3527
-You can download and install GNU coreutils to get an 'rm' implementation
3528
-that behaves properly: <http://www.gnu.org/software/coreutils/>.
3529
-
3530
-If you want to complete the configuration process using your problematic
3531
-'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
3532
-to "yes", and re-run configure.
3533
-
3534
-END
3535
-    as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5
3536
-  fi
3537
-fi
3538 3457
 # Check whether --enable-silent-rules was given.
3539 3458
 if test "${enable_silent_rules+set}" = set; then :
3540 3459
   enableval=$enable_silent_rules;
3541 3460
 fi
3542 3461
 
3543
-case $enable_silent_rules in # (((
3544
-  yes) AM_DEFAULT_VERBOSITY=0;;
3545
-   no) AM_DEFAULT_VERBOSITY=1;;
3546
-    *) AM_DEFAULT_VERBOSITY=0;;
3462
+case $enable_silent_rules in
3463
+yes) AM_DEFAULT_VERBOSITY=0;;
3464
+no)  AM_DEFAULT_VERBOSITY=1;;
3465
+*)   AM_DEFAULT_VERBOSITY=0;;
3547 3466
 esac
3548 3467
 am_make=${MAKE-make}
3549 3468
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
... ...
@@ -3731,7 +3582,7 @@ am__quote=
3731 3731
 _am_result=none
3732 3732
 # First try GNU make style include.
3733 3733
 echo "include confinc" > confmf
3734
-# Ignore all kinds of additional output from 'make'.
3734
+# Ignore all kinds of additional output from `make'.
3735 3735
 case `$am_make -s -f confmf 2> /dev/null` in #(
3736 3736
 *the\ am__doit\ target*)
3737 3737
   am__include=include
... ...
@@ -3797,7 +3648,7 @@ do
3797 3797
   IFS=$as_save_IFS
3798 3798
   test -z "$as_dir" && as_dir=.
3799 3799
     for ac_exec_ext in '' $ac_executable_extensions; do
3800
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
3800
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
3801 3801
     ac_cv_prog_CC="${ac_tool_prefix}gcc"
3802 3802
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
3803 3803
     break 2
... ...
@@ -3837,7 +3688,7 @@ do
3837 3837
   IFS=$as_save_IFS
3838 3838
   test -z "$as_dir" && as_dir=.
3839 3839
     for ac_exec_ext in '' $ac_executable_extensions; do
3840
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
3840
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
3841 3841
     ac_cv_prog_ac_ct_CC="gcc"
3842 3842
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
3843 3843
     break 2
... ...
@@ -3890,7 +3741,7 @@ do
3890 3890
   IFS=$as_save_IFS
3891 3891
   test -z "$as_dir" && as_dir=.
3892 3892
     for ac_exec_ext in '' $ac_executable_extensions; do
3893
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
3893
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
3894 3894
     ac_cv_prog_CC="${ac_tool_prefix}cc"
3895 3895
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
3896 3896
     break 2
... ...
@@ -3931,7 +3782,7 @@ do
3931 3931
   IFS=$as_save_IFS
3932 3932
   test -z "$as_dir" && as_dir=.
3933 3933
     for ac_exec_ext in '' $ac_executable_extensions; do
3934
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
3934
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
3935 3935
     if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
3936 3936
        ac_prog_rejected=yes
3937 3937
        continue
... ...
@@ -3989,7 +3840,7 @@ do
3989 3989
   IFS=$as_save_IFS
3990 3990
   test -z "$as_dir" && as_dir=.
3991 3991
     for ac_exec_ext in '' $ac_executable_extensions; do
3992
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
3992
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
3993 3993
     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
3994 3994
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
3995 3995
     break 2
... ...
@@ -4033,7 +3884,7 @@ do
4033 4033
   IFS=$as_save_IFS
4034 4034
   test -z "$as_dir" && as_dir=.
4035 4035
     for ac_exec_ext in '' $ac_executable_extensions; do
4036
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
4036
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
4037 4037
     ac_cv_prog_ac_ct_CC="$ac_prog"
4038 4038
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4039 4039
     break 2
... ...
@@ -4479,7 +4330,8 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
4479 4479
 /* end confdefs.h.  */
4480 4480
 #include <stdarg.h>
4481 4481
 #include <stdio.h>
4482
-struct stat;
4482
+#include <sys/types.h>
4483
+#include <sys/stat.h>
4483 4484
 /* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
4484 4485
 struct buf { int x; };
4485 4486
 FILE * (*rcsopen) (struct buf *, struct stat *, int);
... ...
@@ -4564,65 +4416,6 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
4564 4564
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
4565 4565
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
4566 4566
 
4567
-ac_ext=c
4568
-ac_cpp='$CPP $CPPFLAGS'
4569
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
4570
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
4571
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
4572
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5
4573
-$as_echo_n "checking whether $CC understands -c and -o together... " >&6; }
4574
-if ${am_cv_prog_cc_c_o+:} false; then :
4575
-  $as_echo_n "(cached) " >&6
4576
-else
4577
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
4578
-/* end confdefs.h.  */
4579
-
4580
-int
4581
-main ()
4582
-{
4583
-
4584
-  ;
4585
-  return 0;
4586
-}
4587
-_ACEOF
4588
-  # Make sure it works both with $CC and with simple cc.
4589
-  # Following AC_PROG_CC_C_O, we do the test twice because some
4590
-  # compilers refuse to overwrite an existing .o file with -o,
4591
-  # though they will create one.
4592
-  am_cv_prog_cc_c_o=yes
4593
-  for am_i in 1 2; do
4594
-    if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5
4595
-   ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5
4596
-   ac_status=$?
4597
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
4598
-   (exit $ac_status); } \
4599
-         && test -f conftest2.$ac_objext; then
4600
-      : OK
4601
-    else
4602
-      am_cv_prog_cc_c_o=no
4603
-      break
4604
-    fi
4605
-  done
4606
-  rm -f core conftest*
4607
-  unset am_i
4608
-fi
4609
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5
4610
-$as_echo "$am_cv_prog_cc_c_o" >&6; }
4611
-if test "$am_cv_prog_cc_c_o" != yes; then
4612
-   # Losing compiler, so override with the script.
4613
-   # FIXME: It is wrong to rewrite CC.
4614
-   # But if we don't then we get into trouble of one sort or another.
4615
-   # A longer-term fix would be to have automake use am__CC in this case,
4616
-   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
4617
-   CC="$am_aux_dir/compile $CC"
4618
-fi
4619
-ac_ext=c
4620
-ac_cpp='$CPP $CPPFLAGS'
4621
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
4622
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
4623
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
4624
-
4625
-
4626 4567
 depcc="$CC"   am_compiler_list=
4627 4568
 
4628 4569
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
... ...
@@ -4634,8 +4427,8 @@ else
4634 4634
   # We make a subdir and do the tests there.  Otherwise we can end up
4635 4635
   # making bogus files that we don't know about and never remove.  For
4636 4636
   # instance it was reported that on HP-UX the gcc test will end up
4637
-  # making a dummy file named 'D' -- because '-MD' means "put the output
4638
-  # in D".
4637
+  # making a dummy file named `D' -- because `-MD' means `put the output
4638
+  # in D'.
4639 4639
   rm -rf conftest.dir
4640 4640
   mkdir conftest.dir
4641 4641
   # Copy depcomp to subdir because otherwise we won't find it if we're
... ...
@@ -4670,16 +4463,16 @@ else
4670 4670
     : > sub/conftest.c
4671 4671
     for i in 1 2 3 4 5 6; do
4672 4672
       echo '#include "conftst'$i'.h"' >> sub/conftest.c
4673
-      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
4674
-      # Solaris 10 /bin/sh.
4675
-      echo '/* dummy */' > sub/conftst$i.h
4673
+      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
4674
+      # Solaris 8's {/usr,}/bin/sh.
4675
+      touch sub/conftst$i.h
4676 4676
     done
4677 4677
     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
4678 4678
 
4679
-    # We check with '-c' and '-o' for the sake of the "dashmstdout"
4679
+    # We check with `-c' and `-o' for the sake of the "dashmstdout"
4680 4680
     # mode.  It turns out that the SunPro C++ compiler does not properly
4681
-    # handle '-M -o', and we need to detect this.  Also, some Intel
4682
-    # versions had trouble with output in subdirs.
4681
+    # handle `-M -o', and we need to detect this.  Also, some Intel
4682
+    # versions had trouble with output in subdirs
4683 4683
     am__obj=sub/conftest.${OBJEXT-o}
4684 4684
     am__minus_obj="-o $am__obj"
4685 4685
     case $depmode in
... ...
@@ -4688,8 +4481,8 @@ else
4688 4688
       test "$am__universal" = false || continue
4689 4689
       ;;
4690 4690
     nosideeffect)
4691
-      # After this tag, mechanisms are not by side-effect, so they'll
4692
-      # only be used when explicitly requested.
4691
+      # after this tag, mechanisms are not by side-effect, so they'll
4692
+      # only be used when explicitly requested
4693 4693
       if test "x$enable_dependency_tracking" = xyes; then
4694 4694
 	continue
4695 4695
       else
... ...
@@ -4697,7 +4490,7 @@ else
4697 4697
       fi
4698 4698
       ;;
4699 4699
     msvc7 | msvc7msys | msvisualcpp | msvcmsys)
4700
-      # This compiler won't grok '-c -o', but also, the minuso test has
4700
+      # This compiler won't grok `-c -o', but also, the minuso test has
4701 4701
       # not run yet.  These depmodes are late enough in the game, and
4702 4702
       # so weak that their functioning should not be impacted.
4703 4703
       am__obj=conftest.${OBJEXT-o}
... ...
@@ -4773,7 +4566,7 @@ do
4773 4773
     for ac_prog in sed gsed; do
4774 4774
     for ac_exec_ext in '' $ac_executable_extensions; do
4775 4775
       ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
4776
-      as_fn_executable_p "$ac_path_SED" || continue
4776
+      { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
4777 4777
 # Check for GNU ac_path_SED and select it if it is found.
4778 4778
   # Check for GNU $ac_path_SED
4779 4779
 case `"$ac_path_SED" --version 2>&1` in
... ...
@@ -4849,7 +4642,7 @@ do
4849 4849
     for ac_prog in grep ggrep; do
4850 4850
     for ac_exec_ext in '' $ac_executable_extensions; do
4851 4851
       ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
4852
-      as_fn_executable_p "$ac_path_GREP" || continue
4852
+      { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
4853 4853
 # Check for GNU ac_path_GREP and select it if it is found.
4854 4854
   # Check for GNU $ac_path_GREP
4855 4855
 case `"$ac_path_GREP" --version 2>&1` in
... ...
@@ -4915,7 +4708,7 @@ do
4915 4915
     for ac_prog in egrep; do
4916 4916
     for ac_exec_ext in '' $ac_executable_extensions; do
4917 4917
       ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
4918
-      as_fn_executable_p "$ac_path_EGREP" || continue
4918
+      { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
4919 4919
 # Check for GNU ac_path_EGREP and select it if it is found.
4920 4920
   # Check for GNU $ac_path_EGREP
4921 4921
 case `"$ac_path_EGREP" --version 2>&1` in
... ...
@@ -4982,7 +4775,7 @@ do
4982 4982
     for ac_prog in fgrep; do
4983 4983
     for ac_exec_ext in '' $ac_executable_extensions; do
4984 4984
       ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
4985
-      as_fn_executable_p "$ac_path_FGREP" || continue
4985
+      { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue
4986 4986
 # Check for GNU ac_path_FGREP and select it if it is found.
4987 4987
   # Check for GNU $ac_path_FGREP
4988 4988
 case `"$ac_path_FGREP" --version 2>&1` in
... ...
@@ -5238,7 +5031,7 @@ do
5238 5238
   IFS=$as_save_IFS
5239 5239
   test -z "$as_dir" && as_dir=.
5240 5240
     for ac_exec_ext in '' $ac_executable_extensions; do
5241
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
5241
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
5242 5242
     ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog"
5243 5243
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
5244 5244
     break 2
... ...
@@ -5282,7 +5075,7 @@ do
5282 5282
   IFS=$as_save_IFS
5283 5283
   test -z "$as_dir" && as_dir=.
5284 5284
     for ac_exec_ext in '' $ac_executable_extensions; do
5285
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
5285
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
5286 5286
     ac_cv_prog_ac_ct_DUMPBIN="$ac_prog"
5287 5287
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
5288 5288
     break 2
... ...
@@ -5707,7 +5500,7 @@ do
5707 5707
   IFS=$as_save_IFS
5708 5708
   test -z "$as_dir" && as_dir=.
5709 5709
     for ac_exec_ext in '' $ac_executable_extensions; do
5710
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
5710
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
5711 5711
     ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
5712 5712
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
5713 5713
     break 2
... ...
@@ -5747,7 +5540,7 @@ do
5747 5747
   IFS=$as_save_IFS
5748 5748
   test -z "$as_dir" && as_dir=.
5749 5749
     for ac_exec_ext in '' $ac_executable_extensions; do
5750
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
5750
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
5751 5751
     ac_cv_prog_ac_ct_OBJDUMP="objdump"
5752 5752
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
5753 5753
     break 2
... ...
@@ -6049,7 +5842,7 @@ do
6049 6049
   IFS=$as_save_IFS
6050 6050
   test -z "$as_dir" && as_dir=.
6051 6051
     for ac_exec_ext in '' $ac_executable_extensions; do
6052
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
6052
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
6053 6053
     ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
6054 6054
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
6055 6055
     break 2
... ...
@@ -6089,7 +5882,7 @@ do
6089 6089
   IFS=$as_save_IFS
6090 6090
   test -z "$as_dir" && as_dir=.
6091 6091
     for ac_exec_ext in '' $ac_executable_extensions; do
6092
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
6092
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
6093 6093
     ac_cv_prog_ac_ct_DLLTOOL="dlltool"
6094 6094
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
6095 6095
     break 2
... ...
@@ -6193,7 +5986,7 @@ do
6193 6193
   IFS=$as_save_IFS
6194 6194
   test -z "$as_dir" && as_dir=.
6195 6195
     for ac_exec_ext in '' $ac_executable_extensions; do
6196
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
6196
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
6197 6197
     ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
6198 6198
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
6199 6199
     break 2
... ...
@@ -6237,7 +6030,7 @@ do
6237 6237
   IFS=$as_save_IFS
6238 6238
   test -z "$as_dir" && as_dir=.
6239 6239
     for ac_exec_ext in '' $ac_executable_extensions; do
6240
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
6240
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
6241 6241
     ac_cv_prog_ac_ct_AR="$ac_prog"
6242 6242
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
6243 6243
     break 2
... ...
@@ -6362,7 +6155,7 @@ do
6362 6362
   IFS=$as_save_IFS
6363 6363
   test -z "$as_dir" && as_dir=.
6364 6364
     for ac_exec_ext in '' $ac_executable_extensions; do
6365
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
6365
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
6366 6366
     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
6367 6367
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
6368 6368
     break 2
... ...
@@ -6402,7 +6195,7 @@ do
6402 6402
   IFS=$as_save_IFS
6403 6403
   test -z "$as_dir" && as_dir=.
6404 6404
     for ac_exec_ext in '' $ac_executable_extensions; do
6405
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
6405
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
6406 6406
     ac_cv_prog_ac_ct_STRIP="strip"
6407 6407
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
6408 6408
     break 2
... ...
@@ -6461,7 +6254,7 @@ do
6461 6461
   IFS=$as_save_IFS
6462 6462
   test -z "$as_dir" && as_dir=.
6463 6463
     for ac_exec_ext in '' $ac_executable_extensions; do
6464
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
6464
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
6465 6465
     ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
6466 6466
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
6467 6467
     break 2
... ...
@@ -6501,7 +6294,7 @@ do
6501 6501
   IFS=$as_save_IFS
6502 6502
   test -z "$as_dir" && as_dir=.
6503 6503
     for ac_exec_ext in '' $ac_executable_extensions; do
6504
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
6504
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
6505 6505
     ac_cv_prog_ac_ct_RANLIB="ranlib"
6506 6506
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
6507 6507
     break 2
... ...
@@ -7163,7 +6956,7 @@ do
7163 7163
   IFS=$as_save_IFS
7164 7164
   test -z "$as_dir" && as_dir=.
7165 7165
     for ac_exec_ext in '' $ac_executable_extensions; do
7166
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
7166
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7167 7167
     ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
7168 7168
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7169 7169
     break 2
... ...
@@ -7203,7 +6996,7 @@ do
7203 7203
   IFS=$as_save_IFS
7204 7204
   test -z "$as_dir" && as_dir=.
7205 7205
     for ac_exec_ext in '' $ac_executable_extensions; do
7206
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
7206
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7207 7207
     ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
7208 7208
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7209 7209
     break 2
... ...
@@ -7283,7 +7076,7 @@ do
7283 7283
   IFS=$as_save_IFS
7284 7284
   test -z "$as_dir" && as_dir=.
7285 7285
     for ac_exec_ext in '' $ac_executable_extensions; do
7286
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
7286
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7287 7287
     ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
7288 7288
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7289 7289
     break 2
... ...
@@ -7323,7 +7116,7 @@ do
7323 7323
   IFS=$as_save_IFS
7324 7324
   test -z "$as_dir" && as_dir=.
7325 7325
     for ac_exec_ext in '' $ac_executable_extensions; do
7326
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
7326
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7327 7327
     ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
7328 7328
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7329 7329
     break 2
... ...
@@ -7375,7 +7168,7 @@ do
7375 7375
   IFS=$as_save_IFS
7376 7376
   test -z "$as_dir" && as_dir=.
7377 7377
     for ac_exec_ext in '' $ac_executable_extensions; do
7378
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
7378
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7379 7379
     ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
7380 7380
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7381 7381
     break 2
... ...
@@ -7415,7 +7208,7 @@ do
7415 7415
   IFS=$as_save_IFS
7416 7416
   test -z "$as_dir" && as_dir=.
7417 7417
     for ac_exec_ext in '' $ac_executable_extensions; do
7418
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
7418
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7419 7419
     ac_cv_prog_ac_ct_NMEDIT="nmedit"
7420 7420
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7421 7421
     break 2
... ...
@@ -7467,7 +7260,7 @@ do
7467 7467
   IFS=$as_save_IFS
7468 7468
   test -z "$as_dir" && as_dir=.
7469 7469
     for ac_exec_ext in '' $ac_executable_extensions; do
7470
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
7470
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7471 7471
     ac_cv_prog_LIPO="${ac_tool_prefix}lipo"
7472 7472
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7473 7473
     break 2
... ...
@@ -7507,7 +7300,7 @@ do
7507 7507
   IFS=$as_save_IFS
7508 7508
   test -z "$as_dir" && as_dir=.
7509 7509
     for ac_exec_ext in '' $ac_executable_extensions; do
7510
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
7510
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7511 7511
     ac_cv_prog_ac_ct_LIPO="lipo"
7512 7512
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7513 7513
     break 2
... ...
@@ -7559,7 +7352,7 @@ do
7559 7559
   IFS=$as_save_IFS
7560 7560
   test -z "$as_dir" && as_dir=.
7561 7561
     for ac_exec_ext in '' $ac_executable_extensions; do
7562
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
7562
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7563 7563
     ac_cv_prog_OTOOL="${ac_tool_prefix}otool"
7564 7564
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7565 7565
     break 2
... ...
@@ -7599,7 +7392,7 @@ do
7599 7599
   IFS=$as_save_IFS
7600 7600
   test -z "$as_dir" && as_dir=.
7601 7601
     for ac_exec_ext in '' $ac_executable_extensions; do
7602
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
7602
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7603 7603
     ac_cv_prog_ac_ct_OTOOL="otool"
7604 7604
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7605 7605
     break 2
... ...
@@ -7651,7 +7444,7 @@ do
7651 7651
   IFS=$as_save_IFS
7652 7652
   test -z "$as_dir" && as_dir=.
7653 7653
     for ac_exec_ext in '' $ac_executable_extensions; do
7654
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
7654
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7655 7655
     ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64"
7656 7656
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7657 7657
     break 2
... ...
@@ -7691,7 +7484,7 @@ do
7691 7691
   IFS=$as_save_IFS
7692 7692
   test -z "$as_dir" && as_dir=.
7693 7693
     for ac_exec_ext in '' $ac_executable_extensions; do
7694
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
7694
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7695 7695
     ac_cv_prog_ac_ct_OTOOL64="otool64"
7696 7696
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7697 7697
     break 2
... ...
@@ -13274,7 +13067,7 @@ do
13274 13274
   IFS=$as_save_IFS
13275 13275
   test -z "$as_dir" && as_dir=.
13276 13276
     for ac_exec_ext in '' $ac_executable_extensions; do
13277
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
13277
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
13278 13278
     ac_cv_prog_CC="${ac_tool_prefix}gcc"
13279 13279
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
13280 13280
     break 2
... ...
@@ -13314,7 +13107,7 @@ do
13314 13314
   IFS=$as_save_IFS
13315 13315
   test -z "$as_dir" && as_dir=.
13316 13316
     for ac_exec_ext in '' $ac_executable_extensions; do
13317
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
13317
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
13318 13318
     ac_cv_prog_ac_ct_CC="gcc"
13319 13319
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
13320 13320
     break 2
... ...
@@ -13367,7 +13160,7 @@ do
13367 13367
   IFS=$as_save_IFS
13368 13368
   test -z "$as_dir" && as_dir=.
13369 13369
     for ac_exec_ext in '' $ac_executable_extensions; do
13370
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
13370
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
13371 13371
     ac_cv_prog_CC="${ac_tool_prefix}cc"
13372 13372
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
13373 13373
     break 2
... ...
@@ -13408,7 +13201,7 @@ do
13408 13408
   IFS=$as_save_IFS
13409 13409
   test -z "$as_dir" && as_dir=.
13410 13410
     for ac_exec_ext in '' $ac_executable_extensions; do
13411
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
13411
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
13412 13412
     if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
13413 13413
        ac_prog_rejected=yes
13414 13414
        continue
... ...
@@ -13466,7 +13259,7 @@ do
13466 13466
   IFS=$as_save_IFS
13467 13467
   test -z "$as_dir" && as_dir=.
13468 13468
     for ac_exec_ext in '' $ac_executable_extensions; do
13469
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
13469
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
13470 13470
     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
13471 13471
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
13472 13472
     break 2
... ...
@@ -13510,7 +13303,7 @@ do
13510 13510
   IFS=$as_save_IFS
13511 13511
   test -z "$as_dir" && as_dir=.
13512 13512
     for ac_exec_ext in '' $ac_executable_extensions; do
13513
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
13513
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
13514 13514
     ac_cv_prog_ac_ct_CC="$ac_prog"
13515 13515
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
13516 13516
     break 2
... ...
@@ -13706,7 +13499,8 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
13706 13706
 /* end confdefs.h.  */
13707 13707
 #include <stdarg.h>
13708 13708
 #include <stdio.h>
13709
-struct stat;
13709
+#include <sys/types.h>
13710
+#include <sys/stat.h>
13710 13711
 /* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
13711 13712
 struct buf { int x; };
13712 13713
 FILE * (*rcsopen) (struct buf *, struct stat *, int);
... ...
@@ -13791,65 +13585,6 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
13791 13791
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
13792 13792
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
13793 13793
 
13794
-ac_ext=c
13795
-ac_cpp='$CPP $CPPFLAGS'
13796
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
13797
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
13798
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
13799
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5
13800
-$as_echo_n "checking whether $CC understands -c and -o together... " >&6; }
13801
-if ${am_cv_prog_cc_c_o+:} false; then :
13802
-  $as_echo_n "(cached) " >&6
13803
-else
13804
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
13805
-/* end confdefs.h.  */
13806
-
13807
-int
13808
-main ()
13809
-{
13810
-
13811
-  ;
13812
-  return 0;
13813
-}
13814
-_ACEOF
13815
-  # Make sure it works both with $CC and with simple cc.
13816
-  # Following AC_PROG_CC_C_O, we do the test twice because some
13817
-  # compilers refuse to overwrite an existing .o file with -o,
13818
-  # though they will create one.
13819
-  am_cv_prog_cc_c_o=yes
13820
-  for am_i in 1 2; do
13821
-    if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5
13822
-   ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5
13823
-   ac_status=$?
13824
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
13825
-   (exit $ac_status); } \
13826
-         && test -f conftest2.$ac_objext; then
13827
-      : OK
13828
-    else
13829
-      am_cv_prog_cc_c_o=no
13830
-      break
13831
-    fi
13832
-  done
13833
-  rm -f core conftest*
13834
-  unset am_i
13835
-fi
13836
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5
13837
-$as_echo "$am_cv_prog_cc_c_o" >&6; }
13838
-if test "$am_cv_prog_cc_c_o" != yes; then
13839
-   # Losing compiler, so override with the script.
13840
-   # FIXME: It is wrong to rewrite CC.
13841
-   # But if we don't then we get into trouble of one sort or another.
13842
-   # A longer-term fix would be to have automake use am__CC in this case,
13843
-   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
13844
-   CC="$am_aux_dir/compile $CC"
13845
-fi
13846
-ac_ext=c
13847
-ac_cpp='$CPP $CPPFLAGS'
13848
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
13849
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
13850
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
13851
-
13852
-
13853 13794
 depcc="$CC"   am_compiler_list=
13854 13795
 
13855 13796
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
... ...
@@ -13861,8 +13596,8 @@ else
13861 13861
   # We make a subdir and do the tests there.  Otherwise we can end up
13862 13862
   # making bogus files that we don't know about and never remove.  For
13863 13863
   # instance it was reported that on HP-UX the gcc test will end up
13864
-  # making a dummy file named 'D' -- because '-MD' means "put the output
13865
-  # in D".
13864
+  # making a dummy file named `D' -- because `-MD' means `put the output
13865
+  # in D'.
13866 13866
   rm -rf conftest.dir
13867 13867
   mkdir conftest.dir
13868 13868
   # Copy depcomp to subdir because otherwise we won't find it if we're
... ...
@@ -13897,16 +13632,16 @@ else
13897 13897
     : > sub/conftest.c
13898 13898
     for i in 1 2 3 4 5 6; do
13899 13899
       echo '#include "conftst'$i'.h"' >> sub/conftest.c
13900
-      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
13901
-      # Solaris 10 /bin/sh.
13902
-      echo '/* dummy */' > sub/conftst$i.h
13900
+      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
13901
+      # Solaris 8's {/usr,}/bin/sh.
13902
+      touch sub/conftst$i.h
13903 13903
     done
13904 13904
     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
13905 13905
 
13906
-    # We check with '-c' and '-o' for the sake of the "dashmstdout"
13906
+    # We check with `-c' and `-o' for the sake of the "dashmstdout"
13907 13907
     # mode.  It turns out that the SunPro C++ compiler does not properly
13908
-    # handle '-M -o', and we need to detect this.  Also, some Intel
13909
-    # versions had trouble with output in subdirs.
13908
+    # handle `-M -o', and we need to detect this.  Also, some Intel
13909
+    # versions had trouble with output in subdirs
13910 13910
     am__obj=sub/conftest.${OBJEXT-o}
13911 13911
     am__minus_obj="-o $am__obj"
13912 13912
     case $depmode in
... ...
@@ -13915,8 +13650,8 @@ else
13915 13915
       test "$am__universal" = false || continue
13916 13916
       ;;
13917 13917
     nosideeffect)
13918
-      # After this tag, mechanisms are not by side-effect, so they'll
13919
-      # only be used when explicitly requested.
13918
+      # after this tag, mechanisms are not by side-effect, so they'll
13919
+      # only be used when explicitly requested
13920 13920
       if test "x$enable_dependency_tracking" = xyes; then
13921 13921
 	continue
13922 13922
       else
... ...
@@ -13924,7 +13659,7 @@ else
13924 13924
       fi
13925 13925
       ;;
13926 13926
     msvc7 | msvc7msys | msvisualcpp | msvcmsys)
13927
-      # This compiler won't grok '-c -o', but also, the minuso test has
13927
+      # This compiler won't grok `-c -o', but also, the minuso test has
13928 13928
       # not run yet.  These depmodes are late enough in the game, and
13929 13929
       # so weak that their functioning should not be impacted.
13930 13930
       am__obj=conftest.${OBJEXT-o}
... ...
@@ -14295,11 +14030,11 @@ else
14295 14295
 int
14296 14296
 main ()
14297 14297
 {
14298
-
14298
+/* FIXME: Include the comments suggested by Paul. */
14299 14299
 #ifndef __cplusplus
14300
-  /* Ultrix mips cc rejects this sort of thing.  */
14300
+  /* Ultrix mips cc rejects this.  */
14301 14301
   typedef int charset[2];
14302
-  const charset cs = { 0, 0 };
14302
+  const charset cs;
14303 14303
   /* SunOS 4.1.1 cc rejects this.  */
14304 14304
   char const *const *pcpcc;
14305 14305
   char **ppc;
... ...
@@ -14316,9 +14051,8 @@ main ()
14316 14316
   ++pcpcc;
14317 14317
   ppc = (char**) pcpcc;
14318 14318
   pcpcc = (char const *const *) ppc;
14319
-  { /* SCO 3.2v4 cc rejects this sort of thing.  */
14320
-    char tx;
14321
-    char *t = &tx;
14319
+  { /* SCO 3.2v4 cc rejects this.  */
14320
+    char *t;
14322 14321
     char const *s = 0 ? (char *) 0 : (char const *) 0;
14323 14322
 
14324 14323
     *t++ = 0;
... ...
@@ -14334,10 +14068,10 @@ main ()
14334 14334
     iptr p = 0;
14335 14335
     ++p;
14336 14336
   }
14337
-  { /* AIX XL C 1.02.0.0 rejects this sort of thing, saying
14337
+  { /* AIX XL C 1.02.0.0 rejects this saying
14338 14338
        "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
14339
-    struct s { int j; const int *ap[3]; } bx;
14340
-    struct s *b = &bx; b->j = 5;
14339
+    struct s { int j; const int *ap[3]; };
14340
+    struct s *b; b->j = 5;
14341 14341
   }
14342 14342
   { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
14343 14343
     const int foo = 10;
... ...
@@ -16566,7 +16300,7 @@ do
16566 16566
   IFS=$as_save_IFS
16567 16567
   test -z "$as_dir" && as_dir=.
16568 16568
     for ac_exec_ext in '' $ac_executable_extensions; do
16569
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
16569
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
16570 16570
     ac_cv_prog_GCOV="$ac_prog"
16571 16571
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
16572 16572
     break 2
... ...
@@ -16609,7 +16343,7 @@ do
16609 16609
   IFS=$as_save_IFS
16610 16610
   test -z "$as_dir" && as_dir=.
16611 16611
     for ac_exec_ext in '' $ac_executable_extensions; do
16612
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
16612
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
16613 16613
     ac_cv_prog_LCOV="$ac_prog"
16614 16614
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
16615 16615
     break 2
... ...
@@ -16652,7 +16386,7 @@ do
16652 16652
   IFS=$as_save_IFS
16653 16653
   test -z "$as_dir" && as_dir=.
16654 16654
     for ac_exec_ext in '' $ac_executable_extensions; do
16655
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
16655
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
16656 16656
     ac_cv_prog_GENHTML="$ac_prog"
16657 16657
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
16658 16658
     break 2
... ...
@@ -16987,6 +16721,100 @@ fi
16987 16987
 LDFLAGS="$save_LDFLAGS"
16988 16988
 CFLAGS="$save_CFLAGS"
16989 16989
 
16990
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libjson installation" >&5
16991
+$as_echo_n "checking for libjson installation... " >&6; }
16992
+
16993
+
16994
+# Check whether --with-libjson was given.
16995
+if test "${with_libjson+set}" = set; then :
16996
+  withval=$with_libjson;
16997
+if test "$withval"; then
16998
+    LIBJSON_HOME="$withval"
16999
+fi
17000
+
17001
+else
17002
+
17003
+LIBJSON_HOME=/usr/local
17004
+if test ! -f "$LIBJSON_HOME/include/json/json.h"
17005
+then
17006
+    LIBJSON_HOME=/usr
17007
+fi
17008
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBJSON_HOME" >&5
17009
+$as_echo "$LIBJSON_HOME" >&6; }
17010
+
17011
+fi
17012
+
17013
+
17014
+if test ! -f "$LIBJSON_HOME/include/json/json.h"
17015
+then
17016
+    as_fn_error $? "libjson not found." "$LINENO" 5
17017
+fi
17018
+
17019
+JSON_LDFLAGS="-L$LIBJSON_HOME/lib"
17020
+JSON_LIBS="-ljson"
17021
+JSON_CPPFLAGS="-I$LIBJSON_HOME/include"
17022
+
17023
+save_LDFLAGS="$LDFLAGS"
17024
+LDFLAGS="-L$LIBJSON_HOME/lib $JSON_LIBS"
17025
+
17026
+save_CFLAGS="$CFLAGS"
17027
+CFLAGS="$JSON_CPPFLAGS"
17028
+
17029
+have_json="no"
17030
+
17031
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for json_object_new_object in -ljson" >&5
17032
+$as_echo_n "checking for json_object_new_object in -ljson... " >&6; }
17033
+if ${ac_cv_lib_json_json_object_new_object+:} false; then :
17034
+  $as_echo_n "(cached) " >&6
17035
+else
17036
+  ac_check_lib_save_LIBS=$LIBS
17037
+LIBS="-ljson  $LIBS"
17038
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
17039
+/* end confdefs.h.  */
17040
+
17041
+/* Override any GCC internal prototype to avoid an error.
17042
+   Use char because int might match the return type of a GCC
17043
+   builtin and then its argument prototype would still apply.  */
17044
+#ifdef __cplusplus
17045
+extern "C"
17046
+#endif
17047
+char json_object_new_object ();
17048
+int
17049
+main ()
17050
+{
17051
+return json_object_new_object ();
17052
+  ;
17053
+  return 0;
17054
+}
17055
+_ACEOF
17056
+if ac_fn_c_try_link "$LINENO"; then :
17057
+  ac_cv_lib_json_json_object_new_object=yes
17058
+else
17059
+  ac_cv_lib_json_json_object_new_object=no
17060
+fi
17061
+rm -f core conftest.err conftest.$ac_objext \
17062
+    conftest$ac_exeext conftest.$ac_ext
17063
+LIBS=$ac_check_lib_save_LIBS
17064
+fi
17065
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_json_json_object_new_object" >&5
17066
+$as_echo "$ac_cv_lib_json_json_object_new_object" >&6; }
17067
+if test "x$ac_cv_lib_json_json_object_new_object" = xyes; then :
17068
+  have_json="yes"
17069
+else
17070
+  as_fn_error $? "Your libjson installation is misconfigured or missing" "$LINENO" 5
17071
+fi
17072
+
17073
+
17074
+LDFLAGS="$save_LDFLAGS"
17075
+CFLAGS="$save_CFLAGS"
17076
+
17077
+if test "$have_json" = "yes"; then
17078
+
17079
+$as_echo "#define HAVE_JSON 1" >>confdefs.h
17080
+
17081
+fi
17082
+
17083
+
16990 17084
 
16991 17085
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
16992 17086
 $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
... ...
@@ -19460,7 +19288,7 @@ do
19460 19460
   IFS=$as_save_IFS
19461 19461
   test -z "$as_dir" && as_dir=.
19462 19462
     for ac_exec_ext in '' $ac_executable_extensions; do
19463
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
19463
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
19464 19464
     ac_cv_path_GETENT="$as_dir/$ac_word$ac_exec_ext"
19465 19465
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
19466 19466
     break 2
... ...
@@ -22211,6 +22039,9 @@ fi
22211 22211
 
22212 22212
 
22213 22213
 
22214
+
22215
+
22216
+
22214 22217
  if test "$have_curl" = "yes"; then
22215 22218
   ENABLE_CLAMSUBMIT_TRUE=
22216 22219
   ENABLE_CLAMSUBMIT_FALSE='#'
... ...
@@ -22332,14 +22163,6 @@ LIBOBJS=$ac_libobjs
22332 22332
 LTLIBOBJS=$ac_ltlibobjs
22333 22333
 
22334 22334
 
22335
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5
22336
-$as_echo_n "checking that generated files are newer than configure... " >&6; }
22337
-   if test -n "$am_sleep_pid"; then
22338
-     # Hide warnings about reused PIDs.
22339
-     wait $am_sleep_pid 2>/dev/null
22340
-   fi
22341
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5
22342
-$as_echo "done" >&6; }
22343 22335
  if test -n "$EXEEXT"; then
22344 22336
   am__EXEEXT_TRUE=
22345 22337
   am__EXEEXT_FALSE='#'
... ...
@@ -22728,16 +22551,16 @@ if (echo >conf$$.file) 2>/dev/null; then
22728 22728
     # ... but there are two gotchas:
22729 22729
     # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
22730 22730
     # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
22731
-    # In both cases, we have to default to `cp -pR'.
22731
+    # In both cases, we have to default to `cp -p'.
22732 22732
     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
22733
-      as_ln_s='cp -pR'
22733
+      as_ln_s='cp -p'
22734 22734
   elif ln conf$$.file conf$$ 2>/dev/null; then
22735 22735
     as_ln_s=ln
22736 22736
   else
22737
-    as_ln_s='cp -pR'
22737
+    as_ln_s='cp -p'
22738 22738
   fi
22739 22739
 else
22740
-  as_ln_s='cp -pR'
22740
+  as_ln_s='cp -p'
22741 22741
 fi
22742 22742
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
22743 22743
 rmdir conf$$.dir 2>/dev/null
... ...
@@ -22797,16 +22620,28 @@ else
22797 22797
   as_mkdir_p=false
22798 22798
 fi
22799 22799
 
22800
-
22801
-# as_fn_executable_p FILE
22802
-# -----------------------
22803
-# Test if FILE is an executable regular file.
22804
-as_fn_executable_p ()
22805
-{
22806
-  test -f "$1" && test -x "$1"
22807
-} # as_fn_executable_p
22808
-as_test_x='test -x'
22809
-as_executable_p=as_fn_executable_p
22800
+if test -x / >/dev/null 2>&1; then
22801
+  as_test_x='test -x'
22802
+else
22803
+  if ls -dL / >/dev/null 2>&1; then
22804
+    as_ls_L_option=L
22805
+  else
22806
+    as_ls_L_option=
22807
+  fi
22808
+  as_test_x='
22809
+    eval sh -c '\''
22810
+      if test -d "$1"; then
22811
+	test -d "$1/.";
22812
+      else
22813
+	case $1 in #(
22814
+	-*)set "./$1";;
22815
+	esac;
22816
+	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
22817
+	???[sx]*):;;*)false;;esac;fi
22818
+    '\'' sh
22819
+  '
22820
+fi
22821
+as_executable_p=$as_test_x
22810 22822
 
22811 22823
 # Sed expression to map a string onto a valid CPP name.
22812 22824
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
... ...
@@ -22828,7 +22663,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
22828 22828
 # values after options handling.
22829 22829
 ac_log="
22830 22830
 This file was extended by ClamAV $as_me devel, which was
22831
-generated by GNU Autoconf 2.69.  Invocation command line was
22831
+generated by GNU Autoconf 2.68.  Invocation command line was
22832 22832
 
22833 22833
   CONFIG_FILES    = $CONFIG_FILES
22834 22834
   CONFIG_HEADERS  = $CONFIG_HEADERS
... ...
@@ -22895,10 +22730,10 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
22895 22895
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
22896 22896
 ac_cs_version="\\
22897 22897
 ClamAV config.status devel
22898
-configured by $0, generated by GNU Autoconf 2.69,
22898
+configured by $0, generated by GNU Autoconf 2.68,
22899 22899
   with options \\"\$ac_cs_config\\"
22900 22900
 
22901
-Copyright (C) 2012 Free Software Foundation, Inc.
22901
+Copyright (C) 2010 Free Software Foundation, Inc.
22902 22902
 This config.status script is free software; the Free Software Foundation
22903 22903
 gives unlimited permission to copy, distribute and modify it."
22904 22904
 
... ...
@@ -22989,7 +22824,7 @@ fi
22989 22989
 _ACEOF
22990 22990
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
22991 22991
 if \$ac_cs_recheck; then
22992
-  set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
22992
+  set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
22993 22993
   shift
22994 22994
   \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
22995 22995
   CONFIG_SHELL='$SHELL'
... ...
@@ -23932,7 +23767,7 @@ $as_echo "$as_me: executing $ac_file commands" >&6;}
23932 23932
 
23933 23933
   case $ac_file$ac_mode in
23934 23934
     "depfiles":C) test x"$AMDEP_TRUE" != x"" || {
23935
-  # Older Autoconf quotes --file arguments for eval, but not when files
23935
+  # Autoconf 2.62 quotes --file arguments for eval, but not when files
23936 23936
   # are listed without --file.  Let's play safe and only enable the eval
23937 23937
   # if we detect the quoting.
23938 23938
   case $CONFIG_FILES in
... ...
@@ -23945,7 +23780,7 @@ $as_echo "$as_me: executing $ac_file commands" >&6;}
23945 23945
     # Strip MF so we end up with the name of the file.
23946 23946
     mf=`echo "$mf" | sed -e 's/:.*$//'`
23947 23947
     # Check whether this is an Automake generated Makefile or not.
23948
-    # We used to match only the files named 'Makefile.in', but
23948
+    # We used to match only the files named `Makefile.in', but
23949 23949
     # some people rename them; so instead we look at the file content.
23950 23950
     # Grep'ing the first line is not enough: some people post-process
23951 23951
     # each Makefile.in and add a new line on top of each file to say so.
... ...
@@ -23979,19 +23814,21 @@ $as_echo X"$mf" |
23979 23979
       continue
23980 23980
     fi
23981 23981
     # Extract the definition of DEPDIR, am__include, and am__quote
23982
-    # from the Makefile without running 'make'.
23982
+    # from the Makefile without running `make'.
23983 23983
     DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
23984 23984
     test -z "$DEPDIR" && continue
23985 23985
     am__include=`sed -n 's/^am__include = //p' < "$mf"`
23986
-    test -z "$am__include" && continue
23986
+    test -z "am__include" && continue
23987 23987
     am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
23988
+    # When using ansi2knr, U may be empty or an underscore; expand it
23989
+    U=`sed -n 's/^U = //p' < "$mf"`
23988 23990
     # Find all dependency output files, they are included files with
23989 23991
     # $(DEPDIR) in their names.  We invoke sed twice because it is the
23990 23992
     # simplest approach to changing $(DEPDIR) to its actual value in the
23991 23993
     # expansion.
23992 23994
     for file in `sed -n "
23993 23995
       s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
23994
-	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
23996
+	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
23995 23997
       # Make sure the directory exists.
23996 23998
       test -f "$dirpart/$file" && continue
23997 23999
       fdir=`$as_dirname -- "$file" ||
... ...
@@ -24964,14 +24801,6 @@ LIBOBJS=$ac_libobjs
24964 24964
 LTLIBOBJS=$ac_ltlibobjs
24965 24965
 
24966 24966
 
24967
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5
24968
-$as_echo_n "checking that generated files are newer than configure... " >&6; }
24969
-   if test -n "$am_sleep_pid"; then
24970
-     # Hide warnings about reused PIDs.
24971
-     wait $am_sleep_pid 2>/dev/null
24972
-   fi
24973
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5
24974
-$as_echo "done" >&6; }
24975 24967
  if test -n "$EXEEXT"; then
24976 24968
   am__EXEEXT_TRUE=
24977 24969
   am__EXEEXT_FALSE='#'
... ...
@@ -25368,16 +25197,16 @@ if (echo >conf$$.file) 2>/dev/null; then
25368 25368
     # ... but there are two gotchas:
25369 25369
     # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
25370 25370
     # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
25371
-    # In both cases, we have to default to `cp -pR'.
25371
+    # In both cases, we have to default to `cp -p'.
25372 25372
     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
25373
-      as_ln_s='cp -pR'
25373
+      as_ln_s='cp -p'
25374 25374
   elif ln conf$$.file conf$$ 2>/dev/null; then
25375 25375
     as_ln_s=ln
25376 25376
   else
25377
-    as_ln_s='cp -pR'
25377
+    as_ln_s='cp -p'
25378 25378
   fi
25379 25379
 else
25380
-  as_ln_s='cp -pR'
25380
+  as_ln_s='cp -p'
25381 25381
 fi
25382 25382
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
25383 25383
 rmdir conf$$.dir 2>/dev/null
... ...
@@ -25437,16 +25266,28 @@ else
25437 25437
   as_mkdir_p=false
25438 25438
 fi
25439 25439
 
25440
-
25441
-# as_fn_executable_p FILE
25442
-# -----------------------
25443
-# Test if FILE is an executable regular file.
25444
-as_fn_executable_p ()
25445
-{
25446
-  test -f "$1" && test -x "$1"
25447
-} # as_fn_executable_p
25448
-as_test_x='test -x'
25449
-as_executable_p=as_fn_executable_p
25440
+if test -x / >/dev/null 2>&1; then
25441
+  as_test_x='test -x'
25442
+else
25443
+  if ls -dL / >/dev/null 2>&1; then
25444
+    as_ls_L_option=L
25445
+  else
25446
+    as_ls_L_option=
25447
+  fi
25448
+  as_test_x='
25449
+    eval sh -c '\''
25450
+      if test -d "$1"; then
25451
+	test -d "$1/.";
25452
+      else
25453
+	case $1 in #(
25454
+	-*)set "./$1";;
25455
+	esac;
25456
+	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
25457
+	???[sx]*):;;*)false;;esac;fi
25458
+    '\'' sh
25459
+  '
25460
+fi
25461
+as_executable_p=$as_test_x
25450 25462
 
25451 25463
 # Sed expression to map a string onto a valid CPP name.
25452 25464
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
... ...
@@ -25468,7 +25309,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
25468 25468
 # values after options handling.
25469 25469
 ac_log="
25470 25470
 This file was extended by ClamAV $as_me devel, which was
25471
-generated by GNU Autoconf 2.69.  Invocation command line was
25471
+generated by GNU Autoconf 2.68.  Invocation command line was
25472 25472
 
25473 25473
   CONFIG_FILES    = $CONFIG_FILES
25474 25474
   CONFIG_HEADERS  = $CONFIG_HEADERS
... ...
@@ -25535,10 +25376,10 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
25535 25535
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
25536 25536
 ac_cs_version="\\
25537 25537
 ClamAV config.status devel
25538
-configured by $0, generated by GNU Autoconf 2.69,
25538
+configured by $0, generated by GNU Autoconf 2.68,
25539 25539
   with options \\"\$ac_cs_config\\"
25540 25540
 
25541
-Copyright (C) 2012 Free Software Foundation, Inc.
25541
+Copyright (C) 2010 Free Software Foundation, Inc.
25542 25542
 This config.status script is free software; the Free Software Foundation
25543 25543
 gives unlimited permission to copy, distribute and modify it."
25544 25544
 
... ...
@@ -25629,7 +25470,7 @@ fi
25629 25629
 _ACEOF
25630 25630
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
25631 25631
 if \$ac_cs_recheck; then
25632
-  set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
25632
+  set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
25633 25633
   shift
25634 25634
   \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
25635 25635
   CONFIG_SHELL='$SHELL'
... ...
@@ -26574,7 +26415,7 @@ $as_echo "$as_me: executing $ac_file commands" >&6;}
26574 26574
 
26575 26575
   case $ac_file$ac_mode in
26576 26576
     "depfiles":C) test x"$AMDEP_TRUE" != x"" || {
26577
-  # Older Autoconf quotes --file arguments for eval, but not when files
26577
+  # Autoconf 2.62 quotes --file arguments for eval, but not when files
26578 26578
   # are listed without --file.  Let's play safe and only enable the eval
26579 26579
   # if we detect the quoting.
26580 26580
   case $CONFIG_FILES in
... ...
@@ -26587,7 +26428,7 @@ $as_echo "$as_me: executing $ac_file commands" >&6;}
26587 26587
     # Strip MF so we end up with the name of the file.
26588 26588
     mf=`echo "$mf" | sed -e 's/:.*$//'`
26589 26589
     # Check whether this is an Automake generated Makefile or not.
26590
-    # We used to match only the files named 'Makefile.in', but
26590
+    # We used to match only the files named `Makefile.in', but
26591 26591
     # some people rename them; so instead we look at the file content.
26592 26592
     # Grep'ing the first line is not enough: some people post-process
26593 26593
     # each Makefile.in and add a new line on top of each file to say so.
... ...
@@ -26621,19 +26462,21 @@ $as_echo X"$mf" |
26621 26621
       continue
26622 26622
     fi
26623 26623
     # Extract the definition of DEPDIR, am__include, and am__quote
26624
-    # from the Makefile without running 'make'.
26624
+    # from the Makefile without running `make'.
26625 26625
     DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
26626 26626
     test -z "$DEPDIR" && continue
26627 26627
     am__include=`sed -n 's/^am__include = //p' < "$mf"`
26628
-    test -z "$am__include" && continue
26628
+    test -z "am__include" && continue
26629 26629
     am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
26630
+    # When using ansi2knr, U may be empty or an underscore; expand it
26631
+    U=`sed -n 's/^U = //p' < "$mf"`
26630 26632
     # Find all dependency output files, they are included files with
26631 26633
     # $(DEPDIR) in their names.  We invoke sed twice because it is the
26632 26634
     # simplest approach to changing $(DEPDIR) to its actual value in the
26633 26635
     # expansion.
26634 26636
     for file in `sed -n "
26635 26637
       s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
26636
-	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
26638
+	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
26637 26639
       # Make sure the directory exists.
26638 26640
       test -f "$dirpart/$file" && continue
26639 26641
       fdir=`$as_dirname -- "$file" ||
... ...
@@ -79,6 +79,7 @@ m4_include([m4/reorganization/code_checks/coverage.m4])
79 79
 dnl libclamav dependencies
80 80
 m4_include([m4/reorganization/libs/xml.m4])
81 81
 m4_include([m4/reorganization/libs/openssl.m4])
82
+m4_include([m4/reorganization/libs/json.m4])
82 83
 
83 84
 AM_MAINTAINER_MODE
84 85
 m4_include([m4/reorganization/libs/libz.m4])
... ...
@@ -1,8 +1,9 @@
1
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
1
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
2 2
 # @configure_input@
3 3
 
4
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
5
-
4
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
5
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
6
+# Foundation, Inc.
6 7
 # This Makefile.in is free software; the Free Software Foundation
7 8
 # gives unlimited permission to copy and/or distribute it,
8 9
 # with or without modifications, as long as this notice is preserved.
... ...
@@ -33,51 +34,6 @@
33 33
 #  along with this program; if not, write to the Free Software
34 34
 #  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
35 35
 VPATH = @srcdir@
36
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
37
-am__make_running_with_option = \
38
-  case $${target_option-} in \
39
-      ?) ;; \
40
-      *) echo "am__make_running_with_option: internal error: invalid" \
41
-              "target option '$${target_option-}' specified" >&2; \
42
-         exit 1;; \
43
-  esac; \
44
-  has_opt=no; \
45
-  sane_makeflags=$$MAKEFLAGS; \
46
-  if $(am__is_gnu_make); then \
47
-    sane_makeflags=$$MFLAGS; \
48
-  else \
49
-    case $$MAKEFLAGS in \
50
-      *\\[\ \	]*) \
51
-        bs=\\; \
52
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
53
-          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
54
-    esac; \
55
-  fi; \
56
-  skip_next=no; \
57
-  strip_trailopt () \
58
-  { \
59
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
60
-  }; \
61
-  for flg in $$sane_makeflags; do \
62
-    test $$skip_next = yes && { skip_next=no; continue; }; \
63
-    case $$flg in \
64
-      *=*|--*) continue;; \
65
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
66
-      -*I?*) strip_trailopt 'I';; \
67
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
68
-      -*O?*) strip_trailopt 'O';; \
69
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
70
-      -*l?*) strip_trailopt 'l';; \
71
-      -[dEDm]) skip_next=yes;; \
72
-      -[JT]) skip_next=yes;; \
73
-    esac; \
74
-    case $$flg in \
75
-      *$$target_option*) has_opt=yes; break;; \
76
-    esac; \
77
-  done; \
78
-  test $$has_opt = yes
79
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
80
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
81 36
 pkgdatadir = $(datadir)/@PACKAGE@
82 37
 pkgincludedir = $(includedir)/@PACKAGE@
83 38
 pkglibdir = $(libdir)/@PACKAGE@
... ...
@@ -98,7 +54,7 @@ build_triplet = @build@
98 98
 host_triplet = @host@
99 99
 target_triplet = @target@
100 100
 subdir = database
101
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
101
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
102 102
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
103 103
 am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
104 104
 	$(top_srcdir)/m4/argz.m4 \
... ...
@@ -122,6 +78,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
122 122
 	$(top_srcdir)/m4/reorganization/code_checks/coverage.m4 \
123 123
 	$(top_srcdir)/m4/reorganization/libs/xml.m4 \
124 124
 	$(top_srcdir)/m4/reorganization/libs/openssl.m4 \
125
+	$(top_srcdir)/m4/reorganization/libs/json.m4 \
125 126
 	$(top_srcdir)/m4/reorganization/libs/libz.m4 \
126 127
 	$(top_srcdir)/m4/reorganization/libs/bzip.m4 \
127 128
 	$(top_srcdir)/m4/reorganization/libs/unrar.m4 \
... ...
@@ -171,26 +128,14 @@ mkinstalldirs = $(install_sh) -d
171 171
 CONFIG_HEADER = $(top_builddir)/clamav-config.h
172 172
 CONFIG_CLEAN_FILES =
173 173
 CONFIG_CLEAN_VPATH_FILES =
174
-AM_V_P = $(am__v_P_@AM_V@)
175
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
176
-am__v_P_0 = false
177
-am__v_P_1 = :
178 174
 AM_V_GEN = $(am__v_GEN_@AM_V@)
179 175
 am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
180
-am__v_GEN_0 = @echo "  GEN     " $@;
181
-am__v_GEN_1 = 
176
+am__v_GEN_0 = @echo "  GEN   " $@;
182 177
 AM_V_at = $(am__v_at_@AM_V@)
183 178
 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
184 179
 am__v_at_0 = @
185
-am__v_at_1 = 
186 180
 SOURCES =
187 181
 DIST_SOURCES =
188
-am__can_run_installinfo = \
189
-  case $$AM_UPDATE_INFO_DIR in \
190
-    n|no|NO) false;; \
191
-    *) (install-info --version) >/dev/null 2>&1;; \
192
-  esac
193
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
194 182
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
195 183
 ACLOCAL = @ACLOCAL@
196 184
 AMTAR = @AMTAR@
... ...
@@ -258,6 +203,9 @@ INSTALL_DATA = @INSTALL_DATA@
258 258
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
259 259
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
260 260
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
261
+JSON_CPPFLAGS = @JSON_CPPFLAGS@
262
+JSON_LDFLAGS = @JSON_LDFLAGS@
263
+JSON_LIBS = @JSON_LIBS@
261 264
 LCOV = @LCOV@
262 265
 LD = @LD@
263 266
 LDFLAGS = @LDFLAGS@
... ...
@@ -422,11 +370,11 @@ mostlyclean-libtool:
422 422
 
423 423
 clean-libtool:
424 424
 	-rm -rf .libs _libs
425
-tags TAGS:
426
-
427
-ctags CTAGS:
425
+tags: TAGS
426
+TAGS:
428 427
 
429
-cscope cscopelist:
428
+ctags: CTAGS
429
+CTAGS:
430 430
 
431 431
 
432 432
 distdir: $(DISTFILES)
... ...
@@ -562,17 +510,16 @@ uninstall-am:
562 562
 .MAKE: install-am install-strip
563 563
 
564 564
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
565
-	cscopelist-am ctags-am distclean distclean-generic \
566
-	distclean-libtool distdir dvi dvi-am html html-am info info-am \
567
-	install install-am install-data install-data-am \
568
-	install-data-local install-dvi install-dvi-am install-exec \
569
-	install-exec-am install-html install-html-am install-info \
570
-	install-info-am install-man install-pdf install-pdf-am \
571
-	install-ps install-ps-am install-strip installcheck \
572
-	installcheck-am installdirs maintainer-clean \
573
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
574
-	mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \
575
-	uninstall-am
565
+	distclean distclean-generic distclean-libtool distdir dvi \
566
+	dvi-am html html-am info info-am install install-am \
567
+	install-data install-data-am install-data-local install-dvi \
568
+	install-dvi-am install-exec install-exec-am install-html \
569
+	install-html-am install-info install-info-am install-man \
570
+	install-pdf install-pdf-am install-ps install-ps-am \
571
+	install-strip installcheck installcheck-am installdirs \
572
+	maintainer-clean maintainer-clean-generic mostlyclean \
573
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
574
+	uninstall uninstall-am
576 575
 
577 576
 
578 577
 install-data-local:
... ...
@@ -1,8 +1,9 @@
1
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
1
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
2 2
 # @configure_input@
3 3
 
4
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
5
-
4
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
5
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
6
+# Foundation, Inc.
6 7
 # This Makefile.in is free software; the Free Software Foundation
7 8
 # gives unlimited permission to copy and/or distribute it,
8 9
 # with or without modifications, as long as this notice is preserved.
... ...
@@ -32,51 +33,6 @@
32 32
 #  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
33 33
 #  MA 02110-1301, USA.
34 34
 VPATH = @srcdir@
35
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
36
-am__make_running_with_option = \
37
-  case $${target_option-} in \
38
-      ?) ;; \
39
-      *) echo "am__make_running_with_option: internal error: invalid" \
40
-              "target option '$${target_option-}' specified" >&2; \
41
-         exit 1;; \
42
-  esac; \
43
-  has_opt=no; \
44
-  sane_makeflags=$$MAKEFLAGS; \
45
-  if $(am__is_gnu_make); then \
46
-    sane_makeflags=$$MFLAGS; \
47
-  else \
48
-    case $$MAKEFLAGS in \
49
-      *\\[\ \	]*) \
50
-        bs=\\; \
51
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
52
-          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
53
-    esac; \
54
-  fi; \
55
-  skip_next=no; \
56
-  strip_trailopt () \
57
-  { \
58
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
59
-  }; \
60
-  for flg in $$sane_makeflags; do \
61
-    test $$skip_next = yes && { skip_next=no; continue; }; \
62
-    case $$flg in \
63
-      *=*|--*) continue;; \
64
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
65
-      -*I?*) strip_trailopt 'I';; \
66
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
67
-      -*O?*) strip_trailopt 'O';; \
68
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
69
-      -*l?*) strip_trailopt 'l';; \
70
-      -[dEDm]) skip_next=yes;; \
71
-      -[JT]) skip_next=yes;; \
72
-    esac; \
73
-    case $$flg in \
74
-      *$$target_option*) has_opt=yes; break;; \
75
-    esac; \
76
-  done; \
77
-  test $$has_opt = yes
78
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
79
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
80 35
 pkgdatadir = $(datadir)/@PACKAGE@
81 36
 pkgincludedir = $(includedir)/@PACKAGE@
82 37
 pkglibdir = $(libdir)/@PACKAGE@
... ...
@@ -97,7 +53,7 @@ build_triplet = @build@
97 97
 host_triplet = @host@
98 98
 target_triplet = @target@
99 99
 subdir = docs
100
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
100
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
101 101
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
102 102
 am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
103 103
 	$(top_srcdir)/m4/argz.m4 \
... ...
@@ -121,6 +77,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
121 121
 	$(top_srcdir)/m4/reorganization/code_checks/coverage.m4 \
122 122
 	$(top_srcdir)/m4/reorganization/libs/xml.m4 \
123 123
 	$(top_srcdir)/m4/reorganization/libs/openssl.m4 \
124
+	$(top_srcdir)/m4/reorganization/libs/json.m4 \
124 125
 	$(top_srcdir)/m4/reorganization/libs/libz.m4 \
125 126
 	$(top_srcdir)/m4/reorganization/libs/bzip.m4 \
126 127
 	$(top_srcdir)/m4/reorganization/libs/unrar.m4 \
... ...
@@ -170,25 +127,14 @@ mkinstalldirs = $(install_sh) -d
170 170
 CONFIG_HEADER = $(top_builddir)/clamav-config.h
171 171
 CONFIG_CLEAN_FILES =
172 172
 CONFIG_CLEAN_VPATH_FILES =
173
-AM_V_P = $(am__v_P_@AM_V@)
174
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
175
-am__v_P_0 = false
176
-am__v_P_1 = :
177 173
 AM_V_GEN = $(am__v_GEN_@AM_V@)
178 174
 am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
179
-am__v_GEN_0 = @echo "  GEN     " $@;
180
-am__v_GEN_1 = 
175
+am__v_GEN_0 = @echo "  GEN   " $@;
181 176
 AM_V_at = $(am__v_at_@AM_V@)
182 177
 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
183 178
 am__v_at_0 = @
184
-am__v_at_1 = 
185 179
 SOURCES =
186 180
 DIST_SOURCES =
187
-am__can_run_installinfo = \
188
-  case $$AM_UPDATE_INFO_DIR in \
189
-    n|no|NO) false;; \
190
-    *) (install-info --version) >/dev/null 2>&1;; \
191
-  esac
192 181
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
193 182
 am__vpath_adj = case $$p in \
194 183
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
... ...
@@ -223,7 +169,6 @@ man5dir = $(mandir)/man5
223 223
 man8dir = $(mandir)/man8
224 224
 NROFF = nroff
225 225
 MANS = $(man_MANS)
226
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
227 226
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
228 227
 ACLOCAL = @ACLOCAL@
229 228
 AMTAR = @AMTAR@
... ...
@@ -291,6 +236,9 @@ INSTALL_DATA = @INSTALL_DATA@
291 291
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
292 292
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
293 293
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
294
+JSON_CPPFLAGS = @JSON_CPPFLAGS@
295
+JSON_LDFLAGS = @JSON_LDFLAGS@
296
+JSON_LIBS = @JSON_LIBS@
294 297
 LCOV = @LCOV@
295 298
 LD = @LD@
296 299
 LDFLAGS = @LDFLAGS@
... ...
@@ -457,18 +405,11 @@ clean-libtool:
457 457
 	-rm -rf .libs _libs
458 458
 install-man1: $(man_MANS)
459 459
 	@$(NORMAL_INSTALL)
460
-	@list1=''; \
461
-	list2='$(man_MANS)'; \
462
-	test -n "$(man1dir)" \
463
-	  && test -n "`echo $$list1$$list2`" \
464
-	  || exit 0; \
465
-	echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \
466
-	$(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \
467
-	{ for i in $$list1; do echo "$$i"; done;  \
468
-	if test -n "$$list2"; then \
469
-	  for i in $$list2; do echo "$$i"; done \
470
-	    | sed -n '/\.1[a-z]*$$/p'; \
471
-	fi; \
460
+	test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
461
+	@list=''; test -n "$(man1dir)" || exit 0; \
462
+	{ for i in $$list; do echo "$$i"; done; \
463
+	l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
464
+	  sed -n '/\.1[a-z]*$$/p'; \
472 465
 	} | while read p; do \
473 466
 	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
474 467
 	  echo "$$d$$p"; echo "$$p"; \
... ...
@@ -500,18 +441,11 @@ uninstall-man1:
500 500
 	dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
501 501
 install-man5: $(man_MANS)
502 502
 	@$(NORMAL_INSTALL)
503
-	@list1=''; \
504
-	list2='$(man_MANS)'; \
505
-	test -n "$(man5dir)" \
506
-	  && test -n "`echo $$list1$$list2`" \
507
-	  || exit 0; \
508
-	echo " $(MKDIR_P) '$(DESTDIR)$(man5dir)'"; \
509
-	$(MKDIR_P) "$(DESTDIR)$(man5dir)" || exit 1; \
510
-	{ for i in $$list1; do echo "$$i"; done;  \
511
-	if test -n "$$list2"; then \
512
-	  for i in $$list2; do echo "$$i"; done \
513
-	    | sed -n '/\.5[a-z]*$$/p'; \
514
-	fi; \
503
+	test -z "$(man5dir)" || $(MKDIR_P) "$(DESTDIR)$(man5dir)"
504
+	@list=''; test -n "$(man5dir)" || exit 0; \
505
+	{ for i in $$list; do echo "$$i"; done; \
506
+	l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
507
+	  sed -n '/\.5[a-z]*$$/p'; \
515 508
 	} | while read p; do \
516 509
 	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
517 510
 	  echo "$$d$$p"; echo "$$p"; \
... ...
@@ -543,18 +477,11 @@ uninstall-man5:
543 543
 	dir='$(DESTDIR)$(man5dir)'; $(am__uninstall_files_from_dir)
544 544
 install-man8: $(man_MANS)
545 545
 	@$(NORMAL_INSTALL)
546
-	@list1=''; \
547
-	list2='$(man_MANS)'; \
548
-	test -n "$(man8dir)" \
549
-	  && test -n "`echo $$list1$$list2`" \
550
-	  || exit 0; \
551
-	echo " $(MKDIR_P) '$(DESTDIR)$(man8dir)'"; \
552
-	$(MKDIR_P) "$(DESTDIR)$(man8dir)" || exit 1; \
553
-	{ for i in $$list1; do echo "$$i"; done;  \
554
-	if test -n "$$list2"; then \
555
-	  for i in $$list2; do echo "$$i"; done \
556
-	    | sed -n '/\.8[a-z]*$$/p'; \
557
-	fi; \
546
+	test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)"
547
+	@list=''; test -n "$(man8dir)" || exit 0; \
548
+	{ for i in $$list; do echo "$$i"; done; \
549
+	l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
550
+	  sed -n '/\.8[a-z]*$$/p'; \
558 551
 	} | while read p; do \
559 552
 	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
560 553
 	  echo "$$d$$p"; echo "$$p"; \
... ...
@@ -584,14 +511,27 @@ uninstall-man8:
584 584
 	} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \
585 585
 	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
586 586
 	dir='$(DESTDIR)$(man8dir)'; $(am__uninstall_files_from_dir)
587
-tags TAGS:
588
-
589
-ctags CTAGS:
587
+tags: TAGS
588
+TAGS:
590 589
 
591
-cscope cscopelist:
590
+ctags: CTAGS
591
+CTAGS:
592 592
 
593 593
 
594 594
 distdir: $(DISTFILES)
595
+	@list='$(MANS)'; if test -n "$$list"; then \
596
+	  list=`for p in $$list; do \
597
+	    if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
598
+	    if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \
599
+	  if test -n "$$list" && \
600
+	    grep 'ab help2man is required to generate this page' $$list >/dev/null; then \
601
+	    echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \
602
+	    grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/         /' >&2; \
603
+	    echo "       to fix them, install help2man, remove and regenerate the man pages;" >&2; \
604
+	    echo "       typically \`make maintainer-clean' will remove them" >&2; \
605
+	    exit 1; \
606
+	  else :; fi; \
607
+	else :; fi
595 608
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
596 609
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
597 610
 	list='$(DISTFILES)'; \
... ...
@@ -729,18 +669,17 @@ uninstall-man: uninstall-man1 uninstall-man5 uninstall-man8
729 729
 .MAKE: install-am install-strip
730 730
 
731 731
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
732
-	cscopelist-am ctags-am distclean distclean-generic \
733
-	distclean-libtool distdir dvi dvi-am html html-am info info-am \
734
-	install install-am install-data install-data-am install-dvi \
735
-	install-dvi-am install-exec install-exec-am install-html \
736
-	install-html-am install-info install-info-am install-man \
737
-	install-man1 install-man5 install-man8 install-pdf \
738
-	install-pdf-am install-ps install-ps-am install-strip \
739
-	installcheck installcheck-am installdirs maintainer-clean \
732
+	distclean distclean-generic distclean-libtool distdir dvi \
733
+	dvi-am html html-am info info-am install install-am \
734
+	install-data install-data-am install-dvi install-dvi-am \
735
+	install-exec install-exec-am install-html install-html-am \
736
+	install-info install-info-am install-man install-man1 \
737
+	install-man5 install-man8 install-pdf install-pdf-am \
738
+	install-ps install-ps-am install-strip installcheck \
739
+	installcheck-am installdirs maintainer-clean \
740 740
 	maintainer-clean-generic mostlyclean mostlyclean-generic \
741
-	mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \
742
-	uninstall-am uninstall-man uninstall-man1 uninstall-man5 \
743
-	uninstall-man8
741
+	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
742
+	uninstall-man uninstall-man1 uninstall-man5 uninstall-man8
744 743
 
745 744
 
746 745
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
... ...
@@ -1,8 +1,9 @@
1
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
1
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
2 2
 # @configure_input@
3 3
 
4
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
5
-
4
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
5
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
6
+# Foundation, Inc.
6 7
 # This Makefile.in is free software; the Free Software Foundation
7 8
 # gives unlimited permission to copy and/or distribute it,
8 9
 # with or without modifications, as long as this notice is preserved.
... ...
@@ -33,51 +34,6 @@
33 33
 #  MA 02110-1301, USA.
34 34
 
35 35
 VPATH = @srcdir@
36
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
37
-am__make_running_with_option = \
38
-  case $${target_option-} in \
39
-      ?) ;; \
40
-      *) echo "am__make_running_with_option: internal error: invalid" \
41
-              "target option '$${target_option-}' specified" >&2; \
42
-         exit 1;; \
43
-  esac; \
44
-  has_opt=no; \
45
-  sane_makeflags=$$MAKEFLAGS; \
46
-  if $(am__is_gnu_make); then \
47
-    sane_makeflags=$$MFLAGS; \
48
-  else \
49
-    case $$MAKEFLAGS in \
50
-      *\\[\ \	]*) \
51
-        bs=\\; \
52
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
53
-          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
54
-    esac; \
55
-  fi; \
56
-  skip_next=no; \
57
-  strip_trailopt () \
58
-  { \
59
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
60
-  }; \
61
-  for flg in $$sane_makeflags; do \
62
-    test $$skip_next = yes && { skip_next=no; continue; }; \
63
-    case $$flg in \
64
-      *=*|--*) continue;; \
65
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
66
-      -*I?*) strip_trailopt 'I';; \
67
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
68
-      -*O?*) strip_trailopt 'O';; \
69
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
70
-      -*l?*) strip_trailopt 'l';; \
71
-      -[dEDm]) skip_next=yes;; \
72
-      -[JT]) skip_next=yes;; \
73
-    esac; \
74
-    case $$flg in \
75
-      *$$target_option*) has_opt=yes; break;; \
76
-    esac; \
77
-  done; \
78
-  test $$has_opt = yes
79
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
80
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
81 36
 pkgdatadir = $(datadir)/@PACKAGE@
82 37
 pkgincludedir = $(includedir)/@PACKAGE@
83 38
 pkglibdir = $(libdir)/@PACKAGE@
... ...
@@ -99,7 +55,7 @@ host_triplet = @host@
99 99
 target_triplet = @target@
100 100
 @BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@am__append_1 = clamav-milter.conf.sample
101 101
 subdir = etc
102
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
102
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
103 103
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
104 104
 am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
105 105
 	$(top_srcdir)/m4/argz.m4 \
... ...
@@ -123,6 +79,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
123 123
 	$(top_srcdir)/m4/reorganization/code_checks/coverage.m4 \
124 124
 	$(top_srcdir)/m4/reorganization/libs/xml.m4 \
125 125
 	$(top_srcdir)/m4/reorganization/libs/openssl.m4 \
126
+	$(top_srcdir)/m4/reorganization/libs/json.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 \
... ...
@@ -172,25 +129,14 @@ mkinstalldirs = $(install_sh) -d
172 172
 CONFIG_HEADER = $(top_builddir)/clamav-config.h
173 173
 CONFIG_CLEAN_FILES =
174 174
 CONFIG_CLEAN_VPATH_FILES =
175
-AM_V_P = $(am__v_P_@AM_V@)
176
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
177
-am__v_P_0 = false
178
-am__v_P_1 = :
179 175
 AM_V_GEN = $(am__v_GEN_@AM_V@)
180 176
 am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
181
-am__v_GEN_0 = @echo "  GEN     " $@;
182
-am__v_GEN_1 = 
177
+am__v_GEN_0 = @echo "  GEN   " $@;
183 178
 AM_V_at = $(am__v_at_@AM_V@)
184 179
 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
185 180
 am__v_at_0 = @
186
-am__v_at_1 = 
187 181
 SOURCES =
188 182
 DIST_SOURCES =
189
-am__can_run_installinfo = \
190
-  case $$AM_UPDATE_INFO_DIR in \
191
-    n|no|NO) false;; \
192
-    *) (install-info --version) >/dev/null 2>&1;; \
193
-  esac
194 183
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
195 184
 am__vpath_adj = case $$p in \
196 185
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
... ...
@@ -220,7 +166,6 @@ am__uninstall_files_from_dir = { \
220 220
   }
221 221
 am__installdirs = "$(DESTDIR)$(sysconfdir)"
222 222
 DATA = $(sysconf_DATA)
223
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
224 223
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
225 224
 ACLOCAL = @ACLOCAL@
226 225
 AMTAR = @AMTAR@
... ...
@@ -288,6 +233,9 @@ INSTALL_DATA = @INSTALL_DATA@
288 288
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
289 289
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
290 290
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
291
+JSON_CPPFLAGS = @JSON_CPPFLAGS@
292
+JSON_LDFLAGS = @JSON_LDFLAGS@
293
+JSON_LIBS = @JSON_LIBS@
291 294
 LCOV = @LCOV@
292 295
 LD = @LD@
293 296
 LDFLAGS = @LDFLAGS@
... ...
@@ -455,11 +403,8 @@ clean-libtool:
455 455
 	-rm -rf .libs _libs
456 456
 install-sysconfDATA: $(sysconf_DATA)
457 457
 	@$(NORMAL_INSTALL)
458
+	test -z "$(sysconfdir)" || $(MKDIR_P) "$(DESTDIR)$(sysconfdir)"
458 459
 	@list='$(sysconf_DATA)'; test -n "$(sysconfdir)" || list=; \
459
-	if test -n "$$list"; then \
460
-	  echo " $(MKDIR_P) '$(DESTDIR)$(sysconfdir)'"; \
461
-	  $(MKDIR_P) "$(DESTDIR)$(sysconfdir)" || exit 1; \
462
-	fi; \
463 460
 	for p in $$list; do \
464 461
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
465 462
 	  echo "$$d$$p"; \
... ...
@@ -474,11 +419,11 @@ uninstall-sysconfDATA:
474 474
 	@list='$(sysconf_DATA)'; test -n "$(sysconfdir)" || list=; \
475 475
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
476 476
 	dir='$(DESTDIR)$(sysconfdir)'; $(am__uninstall_files_from_dir)
477
-tags TAGS:
478
-
479
-ctags CTAGS:
477
+tags: TAGS
478
+TAGS:
480 479
 
481
-cscope cscopelist:
480
+ctags: CTAGS
481
+CTAGS:
482 482
 
483 483
 
484 484
 distdir: $(DISTFILES)
... ...
@@ -617,16 +562,16 @@ uninstall-am: uninstall-sysconfDATA
617 617
 .MAKE: install-am install-strip
618 618
 
619 619
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
620
-	cscopelist-am ctags-am distclean distclean-generic \
621
-	distclean-libtool distdir dvi dvi-am html html-am info info-am \
622
-	install install-am install-data install-data-am install-dvi \
623
-	install-dvi-am install-exec install-exec-am install-html \
624
-	install-html-am install-info install-info-am install-man \
625
-	install-pdf install-pdf-am install-ps install-ps-am \
626
-	install-strip install-sysconfDATA installcheck installcheck-am \
627
-	installdirs maintainer-clean maintainer-clean-generic \
628
-	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
629
-	ps ps-am tags-am uninstall uninstall-am uninstall-sysconfDATA
620
+	distclean distclean-generic distclean-libtool distdir dvi \
621
+	dvi-am html html-am info info-am install install-am \
622
+	install-data install-data-am install-dvi install-dvi-am \
623
+	install-exec install-exec-am install-html install-html-am \
624
+	install-info install-info-am install-man install-pdf \
625
+	install-pdf-am install-ps install-ps-am install-strip \
626
+	install-sysconfDATA installcheck installcheck-am installdirs \
627
+	maintainer-clean maintainer-clean-generic mostlyclean \
628
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
629
+	uninstall uninstall-am uninstall-sysconfDATA
630 630
 
631 631
 
632 632
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
... ...
@@ -1,8 +1,9 @@
1
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
1
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
2 2
 # @configure_input@
3 3
 
4
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
5
-
4
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
5
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
6
+# Foundation, Inc.
6 7
 # This Makefile.in is free software; the Free Software Foundation
7 8
 # gives unlimited permission to copy and/or distribute it,
8 9
 # with or without modifications, as long as this notice is preserved.
... ...
@@ -34,51 +35,6 @@
34 34
 #  MA 02110-1301, USA.
35 35
 
36 36
 VPATH = @srcdir@
37
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
38
-am__make_running_with_option = \
39
-  case $${target_option-} in \
40
-      ?) ;; \
41
-      *) echo "am__make_running_with_option: internal error: invalid" \
42
-              "target option '$${target_option-}' specified" >&2; \
43
-         exit 1;; \
44
-  esac; \
45
-  has_opt=no; \
46
-  sane_makeflags=$$MAKEFLAGS; \
47
-  if $(am__is_gnu_make); then \
48
-    sane_makeflags=$$MFLAGS; \
49
-  else \
50
-    case $$MAKEFLAGS in \
51
-      *\\[\ \	]*) \
52
-        bs=\\; \
53
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
54
-          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
55
-    esac; \
56
-  fi; \
57
-  skip_next=no; \
58
-  strip_trailopt () \
59
-  { \
60
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
61
-  }; \
62
-  for flg in $$sane_makeflags; do \
63
-    test $$skip_next = yes && { skip_next=no; continue; }; \
64
-    case $$flg in \
65
-      *=*|--*) continue;; \
66
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
67
-      -*I?*) strip_trailopt 'I';; \
68
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
69
-      -*O?*) strip_trailopt 'O';; \
70
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
71
-      -*l?*) strip_trailopt 'l';; \
72
-      -[dEDm]) skip_next=yes;; \
73
-      -[JT]) skip_next=yes;; \
74
-    esac; \
75
-    case $$flg in \
76
-      *$$target_option*) has_opt=yes; break;; \
77
-    esac; \
78
-  done; \
79
-  test $$has_opt = yes
80
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
81
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
82 37
 pkgdatadir = $(datadir)/@PACKAGE@
83 38
 pkgincludedir = $(includedir)/@PACKAGE@
84 39
 pkglibdir = $(libdir)/@PACKAGE@
... ...
@@ -100,8 +56,7 @@ host_triplet = @host@
100 100
 target_triplet = @target@
101 101
 bin_PROGRAMS = freshclam$(EXEEXT)
102 102
 subdir = freshclam
103
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
104
-	$(top_srcdir)/config/depcomp
103
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
105 104
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
106 105
 am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
107 106
 	$(top_srcdir)/m4/argz.m4 \
... ...
@@ -125,6 +80,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
125 125
 	$(top_srcdir)/m4/reorganization/code_checks/coverage.m4 \
126 126
 	$(top_srcdir)/m4/reorganization/libs/xml.m4 \
127 127
 	$(top_srcdir)/m4/reorganization/libs/openssl.m4 \
128
+	$(top_srcdir)/m4/reorganization/libs/json.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 \
... ...
@@ -186,19 +142,6 @@ freshclam_LDADD = $(LDADD)
186 186
 AM_V_lt = $(am__v_lt_@AM_V@)
187 187
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
188 188
 am__v_lt_0 = --silent
189
-am__v_lt_1 = 
190
-AM_V_P = $(am__v_P_@AM_V@)
191
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
192
-am__v_P_0 = false
193
-am__v_P_1 = :
194
-AM_V_GEN = $(am__v_GEN_@AM_V@)
195
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
196
-am__v_GEN_0 = @echo "  GEN     " $@;
197
-am__v_GEN_1 = 
198
-AM_V_at = $(am__v_at_@AM_V@)
199
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
200
-am__v_at_0 = @
201
-am__v_at_1 = 
202 189
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
203 190
 depcomp = $(SHELL) $(top_srcdir)/config/depcomp
204 191
 am__depfiles_maybe = depfiles
... ...
@@ -211,40 +154,22 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
211 211
 	$(AM_CFLAGS) $(CFLAGS)
212 212
 AM_V_CC = $(am__v_CC_@AM_V@)
213 213
 am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
214
-am__v_CC_0 = @echo "  CC      " $@;
215
-am__v_CC_1 = 
214
+am__v_CC_0 = @echo "  CC    " $@;
215
+AM_V_at = $(am__v_at_@AM_V@)
216
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
217
+am__v_at_0 = @
216 218
 CCLD = $(CC)
217 219
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
218 220
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
219 221
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
220 222
 AM_V_CCLD = $(am__v_CCLD_@AM_V@)
221 223
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
222
-am__v_CCLD_0 = @echo "  CCLD    " $@;
223
-am__v_CCLD_1 = 
224
+am__v_CCLD_0 = @echo "  CCLD  " $@;
225
+AM_V_GEN = $(am__v_GEN_@AM_V@)
226
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
227
+am__v_GEN_0 = @echo "  GEN   " $@;
224 228
 SOURCES = $(freshclam_SOURCES)
225 229
 DIST_SOURCES = $(freshclam_SOURCES)
226
-am__can_run_installinfo = \
227
-  case $$AM_UPDATE_INFO_DIR in \
228
-    n|no|NO) false;; \
229
-    *) (install-info --version) >/dev/null 2>&1;; \
230
-  esac
231
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
232
-# Read a list of newline-separated strings from the standard input,
233
-# and print each of them once, without duplicates.  Input order is
234
-# *not* preserved.
235
-am__uniquify_input = $(AWK) '\
236
-  BEGIN { nonempty = 0; } \
237
-  { items[$$0] = 1; nonempty = 1; } \
238
-  END { if (nonempty) { for (i in items) print i; }; } \
239
-'
240
-# Make sure the list of sources is unique.  This is necessary because,
241
-# e.g., the same source file might be shared among _SOURCES variables
242
-# for different programs/libraries.
243
-am__define_uniq_tagged_files = \
244
-  list='$(am__tagged_files)'; \
245
-  unique=`for i in $$list; do \
246
-    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
247
-  done | $(am__uniquify_input)`
248 230
 ETAGS = etags
249 231
 CTAGS = ctags
250 232
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
... ...
@@ -314,6 +239,9 @@ INSTALL_DATA = @INSTALL_DATA@
314 314
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
315 315
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
316 316
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
317
+JSON_CPPFLAGS = @JSON_CPPFLAGS@
318
+JSON_LDFLAGS = @JSON_LDFLAGS@
319
+JSON_LIBS = @JSON_LIBS@
317 320
 LCOV = @LCOV@
318 321
 LD = @LD@
319 322
 LDFLAGS = @LDFLAGS@
... ...
@@ -507,19 +435,14 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
507 507
 $(am__aclocal_m4_deps):
508 508
 install-binPROGRAMS: $(bin_PROGRAMS)
509 509
 	@$(NORMAL_INSTALL)
510
+	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
510 511
 	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
511
-	if test -n "$$list"; then \
512
-	  echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
513
-	  $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
514
-	fi; \
515 512
 	for p in $$list; do echo "$$p $$p"; done | \
516 513
 	sed 's/$(EXEEXT)$$//' | \
517
-	while read p p1; do if test -f $$p \
518
-	 || test -f $$p1 \
519
-	  ; then echo "$$p"; echo "$$p"; else :; fi; \
514
+	while read p p1; do if test -f $$p || test -f $$p1; \
515
+	  then echo "$$p"; echo "$$p"; else :; fi; \
520 516
 	done | \
521
-	sed -e 'p;s,.*/,,;n;h' \
522
-	    -e 's|.*|.|' \
517
+	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
523 518
 	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
524 519
 	sed 'N;N;N;s,\n, ,g' | \
525 520
 	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
... ...
@@ -540,8 +463,7 @@ uninstall-binPROGRAMS:
540 540
 	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
541 541
 	files=`for p in $$list; do echo "$$p"; done | \
542 542
 	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
543
-	      -e 's/$$/$(EXEEXT)/' \
544
-	`; \
543
+	      -e 's/$$/$(EXEEXT)/' `; \
545 544
 	test -n "$$list" || exit 0; \
546 545
 	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
547 546
 	cd "$(DESTDIR)$(bindir)" && rm -f $$files
... ...
@@ -570,7 +492,6 @@ installcheck-binPROGRAMS: $(bin_PROGRAMS)
570 570
 	    else echo "$$f does not support $$opt" 1>&2; bad=1; fi; \
571 571
 	  done; \
572 572
 	done; rm -f c$${pid}_.???; exit $$bad
573
-
574 573
 freshclam$(EXEEXT): $(freshclam_OBJECTS) $(freshclam_DEPENDENCIES) $(EXTRA_freshclam_DEPENDENCIES) 
575 574
 	@rm -f freshclam$(EXEEXT)
576 575
 	$(AM_V_CCLD)$(LINK) $(freshclam_OBJECTS) $(freshclam_LDADD) $(LIBS)
... ...
@@ -601,14 +522,14 @@ distclean-compile:
601 601
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
602 602
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
603 603
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
604
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
604
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
605 605
 
606 606
 .c.obj:
607 607
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
608 608
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
609 609
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
610 610
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
611
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
611
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
612 612
 
613 613
 .c.lo:
614 614
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
... ...
@@ -721,15 +642,26 @@ mostlyclean-libtool:
721 721
 clean-libtool:
722 722
 	-rm -rf .libs _libs
723 723
 
724
-ID: $(am__tagged_files)
725
-	$(am__define_uniq_tagged_files); mkid -fID $$unique
726
-tags: tags-am
727
-TAGS: tags
728
-
729
-tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
724
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
725
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
726
+	unique=`for i in $$list; do \
727
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
728
+	  done | \
729
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
730
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
731
+	mkid -fID $$unique
732
+tags: TAGS
733
+
734
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
735
+		$(TAGS_FILES) $(LISP)
730 736
 	set x; \
731 737
 	here=`pwd`; \
732
-	$(am__define_uniq_tagged_files); \
738
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
739
+	unique=`for i in $$list; do \
740
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
741
+	  done | \
742
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
743
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
733 744
 	shift; \
734 745
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
735 746
 	  test -n "$$unique" || unique=$$empty_fix; \
... ...
@@ -741,11 +673,15 @@ tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
741 741
 	      $$unique; \
742 742
 	  fi; \
743 743
 	fi
744
-ctags: ctags-am
745
-
746
-CTAGS: ctags
747
-ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
748
-	$(am__define_uniq_tagged_files); \
744
+ctags: CTAGS
745
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
746
+		$(TAGS_FILES) $(LISP)
747
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
748
+	unique=`for i in $$list; do \
749
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
750
+	  done | \
751
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
752
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
749 753
 	test -z "$(CTAGS_ARGS)$$unique" \
750 754
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
751 755
 	     $$unique
... ...
@@ -754,21 +690,6 @@ GTAGS:
754 754
 	here=`$(am__cd) $(top_builddir) && pwd` \
755 755
 	  && $(am__cd) $(top_srcdir) \
756 756
 	  && gtags -i $(GTAGS_ARGS) "$$here"
757
-cscopelist: cscopelist-am
758
-
759
-cscopelist-am: $(am__tagged_files)
760
-	list='$(am__tagged_files)'; \
761
-	case "$(srcdir)" in \
762
-	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
763
-	  *) sdir=$(subdir)/$(srcdir) ;; \
764
-	esac; \
765
-	for i in $$list; do \
766
-	  if test -f "$$i"; then \
767
-	    echo "$(subdir)/$$i"; \
768
-	  else \
769
-	    echo "$$sdir/$$i"; \
770
-	  fi; \
771
-	done >> $(top_builddir)/cscope.files
772 757
 
773 758
 distclean-tags:
774 759
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
... ...
@@ -913,20 +834,19 @@ uninstall-am: uninstall-binPROGRAMS
913 913
 
914 914
 .MAKE: install-am install-strip
915 915
 
916
-.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \
917
-	clean-binPROGRAMS clean-generic clean-libtool cscopelist-am \
918
-	ctags ctags-am distclean distclean-compile distclean-generic \
919
-	distclean-libtool distclean-tags distdir dvi dvi-am html \
920
-	html-am info info-am install install-am install-binPROGRAMS \
921
-	install-data install-data-am install-dvi install-dvi-am \
922
-	install-exec install-exec-am install-html install-html-am \
923
-	install-info install-info-am install-man install-pdf \
924
-	install-pdf-am install-ps install-ps-am install-strip \
925
-	installcheck installcheck-am installcheck-binPROGRAMS \
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-binPROGRAMS
916
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
917
+	clean-generic clean-libtool ctags distclean distclean-compile \
918
+	distclean-generic distclean-libtool distclean-tags distdir dvi \
919
+	dvi-am html html-am info info-am install install-am \
920
+	install-binPROGRAMS install-data install-data-am install-dvi \
921
+	install-dvi-am install-exec install-exec-am install-html \
922
+	install-html-am install-info install-info-am install-man \
923
+	install-pdf install-pdf-am install-ps install-ps-am \
924
+	install-strip installcheck installcheck-am \
925
+	installcheck-binPROGRAMS installdirs maintainer-clean \
926
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
927
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
928
+	tags uninstall uninstall-am uninstall-binPROGRAMS
930 929
 
931 930
 
932 931
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
... ...
@@ -138,12 +138,12 @@ distclean-recursive distdir maintainer-clean-recursive: c++/Makefile
138 138
 endif
139 139
 
140 140
 libclamav_nocxx_la_SOURCES = bytecode_nojit.c
141
-libclamav_nocxx_la_CFLAGS=$(AM_CFLAGS) @SSL_CPPFLAGS@
141
+libclamav_nocxx_la_CFLAGS=$(AM_CFLAGS) @SSL_CPPFLAGS@ @JSON_CPPFLAGS@
142 142
 
143
-libclamav_la_LIBADD = @SSL_LIBS@ @LIBCLAMAV_LIBS@ @LIBLTDL@ $(IFACELIBADD) $(LLVMLIBADD) libclamav_internal_utils.la @THREAD_LIBS@ @LIBM@
143
+libclamav_la_LIBADD = @SSL_LIBS@ @JSON_LIBS@ @LIBCLAMAV_LIBS@ @LIBLTDL@ $(IFACELIBADD) $(LLVMLIBADD) libclamav_internal_utils.la @THREAD_LIBS@ @LIBM@
144 144
 libclamav_la_DEPENDENCIES =  @LTDLDEPS@ $(IFACEDEP) $(LLVMDEP) libclamav_internal_utils.la
145 145
 libclamav_la_CFLAGS =$(AM_CFLAGS) $(XML_CPPFLAGS) -DSEARCH_LIBDIR=\"$(libdir)\" @LIBCLAMAV_CPPFLAGS@
146
-libclamav_la_LDFLAGS = @SSL_LDFLAGS@ @TH_SAFE@ $(XML_LIBS) -version-info @LIBCLAMAV_VERSION@ -no-undefined
146
+libclamav_la_LDFLAGS = @SSL_LDFLAGS@ @TH_SAFE@ @JSON_LDFLAGS@ $(XML_LIBS) -version-info @LIBCLAMAV_VERSION@ -no-undefined
147 147
 
148 148
 if VERSIONSCRIPT
149 149
 libclamav_la_LDFLAGS += -Wl,@VERSIONSCRIPTFLAG@,@top_srcdir@/libclamav/libclamav.map
... ...
@@ -1,8 +1,9 @@
1
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
1
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
2 2
 # @configure_input@
3 3
 
4
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
5
-
4
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
5
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
6
+# Foundation, Inc.
6 7
 # This Makefile.in is free software; the Free Software Foundation
7 8
 # gives unlimited permission to copy and/or distribute it,
8 9
 # with or without modifications, as long as this notice is preserved.
... ...
@@ -35,51 +36,6 @@
35 35
 
36 36
 
37 37
 VPATH = @srcdir@
38
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
39
-am__make_running_with_option = \
40
-  case $${target_option-} in \
41
-      ?) ;; \
42
-      *) echo "am__make_running_with_option: internal error: invalid" \
43
-              "target option '$${target_option-}' specified" >&2; \
44
-         exit 1;; \
45
-  esac; \
46
-  has_opt=no; \
47
-  sane_makeflags=$$MAKEFLAGS; \
48
-  if $(am__is_gnu_make); then \
49
-    sane_makeflags=$$MFLAGS; \
50
-  else \
51
-    case $$MAKEFLAGS in \
52
-      *\\[\ \	]*) \
53
-        bs=\\; \
54
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
55
-          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
56
-    esac; \
57
-  fi; \
58
-  skip_next=no; \
59
-  strip_trailopt () \
60
-  { \
61
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
62
-  }; \
63
-  for flg in $$sane_makeflags; do \
64
-    test $$skip_next = yes && { skip_next=no; continue; }; \
65
-    case $$flg in \
66
-      *=*|--*) continue;; \
67
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
68
-      -*I?*) strip_trailopt 'I';; \
69
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
70
-      -*O?*) strip_trailopt 'O';; \
71
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
72
-      -*l?*) strip_trailopt 'l';; \
73
-      -[dEDm]) skip_next=yes;; \
74
-      -[JT]) skip_next=yes;; \
75
-    esac; \
76
-    case $$flg in \
77
-      *$$target_option*) has_opt=yes; break;; \
78
-    esac; \
79
-  done; \
80
-  test $$has_opt = yes
81
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
82
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
83 38
 pkgdatadir = $(datadir)/@PACKAGE@
84 39
 pkgincludedir = $(includedir)/@PACKAGE@
85 40
 pkglibdir = $(libdir)/@PACKAGE@
... ...
@@ -109,8 +65,8 @@ target_triplet = @target@
109 109
 @ENABLE_UNRAR_TRUE@@VERSIONSCRIPT_TRUE@am__append_5 = -Wl,@VERSIONSCRIPTFLAG@,@top_srcdir@/libclamunrar_iface/libclamunrar_iface.map
110 110
 @VERSIONSCRIPT_TRUE@am__append_6 = -Wl,@VERSIONSCRIPTFLAG@,@top_srcdir@/libclamav/libclamav.map
111 111
 subdir = libclamav
112
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
113
-	$(top_srcdir)/config/depcomp $(include_HEADERS)
112
+DIST_COMMON = $(include_HEADERS) $(srcdir)/Makefile.am \
113
+	$(srcdir)/Makefile.in
114 114
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
115 115
 am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
116 116
 	$(top_srcdir)/m4/argz.m4 \
... ...
@@ -134,6 +90,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
134 134
 	$(top_srcdir)/m4/reorganization/code_checks/coverage.m4 \
135 135
 	$(top_srcdir)/m4/reorganization/libs/xml.m4 \
136 136
 	$(top_srcdir)/m4/reorganization/libs/openssl.m4 \
137
+	$(top_srcdir)/m4/reorganization/libs/json.m4 \
137 138
 	$(top_srcdir)/m4/reorganization/libs/libz.m4 \
138 139
 	$(top_srcdir)/m4/reorganization/libs/bzip.m4 \
139 140
 	$(top_srcdir)/m4/reorganization/libs/unrar.m4 \
... ...
@@ -334,7 +291,6 @@ libclamav_la_OBJECTS = $(am_libclamav_la_OBJECTS)
334 334
 AM_V_lt = $(am__v_lt_@AM_V@)
335 335
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
336 336
 am__v_lt_0 = --silent
337
-am__v_lt_1 = 
338 337
 libclamav_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
339 338
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(libclamav_la_CFLAGS) \
340 339
 	$(CFLAGS) $(libclamav_la_LDFLAGS) $(LDFLAGS) -o $@
... ...
@@ -415,18 +371,6 @@ libclamunrar_iface_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
415 415
 	$(AM_CFLAGS) $(CFLAGS) $(libclamunrar_iface_la_LDFLAGS) \
416 416
 	$(LDFLAGS) -o $@
417 417
 @ENABLE_UNRAR_TRUE@am_libclamunrar_iface_la_rpath = -rpath $(libdir)
418
-AM_V_P = $(am__v_P_@AM_V@)
419
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
420
-am__v_P_0 = false
421
-am__v_P_1 = :
422
-AM_V_GEN = $(am__v_GEN_@AM_V@)
423
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
424
-am__v_GEN_0 = @echo "  GEN     " $@;
425
-am__v_GEN_1 = 
426
-AM_V_at = $(am__v_at_@AM_V@)
427
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
428
-am__v_at_0 = @
429
-am__v_at_1 = 
430 418
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
431 419
 depcomp = $(SHELL) $(top_srcdir)/config/depcomp
432 420
 am__depfiles_maybe = depfiles
... ...
@@ -439,16 +383,20 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
439 439
 	$(AM_CFLAGS) $(CFLAGS)
440 440
 AM_V_CC = $(am__v_CC_@AM_V@)
441 441
 am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
442
-am__v_CC_0 = @echo "  CC      " $@;
443
-am__v_CC_1 = 
442
+am__v_CC_0 = @echo "  CC    " $@;
443
+AM_V_at = $(am__v_at_@AM_V@)
444
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
445
+am__v_at_0 = @
444 446
 CCLD = $(CC)
445 447
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
446 448
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
447 449
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
448 450
 AM_V_CCLD = $(am__v_CCLD_@AM_V@)
449 451
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
450
-am__v_CCLD_0 = @echo "  CCLD    " $@;
451
-am__v_CCLD_1 = 
452
+am__v_CCLD_0 = @echo "  CCLD  " $@;
453
+AM_V_GEN = $(am__v_GEN_@AM_V@)
454
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
455
+am__v_GEN_0 = @echo "  GEN   " $@;
452 456
 SOURCES = $(libclamav_la_SOURCES) \
453 457
 	$(libclamav_internal_utils_la_SOURCES) \
454 458
 	$(libclamav_internal_utils_nothreads_la_SOURCES) \
... ...
@@ -460,45 +408,19 @@ DIST_SOURCES = $(libclamav_la_SOURCES) \
460 460
 	$(libclamav_nocxx_la_SOURCES) \
461 461
 	$(am__libclamunrar_la_SOURCES_DIST) \
462 462
 	$(am__libclamunrar_iface_la_SOURCES_DIST)
463
-RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
464
-	ctags-recursive dvi-recursive html-recursive info-recursive \
465
-	install-data-recursive install-dvi-recursive \
466
-	install-exec-recursive install-html-recursive \
467
-	install-info-recursive install-pdf-recursive \
468
-	install-ps-recursive install-recursive installcheck-recursive \
469
-	installdirs-recursive pdf-recursive ps-recursive \
470
-	tags-recursive uninstall-recursive
471
-am__can_run_installinfo = \
472
-  case $$AM_UPDATE_INFO_DIR in \
473
-    n|no|NO) false;; \
474
-    *) (install-info --version) >/dev/null 2>&1;; \
475
-  esac
463
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
464
+	html-recursive info-recursive install-data-recursive \
465
+	install-dvi-recursive install-exec-recursive \
466
+	install-html-recursive install-info-recursive \
467
+	install-pdf-recursive install-ps-recursive install-recursive \
468
+	installcheck-recursive installdirs-recursive pdf-recursive \
469
+	ps-recursive uninstall-recursive
476 470
 HEADERS = $(include_HEADERS)
477 471
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
478 472
   distclean-recursive maintainer-clean-recursive
479
-am__recursive_targets = \
480
-  $(RECURSIVE_TARGETS) \
481
-  $(RECURSIVE_CLEAN_TARGETS) \
482
-  $(am__extra_recursive_targets)
483
-AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
473
+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
474
+	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
484 475
 	distdir
485
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
486
-# Read a list of newline-separated strings from the standard input,
487
-# and print each of them once, without duplicates.  Input order is
488
-# *not* preserved.
489
-am__uniquify_input = $(AWK) '\
490
-  BEGIN { nonempty = 0; } \
491
-  { items[$$0] = 1; nonempty = 1; } \
492
-  END { if (nonempty) { for (i in items) print i; }; } \
493
-'
494
-# Make sure the list of sources is unique.  This is necessary because,
495
-# e.g., the same source file might be shared among _SOURCES variables
496
-# for different programs/libraries.
497
-am__define_uniq_tagged_files = \
498
-  list='$(am__tagged_files)'; \
499
-  unique=`for i in $$list; do \
500
-    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
501
-  done | $(am__uniquify_input)`
502 476
 ETAGS = etags
503 477
 CTAGS = ctags
504 478
 DIST_SUBDIRS = c++
... ...
@@ -594,6 +516,9 @@ INSTALL_DATA = @INSTALL_DATA@
594 594
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
595 595
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
596 596
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
597
+JSON_CPPFLAGS = @JSON_CPPFLAGS@
598
+JSON_LDFLAGS = @JSON_LDFLAGS@
599
+JSON_LIBS = @JSON_LIBS@
597 600
 LCOV = @LCOV@
598 601
 LD = @LD@
599 602
 LDFLAGS = @LDFLAGS@
... ...
@@ -817,12 +742,12 @@ libclamav_internal_utils_nothreads_la_LIBADD = @SSL_LIBS@
817 817
 @ENABLE_LLVM_TRUE@LLVMDEP = c++/libclamavcxx.la
818 818
 @ENABLE_LLVM_TRUE@SUBDIRS = c++
819 819
 libclamav_nocxx_la_SOURCES = bytecode_nojit.c
820
-libclamav_nocxx_la_CFLAGS = $(AM_CFLAGS) @SSL_CPPFLAGS@
821
-libclamav_la_LIBADD = @SSL_LIBS@ @LIBCLAMAV_LIBS@ @LIBLTDL@ $(IFACELIBADD) $(LLVMLIBADD) libclamav_internal_utils.la @THREAD_LIBS@ @LIBM@
820
+libclamav_nocxx_la_CFLAGS = $(AM_CFLAGS) @SSL_CPPFLAGS@ @JSON_CPPFLAGS@
821
+libclamav_la_LIBADD = @SSL_LIBS@ @JSON_LIBS@ @LIBCLAMAV_LIBS@ @LIBLTDL@ $(IFACELIBADD) $(LLVMLIBADD) libclamav_internal_utils.la @THREAD_LIBS@ @LIBM@
822 822
 libclamav_la_DEPENDENCIES = @LTDLDEPS@ $(IFACEDEP) $(LLVMDEP) libclamav_internal_utils.la
823 823
 libclamav_la_CFLAGS = $(AM_CFLAGS) $(XML_CPPFLAGS) -DSEARCH_LIBDIR=\"$(libdir)\" @LIBCLAMAV_CPPFLAGS@
824
-libclamav_la_LDFLAGS = @SSL_LDFLAGS@ @TH_SAFE@ $(XML_LIBS) \
825
-	-version-info @LIBCLAMAV_VERSION@ -no-undefined \
824
+libclamav_la_LDFLAGS = @SSL_LDFLAGS@ @TH_SAFE@ @JSON_LDFLAGS@ \
825
+	$(XML_LIBS) -version-info @LIBCLAMAV_VERSION@ -no-undefined \
826 826
 	$(am__append_6)
827 827
 include_HEADERS = clamav.h
828 828
 libclamav_la_SOURCES = matcher-ac.c matcher-ac.h matcher-bm.c \
... ...
@@ -981,9 +906,9 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
981 981
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
982 982
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
983 983
 $(am__aclocal_m4_deps):
984
-
985 984
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
986 985
 	@$(NORMAL_INSTALL)
986
+	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
987 987
 	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
988 988
 	list2=; for p in $$list; do \
989 989
 	  if test -f $$p; then \
... ...
@@ -991,8 +916,6 @@ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
991 991
 	  else :; fi; \
992 992
 	done; \
993 993
 	test -z "$$list2" || { \
994
-	  echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \
995
-	  $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \
996 994
 	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \
997 995
 	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \
998 996
 	}
... ...
@@ -1008,41 +931,31 @@ uninstall-libLTLIBRARIES:
1008 1008
 
1009 1009
 clean-libLTLIBRARIES:
1010 1010
 	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
1011
-	@list='$(lib_LTLIBRARIES)'; \
1012
-	locs=`for p in $$list; do echo $$p; done | \
1013
-	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
1014
-	      sort -u`; \
1015
-	test -z "$$locs" || { \
1016
-	  echo rm -f $${locs}; \
1017
-	  rm -f $${locs}; \
1018
-	}
1011
+	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
1012
+	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
1013
+	  test "$$dir" != "$$p" || dir=.; \
1014
+	  echo "rm -f \"$${dir}/so_locations\""; \
1015
+	  rm -f "$${dir}/so_locations"; \
1016
+	done
1019 1017
 
1020 1018
 clean-noinstLTLIBRARIES:
1021 1019
 	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
1022
-	@list='$(noinst_LTLIBRARIES)'; \
1023
-	locs=`for p in $$list; do echo $$p; done | \
1024
-	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
1025
-	      sort -u`; \
1026
-	test -z "$$locs" || { \
1027
-	  echo rm -f $${locs}; \
1028
-	  rm -f $${locs}; \
1029
-	}
1030
-
1020
+	@list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
1021
+	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
1022
+	  test "$$dir" != "$$p" || dir=.; \
1023
+	  echo "rm -f \"$${dir}/so_locations\""; \
1024
+	  rm -f "$${dir}/so_locations"; \
1025
+	done
1031 1026
 libclamav.la: $(libclamav_la_OBJECTS) $(libclamav_la_DEPENDENCIES) $(EXTRA_libclamav_la_DEPENDENCIES) 
1032 1027
 	$(AM_V_CCLD)$(libclamav_la_LINK) -rpath $(libdir) $(libclamav_la_OBJECTS) $(libclamav_la_LIBADD) $(LIBS)
1033
-
1034 1028
 libclamav_internal_utils.la: $(libclamav_internal_utils_la_OBJECTS) $(libclamav_internal_utils_la_DEPENDENCIES) $(EXTRA_libclamav_internal_utils_la_DEPENDENCIES) 
1035 1029
 	$(AM_V_CCLD)$(libclamav_internal_utils_la_LINK)  $(libclamav_internal_utils_la_OBJECTS) $(libclamav_internal_utils_la_LIBADD) $(LIBS)
1036
-
1037 1030
 libclamav_internal_utils_nothreads.la: $(libclamav_internal_utils_nothreads_la_OBJECTS) $(libclamav_internal_utils_nothreads_la_DEPENDENCIES) $(EXTRA_libclamav_internal_utils_nothreads_la_DEPENDENCIES) 
1038 1031
 	$(AM_V_CCLD)$(libclamav_internal_utils_nothreads_la_LINK)  $(libclamav_internal_utils_nothreads_la_OBJECTS) $(libclamav_internal_utils_nothreads_la_LIBADD) $(LIBS)
1039
-
1040 1032
 libclamav_nocxx.la: $(libclamav_nocxx_la_OBJECTS) $(libclamav_nocxx_la_DEPENDENCIES) $(EXTRA_libclamav_nocxx_la_DEPENDENCIES) 
1041 1033
 	$(AM_V_CCLD)$(libclamav_nocxx_la_LINK)  $(libclamav_nocxx_la_OBJECTS) $(libclamav_nocxx_la_LIBADD) $(LIBS)
1042
-
1043 1034
 libclamunrar.la: $(libclamunrar_la_OBJECTS) $(libclamunrar_la_DEPENDENCIES) $(EXTRA_libclamunrar_la_DEPENDENCIES) 
1044 1035
 	$(AM_V_CCLD)$(libclamunrar_la_LINK) $(am_libclamunrar_la_rpath) $(libclamunrar_la_OBJECTS) $(libclamunrar_la_LIBADD) $(LIBS)
1045
-
1046 1036
 libclamunrar_iface.la: $(libclamunrar_iface_la_OBJECTS) $(libclamunrar_iface_la_DEPENDENCIES) $(EXTRA_libclamunrar_iface_la_DEPENDENCIES) 
1047 1037
 	$(AM_V_CCLD)$(libclamunrar_iface_la_LINK) $(am_libclamunrar_iface_la_rpath) $(libclamunrar_iface_la_OBJECTS) $(libclamunrar_iface_la_LIBADD) $(LIBS)
1048 1038
 
... ...
@@ -1304,14 +1217,14 @@ distclean-compile:
1304 1304
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
1305 1305
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
1306 1306
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1307
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
1307
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
1308 1308
 
1309 1309
 .c.obj:
1310 1310
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
1311 1311
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
1312 1312
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
1313 1313
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1314
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
1314
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
1315 1315
 
1316 1316
 .c.lo:
1317 1317
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
... ...
@@ -3049,11 +2962,8 @@ clean-libtool:
3049 3049
 	-rm -rf .libs _libs
3050 3050
 install-includeHEADERS: $(include_HEADERS)
3051 3051
 	@$(NORMAL_INSTALL)
3052
+	test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)"
3052 3053
 	@list='$(include_HEADERS)'; test -n "$(includedir)" || list=; \
3053
-	if test -n "$$list"; then \
3054
-	  echo " $(MKDIR_P) '$(DESTDIR)$(includedir)'"; \
3055
-	  $(MKDIR_P) "$(DESTDIR)$(includedir)" || exit 1; \
3056
-	fi; \
3057 3054
 	for p in $$list; do \
3058 3055
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
3059 3056
 	  echo "$$d$$p"; \
... ...
@@ -3070,25 +2980,22 @@ uninstall-includeHEADERS:
3070 3070
 	dir='$(DESTDIR)$(includedir)'; $(am__uninstall_files_from_dir)
3071 3071
 
3072 3072
 # This directory's subdirectories are mostly independent; you can cd
3073
-# into them and run 'make' without going through this Makefile.
3074
-# To change the values of 'make' variables: instead of editing Makefiles,
3075
-# (1) if the variable is set in 'config.status', edit 'config.status'
3076
-#     (which will cause the Makefiles to be regenerated when you run 'make');
3077
-# (2) otherwise, pass the desired values on the 'make' command line.
3078
-$(am__recursive_targets):
3079
-	@fail=; \
3080
-	if $(am__make_keepgoing); then \
3081
-	  failcom='fail=yes'; \
3082
-	else \
3083
-	  failcom='exit 1'; \
3084
-	fi; \
3073
+# into them and run `make' without going through this Makefile.
3074
+# To change the values of `make' variables: instead of editing Makefiles,
3075
+# (1) if the variable is set in `config.status', edit `config.status'
3076
+#     (which will cause the Makefiles to be regenerated when you run `make');
3077
+# (2) otherwise, pass the desired values on the `make' command line.
3078
+$(RECURSIVE_TARGETS):
3079
+	@fail= failcom='exit 1'; \
3080
+	for f in x $$MAKEFLAGS; do \
3081
+	  case $$f in \
3082
+	    *=* | --[!k]*);; \
3083
+	    *k*) failcom='fail=yes';; \
3084
+	  esac; \
3085
+	done; \
3085 3086
 	dot_seen=no; \
3086 3087
 	target=`echo $@ | sed s/-recursive//`; \
3087
-	case "$@" in \
3088
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
3089
-	  *) list='$(SUBDIRS)' ;; \
3090
-	esac; \
3091
-	for subdir in $$list; do \
3088
+	list='$(SUBDIRS)'; for subdir in $$list; do \
3092 3089
 	  echo "Making $$target in $$subdir"; \
3093 3090
 	  if test "$$subdir" = "."; then \
3094 3091
 	    dot_seen=yes; \
... ...
@@ -3103,12 +3010,57 @@ $(am__recursive_targets):
3103 3103
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
3104 3104
 	fi; test -z "$$fail"
3105 3105
 
3106
-ID: $(am__tagged_files)
3107
-	$(am__define_uniq_tagged_files); mkid -fID $$unique
3108
-tags: tags-recursive
3109
-TAGS: tags
3106
+$(RECURSIVE_CLEAN_TARGETS):
3107
+	@fail= failcom='exit 1'; \
3108
+	for f in x $$MAKEFLAGS; do \
3109
+	  case $$f in \
3110
+	    *=* | --[!k]*);; \
3111
+	    *k*) failcom='fail=yes';; \
3112
+	  esac; \
3113
+	done; \
3114
+	dot_seen=no; \
3115
+	case "$@" in \
3116
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
3117
+	  *) list='$(SUBDIRS)' ;; \
3118
+	esac; \
3119
+	rev=''; for subdir in $$list; do \
3120
+	  if test "$$subdir" = "."; then :; else \
3121
+	    rev="$$subdir $$rev"; \
3122
+	  fi; \
3123
+	done; \
3124
+	rev="$$rev ."; \
3125
+	target=`echo $@ | sed s/-recursive//`; \
3126
+	for subdir in $$rev; do \
3127
+	  echo "Making $$target in $$subdir"; \
3128
+	  if test "$$subdir" = "."; then \
3129
+	    local_target="$$target-am"; \
3130
+	  else \
3131
+	    local_target="$$target"; \
3132
+	  fi; \
3133
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
3134
+	  || eval $$failcom; \
3135
+	done && test -z "$$fail"
3136
+tags-recursive:
3137
+	list='$(SUBDIRS)'; for subdir in $$list; do \
3138
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
3139
+	done
3140
+ctags-recursive:
3141
+	list='$(SUBDIRS)'; for subdir in $$list; do \
3142
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
3143
+	done
3110 3144
 
3111
-tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
3145
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
3146
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
3147
+	unique=`for i in $$list; do \
3148
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
3149
+	  done | \
3150
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
3151
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
3152
+	mkid -fID $$unique
3153
+tags: TAGS
3154
+
3155
+TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
3156
+		$(TAGS_FILES) $(LISP)
3112 3157
 	set x; \
3113 3158
 	here=`pwd`; \
3114 3159
 	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
... ...
@@ -3124,7 +3076,12 @@ tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
3124 3124
 	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
3125 3125
 	  fi; \
3126 3126
 	done; \
3127
-	$(am__define_uniq_tagged_files); \
3127
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
3128
+	unique=`for i in $$list; do \
3129
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
3130
+	  done | \
3131
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
3132
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
3128 3133
 	shift; \
3129 3134
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
3130 3135
 	  test -n "$$unique" || unique=$$empty_fix; \
... ...
@@ -3136,11 +3093,15 @@ tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
3136 3136
 	      $$unique; \
3137 3137
 	  fi; \
3138 3138
 	fi
3139
-ctags: ctags-recursive
3140
-
3141
-CTAGS: ctags
3142
-ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
3143
-	$(am__define_uniq_tagged_files); \
3139
+ctags: CTAGS
3140
+CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
3141
+		$(TAGS_FILES) $(LISP)
3142
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
3143
+	unique=`for i in $$list; do \
3144
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
3145
+	  done | \
3146
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
3147
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
3144 3148
 	test -z "$(CTAGS_ARGS)$$unique" \
3145 3149
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
3146 3150
 	     $$unique
... ...
@@ -3149,21 +3110,6 @@ GTAGS:
3149 3149
 	here=`$(am__cd) $(top_builddir) && pwd` \
3150 3150
 	  && $(am__cd) $(top_srcdir) \
3151 3151
 	  && gtags -i $(GTAGS_ARGS) "$$here"
3152
-cscopelist: cscopelist-recursive
3153
-
3154
-cscopelist-am: $(am__tagged_files)
3155
-	list='$(am__tagged_files)'; \
3156
-	case "$(srcdir)" in \
3157
-	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
3158
-	  *) sdir=$(subdir)/$(srcdir) ;; \
3159
-	esac; \
3160
-	for i in $$list; do \
3161
-	  if test -f "$$i"; then \
3162
-	    echo "$(subdir)/$$i"; \
3163
-	  else \
3164
-	    echo "$$sdir/$$i"; \
3165
-	  fi; \
3166
-	done >> $(top_builddir)/cscope.files
3167 3152
 
3168 3153
 distclean-tags:
3169 3154
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
... ...
@@ -3200,10 +3146,13 @@ distdir: $(DISTFILES)
3200 3200
 	done
3201 3201
 	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
3202 3202
 	  if test "$$subdir" = .; then :; else \
3203
-	    $(am__make_dryrun) \
3204
-	      || test -d "$(distdir)/$$subdir" \
3205
-	      || $(MKDIR_P) "$(distdir)/$$subdir" \
3206
-	      || exit 1; \
3203
+	    test -d "$(distdir)/$$subdir" \
3204
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
3205
+	    || exit 1; \
3206
+	  fi; \
3207
+	done
3208
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
3209
+	  if test "$$subdir" = .; then :; else \
3207 3210
 	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
3208 3211
 	    $(am__relativize); \
3209 3212
 	    new_distdir=$$reldir; \
... ...
@@ -3336,25 +3285,26 @@ ps-am:
3336 3336
 
3337 3337
 uninstall-am: uninstall-includeHEADERS uninstall-libLTLIBRARIES
3338 3338
 
3339
-.MAKE: $(am__recursive_targets) all check install install-am \
3340
-	install-strip
3341
-
3342
-.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \
3343
-	check-am clean clean-generic clean-libLTLIBRARIES \
3344
-	clean-libtool clean-noinstLTLIBRARIES cscopelist-am ctags \
3345
-	ctags-am distclean distclean-compile distclean-generic \
3346
-	distclean-libtool distclean-tags distdir dvi dvi-am html \
3347
-	html-am info info-am install install-am install-data \
3348
-	install-data-am install-dvi install-dvi-am install-exec \
3349
-	install-exec-am install-html install-html-am \
3339
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all check \
3340
+	ctags-recursive install install-am install-strip \
3341
+	tags-recursive
3342
+
3343
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
3344
+	all all-am check check-am clean clean-generic \
3345
+	clean-libLTLIBRARIES clean-libtool clean-noinstLTLIBRARIES \
3346
+	ctags ctags-recursive distclean distclean-compile \
3347
+	distclean-generic distclean-libtool distclean-tags distdir dvi \
3348
+	dvi-am html html-am info info-am install install-am \
3349
+	install-data install-data-am install-dvi install-dvi-am \
3350
+	install-exec install-exec-am install-html install-html-am \
3350 3351
 	install-includeHEADERS install-info install-info-am \
3351 3352
 	install-libLTLIBRARIES install-man install-pdf install-pdf-am \
3352 3353
 	install-ps install-ps-am install-strip installcheck \
3353 3354
 	installcheck-am installdirs installdirs-am maintainer-clean \
3354 3355
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
3355 3356
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
3356
-	tags tags-am uninstall uninstall-am uninstall-includeHEADERS \
3357
-	uninstall-libLTLIBRARIES
3357
+	tags tags-recursive uninstall uninstall-am \
3358
+	uninstall-includeHEADERS uninstall-libLTLIBRARIES
3358 3359
 
3359 3360
 @ENABLE_LLVM_FALSE@c++/Makefile: c++/Makefile.nollvm.in
3360 3361
 @ENABLE_LLVM_FALSE@	$(AM_V_at) cp $< $@
... ...
@@ -1,8 +1,9 @@
1
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
1
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
2 2
 # @configure_input@
3 3
 
4
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
5
-
4
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
5
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
6
+# Foundation, Inc.
6 7
 # This Makefile.in is free software; the Free Software Foundation
7 8
 # gives unlimited permission to copy and/or distribute it,
8 9
 # with or without modifications, as long as this notice is preserved.
... ...
@@ -31,51 +32,6 @@
31 31
 
32 32
 
33 33
 VPATH = @srcdir@
34
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
35
-am__make_running_with_option = \
36
-  case $${target_option-} in \
37
-      ?) ;; \
38
-      *) echo "am__make_running_with_option: internal error: invalid" \
39
-              "target option '$${target_option-}' specified" >&2; \
40
-         exit 1;; \
41
-  esac; \
42
-  has_opt=no; \
43
-  sane_makeflags=$$MAKEFLAGS; \
44
-  if $(am__is_gnu_make); then \
45
-    sane_makeflags=$$MFLAGS; \
46
-  else \
47
-    case $$MAKEFLAGS in \
48
-      *\\[\ \	]*) \
49
-        bs=\\; \
50
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
51
-          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
52
-    esac; \
53
-  fi; \
54
-  skip_next=no; \
55
-  strip_trailopt () \
56
-  { \
57
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
58
-  }; \
59
-  for flg in $$sane_makeflags; do \
60
-    test $$skip_next = yes && { skip_next=no; continue; }; \
61
-    case $$flg in \
62
-      *=*|--*) continue;; \
63
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
64
-      -*I?*) strip_trailopt 'I';; \
65
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
66
-      -*O?*) strip_trailopt 'O';; \
67
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
68
-      -*l?*) strip_trailopt 'l';; \
69
-      -[dEDm]) skip_next=yes;; \
70
-      -[JT]) skip_next=yes;; \
71
-    esac; \
72
-    case $$flg in \
73
-      *$$target_option*) has_opt=yes; break;; \
74
-    esac; \
75
-  done; \
76
-  test $$has_opt = yes
77
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
78
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
79 34
 pkgdatadir = $(datadir)/@PACKAGE@
80 35
 pkgincludedir = $(includedir)/@PACKAGE@
81 36
 pkglibdir = $(libdir)/@PACKAGE@
... ...
@@ -108,16 +64,11 @@ target_triplet = @target@
108 108
 @BUILD_EXTERNAL_LLVM_FALSE@@MAINTAINER_MODE_TRUE@am__append_10 = $(TBLGENFILES)
109 109
 @BUILD_EXTERNAL_LLVM_FALSE@@MAINTAINER_MODE_TRUE@noinst_PROGRAMS = tblgen$(EXEEXT)
110 110
 subdir = .
111
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
112
-	$(top_srcdir)/configure $(am__configure_deps) \
113
-	$(srcdir)/clamavcxx-config.h.in $(top_srcdir)/config/depcomp \
114
-	config/compile config/config.guess config/config.sub \
115
-	config/depcomp config/install-sh config/missing \
116
-	config/ltmain.sh $(top_srcdir)/config/compile \
117
-	$(top_srcdir)/config/config.guess \
118
-	$(top_srcdir)/config/config.sub \
119
-	$(top_srcdir)/config/install-sh $(top_srcdir)/config/ltmain.sh \
120
-	$(top_srcdir)/config/missing
111
+DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \
112
+	$(srcdir)/Makefile.in $(srcdir)/clamavcxx-config.h.in \
113
+	$(top_srcdir)/configure config/compile config/config.guess \
114
+	config/config.sub config/depcomp config/install-sh \
115
+	config/ltmain.sh config/missing
121 116
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
122 117
 am__aclocal_m4_deps = $(top_srcdir)/m4/check_gnu_make.m4 \
123 118
 	$(top_srcdir)/m4/cxx_flag_check.m4 $(top_srcdir)/m4/libtool.m4 \
... ...
@@ -146,7 +97,6 @@ libclamavcxx_la_OBJECTS = $(am_libclamavcxx_la_OBJECTS)
146 146
 AM_V_lt = $(am__v_lt_@AM_V@)
147 147
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
148 148
 am__v_lt_0 = --silent
149
-am__v_lt_1 = 
150 149
 libclamavcxx_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
151 150
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
152 151
 	$(libclamavcxx_la_CXXFLAGS) $(CXXFLAGS) \
... ...
@@ -812,18 +762,6 @@ tblgen_LDADD = $(LDADD)
812 812
 tblgen_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
813 813
 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(tblgen_CXXFLAGS) \
814 814
 	$(CXXFLAGS) $(tblgen_LDFLAGS) $(LDFLAGS) -o $@
815
-AM_V_P = $(am__v_P_@AM_V@)
816
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
817
-am__v_P_0 = false
818
-am__v_P_1 = :
819
-AM_V_GEN = $(am__v_GEN_@AM_V@)
820
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
821
-am__v_GEN_0 = @echo "  GEN     " $@;
822
-am__v_GEN_1 = 
823
-AM_V_at = $(am__v_at_@AM_V@)
824
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
825
-am__v_at_0 = @
826
-am__v_at_1 = 
827 815
 DEFAULT_INCLUDES = -I.@am__isrc@
828 816
 depcomp = $(SHELL) $(top_srcdir)/config/depcomp
829 817
 am__depfiles_maybe = depfiles
... ...
@@ -836,16 +774,17 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
836 836
 	$(AM_CFLAGS) $(CFLAGS)
837 837
 AM_V_CC = $(am__v_CC_@AM_V@)
838 838
 am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
839
-am__v_CC_0 = @echo "  CC      " $@;
840
-am__v_CC_1 = 
839
+am__v_CC_0 = @echo "  CC    " $@;
840
+AM_V_at = $(am__v_at_@AM_V@)
841
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
842
+am__v_at_0 = @
841 843
 CCLD = $(CC)
842 844
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
843 845
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
844 846
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
845 847
 AM_V_CCLD = $(am__v_CCLD_@AM_V@)
846 848
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
847
-am__v_CCLD_0 = @echo "  CCLD    " $@;
848
-am__v_CCLD_1 = 
849
+am__v_CCLD_0 = @echo "  CCLD  " $@;
849 850
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
850 851
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
851 852
 LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
... ...
@@ -854,16 +793,17 @@ LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
854 854
 	$(AM_CXXFLAGS) $(CXXFLAGS)
855 855
 AM_V_CXX = $(am__v_CXX_@AM_V@)
856 856
 am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@)
857
-am__v_CXX_0 = @echo "  CXX     " $@;
858
-am__v_CXX_1 = 
857
+am__v_CXX_0 = @echo "  CXX   " $@;
859 858
 CXXLD = $(CXX)
860 859
 CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
861 860
 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
862 861
 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
863 862
 AM_V_CXXLD = $(am__v_CXXLD_@AM_V@)
864 863
 am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@)
865
-am__v_CXXLD_0 = @echo "  CXXLD   " $@;
866
-am__v_CXXLD_1 = 
864
+am__v_CXXLD_0 = @echo "  CXXLD " $@;
865
+AM_V_GEN = $(am__v_GEN_@AM_V@)
866
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
867
+am__v_GEN_0 = @echo "  GEN   " $@;
867 868
 SOURCES = $(libclamavcxx_la_SOURCES) $(libllvmcodegen_la_SOURCES) \
868 869
 	$(libllvmjit_la_SOURCES) $(libllvmpowerpccodegen_la_SOURCES) \
869 870
 	$(libllvmsystem_la_SOURCES) $(libllvmx86codegen_la_SOURCES) \
... ...
@@ -875,33 +815,8 @@ DIST_SOURCES = $(am__libclamavcxx_la_SOURCES_DIST) \
875 875
 	$(am__libllvmsystem_la_SOURCES_DIST) \
876 876
 	$(am__libllvmx86codegen_la_SOURCES_DIST) \
877 877
 	$(am__tblgen_SOURCES_DIST)
878
-am__can_run_installinfo = \
879
-  case $$AM_UPDATE_INFO_DIR in \
880
-    n|no|NO) false;; \
881
-    *) (install-info --version) >/dev/null 2>&1;; \
882
-  esac
883
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \
884
-	$(LISP)clamavcxx-config.h.in
885
-# Read a list of newline-separated strings from the standard input,
886
-# and print each of them once, without duplicates.  Input order is
887
-# *not* preserved.
888
-am__uniquify_input = $(AWK) '\
889
-  BEGIN { nonempty = 0; } \
890
-  { items[$$0] = 1; nonempty = 1; } \
891
-  END { if (nonempty) { for (i in items) print i; }; } \
892
-'
893
-# Make sure the list of sources is unique.  This is necessary because,
894
-# e.g., the same source file might be shared among _SOURCES variables
895
-# for different programs/libraries.
896
-am__define_uniq_tagged_files = \
897
-  list='$(am__tagged_files)'; \
898
-  unique=`for i in $$list; do \
899
-    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
900
-  done | $(am__uniquify_input)`
901 878
 ETAGS = etags
902 879
 CTAGS = ctags
903
-CSCOPE = cscope
904
-AM_RECURSIVE_TARGETS = cscope
905 880
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
906 881
 distdir = $(PACKAGE)-$(VERSION)
907 882
 top_distdir = $(distdir)
... ...
@@ -911,10 +826,8 @@ am__remove_distdir = \
911 911
       && rm -rf "$(distdir)" \
912 912
       || { sleep 5 && rm -rf "$(distdir)"; }; \
913 913
   else :; fi
914
-am__post_remove_distdir = $(am__remove_distdir)
915 914
 DIST_ARCHIVES = $(distdir).tar.gz
916 915
 GZIP_ENV = --best
917
-DIST_TARGETS = dist-gzip
918 916
 distuninstallcheck_listfiles = find . -type f -print
919 917
 am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
920 918
   | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
... ...
@@ -1569,8 +1482,8 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
1569 1569
 $(am__aclocal_m4_deps):
1570 1570
 
1571 1571
 clamavcxx-config.h: stamp-h1
1572
-	@test -f $@ || rm -f stamp-h1
1573
-	@test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1
1572
+	@if test ! -f $@; then rm -f stamp-h1; else :; fi
1573
+	@if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi
1574 1574
 
1575 1575
 stamp-h1: $(srcdir)/clamavcxx-config.h.in $(top_builddir)/config.status
1576 1576
 	@rm -f stamp-h1
... ...
@@ -1585,30 +1498,22 @@ distclean-hdr:
1585 1585
 
1586 1586
 clean-noinstLTLIBRARIES:
1587 1587
 	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
1588
-	@list='$(noinst_LTLIBRARIES)'; \
1589
-	locs=`for p in $$list; do echo $$p; done | \
1590
-	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
1591
-	      sort -u`; \
1592
-	test -z "$$locs" || { \
1593
-	  echo rm -f $${locs}; \
1594
-	  rm -f $${locs}; \
1595
-	}
1596
-
1588
+	@list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
1589
+	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
1590
+	  test "$$dir" != "$$p" || dir=.; \
1591
+	  echo "rm -f \"$${dir}/so_locations\""; \
1592
+	  rm -f "$${dir}/so_locations"; \
1593
+	done
1597 1594
 libclamavcxx.la: $(libclamavcxx_la_OBJECTS) $(libclamavcxx_la_DEPENDENCIES) $(EXTRA_libclamavcxx_la_DEPENDENCIES) 
1598 1595
 	$(AM_V_CXXLD)$(libclamavcxx_la_LINK) $(am_libclamavcxx_la_rpath) $(libclamavcxx_la_OBJECTS) $(libclamavcxx_la_LIBADD) $(LIBS)
1599
-
1600 1596
 libllvmcodegen.la: $(libllvmcodegen_la_OBJECTS) $(libllvmcodegen_la_DEPENDENCIES) $(EXTRA_libllvmcodegen_la_DEPENDENCIES) 
1601 1597
 	$(AM_V_CXXLD)$(CXXLINK) $(am_libllvmcodegen_la_rpath) $(libllvmcodegen_la_OBJECTS) $(libllvmcodegen_la_LIBADD) $(LIBS)
1602
-
1603 1598
 libllvmjit.la: $(libllvmjit_la_OBJECTS) $(libllvmjit_la_DEPENDENCIES) $(EXTRA_libllvmjit_la_DEPENDENCIES) 
1604 1599
 	$(AM_V_CXXLD)$(CXXLINK) $(am_libllvmjit_la_rpath) $(libllvmjit_la_OBJECTS) $(libllvmjit_la_LIBADD) $(LIBS)
1605
-
1606 1600
 libllvmpowerpccodegen.la: $(libllvmpowerpccodegen_la_OBJECTS) $(libllvmpowerpccodegen_la_DEPENDENCIES) $(EXTRA_libllvmpowerpccodegen_la_DEPENDENCIES) 
1607 1601
 	$(AM_V_CXXLD)$(CXXLINK) $(am_libllvmpowerpccodegen_la_rpath) $(libllvmpowerpccodegen_la_OBJECTS) $(libllvmpowerpccodegen_la_LIBADD) $(LIBS)
1608
-
1609 1602
 libllvmsystem.la: $(libllvmsystem_la_OBJECTS) $(libllvmsystem_la_DEPENDENCIES) $(EXTRA_libllvmsystem_la_DEPENDENCIES) 
1610 1603
 	$(AM_V_CXXLD)$(libllvmsystem_la_LINK) $(am_libllvmsystem_la_rpath) $(libllvmsystem_la_OBJECTS) $(libllvmsystem_la_LIBADD) $(LIBS)
1611
-
1612 1604
 libllvmx86codegen.la: $(libllvmx86codegen_la_OBJECTS) $(libllvmx86codegen_la_DEPENDENCIES) $(EXTRA_libllvmx86codegen_la_DEPENDENCIES) 
1613 1605
 	$(AM_V_CXXLD)$(CXXLINK) $(am_libllvmx86codegen_la_rpath) $(libllvmx86codegen_la_OBJECTS) $(libllvmx86codegen_la_LIBADD) $(LIBS)
1614 1606
 
... ...
@@ -1620,7 +1525,6 @@ clean-noinstPROGRAMS:
1620 1620
 	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
1621 1621
 	echo " rm -f" $$list; \
1622 1622
 	rm -f $$list
1623
-
1624 1623
 tblgen$(EXEEXT): $(tblgen_OBJECTS) $(tblgen_DEPENDENCIES) $(EXTRA_tblgen_DEPENDENCIES) 
1625 1624
 	@rm -f tblgen$(EXEEXT)
1626 1625
 	$(AM_V_CXXLD)$(tblgen_LINK) $(tblgen_OBJECTS) $(tblgen_LDADD) $(LIBS)
... ...
@@ -2031,14 +1935,14 @@ distclean-compile:
2031 2031
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
2032 2032
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
2033 2033
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
2034
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
2034
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
2035 2035
 
2036 2036
 .c.obj:
2037 2037
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
2038 2038
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
2039 2039
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
2040 2040
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
2041
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
2041
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
2042 2042
 
2043 2043
 .c.lo:
2044 2044
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
... ...
@@ -5486,15 +5390,26 @@ clean-libtool:
5486 5486
 distclean-libtool:
5487 5487
 	-rm -f libtool config.lt
5488 5488
 
5489
-ID: $(am__tagged_files)
5490
-	$(am__define_uniq_tagged_files); mkid -fID $$unique
5491
-tags: tags-am
5492
-TAGS: tags
5493
-
5494
-tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
5489
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
5490
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
5491
+	unique=`for i in $$list; do \
5492
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
5493
+	  done | \
5494
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
5495
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
5496
+	mkid -fID $$unique
5497
+tags: TAGS
5498
+
5499
+TAGS:  $(HEADERS) $(SOURCES) clamavcxx-config.h.in $(TAGS_DEPENDENCIES) \
5500
+		$(TAGS_FILES) $(LISP)
5495 5501
 	set x; \
5496 5502
 	here=`pwd`; \
5497
-	$(am__define_uniq_tagged_files); \
5503
+	list='$(SOURCES) $(HEADERS) clamavcxx-config.h.in $(LISP) $(TAGS_FILES)'; \
5504
+	unique=`for i in $$list; do \
5505
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
5506
+	  done | \
5507
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
5508
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
5498 5509
 	shift; \
5499 5510
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
5500 5511
 	  test -n "$$unique" || unique=$$empty_fix; \
... ...
@@ -5506,11 +5421,15 @@ tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
5506 5506
 	      $$unique; \
5507 5507
 	  fi; \
5508 5508
 	fi
5509
-ctags: ctags-am
5510
-
5511
-CTAGS: ctags
5512
-ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
5513
-	$(am__define_uniq_tagged_files); \
5509
+ctags: CTAGS
5510
+CTAGS:  $(HEADERS) $(SOURCES) clamavcxx-config.h.in $(TAGS_DEPENDENCIES) \
5511
+		$(TAGS_FILES) $(LISP)
5512
+	list='$(SOURCES) $(HEADERS) clamavcxx-config.h.in $(LISP) $(TAGS_FILES)'; \
5513
+	unique=`for i in $$list; do \
5514
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
5515
+	  done | \
5516
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
5517
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
5514 5518
 	test -z "$(CTAGS_ARGS)$$unique" \
5515 5519
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
5516 5520
 	     $$unique
... ...
@@ -5519,31 +5438,9 @@ GTAGS:
5519 5519
 	here=`$(am__cd) $(top_builddir) && pwd` \
5520 5520
 	  && $(am__cd) $(top_srcdir) \
5521 5521
 	  && gtags -i $(GTAGS_ARGS) "$$here"
5522
-cscope: cscope.files
5523
-	test ! -s cscope.files \
5524
-	  || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS)
5525
-clean-cscope:
5526
-	-rm -f cscope.files
5527
-cscope.files: clean-cscope cscopelist
5528
-cscopelist: cscopelist-am
5529
-
5530
-cscopelist-am: $(am__tagged_files)
5531
-	list='$(am__tagged_files)'; \
5532
-	case "$(srcdir)" in \
5533
-	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
5534
-	  *) sdir=$(subdir)/$(srcdir) ;; \
5535
-	esac; \
5536
-	for i in $$list; do \
5537
-	  if test -f "$$i"; then \
5538
-	    echo "$(subdir)/$$i"; \
5539
-	  else \
5540
-	    echo "$$sdir/$$i"; \
5541
-	  fi; \
5542
-	done >> $(top_builddir)/cscope.files
5543 5522
 
5544 5523
 distclean-tags:
5545 5524
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
5546
-	-rm -f cscope.out cscope.in.out cscope.po.out cscope.files
5547 5525
 
5548 5526
 distdir: $(DISTFILES)
5549 5527
 	$(am__remove_distdir)
... ...
@@ -5589,42 +5486,40 @@ distdir: $(DISTFILES)
5589 5589
 	|| chmod -R a+r "$(distdir)"
5590 5590
 dist-gzip: distdir
5591 5591
 	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
5592
-	$(am__post_remove_distdir)
5592
+	$(am__remove_distdir)
5593 5593
 
5594 5594
 dist-bzip2: distdir
5595 5595
 	tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
5596
-	$(am__post_remove_distdir)
5596
+	$(am__remove_distdir)
5597 5597
 
5598 5598
 dist-lzip: distdir
5599 5599
 	tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
5600
-	$(am__post_remove_distdir)
5600
+	$(am__remove_distdir)
5601
+
5602
+dist-lzma: distdir
5603
+	tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
5604
+	$(am__remove_distdir)
5601 5605
 
5602 5606
 dist-xz: distdir
5603 5607
 	tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
5604
-	$(am__post_remove_distdir)
5608
+	$(am__remove_distdir)
5605 5609
 
5606 5610
 dist-tarZ: distdir
5607
-	@echo WARNING: "Support for shar distribution archives is" \
5608
-	               "deprecated." >&2
5609
-	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
5610 5611
 	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
5611
-	$(am__post_remove_distdir)
5612
+	$(am__remove_distdir)
5612 5613
 
5613 5614
 dist-shar: distdir
5614
-	@echo WARNING: "Support for distribution archives compressed with" \
5615
-		       "legacy program 'compress' is deprecated." >&2
5616
-	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
5617 5615
 	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
5618
-	$(am__post_remove_distdir)
5616
+	$(am__remove_distdir)
5619 5617
 
5620 5618
 dist-zip: distdir
5621 5619
 	-rm -f $(distdir).zip
5622 5620
 	zip -rq $(distdir).zip $(distdir)
5623
-	$(am__post_remove_distdir)
5621
+	$(am__remove_distdir)
5624 5622
 
5625
-dist dist-all:
5626
-	$(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:'
5627
-	$(am__post_remove_distdir)
5623
+dist dist-all: distdir
5624
+	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
5625
+	$(am__remove_distdir)
5628 5626
 
5629 5627
 # This target untars the dist file and tries a VPATH configuration.  Then
5630 5628
 # it guarantees that the distribution is self-contained by making another
... ...
@@ -5635,6 +5530,8 @@ distcheck: dist
5635 5635
 	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
5636 5636
 	*.tar.bz2*) \
5637 5637
 	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
5638
+	*.tar.lzma*) \
5639
+	  lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
5638 5640
 	*.tar.lz*) \
5639 5641
 	  lzip -dc $(distdir).tar.lz | $(am__untar) ;;\
5640 5642
 	*.tar.xz*) \
... ...
@@ -5646,19 +5543,18 @@ distcheck: dist
5646 5646
 	*.zip*) \
5647 5647
 	  unzip $(distdir).zip ;;\
5648 5648
 	esac
5649
-	chmod -R a-w $(distdir)
5650
-	chmod u+w $(distdir)
5651
-	mkdir $(distdir)/_build $(distdir)/_inst
5649
+	chmod -R a-w $(distdir); chmod a+w $(distdir)
5650
+	mkdir $(distdir)/_build
5651
+	mkdir $(distdir)/_inst
5652 5652
 	chmod a-w $(distdir)
5653 5653
 	test -d $(distdir)/_build || exit 0; \
5654 5654
 	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
5655 5655
 	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
5656 5656
 	  && am__cwd=`pwd` \
5657 5657
 	  && $(am__cd) $(distdir)/_build \
5658
-	  && ../configure \
5658
+	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
5659 5659
 	    $(AM_DISTCHECK_CONFIGURE_FLAGS) \
5660 5660
 	    $(DISTCHECK_CONFIGURE_FLAGS) \
5661
-	    --srcdir=.. --prefix="$$dc_install_base" \
5662 5661
 	  && $(MAKE) $(AM_MAKEFLAGS) \
5663 5662
 	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
5664 5663
 	  && $(MAKE) $(AM_MAKEFLAGS) check \
... ...
@@ -5681,7 +5577,7 @@ distcheck: dist
5681 5681
 	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
5682 5682
 	  && cd "$$am__cwd" \
5683 5683
 	  || exit 1
5684
-	$(am__post_remove_distdir)
5684
+	$(am__remove_distdir)
5685 5685
 	@(echo "$(distdir) archives ready for distribution: "; \
5686 5686
 	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
5687 5687
 	  sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
... ...
@@ -5748,8 +5644,8 @@ maintainer-clean-generic:
5748 5748
 	@echo "This command is intended for maintainers to use"
5749 5749
 	@echo "it deletes files that may require special tools to rebuild."
5750 5750
 	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
5751
-@BUILD_EXTERNAL_LLVM_TRUE@clean-local:
5752 5751
 @BUILD_EXTERNAL_LLVM_TRUE@distclean-local:
5752
+@BUILD_EXTERNAL_LLVM_TRUE@clean-local:
5753 5753
 clean: clean-am
5754 5754
 
5755 5755
 clean-am: clean-generic clean-libtool clean-local \
... ...
@@ -5826,23 +5722,23 @@ uninstall-am:
5826 5826
 
5827 5827
 .MAKE: all check install install-am install-strip
5828 5828
 
5829
-.PHONY: CTAGS GTAGS TAGS all all-am am--refresh check check-am clean \
5830
-	clean-cscope clean-generic clean-libtool clean-local \
5831
-	clean-noinstLTLIBRARIES clean-noinstPROGRAMS cscope \
5832
-	cscopelist-am ctags ctags-am dist dist-all dist-bzip2 \
5833
-	dist-gzip dist-hook dist-lzip dist-shar dist-tarZ dist-xz \
5834
-	dist-zip distcheck distclean distclean-compile \
5835
-	distclean-generic distclean-hdr distclean-libtool \
5836
-	distclean-local distclean-tags distcleancheck distdir \
5837
-	distuninstallcheck dvi dvi-am html html-am info info-am \
5838
-	install install-am install-data install-data-am install-dvi \
5839
-	install-dvi-am install-exec install-exec-am install-html \
5840
-	install-html-am install-info install-info-am install-man \
5841
-	install-pdf install-pdf-am install-ps install-ps-am \
5842
-	install-strip installcheck installcheck-am installdirs \
5843
-	maintainer-clean maintainer-clean-generic mostlyclean \
5844
-	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
5845
-	pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am
5829
+.PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \
5830
+	clean-generic clean-libtool clean-local \
5831
+	clean-noinstLTLIBRARIES clean-noinstPROGRAMS ctags dist \
5832
+	dist-all dist-bzip2 dist-gzip dist-hook dist-lzip dist-lzma \
5833
+	dist-shar dist-tarZ dist-xz dist-zip distcheck distclean \
5834
+	distclean-compile distclean-generic distclean-hdr \
5835
+	distclean-libtool distclean-local distclean-tags \
5836
+	distcleancheck distdir distuninstallcheck dvi dvi-am html \
5837
+	html-am info info-am install install-am install-data \
5838
+	install-data-am install-dvi install-dvi-am install-exec \
5839
+	install-exec-am install-html install-html-am install-info \
5840
+	install-info-am install-man install-pdf install-pdf-am \
5841
+	install-ps install-ps-am install-strip installcheck \
5842
+	installcheck-am installdirs maintainer-clean \
5843
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
5844
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
5845
+	tags uninstall uninstall-am
5846 5846
 
5847 5847
 
5848 5848
 @BUILD_EXTERNAL_LLVM_FALSE@@MAINTAINER_MODE_TRUE@llvm/include/llvm/Intrinsics.gen: llvm/include/llvm/Intrinsics.td $(TBLGEN)
... ...
@@ -1,7 +1,8 @@
1
-# generated automatically by aclocal 1.14.1 -*- Autoconf -*-
2
-
3
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
1
+# generated automatically by aclocal 1.11.3 -*- Autoconf -*-
4 2
 
3
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
4
+# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
5
+# Inc.
5 6
 # This file is free software; the Free Software Foundation
6 7
 # gives unlimited permission to copy and/or distribute it,
7 8
 # with or without modifications, as long as this notice is preserved.
... ...
@@ -11,31 +12,33 @@
11 11
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
12 12
 # PARTICULAR PURPOSE.
13 13
 
14
-m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])
15 14
 m4_ifndef([AC_AUTOCONF_VERSION],
16 15
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
17
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],,
18
-[m4_warning([this file was generated for autoconf 2.69.
16
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],,
17
+[m4_warning([this file was generated for autoconf 2.68.
19 18
 You have another version of autoconf.  It may work, but is not guaranteed to.
20 19
 If you have problems, you may need to regenerate the build system entirely.
21
-To do so, use the procedure documented by the package, typically 'autoreconf'.])])
20
+To do so, use the procedure documented by the package, typically `autoreconf'.])])
22 21
 
23
-# Copyright (C) 2002-2013 Free Software Foundation, Inc.
22
+# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software
23
+# Foundation, Inc.
24 24
 #
25 25
 # This file is free software; the Free Software Foundation
26 26
 # gives unlimited permission to copy and/or distribute it,
27 27
 # with or without modifications, as long as this notice is preserved.
28 28
 
29
+# serial 1
30
+
29 31
 # AM_AUTOMAKE_VERSION(VERSION)
30 32
 # ----------------------------
31 33
 # Automake X.Y traces this macro to ensure aclocal.m4 has been
32 34
 # generated from the m4 files accompanying Automake X.Y.
33 35
 # (This private macro should not be called outside this file.)
34 36
 AC_DEFUN([AM_AUTOMAKE_VERSION],
35
-[am__api_version='1.14'
37
+[am__api_version='1.11'
36 38
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
37 39
 dnl require some minimum version.  Point them to the right macro.
38
-m4_if([$1], [1.14.1], [],
40
+m4_if([$1], [1.11.3], [],
39 41
       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
40 42
 ])
41 43
 
... ...
@@ -51,22 +54,24 @@ 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.1])dnl
54
+[AM_AUTOMAKE_VERSION([1.11.3])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]))])
58 58
 
59 59
 # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
60 60
 
61
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
61
+# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
62 62
 #
63 63
 # This file is free software; the Free Software Foundation
64 64
 # gives unlimited permission to copy and/or distribute it,
65 65
 # with or without modifications, as long as this notice is preserved.
66 66
 
67
+# serial 1
68
+
67 69
 # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
68
-# $ac_aux_dir to '$srcdir/foo'.  In other projects, it is set to
69
-# '$srcdir', '$srcdir/..', or '$srcdir/../..'.
70
+# $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to
71
+# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
70 72
 #
71 73
 # Of course, Automake must honor this variable whenever it calls a
72 74
 # tool from the auxiliary directory.  The problem is that $srcdir (and
... ...
@@ -85,7 +90,7 @@ _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
85 85
 #
86 86
 # The reason of the latter failure is that $top_srcdir and $ac_aux_dir
87 87
 # are both prefixed by $srcdir.  In an in-source build this is usually
88
-# harmless because $srcdir is '.', but things will broke when you
88
+# harmless because $srcdir is `.', but things will broke when you
89 89
 # start a VPATH build or use an absolute $srcdir.
90 90
 #
91 91
 # So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
... ...
@@ -111,19 +116,22 @@ am_aux_dir=`cd $ac_aux_dir && pwd`
111 111
 
112 112
 # AM_CONDITIONAL                                            -*- Autoconf -*-
113 113
 
114
-# Copyright (C) 1997-2013 Free Software Foundation, Inc.
114
+# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008
115
+# Free Software Foundation, Inc.
115 116
 #
116 117
 # This file is free software; the Free Software Foundation
117 118
 # gives unlimited permission to copy and/or distribute it,
118 119
 # with or without modifications, as long as this notice is preserved.
119 120
 
121
+# serial 9
122
+
120 123
 # AM_CONDITIONAL(NAME, SHELL-CONDITION)
121 124
 # -------------------------------------
122 125
 # Define a conditional.
123 126
 AC_DEFUN([AM_CONDITIONAL],
124
-[AC_PREREQ([2.52])dnl
125
- m4_if([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
126
-       [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
127
+[AC_PREREQ(2.52)dnl
128
+ ifelse([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
129
+	[$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
127 130
 AC_SUBST([$1_TRUE])dnl
128 131
 AC_SUBST([$1_FALSE])dnl
129 132
 _AM_SUBST_NOTMAKE([$1_TRUE])dnl
... ...
@@ -142,14 +150,16 @@ AC_CONFIG_COMMANDS_PRE(
142 142
 Usually this means the macro was only invoked conditionally.]])
143 143
 fi])])
144 144
 
145
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
145
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009,
146
+# 2010, 2011 Free Software Foundation, Inc.
146 147
 #
147 148
 # This file is free software; the Free Software Foundation
148 149
 # gives unlimited permission to copy and/or distribute it,
149 150
 # with or without modifications, as long as this notice is preserved.
150 151
 
152
+# serial 12
151 153
 
152
-# There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be
154
+# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
153 155
 # written in clear, in which case automake, when reading aclocal.m4,
154 156
 # will think it sees a *use*, and therefore will trigger all it's
155 157
 # C support machinery.  Also note that it means that autoscan, seeing
... ...
@@ -159,7 +169,7 @@ fi])])
159 159
 # _AM_DEPENDENCIES(NAME)
160 160
 # ----------------------
161 161
 # See how the compiler implements dependency checking.
162
-# NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC".
162
+# NAME is "CC", "CXX", "GCJ", or "OBJC".
163 163
 # We try a few techniques and use that to set a single cache variable.
164 164
 #
165 165
 # We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
... ...
@@ -172,13 +182,12 @@ AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
172 172
 AC_REQUIRE([AM_MAKE_INCLUDE])dnl
173 173
 AC_REQUIRE([AM_DEP_TRACK])dnl
174 174
 
175
-m4_if([$1], [CC],   [depcc="$CC"   am_compiler_list=],
176
-      [$1], [CXX],  [depcc="$CXX"  am_compiler_list=],
177
-      [$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
178
-      [$1], [OBJCXX], [depcc="$OBJCXX" am_compiler_list='gcc3 gcc'],
179
-      [$1], [UPC],  [depcc="$UPC"  am_compiler_list=],
180
-      [$1], [GCJ],  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
181
-                    [depcc="$$1"   am_compiler_list=])
175
+ifelse([$1], CC,   [depcc="$CC"   am_compiler_list=],
176
+       [$1], CXX,  [depcc="$CXX"  am_compiler_list=],
177
+       [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
178
+       [$1], UPC,  [depcc="$UPC"  am_compiler_list=],
179
+       [$1], GCJ,  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
180
+                   [depcc="$$1"   am_compiler_list=])
182 181
 
183 182
 AC_CACHE_CHECK([dependency style of $depcc],
184 183
                [am_cv_$1_dependencies_compiler_type],
... ...
@@ -186,8 +195,8 @@ AC_CACHE_CHECK([dependency style of $depcc],
186 186
   # We make a subdir and do the tests there.  Otherwise we can end up
187 187
   # making bogus files that we don't know about and never remove.  For
188 188
   # instance it was reported that on HP-UX the gcc test will end up
189
-  # making a dummy file named 'D' -- because '-MD' means "put the output
190
-  # in D".
189
+  # making a dummy file named `D' -- because `-MD' means `put the output
190
+  # in D'.
191 191
   rm -rf conftest.dir
192 192
   mkdir conftest.dir
193 193
   # Copy depcomp to subdir because otherwise we won't find it if we're
... ...
@@ -227,16 +236,16 @@ AC_CACHE_CHECK([dependency style of $depcc],
227 227
     : > sub/conftest.c
228 228
     for i in 1 2 3 4 5 6; do
229 229
       echo '#include "conftst'$i'.h"' >> sub/conftest.c
230
-      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
231
-      # Solaris 10 /bin/sh.
232
-      echo '/* dummy */' > sub/conftst$i.h
230
+      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
231
+      # Solaris 8's {/usr,}/bin/sh.
232
+      touch sub/conftst$i.h
233 233
     done
234 234
     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
235 235
 
236
-    # We check with '-c' and '-o' for the sake of the "dashmstdout"
236
+    # We check with `-c' and `-o' for the sake of the "dashmstdout"
237 237
     # mode.  It turns out that the SunPro C++ compiler does not properly
238
-    # handle '-M -o', and we need to detect this.  Also, some Intel
239
-    # versions had trouble with output in subdirs.
238
+    # handle `-M -o', and we need to detect this.  Also, some Intel
239
+    # versions had trouble with output in subdirs
240 240
     am__obj=sub/conftest.${OBJEXT-o}
241 241
     am__minus_obj="-o $am__obj"
242 242
     case $depmode in
... ...
@@ -245,8 +254,8 @@ AC_CACHE_CHECK([dependency style of $depcc],
245 245
       test "$am__universal" = false || continue
246 246
       ;;
247 247
     nosideeffect)
248
-      # After this tag, mechanisms are not by side-effect, so they'll
249
-      # only be used when explicitly requested.
248
+      # after this tag, mechanisms are not by side-effect, so they'll
249
+      # only be used when explicitly requested
250 250
       if test "x$enable_dependency_tracking" = xyes; then
251 251
 	continue
252 252
       else
... ...
@@ -254,7 +263,7 @@ AC_CACHE_CHECK([dependency style of $depcc],
254 254
       fi
255 255
       ;;
256 256
     msvc7 | msvc7msys | msvisualcpp | msvcmsys)
257
-      # This compiler won't grok '-c -o', but also, the minuso test has
257
+      # This compiler won't grok `-c -o', but also, the minuso test has
258 258
       # not run yet.  These depmodes are late enough in the game, and
259 259
       # so weak that their functioning should not be impacted.
260 260
       am__obj=conftest.${OBJEXT-o}
... ...
@@ -302,7 +311,7 @@ AM_CONDITIONAL([am__fastdep$1], [
302 302
 # AM_SET_DEPDIR
303 303
 # -------------
304 304
 # Choose a directory name for dependency files.
305
-# This macro is AC_REQUIREd in _AM_DEPENDENCIES.
305
+# This macro is AC_REQUIREd in _AM_DEPENDENCIES
306 306
 AC_DEFUN([AM_SET_DEPDIR],
307 307
 [AC_REQUIRE([AM_SET_LEADING_DOT])dnl
308 308
 AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
... ...
@@ -312,13 +321,9 @@ AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
312 312
 # AM_DEP_TRACK
313 313
 # ------------
314 314
 AC_DEFUN([AM_DEP_TRACK],
315
-[AC_ARG_ENABLE([dependency-tracking], [dnl
316
-AS_HELP_STRING(
317
-  [--enable-dependency-tracking],
318
-  [do not reject slow dependency extractors])
319
-AS_HELP_STRING(
320
-  [--disable-dependency-tracking],
321
-  [speeds up one-time build])])
315
+[AC_ARG_ENABLE(dependency-tracking,
316
+[  --disable-dependency-tracking  speeds up one-time build
317
+  --enable-dependency-tracking   do not reject slow dependency extractors])
322 318
 if test "x$enable_dependency_tracking" != xno; then
323 319
   am_depcomp="$ac_aux_dir/depcomp"
324 320
   AMDEPBACKSLASH='\'
... ...
@@ -333,18 +338,20 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl
333 333
 
334 334
 # Generate code to set up dependency tracking.              -*- Autoconf -*-
335 335
 
336
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
336
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008
337
+# Free Software Foundation, Inc.
337 338
 #
338 339
 # This file is free software; the Free Software Foundation
339 340
 # gives unlimited permission to copy and/or distribute it,
340 341
 # with or without modifications, as long as this notice is preserved.
341 342
 
343
+#serial 5
342 344
 
343 345
 # _AM_OUTPUT_DEPENDENCY_COMMANDS
344 346
 # ------------------------------
345 347
 AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
346 348
 [{
347
-  # Older Autoconf quotes --file arguments for eval, but not when files
349
+  # Autoconf 2.62 quotes --file arguments for eval, but not when files
348 350
   # are listed without --file.  Let's play safe and only enable the eval
349 351
   # if we detect the quoting.
350 352
   case $CONFIG_FILES in
... ...
@@ -357,7 +364,7 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
357 357
     # Strip MF so we end up with the name of the file.
358 358
     mf=`echo "$mf" | sed -e 's/:.*$//'`
359 359
     # Check whether this is an Automake generated Makefile or not.
360
-    # We used to match only the files named 'Makefile.in', but
360
+    # We used to match only the files named `Makefile.in', but
361 361
     # some people rename them; so instead we look at the file content.
362 362
     # Grep'ing the first line is not enough: some people post-process
363 363
     # each Makefile.in and add a new line on top of each file to say so.
... ...
@@ -369,19 +376,21 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
369 369
       continue
370 370
     fi
371 371
     # Extract the definition of DEPDIR, am__include, and am__quote
372
-    # from the Makefile without running 'make'.
372
+    # from the Makefile without running `make'.
373 373
     DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
374 374
     test -z "$DEPDIR" && continue
375 375
     am__include=`sed -n 's/^am__include = //p' < "$mf"`
376
-    test -z "$am__include" && continue
376
+    test -z "am__include" && continue
377 377
     am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
378
+    # When using ansi2knr, U may be empty or an underscore; expand it
379
+    U=`sed -n 's/^U = //p' < "$mf"`
378 380
     # Find all dependency output files, they are included files with
379 381
     # $(DEPDIR) in their names.  We invoke sed twice because it is the
380 382
     # simplest approach to changing $(DEPDIR) to its actual value in the
381 383
     # expansion.
382 384
     for file in `sed -n "
383 385
       s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
384
-	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
386
+	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
385 387
       # Make sure the directory exists.
386 388
       test -f "$dirpart/$file" && continue
387 389
       fdir=`AS_DIRNAME(["$file"])`
... ...
@@ -399,7 +408,7 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
399 399
 # This macro should only be invoked once -- use via AC_REQUIRE.
400 400
 #
401 401
 # This code is only required when automatic dependency tracking
402
-# is enabled.  FIXME.  This creates each '.P' file that we will
402
+# is enabled.  FIXME.  This creates each `.P' file that we will
403 403
 # need in order to bootstrap the dependency handling code.
404 404
 AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
405 405
 [AC_CONFIG_COMMANDS([depfiles],
... ...
@@ -409,21 +418,18 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
409 409
 
410 410
 # Do all the work for Automake.                             -*- Autoconf -*-
411 411
 
412
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
412
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
413
+# 2005, 2006, 2008, 2009 Free Software Foundation, Inc.
413 414
 #
414 415
 # This file is free software; the Free Software Foundation
415 416
 # gives unlimited permission to copy and/or distribute it,
416 417
 # with or without modifications, as long as this notice is preserved.
417 418
 
419
+# serial 16
420
+
418 421
 # This macro actually does too much.  Some checks are only needed if
419 422
 # your package does certain things.  But this isn't really a big deal.
420 423
 
421
-dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O.
422
-m4_define([AC_PROG_CC],
423
-m4_defn([AC_PROG_CC])
424
-[_AM_PROG_CC_C_O
425
-])
426
-
427 424
 # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
428 425
 # AM_INIT_AUTOMAKE([OPTIONS])
429 426
 # -----------------------------------------------
... ...
@@ -436,7 +442,7 @@ m4_defn([AC_PROG_CC])
436 436
 # arguments mandatory, and then we can depend on a new Autoconf
437 437
 # release and drop the old call support.
438 438
 AC_DEFUN([AM_INIT_AUTOMAKE],
439
-[AC_PREREQ([2.65])dnl
439
+[AC_PREREQ([2.62])dnl
440 440
 dnl Autoconf wants to disallow AM_ names.  We explicitly allow
441 441
 dnl the ones we care about.
442 442
 m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
... ...
@@ -465,40 +471,31 @@ AC_SUBST([CYGPATH_W])
465 465
 # Define the identity of the package.
466 466
 dnl Distinguish between old-style and new-style calls.
467 467
 m4_ifval([$2],
468
-[AC_DIAGNOSE([obsolete],
469
-             [$0: two- and three-arguments forms are deprecated.])
470
-m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
468
+[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
471 469
  AC_SUBST([PACKAGE], [$1])dnl
472 470
  AC_SUBST([VERSION], [$2])],
473 471
 [_AM_SET_OPTIONS([$1])dnl
474 472
 dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
475
-m4_if(
476
-  m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]),
477
-  [ok:ok],,
473
+m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
478 474
   [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
479 475
  AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
480 476
  AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
481 477
 
482 478
 _AM_IF_OPTION([no-define],,
483
-[AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package])
484
- AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl
479
+[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
480
+ AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
485 481
 
486 482
 # Some tools Automake needs.
487 483
 AC_REQUIRE([AM_SANITY_CHECK])dnl
488 484
 AC_REQUIRE([AC_ARG_PROGRAM])dnl
489
-AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}])
490
-AM_MISSING_PROG([AUTOCONF], [autoconf])
491
-AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}])
492
-AM_MISSING_PROG([AUTOHEADER], [autoheader])
493
-AM_MISSING_PROG([MAKEINFO], [makeinfo])
485
+AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
486
+AM_MISSING_PROG(AUTOCONF, autoconf)
487
+AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
488
+AM_MISSING_PROG(AUTOHEADER, autoheader)
489
+AM_MISSING_PROG(MAKEINFO, makeinfo)
494 490
 AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
495 491
 AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
496
-AC_REQUIRE([AC_PROG_MKDIR_P])dnl
497
-# For better backward compatibility.  To be removed once Automake 1.9.x
498
-# dies out for good.  For more background, see:
499
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
500
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
501
-AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
492
+AC_REQUIRE([AM_PROG_MKDIR_P])dnl
502 493
 # We need awk for the "check" target.  The system "awk" is bad on
503 494
 # some platforms.
504 495
 AC_REQUIRE([AC_PROG_AWK])dnl
... ...
@@ -509,78 +506,34 @@ _AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
509 509
 			     [_AM_PROG_TAR([v7])])])
510 510
 _AM_IF_OPTION([no-dependencies],,
511 511
 [AC_PROVIDE_IFELSE([AC_PROG_CC],
512
-		  [_AM_DEPENDENCIES([CC])],
513
-		  [m4_define([AC_PROG_CC],
514
-			     m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl
512
+		  [_AM_DEPENDENCIES(CC)],
513
+		  [define([AC_PROG_CC],
514
+			  defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
515 515
 AC_PROVIDE_IFELSE([AC_PROG_CXX],
516
-		  [_AM_DEPENDENCIES([CXX])],
517
-		  [m4_define([AC_PROG_CXX],
518
-			     m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl
516
+		  [_AM_DEPENDENCIES(CXX)],
517
+		  [define([AC_PROG_CXX],
518
+			  defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
519 519
 AC_PROVIDE_IFELSE([AC_PROG_OBJC],
520
-		  [_AM_DEPENDENCIES([OBJC])],
521
-		  [m4_define([AC_PROG_OBJC],
522
-			     m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl
523
-AC_PROVIDE_IFELSE([AC_PROG_OBJCXX],
524
-		  [_AM_DEPENDENCIES([OBJCXX])],
525
-		  [m4_define([AC_PROG_OBJCXX],
526
-			     m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl
520
+		  [_AM_DEPENDENCIES(OBJC)],
521
+		  [define([AC_PROG_OBJC],
522
+			  defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
527 523
 ])
528
-AC_REQUIRE([AM_SILENT_RULES])dnl
529
-dnl The testsuite driver may need to know about EXEEXT, so add the
530
-dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen.  This
531
-dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below.
524
+_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl
525
+dnl The `parallel-tests' driver may need to know about EXEEXT, so add the
526
+dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen.  This macro
527
+dnl is hooked onto _AC_COMPILER_EXEEXT early, see below.
532 528
 AC_CONFIG_COMMANDS_PRE(dnl
533 529
 [m4_provide_if([_AM_COMPILER_EXEEXT],
534 530
   [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
531
+])
535 532
 
536
-# POSIX will say in a future version that running "rm -f" with no argument
537
-# is OK; and we want to be able to make that assumption in our Makefile
538
-# recipes.  So use an aggressive probe to check that the usage we want is
539
-# actually supported "in the wild" to an acceptable degree.
540
-# See automake bug#10828.
541
-# To make any issue more visible, cause the running configure to be aborted
542
-# by default if the 'rm' program in use doesn't match our expectations; the
543
-# user can still override this though.
544
-if rm -f && rm -fr && rm -rf; then : OK; else
545
-  cat >&2 <<'END'
546
-Oops!
547
-
548
-Your 'rm' program seems unable to run without file operands specified
549
-on the command line, even when the '-f' option is present.  This is contrary
550
-to the behaviour of most rm programs out there, and not conforming with
551
-the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
552
-
553
-Please tell bug-automake@gnu.org about your system, including the value
554
-of your $PATH and any error possibly output before this message.  This
555
-can help us improve future automake versions.
556
-
557
-END
558
-  if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
559
-    echo 'Configuration will proceed anyway, since you have set the' >&2
560
-    echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
561
-    echo >&2
562
-  else
563
-    cat >&2 <<'END'
564
-Aborting the configuration process, to ensure you take notice of the issue.
565
-
566
-You can download and install GNU coreutils to get an 'rm' implementation
567
-that behaves properly: <http://www.gnu.org/software/coreutils/>.
568
-
569
-If you want to complete the configuration process using your problematic
570
-'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
571
-to "yes", and re-run configure.
572
-
573
-END
574
-    AC_MSG_ERROR([Your 'rm' program is bad, sorry.])
575
-  fi
576
-fi])
577
-
578
-dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion.  Do not
533
+dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion.  Do not
579 534
 dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
580 535
 dnl mangled by Autoconf and run in a shell conditional statement.
581 536
 m4_define([_AC_COMPILER_EXEEXT],
582 537
 m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
583 538
 
539
+
584 540
 # When config.status generates a header, we must update the stamp-h file.
585 541
 # This file resides in the same directory as the config header
586 542
 # that is generated.  The stamp files are numbered to have different names.
... ...
@@ -602,12 +555,15 @@ for _am_header in $config_headers :; do
602 602
 done
603 603
 echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
604 604
 
605
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
605
+# Copyright (C) 2001, 2003, 2005, 2008, 2011 Free Software Foundation,
606
+# Inc.
606 607
 #
607 608
 # This file is free software; the Free Software Foundation
608 609
 # gives unlimited permission to copy and/or distribute it,
609 610
 # with or without modifications, as long as this notice is preserved.
610 611
 
612
+# serial 1
613
+
611 614
 # AM_PROG_INSTALL_SH
612 615
 # ------------------
613 616
 # Define $install_sh.
... ...
@@ -621,14 +577,16 @@ if test x"${install_sh}" != xset; then
621 621
     install_sh="\${SHELL} $am_aux_dir/install-sh"
622 622
   esac
623 623
 fi
624
-AC_SUBST([install_sh])])
624
+AC_SUBST(install_sh)])
625 625
 
626
-# Copyright (C) 2003-2013 Free Software Foundation, Inc.
626
+# Copyright (C) 2003, 2005  Free Software Foundation, Inc.
627 627
 #
628 628
 # This file is free software; the Free Software Foundation
629 629
 # gives unlimited permission to copy and/or distribute it,
630 630
 # with or without modifications, as long as this notice is preserved.
631 631
 
632
+# serial 2
633
+
632 634
 # Check whether the underlying file-system supports filenames
633 635
 # with a leading dot.  For instance MS-DOS doesn't.
634 636
 AC_DEFUN([AM_SET_LEADING_DOT],
... ...
@@ -645,17 +603,20 @@ AC_SUBST([am__leading_dot])])
645 645
 # Add --enable-maintainer-mode option to configure.         -*- Autoconf -*-
646 646
 # From Jim Meyering
647 647
 
648
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
648
+# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008,
649
+# 2011 Free Software Foundation, Inc.
649 650
 #
650 651
 # This file is free software; the Free Software Foundation
651 652
 # gives unlimited permission to copy and/or distribute it,
652 653
 # with or without modifications, as long as this notice is preserved.
653 654
 
655
+# serial 5
656
+
654 657
 # AM_MAINTAINER_MODE([DEFAULT-MODE])
655 658
 # ----------------------------------
656 659
 # Control maintainer-specific portions of Makefiles.
657
-# Default is to disable them, unless 'enable' is passed literally.
658
-# For symmetry, 'disable' may be passed as well.  Anyway, the user
660
+# Default is to disable them, unless `enable' is passed literally.
661
+# For symmetry, `disable' may be passed as well.  Anyway, the user
659 662
 # can override the default with the --enable/--disable switch.
660 663
 AC_DEFUN([AM_MAINTAINER_MODE],
661 664
 [m4_case(m4_default([$1], [disable]),
... ...
@@ -666,11 +627,10 @@ AC_DEFUN([AM_MAINTAINER_MODE],
666 666
 AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
667 667
   dnl maintainer-mode's default is 'disable' unless 'enable' is passed
668 668
   AC_ARG_ENABLE([maintainer-mode],
669
-    [AS_HELP_STRING([--]am_maintainer_other[-maintainer-mode],
670
-      am_maintainer_other[ make rules and dependencies not useful
671
-      (and sometimes confusing) to the casual installer])],
672
-    [USE_MAINTAINER_MODE=$enableval],
673
-    [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes]))
669
+[  --][am_maintainer_other][-maintainer-mode  am_maintainer_other make rules and dependencies not useful
670
+			  (and sometimes confusing) to the casual installer],
671
+      [USE_MAINTAINER_MODE=$enableval],
672
+      [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes]))
674 673
   AC_MSG_RESULT([$USE_MAINTAINER_MODE])
675 674
   AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes])
676 675
   MAINT=$MAINTAINER_MODE_TRUE
... ...
@@ -678,14 +638,18 @@ AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
678 678
 ]
679 679
 )
680 680
 
681
+AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
682
+
681 683
 # Check to see how 'make' treats includes.	            -*- Autoconf -*-
682 684
 
683
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
685
+# Copyright (C) 2001, 2002, 2003, 2005, 2009  Free Software Foundation, Inc.
684 686
 #
685 687
 # This file is free software; the Free Software Foundation
686 688
 # gives unlimited permission to copy and/or distribute it,
687 689
 # with or without modifications, as long as this notice is preserved.
688 690
 
691
+# serial 4
692
+
689 693
 # AM_MAKE_INCLUDE()
690 694
 # -----------------
691 695
 # Check to see how make treats includes.
... ...
@@ -703,7 +667,7 @@ am__quote=
703 703
 _am_result=none
704 704
 # First try GNU make style include.
705 705
 echo "include confinc" > confmf
706
-# Ignore all kinds of additional output from 'make'.
706
+# Ignore all kinds of additional output from `make'.
707 707
 case `$am_make -s -f confmf 2> /dev/null` in #(
708 708
 *the\ am__doit\ target*)
709 709
   am__include=include
... ...
@@ -730,12 +694,15 @@ rm -f confinc confmf
730 730
 
731 731
 # Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
732 732
 
733
-# Copyright (C) 1997-2013 Free Software Foundation, Inc.
733
+# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008
734
+# Free Software Foundation, Inc.
734 735
 #
735 736
 # This file is free software; the Free Software Foundation
736 737
 # gives unlimited permission to copy and/or distribute it,
737 738
 # with or without modifications, as long as this notice is preserved.
738 739
 
740
+# serial 6
741
+
739 742
 # AM_MISSING_PROG(NAME, PROGRAM)
740 743
 # ------------------------------
741 744
 AC_DEFUN([AM_MISSING_PROG],
... ...
@@ -743,10 +710,11 @@ AC_DEFUN([AM_MISSING_PROG],
743 743
 $1=${$1-"${am_missing_run}$2"}
744 744
 AC_SUBST($1)])
745 745
 
746
+
746 747
 # AM_MISSING_HAS_RUN
747 748
 # ------------------
748
-# Define MISSING if not defined so far and test if it is modern enough.
749
-# If it is, set am_missing_run to use it, otherwise, to nothing.
749
+# Define MISSING if not defined so far and test if it supports --run.
750
+# If it does, set am_missing_run to use it, otherwise, to nothing.
750 751
 AC_DEFUN([AM_MISSING_HAS_RUN],
751 752
 [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
752 753
 AC_REQUIRE_AUX_FILE([missing])dnl
... ...
@@ -759,22 +727,54 @@ if test x"${MISSING+set}" != xset; then
759 759
   esac
760 760
 fi
761 761
 # Use eval to expand $SHELL
762
-if eval "$MISSING --is-lightweight"; then
763
-  am_missing_run="$MISSING "
762
+if eval "$MISSING --run true"; then
763
+  am_missing_run="$MISSING --run "
764 764
 else
765 765
   am_missing_run=
766
-  AC_MSG_WARN(['missing' script is too old or missing])
766
+  AC_MSG_WARN([`missing' script is too old or missing])
767 767
 fi
768 768
 ])
769 769
 
770
+# Copyright (C) 2003, 2004, 2005, 2006, 2011 Free Software Foundation,
771
+# Inc.
772
+#
773
+# This file is free software; the Free Software Foundation
774
+# gives unlimited permission to copy and/or distribute it,
775
+# with or without modifications, as long as this notice is preserved.
776
+
777
+# serial 1
778
+
779
+# AM_PROG_MKDIR_P
780
+# ---------------
781
+# Check for `mkdir -p'.
782
+AC_DEFUN([AM_PROG_MKDIR_P],
783
+[AC_PREREQ([2.60])dnl
784
+AC_REQUIRE([AC_PROG_MKDIR_P])dnl
785
+dnl Automake 1.8 to 1.9.6 used to define mkdir_p.  We now use MKDIR_P,
786
+dnl while keeping a definition of mkdir_p for backward compatibility.
787
+dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
788
+dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
789
+dnl Makefile.ins that do not define MKDIR_P, so we do our own
790
+dnl adjustment using top_builddir (which is defined more often than
791
+dnl MKDIR_P).
792
+AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
793
+case $mkdir_p in
794
+  [[\\/$]]* | ?:[[\\/]]*) ;;
795
+  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
796
+esac
797
+])
798
+
770 799
 # Helper functions for option handling.                     -*- Autoconf -*-
771 800
 
772
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
801
+# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 Free Software
802
+# Foundation, Inc.
773 803
 #
774 804
 # This file is free software; the Free Software Foundation
775 805
 # gives unlimited permission to copy and/or distribute it,
776 806
 # with or without modifications, as long as this notice is preserved.
777 807
 
808
+# serial 5
809
+
778 810
 # _AM_MANGLE_OPTION(NAME)
779 811
 # -----------------------
780 812
 AC_DEFUN([_AM_MANGLE_OPTION],
... ...
@@ -784,7 +784,7 @@ AC_DEFUN([_AM_MANGLE_OPTION],
784 784
 # --------------------
785 785
 # Set option NAME.  Presently that only means defining a flag for this option.
786 786
 AC_DEFUN([_AM_SET_OPTION],
787
-[m4_define(_AM_MANGLE_OPTION([$1]), [1])])
787
+[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
788 788
 
789 789
 # _AM_SET_OPTIONS(OPTIONS)
790 790
 # ------------------------
... ...
@@ -798,58 +798,13 @@ AC_DEFUN([_AM_SET_OPTIONS],
798 798
 AC_DEFUN([_AM_IF_OPTION],
799 799
 [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
800 800
 
801
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
801
+# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
802 802
 #
803 803
 # This file is free software; the Free Software Foundation
804 804
 # gives unlimited permission to copy and/or distribute it,
805 805
 # with or without modifications, as long as this notice is preserved.
806 806
 
807
-# _AM_PROG_CC_C_O
808
-# ---------------
809
-# Like AC_PROG_CC_C_O, but changed for automake.  We rewrite AC_PROG_CC
810
-# to automatically call this.
811
-AC_DEFUN([_AM_PROG_CC_C_O],
812
-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
813
-AC_REQUIRE_AUX_FILE([compile])dnl
814
-AC_LANG_PUSH([C])dnl
815
-AC_CACHE_CHECK(
816
-  [whether $CC understands -c and -o together],
817
-  [am_cv_prog_cc_c_o],
818
-  [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])])
819
-  # Make sure it works both with $CC and with simple cc.
820
-  # Following AC_PROG_CC_C_O, we do the test twice because some
821
-  # compilers refuse to overwrite an existing .o file with -o,
822
-  # though they will create one.
823
-  am_cv_prog_cc_c_o=yes
824
-  for am_i in 1 2; do
825
-    if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \
826
-         && test -f conftest2.$ac_objext; then
827
-      : OK
828
-    else
829
-      am_cv_prog_cc_c_o=no
830
-      break
831
-    fi
832
-  done
833
-  rm -f core conftest*
834
-  unset am_i])
835
-if test "$am_cv_prog_cc_c_o" != yes; then
836
-   # Losing compiler, so override with the script.
837
-   # FIXME: It is wrong to rewrite CC.
838
-   # But if we don't then we get into trouble of one sort or another.
839
-   # A longer-term fix would be to have automake use am__CC in this case,
840
-   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
841
-   CC="$am_aux_dir/compile $CC"
842
-fi
843
-AC_LANG_POP([C])])
844
-
845
-# For backward compatibility.
846
-AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
847
-
848
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
849
-#
850
-# This file is free software; the Free Software Foundation
851
-# gives unlimited permission to copy and/or distribute it,
852
-# with or without modifications, as long as this notice is preserved.
807
+# serial 1
853 808
 
854 809
 # AM_RUN_LOG(COMMAND)
855 810
 # -------------------
... ...
@@ -864,16 +819,22 @@ AC_DEFUN([AM_RUN_LOG],
864 864
 
865 865
 # Check to make sure that the build environment is sane.    -*- Autoconf -*-
866 866
 
867
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
867
+# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008
868
+# Free Software Foundation, Inc.
868 869
 #
869 870
 # This file is free software; the Free Software Foundation
870 871
 # gives unlimited permission to copy and/or distribute it,
871 872
 # with or without modifications, as long as this notice is preserved.
872 873
 
874
+# serial 5
875
+
873 876
 # AM_SANITY_CHECK
874 877
 # ---------------
875 878
 AC_DEFUN([AM_SANITY_CHECK],
876 879
 [AC_MSG_CHECKING([whether build environment is sane])
880
+# Just in case
881
+sleep 1
882
+echo timestamp > conftest.file
877 883
 # Reject unsafe characters in $srcdir or the absolute working directory
878 884
 # name.  Accept space and tab only in the latter.
879 885
 am_lf='
... ...
@@ -884,40 +845,32 @@ case `pwd` in
884 884
 esac
885 885
 case $srcdir in
886 886
   *[[\\\"\#\$\&\'\`$am_lf\ \	]]*)
887
-    AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);;
887
+    AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);;
888 888
 esac
889 889
 
890
-# Do 'set' in a subshell so we don't clobber the current shell's
890
+# Do `set' in a subshell so we don't clobber the current shell's
891 891
 # arguments.  Must try -L first in case configure is actually a
892 892
 # symlink; some systems play weird games with the mod time of symlinks
893 893
 # (eg FreeBSD returns the mod time of the symlink's containing
894 894
 # directory).
895 895
 if (
896
-   am_has_slept=no
897
-   for am_try in 1 2; do
898
-     echo "timestamp, slept: $am_has_slept" > conftest.file
899
-     set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
900
-     if test "$[*]" = "X"; then
901
-	# -L didn't work.
902
-	set X `ls -t "$srcdir/configure" conftest.file`
903
-     fi
904
-     if test "$[*]" != "X $srcdir/configure conftest.file" \
905
-	&& test "$[*]" != "X conftest.file $srcdir/configure"; then
906
-
907
-	# If neither matched, then we have a broken ls.  This can happen
908
-	# if, for instance, CONFIG_SHELL is bash and it inherits a
909
-	# broken ls alias from the environment.  This has actually
910
-	# happened.  Such a system could not be considered "sane".
911
-	AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
912
-  alias in your environment])
913
-     fi
914
-     if test "$[2]" = conftest.file || test $am_try -eq 2; then
915
-       break
916
-     fi
917
-     # Just in case.
918
-     sleep 1
919
-     am_has_slept=yes
920
-   done
896
+   set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
897
+   if test "$[*]" = "X"; then
898
+      # -L didn't work.
899
+      set X `ls -t "$srcdir/configure" conftest.file`
900
+   fi
901
+   rm -f conftest.file
902
+   if test "$[*]" != "X $srcdir/configure conftest.file" \
903
+      && test "$[*]" != "X conftest.file $srcdir/configure"; then
904
+
905
+      # If neither matched, then we have a broken ls.  This can happen
906
+      # if, for instance, CONFIG_SHELL is bash and it inherits a
907
+      # broken ls alias from the environment.  This has actually
908
+      # happened.  Such a system could not be considered "sane".
909
+      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
910
+alias in your environment])
911
+   fi
912
+
921 913
    test "$[2]" = conftest.file
922 914
    )
923 915
 then
... ...
@@ -927,50 +880,31 @@ else
927 927
    AC_MSG_ERROR([newly created file is older than distributed files!
928 928
 Check your system clock])
929 929
 fi
930
-AC_MSG_RESULT([yes])
931
-# If we didn't sleep, we still need to ensure time stamps of config.status and
932
-# generated files are strictly newer.
933
-am_sleep_pid=
934
-if grep 'slept: no' conftest.file >/dev/null 2>&1; then
935
-  ( sleep 1 ) &
936
-  am_sleep_pid=$!
937
-fi
938
-AC_CONFIG_COMMANDS_PRE(
939
-  [AC_MSG_CHECKING([that generated files are newer than configure])
940
-   if test -n "$am_sleep_pid"; then
941
-     # Hide warnings about reused PIDs.
942
-     wait $am_sleep_pid 2>/dev/null
943
-   fi
944
-   AC_MSG_RESULT([done])])
945
-rm -f conftest.file
946
-])
930
+AC_MSG_RESULT(yes)])
947 931
 
948
-# Copyright (C) 2009-2013 Free Software Foundation, Inc.
932
+# Copyright (C) 2009, 2011  Free Software Foundation, Inc.
949 933
 #
950 934
 # This file is free software; the Free Software Foundation
951 935
 # gives unlimited permission to copy and/or distribute it,
952 936
 # with or without modifications, as long as this notice is preserved.
953 937
 
938
+# serial 2
939
+
954 940
 # AM_SILENT_RULES([DEFAULT])
955 941
 # --------------------------
956 942
 # Enable less verbose build rules; with the default set to DEFAULT
957
-# ("yes" being less verbose, "no" or empty being verbose).
943
+# (`yes' being less verbose, `no' or empty being verbose).
958 944
 AC_DEFUN([AM_SILENT_RULES],
959
-[AC_ARG_ENABLE([silent-rules], [dnl
960
-AS_HELP_STRING(
961
-  [--enable-silent-rules],
962
-  [less verbose build output (undo: "make V=1")])
963
-AS_HELP_STRING(
964
-  [--disable-silent-rules],
965
-  [verbose build output (undo: "make V=0")])dnl
966
-])
967
-case $enable_silent_rules in @%:@ (((
968
-  yes) AM_DEFAULT_VERBOSITY=0;;
969
-   no) AM_DEFAULT_VERBOSITY=1;;
970
-    *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);;
945
+[AC_ARG_ENABLE([silent-rules],
946
+[  --enable-silent-rules          less verbose build output (undo: `make V=1')
947
+  --disable-silent-rules         verbose build output (undo: `make V=0')])
948
+case $enable_silent_rules in
949
+yes) AM_DEFAULT_VERBOSITY=0;;
950
+no)  AM_DEFAULT_VERBOSITY=1;;
951
+*)   AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);;
971 952
 esac
972 953
 dnl
973
-dnl A few 'make' implementations (e.g., NonStop OS and NextStep)
954
+dnl A few `make' implementations (e.g., NonStop OS and NextStep)
974 955
 dnl do not support nested variable expansions.
975 956
 dnl See automake bug#9928 and bug#10237.
976 957
 am_make=${MAKE-make}
... ...
@@ -988,7 +922,7 @@ else
988 988
   am_cv_make_support_nested_variables=no
989 989
 fi])
990 990
 if test $am_cv_make_support_nested_variables = yes; then
991
-  dnl Using '$V' instead of '$(V)' breaks IRIX make.
991
+  dnl Using `$V' instead of `$(V)' breaks IRIX make.
992 992
   AM_V='$(V)'
993 993
   AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
994 994
 else
... ...
@@ -1005,40 +939,44 @@ AC_SUBST([AM_BACKSLASH])dnl
1005 1005
 _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
1006 1006
 ])
1007 1007
 
1008
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
1008
+# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
1009 1009
 #
1010 1010
 # This file is free software; the Free Software Foundation
1011 1011
 # gives unlimited permission to copy and/or distribute it,
1012 1012
 # with or without modifications, as long as this notice is preserved.
1013 1013
 
1014
+# serial 1
1015
+
1014 1016
 # AM_PROG_INSTALL_STRIP
1015 1017
 # ---------------------
1016
-# One issue with vendor 'install' (even GNU) is that you can't
1018
+# One issue with vendor `install' (even GNU) is that you can't
1017 1019
 # specify the program used to strip binaries.  This is especially
1018 1020
 # annoying in cross-compiling environments, where the build's strip
1019 1021
 # is unlikely to handle the host's binaries.
1020 1022
 # Fortunately install-sh will honor a STRIPPROG variable, so we
1021
-# always use install-sh in "make install-strip", and initialize
1023
+# always use install-sh in `make install-strip', and initialize
1022 1024
 # STRIPPROG with the value of the STRIP variable (set by the user).
1023 1025
 AC_DEFUN([AM_PROG_INSTALL_STRIP],
1024 1026
 [AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
1025
-# Installed binaries are usually stripped using 'strip' when the user
1026
-# run "make install-strip".  However 'strip' might not be the right
1027
+# Installed binaries are usually stripped using `strip' when the user
1028
+# run `make install-strip'.  However `strip' might not be the right
1027 1029
 # tool to use in cross-compilation environments, therefore Automake
1028
-# will honor the 'STRIP' environment variable to overrule this program.
1029
-dnl Don't test for $cross_compiling = yes, because it might be 'maybe'.
1030
+# will honor the `STRIP' environment variable to overrule this program.
1031
+dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
1030 1032
 if test "$cross_compiling" != no; then
1031 1033
   AC_CHECK_TOOL([STRIP], [strip], :)
1032 1034
 fi
1033 1035
 INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
1034 1036
 AC_SUBST([INSTALL_STRIP_PROGRAM])])
1035 1037
 
1036
-# Copyright (C) 2006-2013 Free Software Foundation, Inc.
1038
+# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc.
1037 1039
 #
1038 1040
 # This file is free software; the Free Software Foundation
1039 1041
 # gives unlimited permission to copy and/or distribute it,
1040 1042
 # with or without modifications, as long as this notice is preserved.
1041 1043
 
1044
+# serial 3
1045
+
1042 1046
 # _AM_SUBST_NOTMAKE(VARIABLE)
1043 1047
 # ---------------------------
1044 1048
 # Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
... ...
@@ -1052,16 +990,18 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
1052 1052
 
1053 1053
 # Check how to create a tarball.                            -*- Autoconf -*-
1054 1054
 
1055
-# Copyright (C) 2004-2013 Free Software Foundation, Inc.
1055
+# Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc.
1056 1056
 #
1057 1057
 # This file is free software; the Free Software Foundation
1058 1058
 # gives unlimited permission to copy and/or distribute it,
1059 1059
 # with or without modifications, as long as this notice is preserved.
1060 1060
 
1061
+# serial 2
1062
+
1061 1063
 # _AM_PROG_TAR(FORMAT)
1062 1064
 # --------------------
1063 1065
 # Check how to create a tarball in format FORMAT.
1064
-# FORMAT should be one of 'v7', 'ustar', or 'pax'.
1066
+# FORMAT should be one of `v7', `ustar', or `pax'.
1065 1067
 #
1066 1068
 # Substitute a variable $(am__tar) that is a command
1067 1069
 # writing to stdout a FORMAT-tarball containing the directory
... ...
@@ -1071,114 +1011,76 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
1071 1071
 # Substitute a variable $(am__untar) that extract such
1072 1072
 # a tarball read from stdin.
1073 1073
 #     $(am__untar) < result.tar
1074
-#
1075 1074
 AC_DEFUN([_AM_PROG_TAR],
1076 1075
 [# Always define AMTAR for backward compatibility.  Yes, it's still used
1077 1076
 # in the wild :-(  We should find a proper way to deprecate it ...
1078 1077
 AC_SUBST([AMTAR], ['$${TAR-tar}'])
1079
-
1080
-# We'll loop over all known methods to create a tar archive until one works.
1078
+m4_if([$1], [v7],
1079
+     [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
1080
+     [m4_case([$1], [ustar],, [pax],,
1081
+              [m4_fatal([Unknown tar format])])
1082
+AC_MSG_CHECKING([how to create a $1 tar archive])
1083
+# Loop over all known methods to create a tar archive until one works.
1081 1084
 _am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
1085
+_am_tools=${am_cv_prog_tar_$1-$_am_tools}
1086
+# Do not fold the above two line into one, because Tru64 sh and
1087
+# Solaris sh will not grok spaces in the rhs of `-'.
1088
+for _am_tool in $_am_tools
1089
+do
1090
+  case $_am_tool in
1091
+  gnutar)
1092
+    for _am_tar in tar gnutar gtar;
1093
+    do
1094
+      AM_RUN_LOG([$_am_tar --version]) && break
1095
+    done
1096
+    am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
1097
+    am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
1098
+    am__untar="$_am_tar -xf -"
1099
+    ;;
1100
+  plaintar)
1101
+    # Must skip GNU tar: if it does not support --format= it doesn't create
1102
+    # ustar tarball either.
1103
+    (tar --version) >/dev/null 2>&1 && continue
1104
+    am__tar='tar chf - "$$tardir"'
1105
+    am__tar_='tar chf - "$tardir"'
1106
+    am__untar='tar xf -'
1107
+    ;;
1108
+  pax)
1109
+    am__tar='pax -L -x $1 -w "$$tardir"'
1110
+    am__tar_='pax -L -x $1 -w "$tardir"'
1111
+    am__untar='pax -r'
1112
+    ;;
1113
+  cpio)
1114
+    am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
1115
+    am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
1116
+    am__untar='cpio -i -H $1 -d'
1117
+    ;;
1118
+  none)
1119
+    am__tar=false
1120
+    am__tar_=false
1121
+    am__untar=false
1122
+    ;;
1123
+  esac
1082 1124
 
1083
-m4_if([$1], [v7],
1084
-  [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
1085
-
1086
-  [m4_case([$1],
1087
-    [ustar],
1088
-     [# The POSIX 1988 'ustar' format is defined with fixed-size fields.
1089
-      # There is notably a 21 bits limit for the UID and the GID.  In fact,
1090
-      # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343
1091
-      # and bug#13588).
1092
-      am_max_uid=2097151 # 2^21 - 1
1093
-      am_max_gid=$am_max_uid
1094
-      # The $UID and $GID variables are not portable, so we need to resort
1095
-      # to the POSIX-mandated id(1) utility.  Errors in the 'id' calls
1096
-      # below are definitely unexpected, so allow the users to see them
1097
-      # (that is, avoid stderr redirection).
1098
-      am_uid=`id -u || echo unknown`
1099
-      am_gid=`id -g || echo unknown`
1100
-      AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format])
1101
-      if test $am_uid -le $am_max_uid; then
1102
-         AC_MSG_RESULT([yes])
1103
-      else
1104
-         AC_MSG_RESULT([no])
1105
-         _am_tools=none
1106
-      fi
1107
-      AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format])
1108
-      if test $am_gid -le $am_max_gid; then
1109
-         AC_MSG_RESULT([yes])
1110
-      else
1111
-        AC_MSG_RESULT([no])
1112
-        _am_tools=none
1113
-      fi],
1114
-
1115
-  [pax],
1116
-    [],
1117
-
1118
-  [m4_fatal([Unknown tar format])])
1119
-
1120
-  AC_MSG_CHECKING([how to create a $1 tar archive])
1121
-
1122
-  # Go ahead even if we have the value already cached.  We do so because we
1123
-  # need to set the values for the 'am__tar' and 'am__untar' variables.
1124
-  _am_tools=${am_cv_prog_tar_$1-$_am_tools}
1125
-
1126
-  for _am_tool in $_am_tools; do
1127
-    case $_am_tool in
1128
-    gnutar)
1129
-      for _am_tar in tar gnutar gtar; do
1130
-        AM_RUN_LOG([$_am_tar --version]) && break
1131
-      done
1132
-      am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
1133
-      am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
1134
-      am__untar="$_am_tar -xf -"
1135
-      ;;
1136
-    plaintar)
1137
-      # Must skip GNU tar: if it does not support --format= it doesn't create
1138
-      # ustar tarball either.
1139
-      (tar --version) >/dev/null 2>&1 && continue
1140
-      am__tar='tar chf - "$$tardir"'
1141
-      am__tar_='tar chf - "$tardir"'
1142
-      am__untar='tar xf -'
1143
-      ;;
1144
-    pax)
1145
-      am__tar='pax -L -x $1 -w "$$tardir"'
1146
-      am__tar_='pax -L -x $1 -w "$tardir"'
1147
-      am__untar='pax -r'
1148
-      ;;
1149
-    cpio)
1150
-      am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
1151
-      am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
1152
-      am__untar='cpio -i -H $1 -d'
1153
-      ;;
1154
-    none)
1155
-      am__tar=false
1156
-      am__tar_=false
1157
-      am__untar=false
1158
-      ;;
1159
-    esac
1125
+  # If the value was cached, stop now.  We just wanted to have am__tar
1126
+  # and am__untar set.
1127
+  test -n "${am_cv_prog_tar_$1}" && break
1160 1128
 
1161
-    # If the value was cached, stop now.  We just wanted to have am__tar
1162
-    # and am__untar set.
1163
-    test -n "${am_cv_prog_tar_$1}" && break
1164
-
1165
-    # tar/untar a dummy directory, and stop if the command works.
1166
-    rm -rf conftest.dir
1167
-    mkdir conftest.dir
1168
-    echo GrepMe > conftest.dir/file
1169
-    AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
1170
-    rm -rf conftest.dir
1171
-    if test -s conftest.tar; then
1172
-      AM_RUN_LOG([$am__untar <conftest.tar])
1173
-      AM_RUN_LOG([cat conftest.dir/file])
1174
-      grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
1175
-    fi
1176
-  done
1129
+  # tar/untar a dummy directory, and stop if the command works
1177 1130
   rm -rf conftest.dir
1131
+  mkdir conftest.dir
1132
+  echo GrepMe > conftest.dir/file
1133
+  AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
1134
+  rm -rf conftest.dir
1135
+  if test -s conftest.tar; then
1136
+    AM_RUN_LOG([$am__untar <conftest.tar])
1137
+    grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
1138
+  fi
1139
+done
1140
+rm -rf conftest.dir
1178 1141
 
1179
-  AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
1180
-  AC_MSG_RESULT([$am_cv_prog_tar_$1])])
1181
-
1142
+AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
1143
+AC_MSG_RESULT([$am_cv_prog_tar_$1])])
1182 1144
 AC_SUBST([am__tar])
1183 1145
 AC_SUBST([am__untar])
1184 1146
 ]) # _AM_PROG_TAR
... ...
@@ -1,11 +1,13 @@
1 1
 #! /bin/sh
2 2
 # Guess values for system-dependent variables and create Makefiles.
3
-# Generated by GNU Autoconf 2.69 for libclamavc++ devel.
3
+# Generated by GNU Autoconf 2.68 for libclamavc++ devel.
4 4
 #
5 5
 # Report bugs to <http://bugs.clamav.net>.
6 6
 #
7 7
 #
8
-# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
8
+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
9
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
10
+# Foundation, Inc.
9 11
 #
10 12
 #
11 13
 # This configure script is free software; the Free Software Foundation
... ...
@@ -134,31 +136,6 @@ export LANGUAGE
134 134
 # CDPATH.
135 135
 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
136 136
 
137
-# Use a proper internal environment variable to ensure we don't fall
138
-  # into an infinite loop, continuously re-executing ourselves.
139
-  if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
140
-    _as_can_reexec=no; export _as_can_reexec;
141
-    # We cannot yet assume a decent shell, so we have to provide a
142
-# neutralization value for shells without unset; and this also
143
-# works around shells that cannot unset nonexistent variables.
144
-# Preserve -v and -x to the replacement shell.
145
-BASH_ENV=/dev/null
146
-ENV=/dev/null
147
-(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
148
-case $- in # ((((
149
-  *v*x* | *x*v* ) as_opts=-vx ;;
150
-  *v* ) as_opts=-v ;;
151
-  *x* ) as_opts=-x ;;
152
-  * ) as_opts= ;;
153
-esac
154
-exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
155
-# Admittedly, this is quite paranoid, since all the known shells bail
156
-# out after a failed `exec'.
157
-$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
158
-as_fn_exit 255
159
-  fi
160
-  # We don't want this to propagate to other subprocesses.
161
-          { _as_can_reexec=; unset _as_can_reexec;}
162 137
 if test "x$CONFIG_SHELL" = x; then
163 138
   as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
164 139
   emulate sh
... ...
@@ -192,8 +169,7 @@ if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
192 192
 else
193 193
   exitcode=1; echo positional parameters were not saved.
194 194
 fi
195
-test x\$exitcode = x0 || exit 1
196
-test -x / || exit 1"
195
+test x\$exitcode = x0 || exit 1"
197 196
   as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
198 197
   as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
199 198
   eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
... ...
@@ -246,25 +222,21 @@ IFS=$as_save_IFS
246 246
 
247 247
 
248 248
       if test "x$CONFIG_SHELL" != x; then :
249
-  export CONFIG_SHELL
250
-             # We cannot yet assume a decent shell, so we have to provide a
251
-# neutralization value for shells without unset; and this also
252
-# works around shells that cannot unset nonexistent variables.
253
-# Preserve -v and -x to the replacement shell.
254
-BASH_ENV=/dev/null
255
-ENV=/dev/null
256
-(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
257
-case $- in # ((((
258
-  *v*x* | *x*v* ) as_opts=-vx ;;
259
-  *v* ) as_opts=-v ;;
260
-  *x* ) as_opts=-x ;;
261
-  * ) as_opts= ;;
262
-esac
263
-exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
264
-# Admittedly, this is quite paranoid, since all the known shells bail
265
-# out after a failed `exec'.
266
-$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
267
-exit 255
249
+  # We cannot yet assume a decent shell, so we have to provide a
250
+	# neutralization value for shells without unset; and this also
251
+	# works around shells that cannot unset nonexistent variables.
252
+	# Preserve -v and -x to the replacement shell.
253
+	BASH_ENV=/dev/null
254
+	ENV=/dev/null
255
+	(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
256
+	export CONFIG_SHELL
257
+	case $- in # ((((
258
+	  *v*x* | *x*v* ) as_opts=-vx ;;
259
+	  *v* ) as_opts=-v ;;
260
+	  *x* ) as_opts=-x ;;
261
+	  * ) as_opts= ;;
262
+	esac
263
+	exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
268 264
 fi
269 265
 
270 266
     if test x$as_have_required = xno; then :
... ...
@@ -367,14 +339,6 @@ $as_echo X"$as_dir" |
367 367
 
368 368
 
369 369
 } # as_fn_mkdir_p
370
-
371
-# as_fn_executable_p FILE
372
-# -----------------------
373
-# Test if FILE is an executable regular file.
374
-as_fn_executable_p ()
375
-{
376
-  test -f "$1" && test -x "$1"
377
-} # as_fn_executable_p
378 370
 # as_fn_append VAR VALUE
379 371
 # ----------------------
380 372
 # Append the text in VALUE to the end of the definition contained in VAR. Take
... ...
@@ -496,10 +460,6 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits
496 496
   chmod +x "$as_me.lineno" ||
497 497
     { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
498 498
 
499
-  # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
500
-  # already done that, so ensure we don't try to do so again and fall
501
-  # in an infinite loop.  This has already happened in practice.
502
-  _as_can_reexec=no; export _as_can_reexec
503 499
   # Don't try to exec as it changes $[0], causing all sort of problems
504 500
   # (the dirname of $[0] is not the place where we might find the
505 501
   # original and so on.  Autoconf is especially sensitive to this).
... ...
@@ -534,16 +494,16 @@ if (echo >conf$$.file) 2>/dev/null; then
534 534
     # ... but there are two gotchas:
535 535
     # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
536 536
     # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
537
-    # In both cases, we have to default to `cp -pR'.
537
+    # In both cases, we have to default to `cp -p'.
538 538
     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
539
-      as_ln_s='cp -pR'
539
+      as_ln_s='cp -p'
540 540
   elif ln conf$$.file conf$$ 2>/dev/null; then
541 541
     as_ln_s=ln
542 542
   else
543
-    as_ln_s='cp -pR'
543
+    as_ln_s='cp -p'
544 544
   fi
545 545
 else
546
-  as_ln_s='cp -pR'
546
+  as_ln_s='cp -p'
547 547
 fi
548 548
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
549 549
 rmdir conf$$.dir 2>/dev/null
... ...
@@ -555,8 +515,28 @@ else
555 555
   as_mkdir_p=false
556 556
 fi
557 557
 
558
-as_test_x='test -x'
559
-as_executable_p=as_fn_executable_p
558
+if test -x / >/dev/null 2>&1; then
559
+  as_test_x='test -x'
560
+else
561
+  if ls -dL / >/dev/null 2>&1; then
562
+    as_ls_L_option=L
563
+  else
564
+    as_ls_L_option=
565
+  fi
566
+  as_test_x='
567
+    eval sh -c '\''
568
+      if test -d "$1"; then
569
+	test -d "$1/.";
570
+      else
571
+	case $1 in #(
572
+	-*)set "./$1";;
573
+	esac;
574
+	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
575
+	???[sx]*):;;*)false;;esac;fi
576
+    '\'' sh
577
+  '
578
+fi
579
+as_executable_p=$as_test_x
560 580
 
561 581
 # Sed expression to map a string onto a valid CPP name.
562 582
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
... ...
@@ -1269,6 +1249,8 @@ target=$target_alias
1269 1269
 if test "x$host_alias" != x; then
1270 1270
   if test "x$build_alias" = x; then
1271 1271
     cross_compiling=maybe
1272
+    $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
1273
+    If a cross compiler is detected then cross compile mode will be used" >&2
1272 1274
   elif test "x$build_alias" != "x$host_alias"; then
1273 1275
     cross_compiling=yes
1274 1276
   fi
... ...
@@ -1433,15 +1415,12 @@ Optional Features:
1433 1433
   --disable-option-checking  ignore unrecognized --enable/--with options
1434 1434
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
1435 1435
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
1436
-  --enable-silent-rules   less verbose build output (undo: "make V=1")
1437
-  --disable-silent-rules  verbose build output (undo: "make V=0")
1438
-  --enable-dependency-tracking
1439
-                          do not reject slow dependency extractors
1440
-  --disable-dependency-tracking
1441
-                          speeds up one-time build
1442
-  --enable-maintainer-mode
1443
-                          enable make rules and dependencies not useful (and
1444
-                          sometimes confusing) to the casual installer
1436
+  --enable-silent-rules          less verbose build output (undo: `make V=1')
1437
+  --disable-silent-rules         verbose build output (undo: `make V=0')
1438
+  --disable-dependency-tracking  speeds up one-time build
1439
+  --enable-dependency-tracking   do not reject slow dependency extractors
1440
+  --enable-maintainer-mode  enable make rules and dependencies not useful
1441
+			  (and sometimes confusing) to the casual installer
1445 1442
   --enable-static[=PKGS]  build static libraries [default=no]
1446 1443
   --enable-shared[=PKGS]  build shared libraries [default=yes]
1447 1444
   --enable-fast-install[=PKGS]
... ...
@@ -1543,9 +1522,9 @@ test -n "$ac_init_help" && exit $ac_status
1543 1543
 if $ac_init_version; then
1544 1544
   cat <<\_ACEOF
1545 1545
 libclamavc++ configure devel
1546
-generated by GNU Autoconf 2.69
1546
+generated by GNU Autoconf 2.68
1547 1547
 
1548
-Copyright (C) 2012 Free Software Foundation, Inc.
1548
+Copyright (C) 2010 Free Software Foundation, Inc.
1549 1549
 This configure script is free software; the Free Software Foundation
1550 1550
 gives unlimited permission to copy, distribute and modify it.
1551 1551
 _ACEOF
... ...
@@ -1769,7 +1748,7 @@ $as_echo "$ac_try_echo"; } >&5
1769 1769
 	 test ! -s conftest.err
1770 1770
        } && test -s conftest$ac_exeext && {
1771 1771
 	 test "$cross_compiling" = yes ||
1772
-	 test -x conftest$ac_exeext
1772
+	 $as_test_x conftest$ac_exeext
1773 1773
        }; then :
1774 1774
   ac_retval=0
1775 1775
 else
... ...
@@ -1919,7 +1898,7 @@ $as_echo "$ac_try_echo"; } >&5
1919 1919
 	 test ! -s conftest.err
1920 1920
        } && test -s conftest$ac_exeext && {
1921 1921
 	 test "$cross_compiling" = yes ||
1922
-	 test -x conftest$ac_exeext
1922
+	 $as_test_x conftest$ac_exeext
1923 1923
        }; then :
1924 1924
   ac_retval=0
1925 1925
 else
... ...
@@ -1984,7 +1963,7 @@ This file contains any messages produced by compilers while
1984 1984
 running configure, to aid debugging if configure makes a mistake.
1985 1985
 
1986 1986
 It was created by libclamavc++ $as_me devel, which was
1987
-generated by GNU Autoconf 2.69.  Invocation command line was
1987
+generated by GNU Autoconf 2.68.  Invocation command line was
1988 1988
 
1989 1989
   $ $0 $@
1990 1990
 
... ...
@@ -2474,7 +2453,7 @@ test -n "$target_alias" &&
2474 2474
   test "$program_prefix$program_suffix$program_transform_name" = \
2475 2475
     NONENONEs,x,x, &&
2476 2476
   program_prefix=${target_alias}-
2477
-am__api_version='1.14'
2477
+am__api_version='1.11'
2478 2478
 
2479 2479
 # Find a good install program.  We prefer a C program (faster),
2480 2480
 # so one script is as good as another.  But avoid the broken or
... ...
@@ -2513,7 +2492,7 @@ case $as_dir/ in #((
2513 2513
     # by default.
2514 2514
     for ac_prog in ginstall scoinst install; do
2515 2515
       for ac_exec_ext in '' $ac_executable_extensions; do
2516
-	if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
2516
+	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
2517 2517
 	  if test $ac_prog = install &&
2518 2518
 	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
2519 2519
 	    # AIX install.  It has an incompatible calling convention.
... ...
@@ -2571,6 +2550,9 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
2571 2571
 
2572 2572
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
2573 2573
 $as_echo_n "checking whether build environment is sane... " >&6; }
2574
+# Just in case
2575
+sleep 1
2576
+echo timestamp > conftest.file
2574 2577
 # Reject unsafe characters in $srcdir or the absolute working directory
2575 2578
 # name.  Accept space and tab only in the latter.
2576 2579
 am_lf='
... ...
@@ -2581,40 +2563,32 @@ case `pwd` in
2581 2581
 esac
2582 2582
 case $srcdir in
2583 2583
   *[\\\"\#\$\&\'\`$am_lf\ \	]*)
2584
-    as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;;
2584
+    as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
2585 2585
 esac
2586 2586
 
2587
-# Do 'set' in a subshell so we don't clobber the current shell's
2587
+# Do `set' in a subshell so we don't clobber the current shell's
2588 2588
 # arguments.  Must try -L first in case configure is actually a
2589 2589
 # symlink; some systems play weird games with the mod time of symlinks
2590 2590
 # (eg FreeBSD returns the mod time of the symlink's containing
2591 2591
 # directory).
2592 2592
 if (
2593
-   am_has_slept=no
2594
-   for am_try in 1 2; do
2595
-     echo "timestamp, slept: $am_has_slept" > conftest.file
2596
-     set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
2597
-     if test "$*" = "X"; then
2598
-	# -L didn't work.
2599
-	set X `ls -t "$srcdir/configure" conftest.file`
2600
-     fi
2601
-     if test "$*" != "X $srcdir/configure conftest.file" \
2602
-	&& test "$*" != "X conftest.file $srcdir/configure"; then
2603
-
2604
-	# If neither matched, then we have a broken ls.  This can happen
2605
-	# if, for instance, CONFIG_SHELL is bash and it inherits a
2606
-	# broken ls alias from the environment.  This has actually
2607
-	# happened.  Such a system could not be considered "sane".
2608
-	as_fn_error $? "ls -t appears to fail.  Make sure there is not a broken
2609
-  alias in your environment" "$LINENO" 5
2610
-     fi
2611
-     if test "$2" = conftest.file || test $am_try -eq 2; then
2612
-       break
2613
-     fi
2614
-     # Just in case.
2615
-     sleep 1
2616
-     am_has_slept=yes
2617
-   done
2593
+   set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
2594
+   if test "$*" = "X"; then
2595
+      # -L didn't work.
2596
+      set X `ls -t "$srcdir/configure" conftest.file`
2597
+   fi
2598
+   rm -f conftest.file
2599
+   if test "$*" != "X $srcdir/configure conftest.file" \
2600
+      && test "$*" != "X conftest.file $srcdir/configure"; then
2601
+
2602
+      # If neither matched, then we have a broken ls.  This can happen
2603
+      # if, for instance, CONFIG_SHELL is bash and it inherits a
2604
+      # broken ls alias from the environment.  This has actually
2605
+      # happened.  Such a system could not be considered "sane".
2606
+      as_fn_error $? "ls -t appears to fail.  Make sure there is not a broken
2607
+alias in your environment" "$LINENO" 5
2608
+   fi
2609
+
2618 2610
    test "$2" = conftest.file
2619 2611
    )
2620 2612
 then
... ...
@@ -2626,16 +2600,6 @@ Check your system clock" "$LINENO" 5
2626 2626
 fi
2627 2627
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
2628 2628
 $as_echo "yes" >&6; }
2629
-# If we didn't sleep, we still need to ensure time stamps of config.status and
2630
-# generated files are strictly newer.
2631
-am_sleep_pid=
2632
-if grep 'slept: no' conftest.file >/dev/null 2>&1; then
2633
-  ( sleep 1 ) &
2634
-  am_sleep_pid=$!
2635
-fi
2636
-
2637
-rm -f conftest.file
2638
-
2639 2629
 test "$program_prefix" != NONE &&
2640 2630
   program_transform_name="s&^&$program_prefix&;$program_transform_name"
2641 2631
 # Use a double $ so make ignores it.
... ...
@@ -2658,12 +2622,12 @@ if test x"${MISSING+set}" != xset; then
2658 2658
   esac
2659 2659
 fi
2660 2660
 # Use eval to expand $SHELL
2661
-if eval "$MISSING --is-lightweight"; then
2662
-  am_missing_run="$MISSING "
2661
+if eval "$MISSING --run true"; then
2662
+  am_missing_run="$MISSING --run "
2663 2663
 else
2664 2664
   am_missing_run=
2665
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5
2666
-$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
2665
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5
2666
+$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
2667 2667
 fi
2668 2668
 
2669 2669
 if test x"${install_sh}" != xset; then
... ...
@@ -2675,10 +2639,10 @@ if test x"${install_sh}" != xset; then
2675 2675
   esac
2676 2676
 fi
2677 2677
 
2678
-# Installed binaries are usually stripped using 'strip' when the user
2679
-# run "make install-strip".  However 'strip' might not be the right
2678
+# Installed binaries are usually stripped using `strip' when the user
2679
+# run `make install-strip'.  However `strip' might not be the right
2680 2680
 # tool to use in cross-compilation environments, therefore Automake
2681
-# will honor the 'STRIP' environment variable to overrule this program.
2681
+# will honor the `STRIP' environment variable to overrule this program.
2682 2682
 if test "$cross_compiling" != no; then
2683 2683
   if test -n "$ac_tool_prefix"; then
2684 2684
   # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
... ...
@@ -2697,7 +2661,7 @@ do
2697 2697
   IFS=$as_save_IFS
2698 2698
   test -z "$as_dir" && as_dir=.
2699 2699
     for ac_exec_ext in '' $ac_executable_extensions; do
2700
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
2700
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
2701 2701
     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
2702 2702
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
2703 2703
     break 2
... ...
@@ -2737,7 +2701,7 @@ do
2737 2737
   IFS=$as_save_IFS
2738 2738
   test -z "$as_dir" && as_dir=.
2739 2739
     for ac_exec_ext in '' $ac_executable_extensions; do
2740
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
2740
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
2741 2741
     ac_cv_prog_ac_ct_STRIP="strip"
2742 2742
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
2743 2743
     break 2
... ...
@@ -2788,7 +2752,7 @@ do
2788 2788
   test -z "$as_dir" && as_dir=.
2789 2789
     for ac_prog in mkdir gmkdir; do
2790 2790
 	 for ac_exec_ext in '' $ac_executable_extensions; do
2791
-	   as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue
2791
+	   { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
2792 2792
 	   case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
2793 2793
 	     'mkdir (GNU coreutils) '* | \
2794 2794
 	     'mkdir (coreutils) '* | \
... ...
@@ -2817,6 +2781,12 @@ fi
2817 2817
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
2818 2818
 $as_echo "$MKDIR_P" >&6; }
2819 2819
 
2820
+mkdir_p="$MKDIR_P"
2821
+case $mkdir_p in
2822
+  [\\/$]* | ?:[\\/]*) ;;
2823
+  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
2824
+esac
2825
+
2820 2826
 for ac_prog in gawk mawk nawk awk
2821 2827
 do
2822 2828
   # Extract the first word of "$ac_prog", so it can be a program name with args.
... ...
@@ -2835,7 +2805,7 @@ do
2835 2835
   IFS=$as_save_IFS
2836 2836
   test -z "$as_dir" && as_dir=.
2837 2837
     for ac_exec_ext in '' $ac_executable_extensions; do
2838
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
2838
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
2839 2839
     ac_cv_prog_AWK="$ac_prog"
2840 2840
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
2841 2841
     break 2
... ...
@@ -2899,45 +2869,6 @@ else
2899 2899
 fi
2900 2900
 rmdir .tst 2>/dev/null
2901 2901
 
2902
-# Check whether --enable-silent-rules was given.
2903
-if test "${enable_silent_rules+set}" = set; then :
2904
-  enableval=$enable_silent_rules;
2905
-fi
2906
-
2907
-case $enable_silent_rules in # (((
2908
-  yes) AM_DEFAULT_VERBOSITY=0;;
2909
-   no) AM_DEFAULT_VERBOSITY=1;;
2910
-    *) AM_DEFAULT_VERBOSITY=1;;
2911
-esac
2912
-am_make=${MAKE-make}
2913
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
2914
-$as_echo_n "checking whether $am_make supports nested variables... " >&6; }
2915
-if ${am_cv_make_support_nested_variables+:} false; then :
2916
-  $as_echo_n "(cached) " >&6
2917
-else
2918
-  if $as_echo 'TRUE=$(BAR$(V))
2919
-BAR0=false
2920
-BAR1=true
2921
-V=1
2922
-am__doit:
2923
-	@$(TRUE)
2924
-.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then
2925
-  am_cv_make_support_nested_variables=yes
2926
-else
2927
-  am_cv_make_support_nested_variables=no
2928
-fi
2929
-fi
2930
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
2931
-$as_echo "$am_cv_make_support_nested_variables" >&6; }
2932
-if test $am_cv_make_support_nested_variables = yes; then
2933
-    AM_V='$(V)'
2934
-  AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
2935
-else
2936
-  AM_V=$AM_DEFAULT_VERBOSITY
2937
-  AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
2938
-fi
2939
-AM_BACKSLASH='\'
2940
-
2941 2902
 if test "`cd $srcdir && pwd`" != "`pwd`"; then
2942 2903
   # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
2943 2904
   # is not polluted with repeated "-I."
... ...
@@ -2979,12 +2910,6 @@ AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
2979 2979
 
2980 2980
 MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
2981 2981
 
2982
-# For better backward compatibility.  To be removed once Automake 1.9.x
2983
-# dies out for good.  For more background, see:
2984
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
2985
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
2986
-mkdir_p='$(MKDIR_P)'
2987
-
2988 2982
 # We need awk for the "check" target.  The system "awk" is bad on
2989 2983
 # some platforms.
2990 2984
 # Always define AMTAR for backward compatibility.  Yes, it's still used
... ...
@@ -2992,151 +2917,101 @@ mkdir_p='$(MKDIR_P)'
2992 2992
 AMTAR='$${TAR-tar}'
2993 2993
 
2994 2994
 
2995
-# We'll loop over all known methods to create a tar archive until one works.
2996
-_am_tools='gnutar  pax cpio none'
2997
-
2998
-
2999
-
3000
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to create a pax tar archive" >&5
2995
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to create a pax tar archive" >&5
3001 2996
 $as_echo_n "checking how to create a pax tar archive... " >&6; }
3002
-
3003
-  # Go ahead even if we have the value already cached.  We do so because we
3004
-  # need to set the values for the 'am__tar' and 'am__untar' variables.
3005
-  _am_tools=${am_cv_prog_tar_pax-$_am_tools}
3006
-
3007
-  for _am_tool in $_am_tools; do
3008
-    case $_am_tool in
3009
-    gnutar)
3010
-      for _am_tar in tar gnutar gtar; do
3011
-        { echo "$as_me:$LINENO: $_am_tar --version" >&5
2997
+# Loop over all known methods to create a tar archive until one works.
2998
+_am_tools='gnutar  pax cpio none'
2999
+_am_tools=${am_cv_prog_tar_pax-$_am_tools}
3000
+# Do not fold the above two line into one, because Tru64 sh and
3001
+# Solaris sh will not grok spaces in the rhs of `-'.
3002
+for _am_tool in $_am_tools
3003
+do
3004
+  case $_am_tool in
3005
+  gnutar)
3006
+    for _am_tar in tar gnutar gtar;
3007
+    do
3008
+      { echo "$as_me:$LINENO: $_am_tar --version" >&5
3012 3009
    ($_am_tar --version) >&5 2>&5
3013 3010
    ac_status=$?
3014 3011
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
3015 3012
    (exit $ac_status); } && break
3016
-      done
3017
-      am__tar="$_am_tar --format=posix -chf - "'"$$tardir"'
3018
-      am__tar_="$_am_tar --format=posix -chf - "'"$tardir"'
3019
-      am__untar="$_am_tar -xf -"
3020
-      ;;
3021
-    plaintar)
3022
-      # Must skip GNU tar: if it does not support --format= it doesn't create
3023
-      # ustar tarball either.
3024
-      (tar --version) >/dev/null 2>&1 && continue
3025
-      am__tar='tar chf - "$$tardir"'
3026
-      am__tar_='tar chf - "$tardir"'
3027
-      am__untar='tar xf -'
3028
-      ;;
3029
-    pax)
3030
-      am__tar='pax -L -x pax -w "$$tardir"'
3031
-      am__tar_='pax -L -x pax -w "$tardir"'
3032
-      am__untar='pax -r'
3033
-      ;;
3034
-    cpio)
3035
-      am__tar='find "$$tardir" -print | cpio -o -H pax -L'
3036
-      am__tar_='find "$tardir" -print | cpio -o -H pax -L'
3037
-      am__untar='cpio -i -H pax -d'
3038
-      ;;
3039
-    none)
3040
-      am__tar=false
3041
-      am__tar_=false
3042
-      am__untar=false
3043
-      ;;
3044
-    esac
3013
+    done
3014
+    am__tar="$_am_tar --format=posix -chf - "'"$$tardir"'
3015
+    am__tar_="$_am_tar --format=posix -chf - "'"$tardir"'
3016
+    am__untar="$_am_tar -xf -"
3017
+    ;;
3018
+  plaintar)
3019
+    # Must skip GNU tar: if it does not support --format= it doesn't create
3020
+    # ustar tarball either.
3021
+    (tar --version) >/dev/null 2>&1 && continue
3022
+    am__tar='tar chf - "$$tardir"'
3023
+    am__tar_='tar chf - "$tardir"'
3024
+    am__untar='tar xf -'
3025
+    ;;
3026
+  pax)
3027
+    am__tar='pax -L -x pax -w "$$tardir"'
3028
+    am__tar_='pax -L -x pax -w "$tardir"'
3029
+    am__untar='pax -r'
3030
+    ;;
3031
+  cpio)
3032
+    am__tar='find "$$tardir" -print | cpio -o -H pax -L'
3033
+    am__tar_='find "$tardir" -print | cpio -o -H pax -L'
3034
+    am__untar='cpio -i -H pax -d'
3035
+    ;;
3036
+  none)
3037
+    am__tar=false
3038
+    am__tar_=false
3039
+    am__untar=false
3040
+    ;;
3041
+  esac
3045 3042
 
3046
-    # If the value was cached, stop now.  We just wanted to have am__tar
3047
-    # and am__untar set.
3048
-    test -n "${am_cv_prog_tar_pax}" && break
3043
+  # If the value was cached, stop now.  We just wanted to have am__tar
3044
+  # and am__untar set.
3045
+  test -n "${am_cv_prog_tar_pax}" && break
3049 3046
 
3050
-    # tar/untar a dummy directory, and stop if the command works.
3051
-    rm -rf conftest.dir
3052
-    mkdir conftest.dir
3053
-    echo GrepMe > conftest.dir/file
3054
-    { echo "$as_me:$LINENO: tardir=conftest.dir && eval $am__tar_ >conftest.tar" >&5
3047
+  # tar/untar a dummy directory, and stop if the command works
3048
+  rm -rf conftest.dir
3049
+  mkdir conftest.dir
3050
+  echo GrepMe > conftest.dir/file
3051
+  { echo "$as_me:$LINENO: tardir=conftest.dir && eval $am__tar_ >conftest.tar" >&5
3055 3052
    (tardir=conftest.dir && eval $am__tar_ >conftest.tar) >&5 2>&5
3056 3053
    ac_status=$?
3057 3054
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
3058 3055
    (exit $ac_status); }
3059
-    rm -rf conftest.dir
3060
-    if test -s conftest.tar; then
3061
-      { echo "$as_me:$LINENO: $am__untar <conftest.tar" >&5
3056
+  rm -rf conftest.dir
3057
+  if test -s conftest.tar; then
3058
+    { echo "$as_me:$LINENO: $am__untar <conftest.tar" >&5
3062 3059
    ($am__untar <conftest.tar) >&5 2>&5
3063 3060
    ac_status=$?
3064 3061
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
3065 3062
    (exit $ac_status); }
3066
-      { echo "$as_me:$LINENO: cat conftest.dir/file" >&5
3067
-   (cat conftest.dir/file) >&5 2>&5
3068
-   ac_status=$?
3069
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
3070
-   (exit $ac_status); }
3071
-      grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
3072
-    fi
3073
-  done
3074
-  rm -rf conftest.dir
3063
+    grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
3064
+  fi
3065
+done
3066
+rm -rf conftest.dir
3075 3067
 
3076
-  if ${am_cv_prog_tar_pax+:} false; then :
3068
+if ${am_cv_prog_tar_pax+:} false; then :
3077 3069
   $as_echo_n "(cached) " >&6
3078 3070
 else
3079 3071
   am_cv_prog_tar_pax=$_am_tool
3080 3072
 fi
3081 3073
 
3082
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_tar_pax" >&5
3074
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_tar_pax" >&5
3083 3075
 $as_echo "$am_cv_prog_tar_pax" >&6; }
3084 3076
 
3085 3077
 
3086 3078
 
3087 3079
 
3088 3080
 
3089
-
3090
-# POSIX will say in a future version that running "rm -f" with no argument
3091
-# is OK; and we want to be able to make that assumption in our Makefile
3092
-# recipes.  So use an aggressive probe to check that the usage we want is
3093
-# actually supported "in the wild" to an acceptable degree.
3094
-# See automake bug#10828.
3095
-# To make any issue more visible, cause the running configure to be aborted
3096
-# by default if the 'rm' program in use doesn't match our expectations; the
3097
-# user can still override this though.
3098
-if rm -f && rm -fr && rm -rf; then : OK; else
3099
-  cat >&2 <<'END'
3100
-Oops!
3101
-
3102
-Your 'rm' program seems unable to run without file operands specified
3103
-on the command line, even when the '-f' option is present.  This is contrary
3104
-to the behaviour of most rm programs out there, and not conforming with
3105
-the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
3106
-
3107
-Please tell bug-automake@gnu.org about your system, including the value
3108
-of your $PATH and any error possibly output before this message.  This
3109
-can help us improve future automake versions.
3110
-
3111
-END
3112
-  if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
3113
-    echo 'Configuration will proceed anyway, since you have set the' >&2
3114
-    echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
3115
-    echo >&2
3116
-  else
3117
-    cat >&2 <<'END'
3118
-Aborting the configuration process, to ensure you take notice of the issue.
3119
-
3120
-You can download and install GNU coreutils to get an 'rm' implementation
3121
-that behaves properly: <http://www.gnu.org/software/coreutils/>.
3122
-
3123
-If you want to complete the configuration process using your problematic
3124
-'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
3125
-to "yes", and re-run configure.
3126
-
3127
-END
3128
-    as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5
3129
-  fi
3130
-fi
3131 3081
 # Check whether --enable-silent-rules was given.
3132 3082
 if test "${enable_silent_rules+set}" = set; then :
3133 3083
   enableval=$enable_silent_rules;
3134 3084
 fi
3135 3085
 
3136
-case $enable_silent_rules in # (((
3137
-  yes) AM_DEFAULT_VERBOSITY=0;;
3138
-   no) AM_DEFAULT_VERBOSITY=1;;
3139
-    *) AM_DEFAULT_VERBOSITY=0;;
3086
+case $enable_silent_rules in
3087
+yes) AM_DEFAULT_VERBOSITY=0;;
3088
+no)  AM_DEFAULT_VERBOSITY=1;;
3089
+*)   AM_DEFAULT_VERBOSITY=0;;
3140 3090
 esac
3141 3091
 am_make=${MAKE-make}
3142 3092
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
... ...
@@ -3197,7 +3072,7 @@ do
3197 3197
   IFS=$as_save_IFS
3198 3198
   test -z "$as_dir" && as_dir=.
3199 3199
     for ac_exec_ext in '' $ac_executable_extensions; do
3200
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
3200
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
3201 3201
     ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
3202 3202
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
3203 3203
     break 2
... ...
@@ -3241,7 +3116,7 @@ do
3241 3241
   IFS=$as_save_IFS
3242 3242
   test -z "$as_dir" && as_dir=.
3243 3243
     for ac_exec_ext in '' $ac_executable_extensions; do
3244
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
3244
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
3245 3245
     ac_cv_prog_ac_ct_CXX="$ac_prog"
3246 3246
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
3247 3247
     break 2
... ...
@@ -3694,7 +3569,7 @@ am__quote=
3694 3694
 _am_result=none
3695 3695
 # First try GNU make style include.
3696 3696
 echo "include confinc" > confmf
3697
-# Ignore all kinds of additional output from 'make'.
3697
+# Ignore all kinds of additional output from `make'.
3698 3698
 case `$am_make -s -f confmf 2> /dev/null` in #(
3699 3699
 *the\ am__doit\ target*)
3700 3700
   am__include=include
... ...
@@ -3750,8 +3625,8 @@ else
3750 3750
   # We make a subdir and do the tests there.  Otherwise we can end up
3751 3751
   # making bogus files that we don't know about and never remove.  For
3752 3752
   # instance it was reported that on HP-UX the gcc test will end up
3753
-  # making a dummy file named 'D' -- because '-MD' means "put the output
3754
-  # in D".
3753
+  # making a dummy file named `D' -- because `-MD' means `put the output
3754
+  # in D'.
3755 3755
   rm -rf conftest.dir
3756 3756
   mkdir conftest.dir
3757 3757
   # Copy depcomp to subdir because otherwise we won't find it if we're
... ...
@@ -3786,16 +3661,16 @@ else
3786 3786
     : > sub/conftest.c
3787 3787
     for i in 1 2 3 4 5 6; do
3788 3788
       echo '#include "conftst'$i'.h"' >> sub/conftest.c
3789
-      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
3790
-      # Solaris 10 /bin/sh.
3791
-      echo '/* dummy */' > sub/conftst$i.h
3789
+      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
3790
+      # Solaris 8's {/usr,}/bin/sh.
3791
+      touch sub/conftst$i.h
3792 3792
     done
3793 3793
     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
3794 3794
 
3795
-    # We check with '-c' and '-o' for the sake of the "dashmstdout"
3795
+    # We check with `-c' and `-o' for the sake of the "dashmstdout"
3796 3796
     # mode.  It turns out that the SunPro C++ compiler does not properly
3797
-    # handle '-M -o', and we need to detect this.  Also, some Intel
3798
-    # versions had trouble with output in subdirs.
3797
+    # handle `-M -o', and we need to detect this.  Also, some Intel
3798
+    # versions had trouble with output in subdirs
3799 3799
     am__obj=sub/conftest.${OBJEXT-o}
3800 3800
     am__minus_obj="-o $am__obj"
3801 3801
     case $depmode in
... ...
@@ -3804,8 +3679,8 @@ else
3804 3804
       test "$am__universal" = false || continue
3805 3805
       ;;
3806 3806
     nosideeffect)
3807
-      # After this tag, mechanisms are not by side-effect, so they'll
3808
-      # only be used when explicitly requested.
3807
+      # after this tag, mechanisms are not by side-effect, so they'll
3808
+      # only be used when explicitly requested
3809 3809
       if test "x$enable_dependency_tracking" = xyes; then
3810 3810
 	continue
3811 3811
       else
... ...
@@ -3813,7 +3688,7 @@ else
3813 3813
       fi
3814 3814
       ;;
3815 3815
     msvc7 | msvc7msys | msvisualcpp | msvcmsys)
3816
-      # This compiler won't grok '-c -o', but also, the minuso test has
3816
+      # This compiler won't grok `-c -o', but also, the minuso test has
3817 3817
       # not run yet.  These depmodes are late enough in the game, and
3818 3818
       # so weak that their functioning should not be impacted.
3819 3819
       am__obj=conftest.${OBJEXT-o}
... ...
@@ -3889,7 +3764,7 @@ do
3889 3889
   IFS=$as_save_IFS
3890 3890
   test -z "$as_dir" && as_dir=.
3891 3891
     for ac_exec_ext in '' $ac_executable_extensions; do
3892
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
3892
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
3893 3893
     ac_cv_prog_CC="${ac_tool_prefix}gcc"
3894 3894
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
3895 3895
     break 2
... ...
@@ -3929,7 +3804,7 @@ do
3929 3929
   IFS=$as_save_IFS
3930 3930
   test -z "$as_dir" && as_dir=.
3931 3931
     for ac_exec_ext in '' $ac_executable_extensions; do
3932
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
3932
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
3933 3933
     ac_cv_prog_ac_ct_CC="gcc"
3934 3934
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
3935 3935
     break 2
... ...
@@ -3982,7 +3857,7 @@ do
3982 3982
   IFS=$as_save_IFS
3983 3983
   test -z "$as_dir" && as_dir=.
3984 3984
     for ac_exec_ext in '' $ac_executable_extensions; do
3985
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
3985
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
3986 3986
     ac_cv_prog_CC="${ac_tool_prefix}cc"
3987 3987
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
3988 3988
     break 2
... ...
@@ -4023,7 +3898,7 @@ do
4023 4023
   IFS=$as_save_IFS
4024 4024
   test -z "$as_dir" && as_dir=.
4025 4025
     for ac_exec_ext in '' $ac_executable_extensions; do
4026
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
4026
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
4027 4027
     if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
4028 4028
        ac_prog_rejected=yes
4029 4029
        continue
... ...
@@ -4081,7 +3956,7 @@ do
4081 4081
   IFS=$as_save_IFS
4082 4082
   test -z "$as_dir" && as_dir=.
4083 4083
     for ac_exec_ext in '' $ac_executable_extensions; do
4084
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
4084
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
4085 4085
     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
4086 4086
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4087 4087
     break 2
... ...
@@ -4125,7 +4000,7 @@ do
4125 4125
   IFS=$as_save_IFS
4126 4126
   test -z "$as_dir" && as_dir=.
4127 4127
     for ac_exec_ext in '' $ac_executable_extensions; do
4128
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
4128
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
4129 4129
     ac_cv_prog_ac_ct_CC="$ac_prog"
4130 4130
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4131 4131
     break 2
... ...
@@ -4321,7 +4196,8 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
4321 4321
 /* end confdefs.h.  */
4322 4322
 #include <stdarg.h>
4323 4323
 #include <stdio.h>
4324
-struct stat;
4324
+#include <sys/types.h>
4325
+#include <sys/stat.h>
4325 4326
 /* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
4326 4327
 struct buf { int x; };
4327 4328
 FILE * (*rcsopen) (struct buf *, struct stat *, int);
... ...
@@ -4406,65 +4282,6 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
4406 4406
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
4407 4407
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
4408 4408
 
4409
-ac_ext=c
4410
-ac_cpp='$CPP $CPPFLAGS'
4411
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
4412
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
4413
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
4414
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5
4415
-$as_echo_n "checking whether $CC understands -c and -o together... " >&6; }
4416
-if ${am_cv_prog_cc_c_o+:} false; then :
4417
-  $as_echo_n "(cached) " >&6
4418
-else
4419
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
4420
-/* end confdefs.h.  */
4421
-
4422
-int
4423
-main ()
4424
-{
4425
-
4426
-  ;
4427
-  return 0;
4428
-}
4429
-_ACEOF
4430
-  # Make sure it works both with $CC and with simple cc.
4431
-  # Following AC_PROG_CC_C_O, we do the test twice because some
4432
-  # compilers refuse to overwrite an existing .o file with -o,
4433
-  # though they will create one.
4434
-  am_cv_prog_cc_c_o=yes
4435
-  for am_i in 1 2; do
4436
-    if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5
4437
-   ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5
4438
-   ac_status=$?
4439
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
4440
-   (exit $ac_status); } \
4441
-         && test -f conftest2.$ac_objext; then
4442
-      : OK
4443
-    else
4444
-      am_cv_prog_cc_c_o=no
4445
-      break
4446
-    fi
4447
-  done
4448
-  rm -f core conftest*
4449
-  unset am_i
4450
-fi
4451
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5
4452
-$as_echo "$am_cv_prog_cc_c_o" >&6; }
4453
-if test "$am_cv_prog_cc_c_o" != yes; then
4454
-   # Losing compiler, so override with the script.
4455
-   # FIXME: It is wrong to rewrite CC.
4456
-   # But if we don't then we get into trouble of one sort or another.
4457
-   # A longer-term fix would be to have automake use am__CC in this case,
4458
-   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
4459
-   CC="$am_aux_dir/compile $CC"
4460
-fi
4461
-ac_ext=c
4462
-ac_cpp='$CPP $CPPFLAGS'
4463
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
4464
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
4465
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
4466
-
4467
-
4468 4409
 depcc="$CC"   am_compiler_list=
4469 4410
 
4470 4411
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
... ...
@@ -4476,8 +4293,8 @@ else
4476 4476
   # We make a subdir and do the tests there.  Otherwise we can end up
4477 4477
   # making bogus files that we don't know about and never remove.  For
4478 4478
   # instance it was reported that on HP-UX the gcc test will end up
4479
-  # making a dummy file named 'D' -- because '-MD' means "put the output
4480
-  # in D".
4479
+  # making a dummy file named `D' -- because `-MD' means `put the output
4480
+  # in D'.
4481 4481
   rm -rf conftest.dir
4482 4482
   mkdir conftest.dir
4483 4483
   # Copy depcomp to subdir because otherwise we won't find it if we're
... ...
@@ -4512,16 +4329,16 @@ else
4512 4512
     : > sub/conftest.c
4513 4513
     for i in 1 2 3 4 5 6; do
4514 4514
       echo '#include "conftst'$i'.h"' >> sub/conftest.c
4515
-      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
4516
-      # Solaris 10 /bin/sh.
4517
-      echo '/* dummy */' > sub/conftst$i.h
4515
+      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
4516
+      # Solaris 8's {/usr,}/bin/sh.
4517
+      touch sub/conftst$i.h
4518 4518
     done
4519 4519
     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
4520 4520
 
4521
-    # We check with '-c' and '-o' for the sake of the "dashmstdout"
4521
+    # We check with `-c' and `-o' for the sake of the "dashmstdout"
4522 4522
     # mode.  It turns out that the SunPro C++ compiler does not properly
4523
-    # handle '-M -o', and we need to detect this.  Also, some Intel
4524
-    # versions had trouble with output in subdirs.
4523
+    # handle `-M -o', and we need to detect this.  Also, some Intel
4524
+    # versions had trouble with output in subdirs
4525 4525
     am__obj=sub/conftest.${OBJEXT-o}
4526 4526
     am__minus_obj="-o $am__obj"
4527 4527
     case $depmode in
... ...
@@ -4530,8 +4347,8 @@ else
4530 4530
       test "$am__universal" = false || continue
4531 4531
       ;;
4532 4532
     nosideeffect)
4533
-      # After this tag, mechanisms are not by side-effect, so they'll
4534
-      # only be used when explicitly requested.
4533
+      # after this tag, mechanisms are not by side-effect, so they'll
4534
+      # only be used when explicitly requested
4535 4535
       if test "x$enable_dependency_tracking" = xyes; then
4536 4536
 	continue
4537 4537
       else
... ...
@@ -4539,7 +4356,7 @@ else
4539 4539
       fi
4540 4540
       ;;
4541 4541
     msvc7 | msvc7msys | msvisualcpp | msvcmsys)
4542
-      # This compiler won't grok '-c -o', but also, the minuso test has
4542
+      # This compiler won't grok `-c -o', but also, the minuso test has
4543 4543
       # not run yet.  These depmodes are late enough in the game, and
4544 4544
       # so weak that their functioning should not be impacted.
4545 4545
       am__obj=conftest.${OBJEXT-o}
... ...
@@ -4748,7 +4565,7 @@ do
4748 4748
     for ac_prog in grep ggrep; do
4749 4749
     for ac_exec_ext in '' $ac_executable_extensions; do
4750 4750
       ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
4751
-      as_fn_executable_p "$ac_path_GREP" || continue
4751
+      { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
4752 4752
 # Check for GNU ac_path_GREP and select it if it is found.
4753 4753
   # Check for GNU $ac_path_GREP
4754 4754
 case `"$ac_path_GREP" --version 2>&1` in
... ...
@@ -4814,7 +4631,7 @@ do
4814 4814
     for ac_prog in egrep; do
4815 4815
     for ac_exec_ext in '' $ac_executable_extensions; do
4816 4816
       ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
4817
-      as_fn_executable_p "$ac_path_EGREP" || continue
4817
+      { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
4818 4818
 # Check for GNU ac_path_EGREP and select it if it is found.
4819 4819
   # Check for GNU $ac_path_EGREP
4820 4820
 case `"$ac_path_EGREP" --version 2>&1` in
... ...
@@ -5367,7 +5184,7 @@ do
5367 5367
     for ac_prog in sed gsed; do
5368 5368
     for ac_exec_ext in '' $ac_executable_extensions; do
5369 5369
       ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
5370
-      as_fn_executable_p "$ac_path_SED" || continue
5370
+      { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
5371 5371
 # Check for GNU ac_path_SED and select it if it is found.
5372 5372
   # Check for GNU $ac_path_SED
5373 5373
 case `"$ac_path_SED" --version 2>&1` in
... ...
@@ -5446,7 +5263,7 @@ do
5446 5446
     for ac_prog in fgrep; do
5447 5447
     for ac_exec_ext in '' $ac_executable_extensions; do
5448 5448
       ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
5449
-      as_fn_executable_p "$ac_path_FGREP" || continue
5449
+      { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue
5450 5450
 # Check for GNU ac_path_FGREP and select it if it is found.
5451 5451
   # Check for GNU $ac_path_FGREP
5452 5452
 case `"$ac_path_FGREP" --version 2>&1` in
... ...
@@ -5702,7 +5519,7 @@ do
5702 5702
   IFS=$as_save_IFS
5703 5703
   test -z "$as_dir" && as_dir=.
5704 5704
     for ac_exec_ext in '' $ac_executable_extensions; do
5705
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
5705
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
5706 5706
     ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog"
5707 5707
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
5708 5708
     break 2
... ...
@@ -5746,7 +5563,7 @@ do
5746 5746
   IFS=$as_save_IFS
5747 5747
   test -z "$as_dir" && as_dir=.
5748 5748
     for ac_exec_ext in '' $ac_executable_extensions; do
5749
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
5749
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
5750 5750
     ac_cv_prog_ac_ct_DUMPBIN="$ac_prog"
5751 5751
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
5752 5752
     break 2
... ...
@@ -6171,7 +5988,7 @@ do
6171 6171
   IFS=$as_save_IFS
6172 6172
   test -z "$as_dir" && as_dir=.
6173 6173
     for ac_exec_ext in '' $ac_executable_extensions; do
6174
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
6174
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
6175 6175
     ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
6176 6176
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
6177 6177
     break 2
... ...
@@ -6211,7 +6028,7 @@ do
6211 6211
   IFS=$as_save_IFS
6212 6212
   test -z "$as_dir" && as_dir=.
6213 6213
     for ac_exec_ext in '' $ac_executable_extensions; do
6214
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
6214
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
6215 6215
     ac_cv_prog_ac_ct_OBJDUMP="objdump"
6216 6216
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
6217 6217
     break 2
... ...
@@ -6513,7 +6330,7 @@ do
6513 6513
   IFS=$as_save_IFS
6514 6514
   test -z "$as_dir" && as_dir=.
6515 6515
     for ac_exec_ext in '' $ac_executable_extensions; do
6516
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
6516
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
6517 6517
     ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
6518 6518
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
6519 6519
     break 2
... ...
@@ -6553,7 +6370,7 @@ do
6553 6553
   IFS=$as_save_IFS
6554 6554
   test -z "$as_dir" && as_dir=.
6555 6555
     for ac_exec_ext in '' $ac_executable_extensions; do
6556
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
6556
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
6557 6557
     ac_cv_prog_ac_ct_DLLTOOL="dlltool"
6558 6558
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
6559 6559
     break 2
... ...
@@ -6656,7 +6473,7 @@ do
6656 6656
   IFS=$as_save_IFS
6657 6657
   test -z "$as_dir" && as_dir=.
6658 6658
     for ac_exec_ext in '' $ac_executable_extensions; do
6659
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
6659
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
6660 6660
     ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
6661 6661
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
6662 6662
     break 2
... ...
@@ -6700,7 +6517,7 @@ do
6700 6700
   IFS=$as_save_IFS
6701 6701
   test -z "$as_dir" && as_dir=.
6702 6702
     for ac_exec_ext in '' $ac_executable_extensions; do
6703
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
6703
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
6704 6704
     ac_cv_prog_ac_ct_AR="$ac_prog"
6705 6705
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
6706 6706
     break 2
... ...
@@ -6825,7 +6642,7 @@ do
6825 6825
   IFS=$as_save_IFS
6826 6826
   test -z "$as_dir" && as_dir=.
6827 6827
     for ac_exec_ext in '' $ac_executable_extensions; do
6828
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
6828
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
6829 6829
     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
6830 6830
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
6831 6831
     break 2
... ...
@@ -6865,7 +6682,7 @@ do
6865 6865
   IFS=$as_save_IFS
6866 6866
   test -z "$as_dir" && as_dir=.
6867 6867
     for ac_exec_ext in '' $ac_executable_extensions; do
6868
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
6868
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
6869 6869
     ac_cv_prog_ac_ct_STRIP="strip"
6870 6870
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
6871 6871
     break 2
... ...
@@ -6924,7 +6741,7 @@ do
6924 6924
   IFS=$as_save_IFS
6925 6925
   test -z "$as_dir" && as_dir=.
6926 6926
     for ac_exec_ext in '' $ac_executable_extensions; do
6927
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
6927
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
6928 6928
     ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
6929 6929
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
6930 6930
     break 2
... ...
@@ -6964,7 +6781,7 @@ do
6964 6964
   IFS=$as_save_IFS
6965 6965
   test -z "$as_dir" && as_dir=.
6966 6966
     for ac_exec_ext in '' $ac_executable_extensions; do
6967
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
6967
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
6968 6968
     ac_cv_prog_ac_ct_RANLIB="ranlib"
6969 6969
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
6970 6970
     break 2
... ...
@@ -7626,7 +7443,7 @@ do
7626 7626
   IFS=$as_save_IFS
7627 7627
   test -z "$as_dir" && as_dir=.
7628 7628
     for ac_exec_ext in '' $ac_executable_extensions; do
7629
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
7629
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7630 7630
     ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
7631 7631
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7632 7632
     break 2
... ...
@@ -7666,7 +7483,7 @@ do
7666 7666
   IFS=$as_save_IFS
7667 7667
   test -z "$as_dir" && as_dir=.
7668 7668
     for ac_exec_ext in '' $ac_executable_extensions; do
7669
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
7669
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7670 7670
     ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
7671 7671
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7672 7672
     break 2
... ...
@@ -7746,7 +7563,7 @@ do
7746 7746
   IFS=$as_save_IFS
7747 7747
   test -z "$as_dir" && as_dir=.
7748 7748
     for ac_exec_ext in '' $ac_executable_extensions; do
7749
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
7749
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7750 7750
     ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
7751 7751
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7752 7752
     break 2
... ...
@@ -7786,7 +7603,7 @@ do
7786 7786
   IFS=$as_save_IFS
7787 7787
   test -z "$as_dir" && as_dir=.
7788 7788
     for ac_exec_ext in '' $ac_executable_extensions; do
7789
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
7789
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7790 7790
     ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
7791 7791
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7792 7792
     break 2
... ...
@@ -7838,7 +7655,7 @@ do
7838 7838
   IFS=$as_save_IFS
7839 7839
   test -z "$as_dir" && as_dir=.
7840 7840
     for ac_exec_ext in '' $ac_executable_extensions; do
7841
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
7841
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7842 7842
     ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
7843 7843
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7844 7844
     break 2
... ...
@@ -7878,7 +7695,7 @@ do
7878 7878
   IFS=$as_save_IFS
7879 7879
   test -z "$as_dir" && as_dir=.
7880 7880
     for ac_exec_ext in '' $ac_executable_extensions; do
7881
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
7881
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7882 7882
     ac_cv_prog_ac_ct_NMEDIT="nmedit"
7883 7883
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7884 7884
     break 2
... ...
@@ -7930,7 +7747,7 @@ do
7930 7930
   IFS=$as_save_IFS
7931 7931
   test -z "$as_dir" && as_dir=.
7932 7932
     for ac_exec_ext in '' $ac_executable_extensions; do
7933
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
7933
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7934 7934
     ac_cv_prog_LIPO="${ac_tool_prefix}lipo"
7935 7935
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7936 7936
     break 2
... ...
@@ -7970,7 +7787,7 @@ do
7970 7970
   IFS=$as_save_IFS
7971 7971
   test -z "$as_dir" && as_dir=.
7972 7972
     for ac_exec_ext in '' $ac_executable_extensions; do
7973
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
7973
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7974 7974
     ac_cv_prog_ac_ct_LIPO="lipo"
7975 7975
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7976 7976
     break 2
... ...
@@ -8022,7 +7839,7 @@ do
8022 8022
   IFS=$as_save_IFS
8023 8023
   test -z "$as_dir" && as_dir=.
8024 8024
     for ac_exec_ext in '' $ac_executable_extensions; do
8025
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
8025
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
8026 8026
     ac_cv_prog_OTOOL="${ac_tool_prefix}otool"
8027 8027
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
8028 8028
     break 2
... ...
@@ -8062,7 +7879,7 @@ do
8062 8062
   IFS=$as_save_IFS
8063 8063
   test -z "$as_dir" && as_dir=.
8064 8064
     for ac_exec_ext in '' $ac_executable_extensions; do
8065
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
8065
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
8066 8066
     ac_cv_prog_ac_ct_OTOOL="otool"
8067 8067
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
8068 8068
     break 2
... ...
@@ -8114,7 +7931,7 @@ do
8114 8114
   IFS=$as_save_IFS
8115 8115
   test -z "$as_dir" && as_dir=.
8116 8116
     for ac_exec_ext in '' $ac_executable_extensions; do
8117
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
8117
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
8118 8118
     ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64"
8119 8119
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
8120 8120
     break 2
... ...
@@ -8154,7 +7971,7 @@ do
8154 8154
   IFS=$as_save_IFS
8155 8155
   test -z "$as_dir" && as_dir=.
8156 8156
     for ac_exec_ext in '' $ac_executable_extensions; do
8157
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
8157
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
8158 8158
     ac_cv_prog_ac_ct_OTOOL64="otool64"
8159 8159
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
8160 8160
     break 2
... ...
@@ -16003,14 +15820,6 @@ LIBOBJS=$ac_libobjs
16003 16003
 LTLIBOBJS=$ac_ltlibobjs
16004 16004
 
16005 16005
 
16006
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5
16007
-$as_echo_n "checking that generated files are newer than configure... " >&6; }
16008
-   if test -n "$am_sleep_pid"; then
16009
-     # Hide warnings about reused PIDs.
16010
-     wait $am_sleep_pid 2>/dev/null
16011
-   fi
16012
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5
16013
-$as_echo "done" >&6; }
16014 16006
  if test -n "$EXEEXT"; then
16015 16007
   am__EXEEXT_TRUE=
16016 16008
   am__EXEEXT_FALSE='#'
... ...
@@ -16354,16 +16163,16 @@ if (echo >conf$$.file) 2>/dev/null; then
16354 16354
     # ... but there are two gotchas:
16355 16355
     # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
16356 16356
     # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
16357
-    # In both cases, we have to default to `cp -pR'.
16357
+    # In both cases, we have to default to `cp -p'.
16358 16358
     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
16359
-      as_ln_s='cp -pR'
16359
+      as_ln_s='cp -p'
16360 16360
   elif ln conf$$.file conf$$ 2>/dev/null; then
16361 16361
     as_ln_s=ln
16362 16362
   else
16363
-    as_ln_s='cp -pR'
16363
+    as_ln_s='cp -p'
16364 16364
   fi
16365 16365
 else
16366
-  as_ln_s='cp -pR'
16366
+  as_ln_s='cp -p'
16367 16367
 fi
16368 16368
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
16369 16369
 rmdir conf$$.dir 2>/dev/null
... ...
@@ -16423,16 +16232,28 @@ else
16423 16423
   as_mkdir_p=false
16424 16424
 fi
16425 16425
 
16426
-
16427
-# as_fn_executable_p FILE
16428
-# -----------------------
16429
-# Test if FILE is an executable regular file.
16430
-as_fn_executable_p ()
16431
-{
16432
-  test -f "$1" && test -x "$1"
16433
-} # as_fn_executable_p
16434
-as_test_x='test -x'
16435
-as_executable_p=as_fn_executable_p
16426
+if test -x / >/dev/null 2>&1; then
16427
+  as_test_x='test -x'
16428
+else
16429
+  if ls -dL / >/dev/null 2>&1; then
16430
+    as_ls_L_option=L
16431
+  else
16432
+    as_ls_L_option=
16433
+  fi
16434
+  as_test_x='
16435
+    eval sh -c '\''
16436
+      if test -d "$1"; then
16437
+	test -d "$1/.";
16438
+      else
16439
+	case $1 in #(
16440
+	-*)set "./$1";;
16441
+	esac;
16442
+	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
16443
+	???[sx]*):;;*)false;;esac;fi
16444
+    '\'' sh
16445
+  '
16446
+fi
16447
+as_executable_p=$as_test_x
16436 16448
 
16437 16449
 # Sed expression to map a string onto a valid CPP name.
16438 16450
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
... ...
@@ -16454,7 +16275,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
16454 16454
 # values after options handling.
16455 16455
 ac_log="
16456 16456
 This file was extended by libclamavc++ $as_me devel, which was
16457
-generated by GNU Autoconf 2.69.  Invocation command line was
16457
+generated by GNU Autoconf 2.68.  Invocation command line was
16458 16458
 
16459 16459
   CONFIG_FILES    = $CONFIG_FILES
16460 16460
   CONFIG_HEADERS  = $CONFIG_HEADERS
... ...
@@ -16520,10 +16341,10 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
16520 16520
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
16521 16521
 ac_cs_version="\\
16522 16522
 libclamavc++ config.status devel
16523
-configured by $0, generated by GNU Autoconf 2.69,
16523
+configured by $0, generated by GNU Autoconf 2.68,
16524 16524
   with options \\"\$ac_cs_config\\"
16525 16525
 
16526
-Copyright (C) 2012 Free Software Foundation, Inc.
16526
+Copyright (C) 2010 Free Software Foundation, Inc.
16527 16527
 This config.status script is free software; the Free Software Foundation
16528 16528
 gives unlimited permission to copy, distribute and modify it."
16529 16529
 
... ...
@@ -16614,7 +16435,7 @@ fi
16614 16614
 _ACEOF
16615 16615
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
16616 16616
 if \$ac_cs_recheck; then
16617
-  set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
16617
+  set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
16618 16618
   shift
16619 16619
   \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
16620 16620
   CONFIG_SHELL='$SHELL'
... ...
@@ -17623,7 +17444,7 @@ $as_echo "$as_me: executing $ac_file commands" >&6;}
17623 17623
 
17624 17624
   case $ac_file$ac_mode in
17625 17625
     "depfiles":C) test x"$AMDEP_TRUE" != x"" || {
17626
-  # Older Autoconf quotes --file arguments for eval, but not when files
17626
+  # Autoconf 2.62 quotes --file arguments for eval, but not when files
17627 17627
   # are listed without --file.  Let's play safe and only enable the eval
17628 17628
   # if we detect the quoting.
17629 17629
   case $CONFIG_FILES in
... ...
@@ -17636,7 +17457,7 @@ $as_echo "$as_me: executing $ac_file commands" >&6;}
17636 17636
     # Strip MF so we end up with the name of the file.
17637 17637
     mf=`echo "$mf" | sed -e 's/:.*$//'`
17638 17638
     # Check whether this is an Automake generated Makefile or not.
17639
-    # We used to match only the files named 'Makefile.in', but
17639
+    # We used to match only the files named `Makefile.in', but
17640 17640
     # some people rename them; so instead we look at the file content.
17641 17641
     # Grep'ing the first line is not enough: some people post-process
17642 17642
     # each Makefile.in and add a new line on top of each file to say so.
... ...
@@ -17670,19 +17491,21 @@ $as_echo X"$mf" |
17670 17670
       continue
17671 17671
     fi
17672 17672
     # Extract the definition of DEPDIR, am__include, and am__quote
17673
-    # from the Makefile without running 'make'.
17673
+    # from the Makefile without running `make'.
17674 17674
     DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
17675 17675
     test -z "$DEPDIR" && continue
17676 17676
     am__include=`sed -n 's/^am__include = //p' < "$mf"`
17677
-    test -z "$am__include" && continue
17677
+    test -z "am__include" && continue
17678 17678
     am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
17679
+    # When using ansi2knr, U may be empty or an underscore; expand it
17680
+    U=`sed -n 's/^U = //p' < "$mf"`
17679 17681
     # Find all dependency output files, they are included files with
17680 17682
     # $(DEPDIR) in their names.  We invoke sed twice because it is the
17681 17683
     # simplest approach to changing $(DEPDIR) to its actual value in the
17682 17684
     # expansion.
17683 17685
     for file in `sed -n "
17684 17686
       s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
17685
-	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
17687
+	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
17686 17688
       # Make sure the directory exists.
17687 17689
       test -f "$dirpart/$file" && continue
17688 17690
       fdir=`$as_dirname -- "$file" ||
... ...
@@ -1,4 +1,5 @@
1 1
 /*
2
+ *  Copyright (C) 2014 Cisco Systems, Inc.
2 3
  *  Copyright (C) 2007-2013 Sourcefire, Inc.
3 4
  *
4 5
  *  Authors: Tomasz Kojm
... ...
@@ -151,7 +152,8 @@ typedef enum {
151 151
 #define CL_SCAN_ALLMATCHES		0x200000
152 152
 #define CL_SCAN_SWF			0x400000
153 153
 #define CL_SCAN_PARTITION_INTXN         0x800000
154
-
154
+#define CL_SCAN_FILE_PROPERTIES        0x10000000
155
+//#define UNUSED                        0x20000000
155 156
 #define CL_SCAN_PERFORMANCE_INFO        0x40000000 /* collect performance timings */
156 157
 #define CL_SCAN_INTERNAL_COLLECT_SHA    0x80000000 /* Enables hash output in sha-collect builds - for internal use only */
157 158
 
... ...
@@ -1,4 +1,5 @@
1 1
 /*
2
+ *  Copyright (C) 2014 Cisco Systems, Inc.
2 3
  *  Copyright (C) 2007-2010 Sourcefire, Inc.
3 4
  *
4 5
  *  Authors: Tomasz Kojm
... ...
@@ -49,6 +50,9 @@
49 49
 #include "bytecode_api.h"
50 50
 #include "events.h"
51 51
 #include "crtmgr.h"
52
+#ifdef HAVE_JSON
53
+#include "json/json_object.h"
54
+#endif
52 55
 
53 56
 /*
54 57
  * CL_FLEVEL is the signature f-level specific to the current code and
... ...
@@ -140,6 +144,9 @@ typedef struct cli_ctx_tag {
140 140
     char entry_filename[2048];
141 141
     int sha_collect;
142 142
 #endif
143
+#ifdef HAVE_JSON
144
+    struct json_object *properties;
145
+#endif
143 146
 } cli_ctx;
144 147
 
145 148
 #define STATS_ANON_UUID "5b585e8f-3be5-11e3-bf0b-18037319526c"
... ...
@@ -414,6 +421,7 @@ extern int have_rar;
414 414
 #define SCAN_STRUCTURED	    (ctx->options & CL_SCAN_STRUCTURED)
415 415
 #define SCAN_ALL            (ctx->options & CL_SCAN_ALLMATCHES)
416 416
 #define SCAN_SWF            (ctx->options & CL_SCAN_SWF)
417
+#define SCAN_PROPERTIES     (ctx->options & CL_SCAN_FILE_PROPERTIES)
417 418
 
418 419
 /* based on macros from A. Melnikoff */
419 420
 #define cbswap16(v) (((v & 0xff) << 8) | (((v) >> 8) & 0xff))
... ...
@@ -1,4 +1,5 @@
1 1
 /*
2
+ *  Copyright (C) 2014 Cisco Systems, Inc.
2 3
  *  Copyright (C) 2007-2013 Sourcefire, Inc.
3 4
  *
4 5
  *  Authors: Tomasz Kojm
... ...
@@ -2518,6 +2519,30 @@ static int magic_scandesc(cli_ctx *ctx, cli_file_t type)
2518 2518
 	early_ret_from_magicscan(CL_EREAD);
2519 2519
     }
2520 2520
     filetype = cli_ftname(type);
2521
+
2522
+#ifdef HAVE_JSON
2523
+    if (SCAN_PROPERTIES && NULL==ctx->properties) {
2524
+        json_object *ftobj, *fsobj;
2525
+        ctx->properties = json_object_new_object();
2526
+        if (NULL == ctx->properties) {
2527
+            cli_errmsg("magic_scandesc: no memory for json properties object\n");
2528
+            early_ret_from_magicscan(CL_EMEM);       
2529
+        }
2530
+        ftobj = json_object_new_string(filetype);
2531
+        if (NULL == ftobj) {
2532
+            cli_errmsg("magic_scandesc: no memory for json file type object.\n");
2533
+            early_ret_from_magicscan(CL_EMEM);       
2534
+        }
2535
+        json_object_object_add(ctx->properties, "FileType", ftobj);
2536
+        fsobj = json_object_new_int((*ctx->fmap)->len);
2537
+        if (NULL == fsobj) {
2538
+            cli_errmsg("magic_scandesc: no memory for json file size object.\n");
2539
+            early_ret_from_magicscan(CL_EMEM);       
2540
+        }
2541
+        json_object_object_add(ctx->properties, "FileSize", fsobj);
2542
+    }
2543
+#endif
2544
+
2521 2545
     hashed_size = 0;
2522 2546
     CALL_PRESCAN_CB(cb_pre_cache);
2523 2547
 
... ...
@@ -3196,8 +3221,8 @@ static int scan_common(int desc, cl_fmap_t *map, const char **virname, unsigned
3196 3196
     ctx.virname = virname;
3197 3197
     ctx.scanned = scanned;
3198 3198
     ctx.options = scanoptions;
3199
-#if 0 /* for development testing only */
3200
-    ctx.options |= CL_SCAN_ALLMATCHES;
3199
+#if 1 /* for development testing only */
3200
+    ctx.options |= CL_SCAN_FILE_PROPERTIES;
3201 3201
 #endif
3202 3202
     ctx.found_possibly_unwanted = 0;
3203 3203
     ctx.container_type = CL_TYPE_ANY;
... ...
@@ -3238,6 +3263,20 @@ static int scan_common(int desc, cl_fmap_t *map, const char **virname, unsigned
3238 3238
 	    rc = CL_VIRUS;
3239 3239
     }
3240 3240
 
3241
+#ifdef HAVE_JSON
3242
+    if (ctx.options & CL_SCAN_FILE_PROPERTIES && ctx.properties!=NULL) {
3243
+        // serialize, etc.
3244
+        const char * jstring = json_object_to_json_string(ctx.properties);
3245
+        if (NULL == jstring) {
3246
+            cli_errmsg("scan_common: no memory for json serialization.\n");
3247
+        }
3248
+        else {
3249
+            cli_errmsg("%s\n", jstring);
3250
+        }
3251
+        json_object_put(ctx.properties); // frees
3252
+    }
3253
+#endif
3254
+
3241 3255
     cli_bitset_free(ctx.hook_lsig_matches);
3242 3256
     free(ctx.fmap);
3243 3257
     if(rc == CL_CLEAN && ctx.found_possibly_unwanted)
... ...
@@ -1,8 +1,9 @@
1
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
1
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
2 2
 # @configure_input@
3 3
 
4
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
5
-
4
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
5
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
6
+# Foundation, Inc.
6 7
 # This Makefile.in is free software; the Free Software Foundation
7 8
 # gives unlimited permission to copy and/or distribute it,
8 9
 # with or without modifications, as long as this notice is preserved.
... ...
@@ -18,51 +19,6 @@
18 18
 
19 19
 
20 20
 VPATH = @srcdir@
21
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
22
-am__make_running_with_option = \
23
-  case $${target_option-} in \
24
-      ?) ;; \
25
-      *) echo "am__make_running_with_option: internal error: invalid" \
26
-              "target option '$${target_option-}' specified" >&2; \
27
-         exit 1;; \
28
-  esac; \
29
-  has_opt=no; \
30
-  sane_makeflags=$$MAKEFLAGS; \
31
-  if $(am__is_gnu_make); then \
32
-    sane_makeflags=$$MFLAGS; \
33
-  else \
34
-    case $$MAKEFLAGS in \
35
-      *\\[\ \	]*) \
36
-        bs=\\; \
37
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
38
-          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
39
-    esac; \
40
-  fi; \
41
-  skip_next=no; \
42
-  strip_trailopt () \
43
-  { \
44
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
45
-  }; \
46
-  for flg in $$sane_makeflags; do \
47
-    test $$skip_next = yes && { skip_next=no; continue; }; \
48
-    case $$flg in \
49
-      *=*|--*) continue;; \
50
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
51
-      -*I?*) strip_trailopt 'I';; \
52
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
53
-      -*O?*) strip_trailopt 'O';; \
54
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
55
-      -*l?*) strip_trailopt 'l';; \
56
-      -[dEDm]) skip_next=yes;; \
57
-      -[JT]) skip_next=yes;; \
58
-    esac; \
59
-    case $$flg in \
60
-      *$$target_option*) has_opt=yes; break;; \
61
-    esac; \
62
-  done; \
63
-  test $$has_opt = yes
64
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
65
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
66 21
 pkgdatadir = $(datadir)/@PACKAGE@
67 22
 pkgincludedir = $(includedir)/@PACKAGE@
68 23
 pkglibdir = $(libdir)/@PACKAGE@
... ...
@@ -86,9 +42,9 @@ target_triplet = @target@
86 86
 @INSTALL_LTDL_TRUE@am__append_2 = libltdl.la
87 87
 @CONVENIENCE_LTDL_TRUE@am__append_3 = libltdlc.la
88 88
 subdir = libltdl
89
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
90
-	$(top_srcdir)/config/depcomp $(am__include_HEADERS_DIST) \
91
-	$(am__ltdlinclude_HEADERS_DIST) COPYING.LIB README
89
+DIST_COMMON = README $(am__include_HEADERS_DIST) \
90
+	$(am__ltdlinclude_HEADERS_DIST) $(srcdir)/Makefile.am \
91
+	$(srcdir)/Makefile.in COPYING.LIB
92 92
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
93 93
 am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
94 94
 	$(top_srcdir)/m4/argz.m4 \
... ...
@@ -112,6 +68,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
112 112
 	$(top_srcdir)/m4/reorganization/code_checks/coverage.m4 \
113 113
 	$(top_srcdir)/m4/reorganization/libs/xml.m4 \
114 114
 	$(top_srcdir)/m4/reorganization/libs/openssl.m4 \
115
+	$(top_srcdir)/m4/reorganization/libs/json.m4 \
115 116
 	$(top_srcdir)/m4/reorganization/libs/libz.m4 \
116 117
 	$(top_srcdir)/m4/reorganization/libs/bzip.m4 \
117 118
 	$(top_srcdir)/m4/reorganization/libs/unrar.m4 \
... ...
@@ -197,7 +154,6 @@ dld_link_la_OBJECTS = $(am_dld_link_la_OBJECTS)
197 197
 AM_V_lt = $(am__v_lt_@AM_V@)
198 198
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
199 199
 am__v_lt_0 = --silent
200
-am__v_lt_1 = 
201 200
 dld_link_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
202 201
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
203 202
 	$(dld_link_la_LDFLAGS) $(LDFLAGS) -o $@
... ...
@@ -252,18 +208,6 @@ shl_load_la_OBJECTS = $(am_shl_load_la_OBJECTS)
252 252
 shl_load_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
253 253
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
254 254
 	$(shl_load_la_LDFLAGS) $(LDFLAGS) -o $@
255
-AM_V_P = $(am__v_P_@AM_V@)
256
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
257
-am__v_P_0 = false
258
-am__v_P_1 = :
259
-AM_V_GEN = $(am__v_GEN_@AM_V@)
260
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
261
-am__v_GEN_0 = @echo "  GEN     " $@;
262
-am__v_GEN_1 = 
263
-AM_V_at = $(am__v_at_@AM_V@)
264
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
265
-am__v_at_0 = @
266
-am__v_at_1 = 
267 255
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
268 256
 depcomp = $(SHELL) $(top_srcdir)/config/depcomp
269 257
 am__depfiles_maybe = depfiles
... ...
@@ -276,16 +220,20 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
276 276
 	$(AM_CFLAGS) $(CFLAGS)
277 277
 AM_V_CC = $(am__v_CC_@AM_V@)
278 278
 am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
279
-am__v_CC_0 = @echo "  CC      " $@;
280
-am__v_CC_1 = 
279
+am__v_CC_0 = @echo "  CC    " $@;
280
+AM_V_at = $(am__v_at_@AM_V@)
281
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
282
+am__v_at_0 = @
281 283
 CCLD = $(CC)
282 284
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
283 285
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
284 286
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
285 287
 AM_V_CCLD = $(am__v_CCLD_@AM_V@)
286 288
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
287
-am__v_CCLD_0 = @echo "  CCLD    " $@;
288
-am__v_CCLD_1 = 
289
+am__v_CCLD_0 = @echo "  CCLD  " $@;
290
+AM_V_GEN = $(am__v_GEN_@AM_V@)
291
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
292
+am__v_GEN_0 = @echo "  GEN   " $@;
289 293
 SOURCES = $(dld_link_la_SOURCES) $(dlopen_la_SOURCES) \
290 294
 	$(dyld_la_SOURCES) $(libltdl_la_SOURCES) \
291 295
 	$(libltdlc_la_SOURCES) $(load_add_on_la_SOURCES) \
... ...
@@ -294,32 +242,10 @@ DIST_SOURCES = $(dld_link_la_SOURCES) $(dlopen_la_SOURCES) \
294 294
 	$(dyld_la_SOURCES) $(libltdl_la_SOURCES) \
295 295
 	$(libltdlc_la_SOURCES) $(load_add_on_la_SOURCES) \
296 296
 	$(loadlibrary_la_SOURCES) $(shl_load_la_SOURCES)
297
-am__can_run_installinfo = \
298
-  case $$AM_UPDATE_INFO_DIR in \
299
-    n|no|NO) false;; \
300
-    *) (install-info --version) >/dev/null 2>&1;; \
301
-  esac
302 297
 am__include_HEADERS_DIST = ltdl.h
303 298
 am__ltdlinclude_HEADERS_DIST = libltdl/lt_system.h libltdl/lt_error.h \
304 299
 	libltdl/lt_dlloader.h
305 300
 HEADERS = $(include_HEADERS) $(ltdlinclude_HEADERS)
306
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
307
-# Read a list of newline-separated strings from the standard input,
308
-# and print each of them once, without duplicates.  Input order is
309
-# *not* preserved.
310
-am__uniquify_input = $(AWK) '\
311
-  BEGIN { nonempty = 0; } \
312
-  { items[$$0] = 1; nonempty = 1; } \
313
-  END { if (nonempty) { for (i in items) print i; }; } \
314
-'
315
-# Make sure the list of sources is unique.  This is necessary because,
316
-# e.g., the same source file might be shared among _SOURCES variables
317
-# for different programs/libraries.
318
-am__define_uniq_tagged_files = \
319
-  list='$(am__tagged_files)'; \
320
-  unique=`for i in $$list; do \
321
-    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
322
-  done | $(am__uniquify_input)`
323 301
 ETAGS = etags
324 302
 CTAGS = ctags
325 303
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
... ...
@@ -389,6 +315,9 @@ INSTALL_DATA = @INSTALL_DATA@
389 389
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
390 390
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
391 391
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
392
+JSON_CPPFLAGS = @JSON_CPPFLAGS@
393
+JSON_LDFLAGS = @JSON_LDFLAGS@
394
+JSON_LIBS = @JSON_LIBS@
392 395
 LCOV = @LCOV@
393 396
 LD = @LD@
394 397
 LDFLAGS = @LDFLAGS@
... ...
@@ -612,9 +541,9 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
612 612
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
613 613
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
614 614
 $(am__aclocal_m4_deps):
615
-
616 615
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
617 616
 	@$(NORMAL_INSTALL)
617
+	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
618 618
 	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
619 619
 	list2=; for p in $$list; do \
620 620
 	  if test -f $$p; then \
... ...
@@ -622,8 +551,6 @@ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
622 622
 	  else :; fi; \
623 623
 	done; \
624 624
 	test -z "$$list2" || { \
625
-	  echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \
626
-	  $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \
627 625
 	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \
628 626
 	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \
629 627
 	}
... ...
@@ -639,47 +566,35 @@ uninstall-libLTLIBRARIES:
639 639
 
640 640
 clean-libLTLIBRARIES:
641 641
 	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
642
-	@list='$(lib_LTLIBRARIES)'; \
643
-	locs=`for p in $$list; do echo $$p; done | \
644
-	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
645
-	      sort -u`; \
646
-	test -z "$$locs" || { \
647
-	  echo rm -f $${locs}; \
648
-	  rm -f $${locs}; \
649
-	}
642
+	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
643
+	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
644
+	  test "$$dir" != "$$p" || dir=.; \
645
+	  echo "rm -f \"$${dir}/so_locations\""; \
646
+	  rm -f "$${dir}/so_locations"; \
647
+	done
650 648
 
651 649
 clean-noinstLTLIBRARIES:
652 650
 	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
653
-	@list='$(noinst_LTLIBRARIES)'; \
654
-	locs=`for p in $$list; do echo $$p; done | \
655
-	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
656
-	      sort -u`; \
657
-	test -z "$$locs" || { \
658
-	  echo rm -f $${locs}; \
659
-	  rm -f $${locs}; \
660
-	}
661
-
651
+	@list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
652
+	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
653
+	  test "$$dir" != "$$p" || dir=.; \
654
+	  echo "rm -f \"$${dir}/so_locations\""; \
655
+	  rm -f "$${dir}/so_locations"; \
656
+	done
662 657
 dld_link.la: $(dld_link_la_OBJECTS) $(dld_link_la_DEPENDENCIES) $(EXTRA_dld_link_la_DEPENDENCIES) 
663 658
 	$(AM_V_CCLD)$(dld_link_la_LINK)  $(dld_link_la_OBJECTS) $(dld_link_la_LIBADD) $(LIBS)
664
-
665 659
 dlopen.la: $(dlopen_la_OBJECTS) $(dlopen_la_DEPENDENCIES) $(EXTRA_dlopen_la_DEPENDENCIES) 
666 660
 	$(AM_V_CCLD)$(dlopen_la_LINK)  $(dlopen_la_OBJECTS) $(dlopen_la_LIBADD) $(LIBS)
667
-
668 661
 dyld.la: $(dyld_la_OBJECTS) $(dyld_la_DEPENDENCIES) $(EXTRA_dyld_la_DEPENDENCIES) 
669 662
 	$(AM_V_CCLD)$(dyld_la_LINK)  $(dyld_la_OBJECTS) $(dyld_la_LIBADD) $(LIBS)
670
-
671 663
 libltdl.la: $(libltdl_la_OBJECTS) $(libltdl_la_DEPENDENCIES) $(EXTRA_libltdl_la_DEPENDENCIES) 
672 664
 	$(AM_V_CCLD)$(libltdl_la_LINK) $(am_libltdl_la_rpath) $(libltdl_la_OBJECTS) $(libltdl_la_LIBADD) $(LIBS)
673
-
674 665
 libltdlc.la: $(libltdlc_la_OBJECTS) $(libltdlc_la_DEPENDENCIES) $(EXTRA_libltdlc_la_DEPENDENCIES) 
675 666
 	$(AM_V_CCLD)$(libltdlc_la_LINK) $(am_libltdlc_la_rpath) $(libltdlc_la_OBJECTS) $(libltdlc_la_LIBADD) $(LIBS)
676
-
677 667
 load_add_on.la: $(load_add_on_la_OBJECTS) $(load_add_on_la_DEPENDENCIES) $(EXTRA_load_add_on_la_DEPENDENCIES) 
678 668
 	$(AM_V_CCLD)$(load_add_on_la_LINK)  $(load_add_on_la_OBJECTS) $(load_add_on_la_LIBADD) $(LIBS)
679
-
680 669
 loadlibrary.la: $(loadlibrary_la_OBJECTS) $(loadlibrary_la_DEPENDENCIES) $(EXTRA_loadlibrary_la_DEPENDENCIES) 
681 670
 	$(AM_V_CCLD)$(loadlibrary_la_LINK)  $(loadlibrary_la_OBJECTS) $(loadlibrary_la_LIBADD) $(LIBS)
682
-
683 671
 shl_load.la: $(shl_load_la_OBJECTS) $(shl_load_la_DEPENDENCIES) $(EXTRA_shl_load_la_DEPENDENCIES) 
684 672
 	$(AM_V_CCLD)$(shl_load_la_LINK)  $(shl_load_la_OBJECTS) $(shl_load_la_LIBADD) $(LIBS)
685 673
 
... ...
@@ -713,14 +628,14 @@ distclean-compile:
713 713
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
714 714
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
715 715
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
716
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
716
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
717 717
 
718 718
 .c.obj:
719 719
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
720 720
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
721 721
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
722 722
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
723
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
723
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
724 724
 
725 725
 .c.lo:
726 726
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
... ...
@@ -862,11 +777,8 @@ clean-libtool:
862 862
 	-rm -rf .libs _libs
863 863
 install-includeHEADERS: $(include_HEADERS)
864 864
 	@$(NORMAL_INSTALL)
865
+	test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)"
865 866
 	@list='$(include_HEADERS)'; test -n "$(includedir)" || list=; \
866
-	if test -n "$$list"; then \
867
-	  echo " $(MKDIR_P) '$(DESTDIR)$(includedir)'"; \
868
-	  $(MKDIR_P) "$(DESTDIR)$(includedir)" || exit 1; \
869
-	fi; \
870 867
 	for p in $$list; do \
871 868
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
872 869
 	  echo "$$d$$p"; \
... ...
@@ -883,11 +795,8 @@ uninstall-includeHEADERS:
883 883
 	dir='$(DESTDIR)$(includedir)'; $(am__uninstall_files_from_dir)
884 884
 install-ltdlincludeHEADERS: $(ltdlinclude_HEADERS)
885 885
 	@$(NORMAL_INSTALL)
886
+	test -z "$(ltdlincludedir)" || $(MKDIR_P) "$(DESTDIR)$(ltdlincludedir)"
886 887
 	@list='$(ltdlinclude_HEADERS)'; test -n "$(ltdlincludedir)" || list=; \
887
-	if test -n "$$list"; then \
888
-	  echo " $(MKDIR_P) '$(DESTDIR)$(ltdlincludedir)'"; \
889
-	  $(MKDIR_P) "$(DESTDIR)$(ltdlincludedir)" || exit 1; \
890
-	fi; \
891 888
 	for p in $$list; do \
892 889
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
893 890
 	  echo "$$d$$p"; \
... ...
@@ -903,15 +812,26 @@ uninstall-ltdlincludeHEADERS:
903 903
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
904 904
 	dir='$(DESTDIR)$(ltdlincludedir)'; $(am__uninstall_files_from_dir)
905 905
 
906
-ID: $(am__tagged_files)
907
-	$(am__define_uniq_tagged_files); mkid -fID $$unique
908
-tags: tags-am
909
-TAGS: tags
910
-
911
-tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
906
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
907
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
908
+	unique=`for i in $$list; do \
909
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
910
+	  done | \
911
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
912
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
913
+	mkid -fID $$unique
914
+tags: TAGS
915
+
916
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
917
+		$(TAGS_FILES) $(LISP)
912 918
 	set x; \
913 919
 	here=`pwd`; \
914
-	$(am__define_uniq_tagged_files); \
920
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
921
+	unique=`for i in $$list; do \
922
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
923
+	  done | \
924
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
925
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
915 926
 	shift; \
916 927
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
917 928
 	  test -n "$$unique" || unique=$$empty_fix; \
... ...
@@ -923,11 +843,15 @@ tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
923 923
 	      $$unique; \
924 924
 	  fi; \
925 925
 	fi
926
-ctags: ctags-am
927
-
928
-CTAGS: ctags
929
-ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
930
-	$(am__define_uniq_tagged_files); \
926
+ctags: CTAGS
927
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
928
+		$(TAGS_FILES) $(LISP)
929
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
930
+	unique=`for i in $$list; do \
931
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
932
+	  done | \
933
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
934
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
931 935
 	test -z "$(CTAGS_ARGS)$$unique" \
932 936
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
933 937
 	     $$unique
... ...
@@ -936,21 +860,6 @@ GTAGS:
936 936
 	here=`$(am__cd) $(top_builddir) && pwd` \
937 937
 	  && $(am__cd) $(top_srcdir) \
938 938
 	  && gtags -i $(GTAGS_ARGS) "$$here"
939
-cscopelist: cscopelist-am
940
-
941
-cscopelist-am: $(am__tagged_files)
942
-	list='$(am__tagged_files)'; \
943
-	case "$(srcdir)" in \
944
-	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
945
-	  *) sdir=$(subdir)/$(srcdir) ;; \
946
-	esac; \
947
-	for i in $$list; do \
948
-	  if test -f "$$i"; then \
949
-	    echo "$(subdir)/$$i"; \
950
-	  else \
951
-	    echo "$$sdir/$$i"; \
952
-	  fi; \
953
-	done >> $(top_builddir)/cscope.files
954 939
 
955 940
 distclean-tags:
956 941
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
... ...
@@ -1101,20 +1010,20 @@ uninstall-am: uninstall-includeHEADERS uninstall-libLTLIBRARIES \
1101 1101
 
1102 1102
 .MAKE: all check install install-am install-strip
1103 1103
 
1104
-.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
1104
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
1105 1105
 	clean-libLTLIBRARIES clean-libtool clean-noinstLTLIBRARIES \
1106
-	cscopelist-am ctags ctags-am distclean distclean-compile \
1107
-	distclean-generic distclean-libtool distclean-tags distdir dvi \
1108
-	dvi-am html html-am info info-am install install-am \
1109
-	install-data install-data-am install-dvi install-dvi-am \
1110
-	install-exec install-exec-am install-html install-html-am \
1106
+	ctags distclean distclean-compile distclean-generic \
1107
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
1108
+	html-am info info-am install install-am install-data \
1109
+	install-data-am install-dvi install-dvi-am install-exec \
1110
+	install-exec-am install-html install-html-am \
1111 1111
 	install-includeHEADERS install-info install-info-am \
1112 1112
 	install-libLTLIBRARIES install-ltdlincludeHEADERS install-man \
1113 1113
 	install-pdf install-pdf-am install-ps install-ps-am \
1114 1114
 	install-strip installcheck installcheck-am installdirs \
1115 1115
 	maintainer-clean maintainer-clean-generic mostlyclean \
1116 1116
 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
1117
-	pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
1117
+	pdf pdf-am ps ps-am tags uninstall uninstall-am \
1118 1118
 	uninstall-includeHEADERS uninstall-libLTLIBRARIES \
1119 1119
 	uninstall-ltdlincludeHEADERS
1120 1120
 
1121 1121
new file mode 100644
... ...
@@ -0,0 +1,45 @@
0
+dnl Check for libjson
1
+AC_MSG_CHECKING([for libjson installation])
2
+
3
+AC_ARG_WITH([libjson],
4
+[  --with-libjson=DIR   path to directory containing libjson (default=
5
+    /usr/local or /usr if not found in /usr/local)],
6
+[
7
+if test "$withval"; then
8
+    LIBJSON_HOME="$withval"
9
+fi
10
+], [
11
+LIBJSON_HOME=/usr/local
12
+if test ! -f "$LIBJSON_HOME/include/json/json.h"
13
+then
14
+    LIBJSON_HOME=/usr
15
+fi
16
+AC_MSG_RESULT([$LIBJSON_HOME])
17
+])
18
+
19
+if test ! -f "$LIBJSON_HOME/include/json/json.h"
20
+then
21
+    AC_MSG_ERROR([libjson not found.])
22
+fi
23
+
24
+JSON_LDFLAGS="-L$LIBJSON_HOME/lib"
25
+JSON_LIBS="-ljson"
26
+JSON_CPPFLAGS="-I$LIBJSON_HOME/include"
27
+
28
+save_LDFLAGS="$LDFLAGS"
29
+LDFLAGS="-L$LIBJSON_HOME/lib $JSON_LIBS"
30
+
31
+save_CFLAGS="$CFLAGS"
32
+CFLAGS="$JSON_CPPFLAGS"
33
+
34
+have_json="no"
35
+
36
+AC_CHECK_LIB([json], [json_object_new_object], [have_json="yes"], [AC_MSG_ERROR([Your libjson installation is misconfigured or missing])])
37
+
38
+LDFLAGS="$save_LDFLAGS"
39
+CFLAGS="$save_CFLAGS"
40
+
41
+if test "$have_json" = "yes"; then
42
+AC_DEFINE([HAVE_JSON],1,[Define to 1 if you have the 'libjson' library (-ljson).])
43
+fi
44
+
... ...
@@ -11,6 +11,7 @@ AC_SUBST([CLAMDTOP_CPPFLAGS])
11 11
 AC_SUBST([CLAMBC_CPPFLAGS])
12 12
 AC_SUBST([LIBCLAMSHARED_CPPFLAGS])
13 13
 AC_SUBST([SSL_CPPFLAGS])
14
+AC_SUBST([JSON_CPPFLAGS])
14 15
 
15 16
 AC_SUBST([LIBCLAMAV_LIBS])
16 17
 AC_SUBST([CLAMD_LIBS])
... ...
@@ -27,3 +28,5 @@ AC_SUBST([CLAMCONF_LIBS])
27 27
 
28 28
 AC_SUBST([SSL_LIBS])
29 29
 AC_SUBST([SSL_LDFLAGS])
30
+AC_SUBST([JSON_LIBS])
31
+AC_SUBST([JSON_LDFLAGS])
... ...
@@ -1,8 +1,9 @@
1
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
1
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
2 2
 # @configure_input@
3 3
 
4
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
5
-
4
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
5
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
6
+# Foundation, Inc.
6 7
 # This Makefile.in is free software; the Free Software Foundation
7 8
 # gives unlimited permission to copy and/or distribute it,
8 9
 # with or without modifications, as long as this notice is preserved.
... ...
@@ -33,51 +34,6 @@
33 33
 #  MA 02110-1301, USA.
34 34
 
35 35
 VPATH = @srcdir@
36
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
37
-am__make_running_with_option = \
38
-  case $${target_option-} in \
39
-      ?) ;; \
40
-      *) echo "am__make_running_with_option: internal error: invalid" \
41
-              "target option '$${target_option-}' specified" >&2; \
42
-         exit 1;; \
43
-  esac; \
44
-  has_opt=no; \
45
-  sane_makeflags=$$MAKEFLAGS; \
46
-  if $(am__is_gnu_make); then \
47
-    sane_makeflags=$$MFLAGS; \
48
-  else \
49
-    case $$MAKEFLAGS in \
50
-      *\\[\ \	]*) \
51
-        bs=\\; \
52
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
53
-          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
54
-    esac; \
55
-  fi; \
56
-  skip_next=no; \
57
-  strip_trailopt () \
58
-  { \
59
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
60
-  }; \
61
-  for flg in $$sane_makeflags; do \
62
-    test $$skip_next = yes && { skip_next=no; continue; }; \
63
-    case $$flg in \
64
-      *=*|--*) continue;; \
65
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
66
-      -*I?*) strip_trailopt 'I';; \
67
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
68
-      -*O?*) strip_trailopt 'O';; \
69
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
70
-      -*l?*) strip_trailopt 'l';; \
71
-      -[dEDm]) skip_next=yes;; \
72
-      -[JT]) skip_next=yes;; \
73
-    esac; \
74
-    case $$flg in \
75
-      *$$target_option*) has_opt=yes; break;; \
76
-    esac; \
77
-  done; \
78
-  test $$has_opt = yes
79
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
80
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
81 36
 pkgdatadir = $(datadir)/@PACKAGE@
82 37
 pkgincludedir = $(includedir)/@PACKAGE@
83 38
 pkglibdir = $(libdir)/@PACKAGE@
... ...
@@ -99,8 +55,7 @@ host_triplet = @host@
99 99
 target_triplet = @target@
100 100
 bin_PROGRAMS = sigtool$(EXEEXT)
101 101
 subdir = sigtool
102
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
103
-	$(top_srcdir)/config/depcomp
102
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
104 103
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
105 104
 am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
106 105
 	$(top_srcdir)/m4/argz.m4 \
... ...
@@ -124,6 +79,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
124 124
 	$(top_srcdir)/m4/reorganization/code_checks/coverage.m4 \
125 125
 	$(top_srcdir)/m4/reorganization/libs/xml.m4 \
126 126
 	$(top_srcdir)/m4/reorganization/libs/openssl.m4 \
127
+	$(top_srcdir)/m4/reorganization/libs/json.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 \
... ...
@@ -183,19 +139,6 @@ sigtool_LDADD = $(LDADD)
183 183
 AM_V_lt = $(am__v_lt_@AM_V@)
184 184
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
185 185
 am__v_lt_0 = --silent
186
-am__v_lt_1 = 
187
-AM_V_P = $(am__v_P_@AM_V@)
188
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
189
-am__v_P_0 = false
190
-am__v_P_1 = :
191
-AM_V_GEN = $(am__v_GEN_@AM_V@)
192
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
193
-am__v_GEN_0 = @echo "  GEN     " $@;
194
-am__v_GEN_1 = 
195
-AM_V_at = $(am__v_at_@AM_V@)
196
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
197
-am__v_at_0 = @
198
-am__v_at_1 = 
199 186
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
200 187
 depcomp = $(SHELL) $(top_srcdir)/config/depcomp
201 188
 am__depfiles_maybe = depfiles
... ...
@@ -208,40 +151,22 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
208 208
 	$(AM_CFLAGS) $(CFLAGS)
209 209
 AM_V_CC = $(am__v_CC_@AM_V@)
210 210
 am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
211
-am__v_CC_0 = @echo "  CC      " $@;
212
-am__v_CC_1 = 
211
+am__v_CC_0 = @echo "  CC    " $@;
212
+AM_V_at = $(am__v_at_@AM_V@)
213
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
214
+am__v_at_0 = @
213 215
 CCLD = $(CC)
214 216
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
215 217
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
216 218
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
217 219
 AM_V_CCLD = $(am__v_CCLD_@AM_V@)
218 220
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
219
-am__v_CCLD_0 = @echo "  CCLD    " $@;
220
-am__v_CCLD_1 = 
221
+am__v_CCLD_0 = @echo "  CCLD  " $@;
222
+AM_V_GEN = $(am__v_GEN_@AM_V@)
223
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
224
+am__v_GEN_0 = @echo "  GEN   " $@;
221 225
 SOURCES = $(sigtool_SOURCES)
222 226
 DIST_SOURCES = $(sigtool_SOURCES)
223
-am__can_run_installinfo = \
224
-  case $$AM_UPDATE_INFO_DIR in \
225
-    n|no|NO) false;; \
226
-    *) (install-info --version) >/dev/null 2>&1;; \
227
-  esac
228
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
229
-# Read a list of newline-separated strings from the standard input,
230
-# and print each of them once, without duplicates.  Input order is
231
-# *not* preserved.
232
-am__uniquify_input = $(AWK) '\
233
-  BEGIN { nonempty = 0; } \
234
-  { items[$$0] = 1; nonempty = 1; } \
235
-  END { if (nonempty) { for (i in items) print i; }; } \
236
-'
237
-# Make sure the list of sources is unique.  This is necessary because,
238
-# e.g., the same source file might be shared among _SOURCES variables
239
-# for different programs/libraries.
240
-am__define_uniq_tagged_files = \
241
-  list='$(am__tagged_files)'; \
242
-  unique=`for i in $$list; do \
243
-    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
244
-  done | $(am__uniquify_input)`
245 227
 ETAGS = etags
246 228
 CTAGS = ctags
247 229
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
... ...
@@ -311,6 +236,9 @@ INSTALL_DATA = @INSTALL_DATA@
311 311
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
312 312
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
313 313
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
314
+JSON_CPPFLAGS = @JSON_CPPFLAGS@
315
+JSON_LDFLAGS = @JSON_LDFLAGS@
316
+JSON_LIBS = @JSON_LIBS@
314 317
 LCOV = @LCOV@
315 318
 LD = @LD@
316 319
 LDFLAGS = @LDFLAGS@
... ...
@@ -490,19 +418,14 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
490 490
 $(am__aclocal_m4_deps):
491 491
 install-binPROGRAMS: $(bin_PROGRAMS)
492 492
 	@$(NORMAL_INSTALL)
493
+	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
493 494
 	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
494
-	if test -n "$$list"; then \
495
-	  echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
496
-	  $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
497
-	fi; \
498 495
 	for p in $$list; do echo "$$p $$p"; done | \
499 496
 	sed 's/$(EXEEXT)$$//' | \
500
-	while read p p1; do if test -f $$p \
501
-	 || test -f $$p1 \
502
-	  ; then echo "$$p"; echo "$$p"; else :; fi; \
497
+	while read p p1; do if test -f $$p || test -f $$p1; \
498
+	  then echo "$$p"; echo "$$p"; else :; fi; \
503 499
 	done | \
504
-	sed -e 'p;s,.*/,,;n;h' \
505
-	    -e 's|.*|.|' \
500
+	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
506 501
 	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
507 502
 	sed 'N;N;N;s,\n, ,g' | \
508 503
 	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
... ...
@@ -523,8 +446,7 @@ uninstall-binPROGRAMS:
523 523
 	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
524 524
 	files=`for p in $$list; do echo "$$p"; done | \
525 525
 	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
526
-	      -e 's/$$/$(EXEEXT)/' \
527
-	`; \
526
+	      -e 's/$$/$(EXEEXT)/' `; \
528 527
 	test -n "$$list" || exit 0; \
529 528
 	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
530 529
 	cd "$(DESTDIR)$(bindir)" && rm -f $$files
... ...
@@ -553,7 +475,6 @@ installcheck-binPROGRAMS: $(bin_PROGRAMS)
553 553
 	    else echo "$$f does not support $$opt" 1>&2; bad=1; fi; \
554 554
 	  done; \
555 555
 	done; rm -f c$${pid}_.???; exit $$bad
556
-
557 556
 sigtool$(EXEEXT): $(sigtool_OBJECTS) $(sigtool_DEPENDENCIES) $(EXTRA_sigtool_DEPENDENCIES) 
558 557
 	@rm -f sigtool$(EXEEXT)
559 558
 	$(AM_V_CCLD)$(LINK) $(sigtool_OBJECTS) $(sigtool_LDADD) $(LIBS)
... ...
@@ -578,14 +499,14 @@ distclean-compile:
578 578
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
579 579
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
580 580
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
581
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
581
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
582 582
 
583 583
 .c.obj:
584 584
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
585 585
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
586 586
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
587 587
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
588
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
588
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
589 589
 
590 590
 .c.lo:
591 591
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
... ...
@@ -684,15 +605,26 @@ mostlyclean-libtool:
684 684
 clean-libtool:
685 685
 	-rm -rf .libs _libs
686 686
 
687
-ID: $(am__tagged_files)
688
-	$(am__define_uniq_tagged_files); mkid -fID $$unique
689
-tags: tags-am
690
-TAGS: tags
691
-
692
-tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
687
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
688
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
689
+	unique=`for i in $$list; do \
690
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
691
+	  done | \
692
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
693
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
694
+	mkid -fID $$unique
695
+tags: TAGS
696
+
697
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
698
+		$(TAGS_FILES) $(LISP)
693 699
 	set x; \
694 700
 	here=`pwd`; \
695
-	$(am__define_uniq_tagged_files); \
701
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
702
+	unique=`for i in $$list; do \
703
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
704
+	  done | \
705
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
706
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
696 707
 	shift; \
697 708
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
698 709
 	  test -n "$$unique" || unique=$$empty_fix; \
... ...
@@ -704,11 +636,15 @@ tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
704 704
 	      $$unique; \
705 705
 	  fi; \
706 706
 	fi
707
-ctags: ctags-am
708
-
709
-CTAGS: ctags
710
-ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
711
-	$(am__define_uniq_tagged_files); \
707
+ctags: CTAGS
708
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
709
+		$(TAGS_FILES) $(LISP)
710
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
711
+	unique=`for i in $$list; do \
712
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
713
+	  done | \
714
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
715
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
712 716
 	test -z "$(CTAGS_ARGS)$$unique" \
713 717
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
714 718
 	     $$unique
... ...
@@ -717,21 +653,6 @@ GTAGS:
717 717
 	here=`$(am__cd) $(top_builddir) && pwd` \
718 718
 	  && $(am__cd) $(top_srcdir) \
719 719
 	  && gtags -i $(GTAGS_ARGS) "$$here"
720
-cscopelist: cscopelist-am
721
-
722
-cscopelist-am: $(am__tagged_files)
723
-	list='$(am__tagged_files)'; \
724
-	case "$(srcdir)" in \
725
-	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
726
-	  *) sdir=$(subdir)/$(srcdir) ;; \
727
-	esac; \
728
-	for i in $$list; do \
729
-	  if test -f "$$i"; then \
730
-	    echo "$(subdir)/$$i"; \
731
-	  else \
732
-	    echo "$$sdir/$$i"; \
733
-	  fi; \
734
-	done >> $(top_builddir)/cscope.files
735 720
 
736 721
 distclean-tags:
737 722
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
... ...
@@ -876,20 +797,19 @@ uninstall-am: uninstall-binPROGRAMS
876 876
 
877 877
 .MAKE: install-am install-strip
878 878
 
879
-.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \
880
-	clean-binPROGRAMS clean-generic clean-libtool cscopelist-am \
881
-	ctags ctags-am distclean distclean-compile distclean-generic \
882
-	distclean-libtool distclean-tags distdir dvi dvi-am html \
883
-	html-am info info-am install install-am install-binPROGRAMS \
884
-	install-data install-data-am install-dvi install-dvi-am \
885
-	install-exec install-exec-am install-html install-html-am \
886
-	install-info install-info-am install-man install-pdf \
887
-	install-pdf-am install-ps install-ps-am install-strip \
888
-	installcheck installcheck-am installcheck-binPROGRAMS \
889
-	installdirs maintainer-clean maintainer-clean-generic \
890
-	mostlyclean mostlyclean-compile mostlyclean-generic \
891
-	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
892
-	uninstall-am uninstall-binPROGRAMS
879
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
880
+	clean-generic clean-libtool ctags distclean distclean-compile \
881
+	distclean-generic distclean-libtool distclean-tags distdir dvi \
882
+	dvi-am html html-am info info-am install install-am \
883
+	install-binPROGRAMS install-data install-data-am install-dvi \
884
+	install-dvi-am install-exec install-exec-am install-html \
885
+	install-html-am install-info install-info-am install-man \
886
+	install-pdf install-pdf-am install-ps install-ps-am \
887
+	install-strip installcheck installcheck-am \
888
+	installcheck-binPROGRAMS installdirs maintainer-clean \
889
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
890
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
891
+	tags uninstall uninstall-am uninstall-binPROGRAMS
893 892
 
894 893
 
895 894
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
... ...
@@ -1,8 +1,9 @@
1
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
1
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
2 2
 # @configure_input@
3 3
 
4
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
5
-
4
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
5
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
6
+# Foundation, Inc.
6 7
 # This Makefile.in is free software; the Free Software Foundation
7 8
 # gives unlimited permission to copy and/or distribute it,
8 9
 # with or without modifications, as long as this notice is preserved.
... ...
@@ -14,51 +15,6 @@
14 14
 
15 15
 @SET_MAKE@
16 16
 VPATH = @srcdir@
17
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
18
-am__make_running_with_option = \
19
-  case $${target_option-} in \
20
-      ?) ;; \
21
-      *) echo "am__make_running_with_option: internal error: invalid" \
22
-              "target option '$${target_option-}' specified" >&2; \
23
-         exit 1;; \
24
-  esac; \
25
-  has_opt=no; \
26
-  sane_makeflags=$$MAKEFLAGS; \
27
-  if $(am__is_gnu_make); then \
28
-    sane_makeflags=$$MFLAGS; \
29
-  else \
30
-    case $$MAKEFLAGS in \
31
-      *\\[\ \	]*) \
32
-        bs=\\; \
33
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
34
-          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
35
-    esac; \
36
-  fi; \
37
-  skip_next=no; \
38
-  strip_trailopt () \
39
-  { \
40
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
41
-  }; \
42
-  for flg in $$sane_makeflags; do \
43
-    test $$skip_next = yes && { skip_next=no; continue; }; \
44
-    case $$flg in \
45
-      *=*|--*) continue;; \
46
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
47
-      -*I?*) strip_trailopt 'I';; \
48
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
49
-      -*O?*) strip_trailopt 'O';; \
50
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
51
-      -*l?*) strip_trailopt 'l';; \
52
-      -[dEDm]) skip_next=yes;; \
53
-      -[JT]) skip_next=yes;; \
54
-    esac; \
55
-    case $$flg in \
56
-      *$$target_option*) has_opt=yes; break;; \
57
-    esac; \
58
-  done; \
59
-  test $$has_opt = yes
60
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
61
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
62 17
 pkgdatadir = $(datadir)/@PACKAGE@
63 18
 pkgincludedir = $(includedir)/@PACKAGE@
64 19
 pkglibdir = $(libdir)/@PACKAGE@
... ...
@@ -81,7 +37,7 @@ target_triplet = @target@
81 81
 @ENABLE_UNRAR_TRUE@am__append_1 = clam-v2.rar clam-v3.rar
82 82
 @HAVE_LIBBZ2_TRUE@am__append_2 = clam.exe.bz2 clam.bz2.zip
83 83
 subdir = test
84
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am README
84
+DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in
85 85
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
86 86
 am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
87 87
 	$(top_srcdir)/m4/argz.m4 \
... ...
@@ -105,6 +61,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
105 105
 	$(top_srcdir)/m4/reorganization/code_checks/coverage.m4 \
106 106
 	$(top_srcdir)/m4/reorganization/libs/xml.m4 \
107 107
 	$(top_srcdir)/m4/reorganization/libs/openssl.m4 \
108
+	$(top_srcdir)/m4/reorganization/libs/json.m4 \
108 109
 	$(top_srcdir)/m4/reorganization/libs/libz.m4 \
109 110
 	$(top_srcdir)/m4/reorganization/libs/bzip.m4 \
110 111
 	$(top_srcdir)/m4/reorganization/libs/unrar.m4 \
... ...
@@ -154,26 +111,14 @@ mkinstalldirs = $(install_sh) -d
154 154
 CONFIG_HEADER = $(top_builddir)/clamav-config.h
155 155
 CONFIG_CLEAN_FILES =
156 156
 CONFIG_CLEAN_VPATH_FILES =
157
-AM_V_P = $(am__v_P_@AM_V@)
158
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
159
-am__v_P_0 = false
160
-am__v_P_1 = :
161 157
 AM_V_GEN = $(am__v_GEN_@AM_V@)
162 158
 am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
163
-am__v_GEN_0 = @echo "  GEN     " $@;
164
-am__v_GEN_1 = 
159
+am__v_GEN_0 = @echo "  GEN   " $@;
165 160
 AM_V_at = $(am__v_at_@AM_V@)
166 161
 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
167 162
 am__v_at_0 = @
168
-am__v_at_1 = 
169 163
 SOURCES =
170 164
 DIST_SOURCES =
171
-am__can_run_installinfo = \
172
-  case $$AM_UPDATE_INFO_DIR in \
173
-    n|no|NO) false;; \
174
-    *) (install-info --version) >/dev/null 2>&1;; \
175
-  esac
176
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
177 165
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
178 166
 ACLOCAL = @ACLOCAL@
179 167
 AMTAR = @AMTAR@
... ...
@@ -241,6 +186,9 @@ INSTALL_DATA = @INSTALL_DATA@
241 241
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
242 242
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
243 243
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
244
+JSON_CPPFLAGS = @JSON_CPPFLAGS@
245
+JSON_LDFLAGS = @JSON_LDFLAGS@
246
+JSON_LIBS = @JSON_LIBS@
244 247
 LCOV = @LCOV@
245 248
 LD = @LD@
246 249
 LDFLAGS = @LDFLAGS@
... ...
@@ -419,11 +367,11 @@ mostlyclean-libtool:
419 419
 
420 420
 clean-libtool:
421 421
 	-rm -rf .libs _libs
422
-tags TAGS:
423
-
424
-ctags CTAGS:
422
+tags: TAGS
423
+TAGS:
425 424
 
426
-cscope cscopelist:
425
+ctags: CTAGS
426
+CTAGS:
427 427
 
428 428
 
429 429
 distdir: $(DISTFILES)
... ...
@@ -559,16 +507,16 @@ uninstall-am:
559 559
 .MAKE: install-am install-strip
560 560
 
561 561
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
562
-	clean-local cscopelist-am ctags-am distclean distclean-generic \
563
-	distclean-libtool distdir dvi dvi-am html html-am info info-am \
564
-	install install-am install-data install-data-am install-dvi \
562
+	clean-local distclean distclean-generic distclean-libtool \
563
+	distdir dvi dvi-am html html-am info info-am install \
564
+	install-am install-data install-data-am install-dvi \
565 565
 	install-dvi-am install-exec install-exec-am install-html \
566 566
 	install-html-am install-info install-info-am install-man \
567 567
 	install-pdf install-pdf-am install-ps install-ps-am \
568 568
 	install-strip installcheck installcheck-am installdirs \
569 569
 	maintainer-clean maintainer-clean-generic mostlyclean \
570 570
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
571
-	tags-am uninstall uninstall-am
571
+	uninstall uninstall-am
572 572
 
573 573
 
574 574
 all: $(FILES)
... ...
@@ -1,8 +1,9 @@
1
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
1
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
2 2
 # @configure_input@
3 3
 
4
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
5
-
4
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
5
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
6
+# Foundation, Inc.
6 7
 # This Makefile.in is free software; the Free Software Foundation
7 8
 # gives unlimited permission to copy and/or distribute it,
8 9
 # with or without modifications, as long as this notice is preserved.
... ...
@@ -14,51 +15,6 @@
14 14
 
15 15
 @SET_MAKE@
16 16
 VPATH = @srcdir@
17
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
18
-am__make_running_with_option = \
19
-  case $${target_option-} in \
20
-      ?) ;; \
21
-      *) echo "am__make_running_with_option: internal error: invalid" \
22
-              "target option '$${target_option-}' specified" >&2; \
23
-         exit 1;; \
24
-  esac; \
25
-  has_opt=no; \
26
-  sane_makeflags=$$MAKEFLAGS; \
27
-  if $(am__is_gnu_make); then \
28
-    sane_makeflags=$$MFLAGS; \
29
-  else \
30
-    case $$MAKEFLAGS in \
31
-      *\\[\ \	]*) \
32
-        bs=\\; \
33
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
34
-          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
35
-    esac; \
36
-  fi; \
37
-  skip_next=no; \
38
-  strip_trailopt () \
39
-  { \
40
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
41
-  }; \
42
-  for flg in $$sane_makeflags; do \
43
-    test $$skip_next = yes && { skip_next=no; continue; }; \
44
-    case $$flg in \
45
-      *=*|--*) continue;; \
46
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
47
-      -*I?*) strip_trailopt 'I';; \
48
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
49
-      -*O?*) strip_trailopt 'O';; \
50
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
51
-      -*l?*) strip_trailopt 'l';; \
52
-      -[dEDm]) skip_next=yes;; \
53
-      -[JT]) skip_next=yes;; \
54
-    esac; \
55
-    case $$flg in \
56
-      *$$target_option*) has_opt=yes; break;; \
57
-    esac; \
58
-  done; \
59
-  test $$has_opt = yes
60
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
61
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
62 17
 pkgdatadir = $(datadir)/@PACKAGE@
63 18
 pkgincludedir = $(includedir)/@PACKAGE@
64 19
 pkglibdir = $(libdir)/@PACKAGE@
... ...
@@ -82,8 +38,7 @@ target_triplet = @target@
82 82
 TESTS = $(am__EXEEXT_1) $(scripts)
83 83
 check_PROGRAMS = $(am__EXEEXT_1) check_clamd$(EXEEXT) $(am__EXEEXT_2)
84 84
 subdir = unit_tests
85
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
86
-	$(top_srcdir)/config/depcomp $(top_srcdir)/config/test-driver
85
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
87 86
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
88 87
 am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
89 88
 	$(top_srcdir)/m4/argz.m4 \
... ...
@@ -107,6 +62,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
107 107
 	$(top_srcdir)/m4/reorganization/code_checks/coverage.m4 \
108 108
 	$(top_srcdir)/m4/reorganization/libs/xml.m4 \
109 109
 	$(top_srcdir)/m4/reorganization/libs/openssl.m4 \
110
+	$(top_srcdir)/m4/reorganization/libs/json.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 \
... ...
@@ -181,7 +137,6 @@ check_clamav_OBJECTS = $(am_check_clamav_OBJECTS)
181 181
 AM_V_lt = $(am__v_lt_@AM_V@)
182 182
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
183 183
 am__v_lt_0 = --silent
184
-am__v_lt_1 = 
185 184
 am__check_clamd_SOURCES_DIST = check_clamav_skip.c check_clamd.c \
186 185
 	checks_common.h
187 186
 @HAVE_LIBCHECK_FALSE@am_check_clamd_OBJECTS =  \
... ...
@@ -195,18 +150,6 @@ am_check_fpu_endian_OBJECTS =  \
195 195
 check_fpu_endian_OBJECTS = $(am_check_fpu_endian_OBJECTS)
196 196
 check_fpu_endian_DEPENDENCIES =  \
197 197
 	$(top_builddir)/libclamav/libclamav.la
198
-AM_V_P = $(am__v_P_@AM_V@)
199
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
200
-am__v_P_0 = false
201
-am__v_P_1 = :
202
-AM_V_GEN = $(am__v_GEN_@AM_V@)
203
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
204
-am__v_GEN_0 = @echo "  GEN     " $@;
205
-am__v_GEN_1 = 
206
-AM_V_at = $(am__v_at_@AM_V@)
207
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
208
-am__v_at_0 = @
209
-am__v_at_1 = 
210 198
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
211 199
 depcomp = $(SHELL) $(top_srcdir)/config/depcomp
212 200
 am__depfiles_maybe = depfiles
... ...
@@ -219,65 +162,40 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
219 219
 	$(AM_CFLAGS) $(CFLAGS)
220 220
 AM_V_CC = $(am__v_CC_@AM_V@)
221 221
 am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
222
-am__v_CC_0 = @echo "  CC      " $@;
223
-am__v_CC_1 = 
222
+am__v_CC_0 = @echo "  CC    " $@;
223
+AM_V_at = $(am__v_at_@AM_V@)
224
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
225
+am__v_at_0 = @
224 226
 CCLD = $(CC)
225 227
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
226 228
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
227 229
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
228 230
 AM_V_CCLD = $(am__v_CCLD_@AM_V@)
229 231
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
230
-am__v_CCLD_0 = @echo "  CCLD    " $@;
231
-am__v_CCLD_1 = 
232
+am__v_CCLD_0 = @echo "  CCLD  " $@;
233
+AM_V_GEN = $(am__v_GEN_@AM_V@)
234
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
235
+am__v_GEN_0 = @echo "  GEN   " $@;
232 236
 SOURCES = $(check_clamav_SOURCES) $(check_clamd_SOURCES) \
233 237
 	$(check_fpu_endian_SOURCES)
234 238
 DIST_SOURCES = $(am__check_clamav_SOURCES_DIST) \
235 239
 	$(am__check_clamd_SOURCES_DIST) $(check_fpu_endian_SOURCES)
236
-am__can_run_installinfo = \
237
-  case $$AM_UPDATE_INFO_DIR in \
238
-    n|no|NO) false;; \
239
-    *) (install-info --version) >/dev/null 2>&1;; \
240
-  esac
241
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
242
-# Read a list of newline-separated strings from the standard input,
243
-# and print each of them once, without duplicates.  Input order is
244
-# *not* preserved.
245
-am__uniquify_input = $(AWK) '\
246
-  BEGIN { nonempty = 0; } \
247
-  { items[$$0] = 1; nonempty = 1; } \
248
-  END { if (nonempty) { for (i in items) print i; }; } \
249
-'
250
-# Make sure the list of sources is unique.  This is necessary because,
251
-# e.g., the same source file might be shared among _SOURCES variables
252
-# for different programs/libraries.
253
-am__define_uniq_tagged_files = \
254
-  list='$(am__tagged_files)'; \
255
-  unique=`for i in $$list; do \
256
-    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
257
-  done | $(am__uniquify_input)`
258 240
 ETAGS = etags
259 241
 CTAGS = ctags
260
-am__tty_colors_dummy = \
261
-  mgn= red= grn= lgn= blu= brg= std=; \
262
-  am__color_tests=no
263
-am__tty_colors = { \
264
-  $(am__tty_colors_dummy); \
265
-  if test "X$(AM_COLOR_TESTS)" = Xno; then \
266
-    am__color_tests=no; \
267
-  elif test "X$(AM_COLOR_TESTS)" = Xalways; then \
268
-    am__color_tests=yes; \
269
-  elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \
270
-    am__color_tests=yes; \
271
-  fi; \
272
-  if test $$am__color_tests = yes; then \
273
-    red=''; \
274
-    grn=''; \
275
-    lgn=''; \
276
-    blu=''; \
277
-    mgn=''; \
278
-    brg=''; \
279
-    std=''; \
280
-  fi; \
242
+# If stdout is a non-dumb tty, use colors.  If test -t is not supported,
243
+# then this fails; a conservative approach.  Of course do not redirect
244
+# stdout here, just stderr.
245
+am__tty_colors = \
246
+red=; grn=; lgn=; blu=; std=; \
247
+test "X$(AM_COLOR_TESTS)" != Xno \
248
+&& test "X$$TERM" != Xdumb \
249
+&& { test "X$(AM_COLOR_TESTS)" = Xalways || test -t 1 2>/dev/null; } \
250
+&& { \
251
+  red=''; \
252
+  grn=''; \
253
+  lgn=''; \
254
+  blu=''; \
255
+  std=''; \
281 256
 }
282 257
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
283 258
 am__vpath_adj = case $$p in \
... ...
@@ -306,161 +224,91 @@ am__uninstall_files_from_dir = { \
306 306
     || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
307 307
          $(am__cd) "$$dir" && rm -f $$files; }; \
308 308
   }
309
-am__recheck_rx = ^[ 	]*:recheck:[ 	]*
310
-am__global_test_result_rx = ^[ 	]*:global-test-result:[ 	]*
311
-am__copy_in_global_log_rx = ^[ 	]*:copy-in-global-log:[ 	]*
312
-# A command that, given a newline-separated list of test names on the
313
-# standard input, print the name of the tests that are to be re-run
314
-# upon "make recheck".
315
-am__list_recheck_tests = $(AWK) '{ \
316
-  recheck = 1; \
317
-  while ((rc = (getline line < ($$0 ".trs"))) != 0) \
318
-    { \
319
-      if (rc < 0) \
320
-        { \
321
-          if ((getline line2 < ($$0 ".log")) < 0) \
322
-	    recheck = 0; \
323
-          break; \
324
-        } \
325
-      else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \
326
-        { \
327
-          recheck = 0; \
328
-          break; \
329
-        } \
330
-      else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \
331
-        { \
332
-          break; \
333
-        } \
334
-    }; \
335
-  if (recheck) \
336
-    print $$0; \
337
-  close ($$0 ".trs"); \
338
-  close ($$0 ".log"); \
339
-}'
340
-# A command that, given a newline-separated list of test names on the
341
-# standard input, create the global log from their .trs and .log files.
342
-am__create_global_log = $(AWK) ' \
343
-function fatal(msg) \
344
-{ \
345
-  print "fatal: making $@: " msg | "cat >&2"; \
346
-  exit 1; \
347
-} \
348
-function rst_section(header) \
349
-{ \
350
-  print header; \
351
-  len = length(header); \
352
-  for (i = 1; i <= len; i = i + 1) \
353
-    printf "="; \
354
-  printf "\n\n"; \
355
-} \
356
-{ \
357
-  copy_in_global_log = 1; \
358
-  global_test_result = "RUN"; \
359
-  while ((rc = (getline line < ($$0 ".trs"))) != 0) \
360
-    { \
361
-      if (rc < 0) \
362
-         fatal("failed to read from " $$0 ".trs"); \
363
-      if (line ~ /$(am__global_test_result_rx)/) \
364
-        { \
365
-          sub("$(am__global_test_result_rx)", "", line); \
366
-          sub("[ 	]*$$", "", line); \
367
-          global_test_result = line; \
368
-        } \
369
-      else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \
370
-        copy_in_global_log = 0; \
371
-    }; \
372
-  if (copy_in_global_log) \
373
-    { \
374
-      rst_section(global_test_result ": " $$0); \
375
-      while ((rc = (getline line < ($$0 ".log"))) != 0) \
376
-      { \
377
-        if (rc < 0) \
378
-          fatal("failed to read from " $$0 ".log"); \
379
-        print line; \
380
-      }; \
381
-      printf "\n"; \
382
-    }; \
383
-  close ($$0 ".trs"); \
384
-  close ($$0 ".log"); \
309
+# Restructured Text title and section.
310
+am__rst_title = sed 's/.*/   &   /;h;s/./=/g;p;x;p;g;p;s/.*//'
311
+am__rst_section = sed 'p;s/./=/g;p;g'
312
+# Put stdin (possibly several lines separated by ".  ") in a box.
313
+# Prefix each line by 'col' and terminate each with 'std', for coloring.
314
+# Multi line coloring is problematic with "less -R", so we really need
315
+# to color each line individually.
316
+am__text_box = $(AWK) '{			\
317
+  n = split($$0, lines, "\\.  "); max = 0;	\
318
+  for (i = 1; i <= n; ++i)			\
319
+    if (max < length(lines[i]))			\
320
+      max = length(lines[i]);			\
321
+  for (i = 0; i < max; ++i)			\
322
+    line = line "=";				\
323
+  print col line std;				\
324
+  for (i = 1; i <= n; ++i)			\
325
+    if (lines[i])				\
326
+      print col lines[i] std;			\
327
+  print col line std;				\
385 328
 }'
386
-# Restructured Text title.
387
-am__rst_title = { sed 's/.*/   &   /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; }
388 329
 # Solaris 10 'make', and several other traditional 'make' implementations,
389 330
 # pass "-e" to $(SHELL), and POSIX 2008 even requires this.  Work around it
390 331
 # by disabling -e (using the XSI extension "set +e") if it's set.
391 332
 am__sh_e_setup = case $$- in *e*) set +e;; esac
392
-# Default flags passed to test drivers.
393
-am__common_driver_flags = \
394
-  --color-tests "$$am__color_tests" \
395
-  --enable-hard-errors "$$am__enable_hard_errors" \
396
-  --expect-failure "$$am__expect_failure"
397 333
 # To be inserted before the command running the test.  Creates the
398 334
 # directory for the log if needed.  Stores in $dir the directory
399
-# containing $f, in $tst the test, in $log the log.  Executes the
400
-# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and
401
-# passes TESTS_ENVIRONMENT.  Set up options for the wrapper that
402
-# will run the test scripts (or their associated LOG_COMPILER, if
403
-# thy have one).
335
+# containing $f, in $tst the test, in $log the log, and passes
336
+# TESTS_ENVIRONMENT.  Save and restore TERM around use of
337
+# TESTS_ENVIRONMENT, in case that unsets it.
404 338
 am__check_pre = \
405 339
 $(am__sh_e_setup);					\
406 340
 $(am__vpath_adj_setup) $(am__vpath_adj)			\
407
-$(am__tty_colors);					\
408 341
 srcdir=$(srcdir); export srcdir;			\
409
-case "$@" in						\
410
-  */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;;	\
411
-    *) am__odir=.;; 					\
412
-esac;							\
413
-test "x$$am__odir" = x"." || test -d "$$am__odir" 	\
414
-  || $(MKDIR_P) "$$am__odir" || exit $$?;		\
342
+rm -f $@-t;						\
343
+am__trap='rm -f '\''$(abs_builddir)/$@-t'\''; (exit $$st); exit $$st'; \
344
+trap "st=129; $$am__trap" 1; trap "st=130; $$am__trap" 2;	\
345
+trap "st=141; $$am__trap" 13; trap "st=143; $$am__trap" 15; \
346
+am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;		\
347
+test "x$$am__odir" = x. || $(MKDIR_P) "$$am__odir" || exit $$?;	\
415 348
 if test -f "./$$f"; then dir=./;			\
416 349
 elif test -f "$$f"; then dir=;				\
417 350
 else dir="$(srcdir)/"; fi;				\
418
-tst=$$dir$$f; log='$@'; 				\
419
-if test -n '$(DISABLE_HARD_ERRORS)'; then		\
420
-  am__enable_hard_errors=no; 				\
421
-else							\
422
-  am__enable_hard_errors=yes; 				\
423
-fi; 							\
351
+tst=$$dir$$f; log='$@'; __SAVED_TERM=$$TERM;		\
352
+$(TESTS_ENVIRONMENT)
353
+# To be appended to the command running the test.  Handle the stdout
354
+# and stderr redirection, and catch the exit status.
355
+am__check_post = \
356
+>$@-t 2>&1;						\
357
+estatus=$$?;						\
358
+if test -n '$(DISABLE_HARD_ERRORS)'			\
359
+   && test $$estatus -eq 99; then			\
360
+  estatus=1;						\
361
+fi;							\
362
+TERM=$$__SAVED_TERM; export TERM;			\
363
+$(am__tty_colors);					\
364
+xfailed=PASS;						\
424 365
 case " $(XFAIL_TESTS) " in				\
425 366
   *[\ \	]$$f[\ \	]* | *[\ \	]$$dir$$f[\ \	]*) \
426
-    am__expect_failure=yes;;				\
427
-  *)							\
428
-    am__expect_failure=no;;				\
429
-esac; 							\
430
-$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT)
431
-# A shell command to get the names of the tests scripts with any registered
432
-# extension removed (i.e., equivalently, the names of the test logs, with
433
-# the '.log' extension removed).  The result is saved in the shell variable
434
-# '$bases'.  This honors runtime overriding of TESTS and TEST_LOGS.  Sadly,
435
-# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)",
436
-# since that might cause problem with VPATH rewrites for suffix-less tests.
437
-# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'.
438
-am__set_TESTS_bases = \
439
-  bases='$(TEST_LOGS)'; \
440
-  bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \
441
-  bases=`echo $$bases`
367
+    xfailed=XFAIL;;					\
368
+esac;							\
369
+case $$estatus.$$xfailed in				\
370
+    0.XFAIL) col=$$red; res=XPASS;;			\
371
+    0.*)     col=$$grn; res=PASS ;;			\
372
+    77.*)    col=$$blu; res=SKIP ;;			\
373
+    99.*)    col=$$red; res=FAIL ;;			\
374
+    *.XFAIL) col=$$lgn; res=XFAIL;;			\
375
+    *.*)     col=$$red; res=FAIL ;;			\
376
+esac;							\
377
+echo "$${col}$$res$${std}: $$f";			\
378
+echo "$$res: $$f (exit: $$estatus)" |			\
379
+  $(am__rst_section) >$@;				\
380
+cat $@-t >>$@;						\
381
+rm -f $@-t
442 382
 RECHECK_LOGS = $(TEST_LOGS)
443
-AM_RECURSIVE_TARGETS = check recheck
383
+AM_RECURSIVE_TARGETS = check recheck check-html recheck-html
384
+TEST_SUITE_HTML = $(TEST_SUITE_LOG:.log=.html)
444 385
 TEST_SUITE_LOG = test-suite.log
445 386
 TEST_EXTENSIONS = @EXEEXT@ .test
446
-LOG_DRIVER = $(SHELL) $(top_srcdir)/config/test-driver
447 387
 LOG_COMPILE = $(LOG_COMPILER) $(AM_LOG_FLAGS) $(LOG_FLAGS)
448
-am__set_b = \
449
-  case '$@' in \
450
-    */*) \
451
-      case '$*' in \
452
-        */*) b='$*';; \
453
-          *) b=`echo '$@' | sed 's/\.log$$//'`; \
454
-       esac;; \
455
-    *) \
456
-      b='$*';; \
457
-  esac
458 388
 am__test_logs1 = $(TESTS:=.log)
459 389
 am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log)
460 390
 TEST_LOGS = $(am__test_logs2:.test.log=.log)
461
-TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/config/test-driver
462 391
 TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \
463 392
 	$(TEST_LOG_FLAGS)
393
+TEST_LOGS_TMP = $(TEST_LOGS:.log=.log-t)
464 394
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
465 395
 ACLOCAL = @ACLOCAL@
466 396
 AMTAR = @AMTAR@
... ...
@@ -528,6 +376,9 @@ INSTALL_DATA = @INSTALL_DATA@
528 528
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
529 529
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
530 530
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
531
+JSON_CPPFLAGS = @JSON_CPPFLAGS@
532
+JSON_LDFLAGS = @JSON_LDFLAGS@
533
+JSON_LIBS = @JSON_LIBS@
531 534
 LCOV = @LCOV@
532 535
 LD = @LD@
533 536
 LDFLAGS = @LDFLAGS@
... ...
@@ -688,7 +539,7 @@ EXTRA_DIST = .split $(srcdir)/*.ref input test-freshclam.conf valgrind.supp viru
688 688
 all: all-am
689 689
 
690 690
 .SUFFIXES:
691
-.SUFFIXES: .c .lo .log .o .obj .test .test$(EXEEXT) .trs
691
+.SUFFIXES: .c .html .lo .log .o .obj .test .test$(EXEEXT)
692 692
 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
693 693
 	@for dep in $?; do \
694 694
 	  case '$(am__configure_deps)' in \
... ...
@@ -728,15 +579,12 @@ clean-checkPROGRAMS:
728 728
 	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
729 729
 	echo " rm -f" $$list; \
730 730
 	rm -f $$list
731
-
732 731
 check_clamav$(EXEEXT): $(check_clamav_OBJECTS) $(check_clamav_DEPENDENCIES) $(EXTRA_check_clamav_DEPENDENCIES) 
733 732
 	@rm -f check_clamav$(EXEEXT)
734 733
 	$(AM_V_CCLD)$(LINK) $(check_clamav_OBJECTS) $(check_clamav_LDADD) $(LIBS)
735
-
736 734
 check_clamd$(EXEEXT): $(check_clamd_OBJECTS) $(check_clamd_DEPENDENCIES) $(EXTRA_check_clamd_DEPENDENCIES) 
737 735
 	@rm -f check_clamd$(EXEEXT)
738 736
 	$(AM_V_CCLD)$(LINK) $(check_clamd_OBJECTS) $(check_clamd_LDADD) $(LIBS)
739
-
740 737
 check_fpu_endian$(EXEEXT): $(check_fpu_endian_OBJECTS) $(check_fpu_endian_DEPENDENCIES) $(EXTRA_check_fpu_endian_DEPENDENCIES) 
741 738
 	@rm -f check_fpu_endian$(EXEEXT)
742 739
 	$(AM_V_CCLD)$(LINK) $(check_fpu_endian_OBJECTS) $(check_fpu_endian_LDADD) $(LIBS)
... ...
@@ -766,14 +614,14 @@ distclean-compile:
766 766
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
767 767
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
768 768
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
769
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
769
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
770 770
 
771 771
 .c.obj:
772 772
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
773 773
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
774 774
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
775 775
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
776
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
776
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
777 777
 
778 778
 .c.lo:
779 779
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
... ...
@@ -970,15 +818,26 @@ mostlyclean-libtool:
970 970
 clean-libtool:
971 971
 	-rm -rf .libs _libs
972 972
 
973
-ID: $(am__tagged_files)
974
-	$(am__define_uniq_tagged_files); mkid -fID $$unique
975
-tags: tags-am
976
-TAGS: tags
977
-
978
-tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
973
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
974
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
975
+	unique=`for i in $$list; do \
976
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
977
+	  done | \
978
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
979
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
980
+	mkid -fID $$unique
981
+tags: TAGS
982
+
983
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
984
+		$(TAGS_FILES) $(LISP)
979 985
 	set x; \
980 986
 	here=`pwd`; \
981
-	$(am__define_uniq_tagged_files); \
987
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
988
+	unique=`for i in $$list; do \
989
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
990
+	  done | \
991
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
992
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
982 993
 	shift; \
983 994
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
984 995
 	  test -n "$$unique" || unique=$$empty_fix; \
... ...
@@ -990,11 +849,15 @@ tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
990 990
 	      $$unique; \
991 991
 	  fi; \
992 992
 	fi
993
-ctags: ctags-am
994
-
995
-CTAGS: ctags
996
-ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
997
-	$(am__define_uniq_tagged_files); \
993
+ctags: CTAGS
994
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
995
+		$(TAGS_FILES) $(LISP)
996
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
997
+	unique=`for i in $$list; do \
998
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
999
+	  done | \
1000
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
1001
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
998 1002
 	test -z "$(CTAGS_ARGS)$$unique" \
999 1003
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
1000 1004
 	     $$unique
... ...
@@ -1003,271 +866,167 @@ GTAGS:
1003 1003
 	here=`$(am__cd) $(top_builddir) && pwd` \
1004 1004
 	  && $(am__cd) $(top_srcdir) \
1005 1005
 	  && gtags -i $(GTAGS_ARGS) "$$here"
1006
-cscopelist: cscopelist-am
1007
-
1008
-cscopelist-am: $(am__tagged_files)
1009
-	list='$(am__tagged_files)'; \
1010
-	case "$(srcdir)" in \
1011
-	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
1012
-	  *) sdir=$(subdir)/$(srcdir) ;; \
1013
-	esac; \
1014
-	for i in $$list; do \
1015
-	  if test -f "$$i"; then \
1016
-	    echo "$(subdir)/$$i"; \
1017
-	  else \
1018
-	    echo "$$sdir/$$i"; \
1019
-	  fi; \
1020
-	done >> $(top_builddir)/cscope.files
1021 1006
 
1022 1007
 distclean-tags:
1023 1008
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
1024 1009
 
1025
-# Recover from deleted '.trs' file; this should ensure that
1026
-# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create
1027
-# both 'foo.log' and 'foo.trs'.  Break the recipe in two subshells
1028
-# to avoid problems with "make -n".
1029
-.log.trs:
1030
-	rm -f $< $@
1031
-	$(MAKE) $(AM_MAKEFLAGS) $<
1032
-
1033
-# Leading 'am--fnord' is there to ensure the list of targets does not
1034
-# expand to empty, as could happen e.g. with make check TESTS=''.
1035
-am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck)
1036
-am--force-recheck:
1037
-	@:
1038
-
1039 1010
 $(TEST_SUITE_LOG): $(TEST_LOGS)
1040
-	@$(am__set_TESTS_bases); \
1041
-	am__f_ok () { test -f "$$1" && test -r "$$1"; }; \
1042
-	redo_bases=`for i in $$bases; do \
1043
-	              am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \
1044
-	            done`; \
1045
-	if test -n "$$redo_bases"; then \
1046
-	  redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \
1047
-	  redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \
1048
-	  if $(am__make_dryrun); then :; else \
1049
-	    rm -f $$redo_logs && rm -f $$redo_results || exit 1; \
1050
-	  fi; \
1051
-	fi; \
1052
-	if test -n "$$am__remaking_logs"; then \
1053
-	  echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \
1054
-	       "recursion detected" >&2; \
1055
-	else \
1056
-	  am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \
1057
-	fi; \
1058
-	if $(am__make_dryrun); then :; else \
1059
-	  st=0;  \
1060
-	  errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \
1061
-	  for i in $$redo_bases; do \
1062
-	    test -f $$i.trs && test -r $$i.trs \
1063
-	      || { echo "$$errmsg $$i.trs" >&2; st=1; }; \
1064
-	    test -f $$i.log && test -r $$i.log \
1065
-	      || { echo "$$errmsg $$i.log" >&2; st=1; }; \
1066
-	  done; \
1067
-	  test $$st -eq 0 || exit 1; \
1068
-	fi
1069
-	@$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \
1070
-	ws='[ 	]'; \
1071
-	results=`for b in $$bases; do echo $$b.trs; done`; \
1072
-	test -n "$$results" || results=/dev/null; \
1073
-	all=`  grep "^$$ws*:test-result:"           $$results | wc -l`; \
1074
-	pass=` grep "^$$ws*:test-result:$$ws*PASS"  $$results | wc -l`; \
1075
-	fail=` grep "^$$ws*:test-result:$$ws*FAIL"  $$results | wc -l`; \
1076
-	skip=` grep "^$$ws*:test-result:$$ws*SKIP"  $$results | wc -l`; \
1077
-	xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \
1078
-	xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \
1079
-	error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \
1080
-	if test `expr $$fail + $$xpass + $$error` -eq 0; then \
1081
-	  success=true; \
1082
-	else \
1083
-	  success=false; \
1084
-	fi; \
1085
-	br='==================='; br=$$br$$br$$br$$br; \
1086
-	result_count () \
1087
-	{ \
1088
-	    if test x"$$1" = x"--maybe-color"; then \
1089
-	      maybe_colorize=yes; \
1090
-	    elif test x"$$1" = x"--no-color"; then \
1091
-	      maybe_colorize=no; \
1092
-	    else \
1093
-	      echo "$@: invalid 'result_count' usage" >&2; exit 4; \
1094
-	    fi; \
1095
-	    shift; \
1096
-	    desc=$$1 count=$$2; \
1097
-	    if test $$maybe_colorize = yes && test $$count -gt 0; then \
1098
-	      color_start=$$3 color_end=$$std; \
1099
-	    else \
1100
-	      color_start= color_end=; \
1101
-	    fi; \
1102
-	    echo "$${color_start}# $$desc $$count$${color_end}"; \
1103
-	}; \
1104
-	create_testsuite_report () \
1105
-	{ \
1106
-	  result_count $$1 "TOTAL:" $$all   "$$brg"; \
1107
-	  result_count $$1 "PASS: " $$pass  "$$grn"; \
1108
-	  result_count $$1 "SKIP: " $$skip  "$$blu"; \
1109
-	  result_count $$1 "XFAIL:" $$xfail "$$lgn"; \
1110
-	  result_count $$1 "FAIL: " $$fail  "$$red"; \
1111
-	  result_count $$1 "XPASS:" $$xpass "$$red"; \
1112
-	  result_count $$1 "ERROR:" $$error "$$mgn"; \
1113
-	}; \
1011
+	@$(am__sh_e_setup);						\
1012
+	list='$(TEST_LOGS)';						\
1013
+	results=`for f in $$list; do					\
1014
+		   test -r $$f && read line < $$f && echo "$$line"	\
1015
+		     || echo FAIL;					\
1016
+		 done`;							\
1017
+	all=`echo "$$results" | sed '/^$$/d' | wc -l | sed -e 's/^[	 ]*//'`; \
1018
+	fail=`echo "$$results" | grep -c '^FAIL'`;			\
1019
+	pass=`echo "$$results" | grep -c '^PASS'`;			\
1020
+	skip=`echo "$$results" | grep -c '^SKIP'`;			\
1021
+	xfail=`echo "$$results" | grep -c '^XFAIL'`;			\
1022
+	xpass=`echo "$$results" | grep -c '^XPASS'`;			\
1023
+	failures=`expr $$fail + $$xpass`;				\
1024
+	all=`expr $$all - $$skip`;					\
1025
+	if test "$$all" -eq 1; then tests=test; All=;			\
1026
+	else tests=tests; All="All "; fi;				\
1027
+	case fail=$$fail:xpass=$$xpass:xfail=$$xfail in			\
1028
+	  fail=0:xpass=0:xfail=0)					\
1029
+	    msg="$$All$$all $$tests passed.  ";				\
1030
+	    exit=true;;							\
1031
+	  fail=0:xpass=0:xfail=*)					\
1032
+	    msg="$$All$$all $$tests behaved as expected";		\
1033
+	    if test "$$xfail" -eq 1; then xfailures=failure;		\
1034
+	    else xfailures=failures; fi;				\
1035
+	    msg="$$msg ($$xfail expected $$xfailures).  ";		\
1036
+	    exit=true;;							\
1037
+	  fail=*:xpass=0:xfail=*)					\
1038
+	    msg="$$fail of $$all $$tests failed.  ";			\
1039
+	    exit=false;;						\
1040
+	  fail=*:xpass=*:xfail=*)					\
1041
+	    msg="$$failures of $$all $$tests did not behave as expected"; \
1042
+	    if test "$$xpass" -eq 1; then xpasses=pass;			\
1043
+	    else xpasses=passes; fi;					\
1044
+	    msg="$$msg ($$xpass unexpected $$xpasses).  ";		\
1045
+	    exit=false;;						\
1046
+	  *)								\
1047
+	    echo >&2 "incorrect case"; exit 4;;				\
1048
+	esac;								\
1049
+	if test "$$skip" -ne 0; then					\
1050
+	  if test "$$skip" -eq 1; then					\
1051
+	    msg="$$msg($$skip test was not run).  ";			\
1052
+	  else								\
1053
+	    msg="$$msg($$skip tests were not run).  ";			\
1054
+	  fi;								\
1055
+	fi;								\
1114 1056
 	{								\
1115 1057
 	  echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" |	\
1116 1058
 	    $(am__rst_title);						\
1117
-	  create_testsuite_report --no-color;				\
1059
+	  echo "$$msg";							\
1118 1060
 	  echo;								\
1119 1061
 	  echo ".. contents:: :depth: 2";				\
1120 1062
 	  echo;								\
1121
-	  for b in $$bases; do echo $$b; done				\
1122
-	    | $(am__create_global_log);					\
1123
-	} >$(TEST_SUITE_LOG).tmp || exit 1;				\
1063
+	  for f in $$list; do						\
1064
+	    test -r $$f && read line < $$f || line=;			\
1065
+	    case $$line in						\
1066
+	      PASS:*|XFAIL:*);;						\
1067
+	      *) echo; cat $$f;;					\
1068
+	    esac;							\
1069
+	  done;								\
1070
+	} >$(TEST_SUITE_LOG).tmp;					\
1124 1071
 	mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG);			\
1125
-	if $$success; then						\
1072
+	if test "$$failures" -ne 0; then				\
1073
+	  msg="$${msg}See $(subdir)/$(TEST_SUITE_LOG).  ";		\
1074
+	  if test -n "$(PACKAGE_BUGREPORT)"; then			\
1075
+	    msg="$${msg}Please report to $(PACKAGE_BUGREPORT).  ";	\
1076
+	  fi;								\
1077
+	fi;								\
1078
+	test x"$$VERBOSE" = x || $$exit || cat $(TEST_SUITE_LOG);	\
1079
+	$(am__tty_colors);						\
1080
+	if $$exit; then							\
1126 1081
 	  col="$$grn";							\
1127 1082
 	 else								\
1128 1083
 	  col="$$red";							\
1129
-	  test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG);		\
1130 1084
 	fi;								\
1131
-	echo "$${col}$$br$${std}"; 					\
1132
-	echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}";	\
1133
-	echo "$${col}$$br$${std}"; 					\
1134
-	create_testsuite_report --maybe-color;				\
1135
-	echo "$$col$$br$$std";						\
1136
-	if $$success; then :; else					\
1137
-	  echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}";		\
1138
-	  if test -n "$(PACKAGE_BUGREPORT)"; then			\
1139
-	    echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}";	\
1140
-	  fi;								\
1141
-	  echo "$$col$$br$$std";					\
1142
-	fi;								\
1143
-	$$success || exit 1
1085
+	echo "$$msg" | $(am__text_box) "col=$$col" "std=$$std";		\
1086
+	$$exit || exit 1
1144 1087
 
1145
-check-TESTS:
1146
-	@list='$(RECHECK_LOGS)';           test -z "$$list" || rm -f $$list
1147
-	@list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list
1148
-	@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
1149
-	@set +e; $(am__set_TESTS_bases); \
1150
-	log_list=`for i in $$bases; do echo $$i.log; done`; \
1151
-	trs_list=`for i in $$bases; do echo $$i.trs; done`; \
1152
-	log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \
1153
-	$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \
1154
-	exit $$?;
1155
-recheck: all $(check_PROGRAMS) $(check_SCRIPTS)
1088
+check-TESTS recheck:
1089
+	@if test $@ != recheck; then \
1090
+	   list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list; \
1091
+	 fi
1156 1092
 	@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
1157
-	@set +e; $(am__set_TESTS_bases); \
1158
-	bases=`for i in $$bases; do echo $$i; done \
1159
-	         | $(am__list_recheck_tests)` || exit 1; \
1160
-	log_list=`for i in $$bases; do echo $$i.log; done`; \
1161
-	log_list=`echo $$log_list`; \
1162
-	$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \
1163
-	        am__force_recheck=am--force-recheck \
1164
-	        TEST_LOGS="$$log_list"; \
1165
-	exit $$?
1093
+	@list='' list2='$(TEST_LOGS)'; for f in $$list2; do \
1094
+	  test .log = $$f && continue; \
1095
+	  if test $@ = recheck; then \
1096
+	    test -f $$f || continue; \
1097
+	    if test -r $$f && read line < $$f; then \
1098
+	      case $$line in FAIL*|XPASS*) : ;; *) continue;; esac; \
1099
+	    fi; \
1100
+	  fi; \
1101
+	  if test -z "$$list"; then list=$$f; else list="$$list $$f"; fi; \
1102
+	done; \
1103
+	if test $@ = recheck && test -n "$$list"; then \
1104
+	  echo "am--clean: ; rm -f $$list" \
1105
+	    | $(MAKE) $(AM_MAKEFLAGS) -f - am--clean || exit 1; \
1106
+	fi; \
1107
+	$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$list"
1108
+recheck: $(check_PROGRAMS) $(check_SCRIPTS)
1109
+
1110
+am--mostlyclean-test-html:
1111
+	list='$(TEST_LOGS:.log=.html)'; test -z "$$list" || rm -f $$list
1112
+	rm -f $(TEST_SUITE_HTML)
1113
+
1114
+.log.html:
1115
+	@list='$(RST2HTML) $$RST2HTML rst2html rst2html.py';		\
1116
+	for r2h in $$list; do						\
1117
+	  if ($$r2h --version) >/dev/null 2>&1; then			\
1118
+	    R2H=$$r2h;							\
1119
+	  fi;								\
1120
+	done;								\
1121
+	if test -z "$$R2H"; then					\
1122
+	  echo >&2 "cannot find rst2html, cannot create $@";		\
1123
+	  exit 2;							\
1124
+	fi;								\
1125
+	$$R2H $< >$@.tmp
1126
+	@mv $@.tmp $@
1127
+
1128
+# Be sure to run check first, and then to convert the result.
1129
+# Beware of concurrent executions.  Run "check" not "check-TESTS", as
1130
+# check-SCRIPTS and other dependencies are rebuilt by the former only.
1131
+# And expect check to fail.
1132
+check-html recheck-html:
1133
+	@target=`echo $@ | sed 's/-html$$//'`; \
1134
+	rv=0; $(MAKE) $(AM_MAKEFLAGS) $$target || rv=$$?; \
1135
+	$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_HTML) TEST_LOGS= || exit 4; \
1136
+	exit $$rv
1166 1137
 check_clamav.log: check_clamav$(EXEEXT)
1167
-	@p='check_clamav$(EXEEXT)'; \
1168
-	b='check_clamav'; \
1169
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
1170
-	--log-file $$b.log --trs-file $$b.trs \
1171
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
1172
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
1138
+	@p='check_clamav$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
1173 1139
 check_freshclam.sh.log: check_freshclam.sh
1174
-	@p='check_freshclam.sh'; \
1175
-	b='check_freshclam.sh'; \
1176
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
1177
-	--log-file $$b.log --trs-file $$b.trs \
1178
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
1179
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
1140
+	@p='check_freshclam.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
1180 1141
 check_sigtool.sh.log: check_sigtool.sh
1181
-	@p='check_sigtool.sh'; \
1182
-	b='check_sigtool.sh'; \
1183
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
1184
-	--log-file $$b.log --trs-file $$b.trs \
1185
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
1186
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
1142
+	@p='check_sigtool.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
1187 1143
 check_unit_vg.sh.log: check_unit_vg.sh
1188
-	@p='check_unit_vg.sh'; \
1189
-	b='check_unit_vg.sh'; \
1190
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
1191
-	--log-file $$b.log --trs-file $$b.trs \
1192
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
1193
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
1144
+	@p='check_unit_vg.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
1194 1145
 check1_clamscan.sh.log: check1_clamscan.sh
1195
-	@p='check1_clamscan.sh'; \
1196
-	b='check1_clamscan.sh'; \
1197
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
1198
-	--log-file $$b.log --trs-file $$b.trs \
1199
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
1200
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
1146
+	@p='check1_clamscan.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
1201 1147
 check2_clamd.sh.log: check2_clamd.sh
1202
-	@p='check2_clamd.sh'; \
1203
-	b='check2_clamd.sh'; \
1204
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
1205
-	--log-file $$b.log --trs-file $$b.trs \
1206
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
1207
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
1148
+	@p='check2_clamd.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
1208 1149
 check3_clamd.sh.log: check3_clamd.sh
1209
-	@p='check3_clamd.sh'; \
1210
-	b='check3_clamd.sh'; \
1211
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
1212
-	--log-file $$b.log --trs-file $$b.trs \
1213
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
1214
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
1150
+	@p='check3_clamd.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
1215 1151
 check4_clamd.sh.log: check4_clamd.sh
1216
-	@p='check4_clamd.sh'; \
1217
-	b='check4_clamd.sh'; \
1218
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
1219
-	--log-file $$b.log --trs-file $$b.trs \
1220
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
1221
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
1152
+	@p='check4_clamd.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
1222 1153
 check5_clamd_vg.sh.log: check5_clamd_vg.sh
1223
-	@p='check5_clamd_vg.sh'; \
1224
-	b='check5_clamd_vg.sh'; \
1225
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
1226
-	--log-file $$b.log --trs-file $$b.trs \
1227
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
1228
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
1154
+	@p='check5_clamd_vg.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
1229 1155
 check6_clamd_vg.sh.log: check6_clamd_vg.sh
1230
-	@p='check6_clamd_vg.sh'; \
1231
-	b='check6_clamd_vg.sh'; \
1232
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
1233
-	--log-file $$b.log --trs-file $$b.trs \
1234
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
1235
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
1156
+	@p='check6_clamd_vg.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
1236 1157
 check7_clamd_hg.sh.log: check7_clamd_hg.sh
1237
-	@p='check7_clamd_hg.sh'; \
1238
-	b='check7_clamd_hg.sh'; \
1239
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
1240
-	--log-file $$b.log --trs-file $$b.trs \
1241
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
1242
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
1158
+	@p='check7_clamd_hg.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
1243 1159
 check8_clamd_hg.sh.log: check8_clamd_hg.sh
1244
-	@p='check8_clamd_hg.sh'; \
1245
-	b='check8_clamd_hg.sh'; \
1246
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
1247
-	--log-file $$b.log --trs-file $$b.trs \
1248
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
1249
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
1160
+	@p='check8_clamd_hg.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
1250 1161
 check9_clamscan_vg.sh.log: check9_clamscan_vg.sh
1251
-	@p='check9_clamscan_vg.sh'; \
1252
-	b='check9_clamscan_vg.sh'; \
1253
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
1254
-	--log-file $$b.log --trs-file $$b.trs \
1255
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
1256
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
1162
+	@p='check9_clamscan_vg.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
1257 1163
 .test.log:
1258
-	@p='$<'; \
1259
-	$(am__set_b); \
1260
-	$(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \
1261
-	--log-file $$b.log --trs-file $$b.trs \
1262
-	$(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
1263
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
1164
+	@p='$<'; $(am__check_pre) $(TEST_LOG_COMPILE) "$$tst" $(am__check_post)
1264 1165
 @am__EXEEXT_TRUE@.test$(EXEEXT).log:
1265
-@am__EXEEXT_TRUE@	@p='$<'; \
1266
-@am__EXEEXT_TRUE@	$(am__set_b); \
1267
-@am__EXEEXT_TRUE@	$(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \
1268
-@am__EXEEXT_TRUE@	--log-file $$b.log --trs-file $$b.trs \
1269
-@am__EXEEXT_TRUE@	$(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
1270
-@am__EXEEXT_TRUE@	"$$tst" $(AM_TESTS_FD_REDIRECT)
1166
+@am__EXEEXT_TRUE@	@p='$<'; $(am__check_pre) $(TEST_LOG_COMPILE) "$$tst" $(am__check_post)
1271 1167
 
1272 1168
 distdir: $(DISTFILES)
1273 1169
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
... ...
@@ -1326,7 +1085,7 @@ install-strip:
1326 1326
 	fi
1327 1327
 mostlyclean-generic:
1328 1328
 	-test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS)
1329
-	-test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs)
1329
+	-test -z "$(TEST_LOGS_TMP)" || rm -f $(TEST_LOGS_TMP)
1330 1330
 	-test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
1331 1331
 
1332 1332
 clean-generic:
... ...
@@ -1398,8 +1157,8 @@ maintainer-clean-am: distclean-am maintainer-clean-generic
1398 1398
 
1399 1399
 mostlyclean: mostlyclean-am
1400 1400
 
1401
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
1402
-	mostlyclean-libtool
1401
+mostlyclean-am: am--mostlyclean-test-html mostlyclean-compile \
1402
+	mostlyclean-generic mostlyclean-libtool
1403 1403
 
1404 1404
 pdf: pdf-am
1405 1405
 
... ...
@@ -1411,21 +1170,22 @@ ps-am:
1411 1411
 
1412 1412
 uninstall-am:
1413 1413
 
1414
-.MAKE: check-am install-am install-strip
1415
-
1416
-.PHONY: CTAGS GTAGS TAGS all all-am check check-TESTS check-am clean \
1417
-	clean-checkPROGRAMS clean-generic clean-libtool clean-local \
1418
-	cscopelist-am ctags ctags-am distclean distclean-compile \
1419
-	distclean-generic distclean-libtool distclean-tags distdir dvi \
1420
-	dvi-am html html-am info info-am install install-am \
1421
-	install-data install-data-am install-dvi install-dvi-am \
1422
-	install-exec install-exec-am install-html install-html-am \
1423
-	install-info install-info-am install-man install-pdf \
1424
-	install-pdf-am install-ps install-ps-am install-strip \
1425
-	installcheck installcheck-am installdirs maintainer-clean \
1426
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
1427
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
1428
-	recheck tags tags-am uninstall uninstall-am
1414
+.MAKE: check-am check-html install-am install-strip recheck-html
1415
+
1416
+.PHONY: CTAGS GTAGS all all-am am--mostlyclean-test-html check \
1417
+	check-TESTS check-am check-html clean clean-checkPROGRAMS \
1418
+	clean-generic clean-libtool clean-local ctags distclean \
1419
+	distclean-compile distclean-generic distclean-libtool \
1420
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
1421
+	install install-am install-data install-data-am install-dvi \
1422
+	install-dvi-am install-exec install-exec-am install-html \
1423
+	install-html-am install-info install-info-am install-man \
1424
+	install-pdf install-pdf-am install-ps install-ps-am \
1425
+	install-strip installcheck installcheck-am installdirs \
1426
+	maintainer-clean maintainer-clean-generic mostlyclean \
1427
+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
1428
+	pdf pdf-am ps ps-am recheck recheck-html tags uninstall \
1429
+	uninstall-am
1429 1430
 
1430 1431
 
1431 1432
 check_unit_vg.sh: $(FILES)