Browse code

YARA work in progress: enable parser functions, add YARA arenas and hash tables.

Steven Morgan authored on 2015/02/21 07:31:10
Showing 33 changed files
... ...
@@ -1,8 +1,9 @@
1
-# Makefile.in generated by automake 1.14 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,16 @@ 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 config/ylwrap \
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 \
123
+	config/ylwrap
129 124
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
130 125
 am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
131 126
 	$(top_srcdir)/m4/argz.m4 \
... ...
@@ -236,63 +187,29 @@ am__uninstall_files_from_dir = { \
236 236
   }
237 237
 am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pkgconfigdir)"
238 238
 SCRIPTS = $(bin_SCRIPTS)
239
-AM_V_P = $(am__v_P_@AM_V@)
240
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
241
-am__v_P_0 = false
242
-am__v_P_1 = :
243 239
 AM_V_GEN = $(am__v_GEN_@AM_V@)
244 240
 am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
245
-am__v_GEN_0 = @echo "  GEN     " $@;
246
-am__v_GEN_1 = 
241
+am__v_GEN_0 = @echo "  GEN   " $@;
247 242
 AM_V_at = $(am__v_at_@AM_V@)
248 243
 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
249 244
 am__v_at_0 = @
250
-am__v_at_1 = 
251 245
 SOURCES =
252 246
 DIST_SOURCES =
253
-RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
254
-	ctags-recursive dvi-recursive html-recursive info-recursive \
255
-	install-data-recursive install-dvi-recursive \
256
-	install-exec-recursive install-html-recursive \
257
-	install-info-recursive install-pdf-recursive \
258
-	install-ps-recursive install-recursive installcheck-recursive \
259
-	installdirs-recursive pdf-recursive ps-recursive \
260
-	tags-recursive uninstall-recursive
261
-am__can_run_installinfo = \
262
-  case $$AM_UPDATE_INFO_DIR in \
263
-    n|no|NO) false;; \
264
-    *) (install-info --version) >/dev/null 2>&1;; \
265
-  esac
247
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
248
+	html-recursive info-recursive install-data-recursive \
249
+	install-dvi-recursive install-exec-recursive \
250
+	install-html-recursive install-info-recursive \
251
+	install-pdf-recursive install-ps-recursive install-recursive \
252
+	installcheck-recursive installdirs-recursive pdf-recursive \
253
+	ps-recursive uninstall-recursive
266 254
 DATA = $(pkgconfig_DATA)
267 255
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
268 256
   distclean-recursive maintainer-clean-recursive
269
-am__recursive_targets = \
270
-  $(RECURSIVE_TARGETS) \
271
-  $(RECURSIVE_CLEAN_TARGETS) \
272
-  $(am__extra_recursive_targets)
273
-AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
274
-	cscope distdir dist dist-all distcheck
275
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \
276
-	$(LISP)clamav-config.h.in
277
-# Read a list of newline-separated strings from the standard input,
278
-# and print each of them once, without duplicates.  Input order is
279
-# *not* preserved.
280
-am__uniquify_input = $(AWK) '\
281
-  BEGIN { nonempty = 0; } \
282
-  { items[$$0] = 1; nonempty = 1; } \
283
-  END { if (nonempty) { for (i in items) print i; }; } \
284
-'
285
-# Make sure the list of sources is unique.  This is necessary because,
286
-# e.g., the same source file might be shared among _SOURCES variables
287
-# for different programs/libraries.
288
-am__define_uniq_tagged_files = \
289
-  list='$(am__tagged_files)'; \
290
-  unique=`for i in $$list; do \
291
-    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
292
-  done | $(am__uniquify_input)`
257
+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
258
+	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
259
+	distdir dist dist-all distcheck
293 260
 ETAGS = etags
294 261
 CTAGS = ctags
295
-CSCOPE = cscope
296 262
 DIST_SUBDIRS = libltdl libclamav clamscan clamd clamdscan freshclam \
297 263
 	sigtool clamconf database docs etc clamav-milter test clamdtop \
298 264
 	clambc unit_tests clamsubmit
... ...
@@ -305,7 +222,6 @@ am__remove_distdir = \
305 305
       && rm -rf "$(distdir)" \
306 306
       || { sleep 5 && rm -rf "$(distdir)"; }; \
307 307
   else :; fi
308
-am__post_remove_distdir = $(am__remove_distdir)
309 308
 am__relativize = \
310 309
   dir0=`pwd`; \
311 310
   sed_first='s,^\([^/]*\)/.*$$,\1,'; \
... ...
@@ -333,7 +249,6 @@ am__relativize = \
333 333
   reldir="$$dir2"
334 334
 DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2
335 335
 GZIP_ENV = --best
336
-DIST_TARGETS = dist-bzip2 dist-gzip
337 336
 am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
338 337
   | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
339 338
 distcleancheck_listfiles = find . -type f -print
... ...
@@ -589,8 +504,8 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
589 589
 $(am__aclocal_m4_deps):
590 590
 
591 591
 clamav-config.h: stamp-h1
592
-	@test -f $@ || rm -f stamp-h1
593
-	@test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1
592
+	@if test ! -f $@; then rm -f stamp-h1; else :; fi
593
+	@if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi
594 594
 
595 595
 stamp-h1: $(srcdir)/clamav-config.h.in $(top_builddir)/config.status
596 596
 	@rm -f stamp-h1
... ...
@@ -636,11 +551,8 @@ docs/man/clamsubmit.1: $(top_builddir)/config.status $(top_srcdir)/docs/man/clam
636 636
 	cd $(top_builddir) && $(SHELL) ./config.status $@
637 637
 install-binSCRIPTS: $(bin_SCRIPTS)
638 638
 	@$(NORMAL_INSTALL)
639
+	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
639 640
 	@list='$(bin_SCRIPTS)'; test -n "$(bindir)" || list=; \
640
-	if test -n "$$list"; then \
641
-	  echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
642
-	  $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
643
-	fi; \
644 641
 	for p in $$list; do \
645 642
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
646 643
 	  if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
... ...
@@ -695,11 +607,8 @@ distclean-libtool:
695 695
 	-rm -f libtool config.lt
696 696
 install-pkgconfigDATA: $(pkgconfig_DATA)
697 697
 	@$(NORMAL_INSTALL)
698
+	test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)"
698 699
 	@list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
699
-	if test -n "$$list"; then \
700
-	  echo " $(MKDIR_P) '$(DESTDIR)$(pkgconfigdir)'"; \
701
-	  $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" || exit 1; \
702
-	fi; \
703 700
 	for p in $$list; do \
704 701
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
705 702
 	  echo "$$d$$p"; \
... ...
@@ -716,25 +625,22 @@ uninstall-pkgconfigDATA:
716 716
 	dir='$(DESTDIR)$(pkgconfigdir)'; $(am__uninstall_files_from_dir)
717 717
 
718 718
 # This directory's subdirectories are mostly independent; you can cd
719
-# into them and run 'make' without going through this Makefile.
720
-# To change the values of 'make' variables: instead of editing Makefiles,
721
-# (1) if the variable is set in 'config.status', edit 'config.status'
722
-#     (which will cause the Makefiles to be regenerated when you run 'make');
723
-# (2) otherwise, pass the desired values on the 'make' command line.
724
-$(am__recursive_targets):
725
-	@fail=; \
726
-	if $(am__make_keepgoing); then \
727
-	  failcom='fail=yes'; \
728
-	else \
729
-	  failcom='exit 1'; \
730
-	fi; \
719
+# into them and run `make' without going through this Makefile.
720
+# To change the values of `make' variables: instead of editing Makefiles,
721
+# (1) if the variable is set in `config.status', edit `config.status'
722
+#     (which will cause the Makefiles to be regenerated when you run `make');
723
+# (2) otherwise, pass the desired values on the `make' command line.
724
+$(RECURSIVE_TARGETS):
725
+	@fail= failcom='exit 1'; \
726
+	for f in x $$MAKEFLAGS; do \
727
+	  case $$f in \
728
+	    *=* | --[!k]*);; \
729
+	    *k*) failcom='fail=yes';; \
730
+	  esac; \
731
+	done; \
731 732
 	dot_seen=no; \
732 733
 	target=`echo $@ | sed s/-recursive//`; \
733
-	case "$@" in \
734
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
735
-	  *) list='$(SUBDIRS)' ;; \
736
-	esac; \
737
-	for subdir in $$list; do \
734
+	list='$(SUBDIRS)'; for subdir in $$list; do \
738 735
 	  echo "Making $$target in $$subdir"; \
739 736
 	  if test "$$subdir" = "."; then \
740 737
 	    dot_seen=yes; \
... ...
@@ -749,12 +655,57 @@ $(am__recursive_targets):
749 749
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
750 750
 	fi; test -z "$$fail"
751 751
 
752
-ID: $(am__tagged_files)
753
-	$(am__define_uniq_tagged_files); mkid -fID $$unique
754
-tags: tags-recursive
755
-TAGS: tags
752
+$(RECURSIVE_CLEAN_TARGETS):
753
+	@fail= failcom='exit 1'; \
754
+	for f in x $$MAKEFLAGS; do \
755
+	  case $$f in \
756
+	    *=* | --[!k]*);; \
757
+	    *k*) failcom='fail=yes';; \
758
+	  esac; \
759
+	done; \
760
+	dot_seen=no; \
761
+	case "$@" in \
762
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
763
+	  *) list='$(SUBDIRS)' ;; \
764
+	esac; \
765
+	rev=''; for subdir in $$list; do \
766
+	  if test "$$subdir" = "."; then :; else \
767
+	    rev="$$subdir $$rev"; \
768
+	  fi; \
769
+	done; \
770
+	rev="$$rev ."; \
771
+	target=`echo $@ | sed s/-recursive//`; \
772
+	for subdir in $$rev; do \
773
+	  echo "Making $$target in $$subdir"; \
774
+	  if test "$$subdir" = "."; then \
775
+	    local_target="$$target-am"; \
776
+	  else \
777
+	    local_target="$$target"; \
778
+	  fi; \
779
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
780
+	  || eval $$failcom; \
781
+	done && test -z "$$fail"
782
+tags-recursive:
783
+	list='$(SUBDIRS)'; for subdir in $$list; do \
784
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
785
+	done
786
+ctags-recursive:
787
+	list='$(SUBDIRS)'; for subdir in $$list; do \
788
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
789
+	done
756 790
 
757
-tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
791
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
792
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
793
+	unique=`for i in $$list; do \
794
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
795
+	  done | \
796
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
797
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
798
+	mkid -fID $$unique
799
+tags: TAGS
800
+
801
+TAGS: tags-recursive $(HEADERS) $(SOURCES) clamav-config.h.in $(TAGS_DEPENDENCIES) \
802
+		$(TAGS_FILES) $(LISP)
758 803
 	set x; \
759 804
 	here=`pwd`; \
760 805
 	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
... ...
@@ -770,7 +721,12 @@ tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
770 770
 	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
771 771
 	  fi; \
772 772
 	done; \
773
-	$(am__define_uniq_tagged_files); \
773
+	list='$(SOURCES) $(HEADERS) clamav-config.h.in $(LISP) $(TAGS_FILES)'; \
774
+	unique=`for i in $$list; do \
775
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
776
+	  done | \
777
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
778
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
774 779
 	shift; \
775 780
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
776 781
 	  test -n "$$unique" || unique=$$empty_fix; \
... ...
@@ -782,11 +738,15 @@ tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
782 782
 	      $$unique; \
783 783
 	  fi; \
784 784
 	fi
785
-ctags: ctags-recursive
786
-
787
-CTAGS: ctags
788
-ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
789
-	$(am__define_uniq_tagged_files); \
785
+ctags: CTAGS
786
+CTAGS: ctags-recursive $(HEADERS) $(SOURCES) clamav-config.h.in $(TAGS_DEPENDENCIES) \
787
+		$(TAGS_FILES) $(LISP)
788
+	list='$(SOURCES) $(HEADERS) clamav-config.h.in $(LISP) $(TAGS_FILES)'; \
789
+	unique=`for i in $$list; do \
790
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
791
+	  done | \
792
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
793
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
790 794
 	test -z "$(CTAGS_ARGS)$$unique" \
791 795
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
792 796
 	     $$unique
... ...
@@ -795,31 +755,9 @@ GTAGS:
795 795
 	here=`$(am__cd) $(top_builddir) && pwd` \
796 796
 	  && $(am__cd) $(top_srcdir) \
797 797
 	  && gtags -i $(GTAGS_ARGS) "$$here"
798
-cscope: cscope.files
799
-	test ! -s cscope.files \
800
-	  || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS)
801
-clean-cscope:
802
-	-rm -f cscope.files
803
-cscope.files: clean-cscope cscopelist
804
-cscopelist: cscopelist-recursive
805
-
806
-cscopelist-am: $(am__tagged_files)
807
-	list='$(am__tagged_files)'; \
808
-	case "$(srcdir)" in \
809
-	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
810
-	  *) sdir=$(subdir)/$(srcdir) ;; \
811
-	esac; \
812
-	for i in $$list; do \
813
-	  if test -f "$$i"; then \
814
-	    echo "$(subdir)/$$i"; \
815
-	  else \
816
-	    echo "$$sdir/$$i"; \
817
-	  fi; \
818
-	done >> $(top_builddir)/cscope.files
819 798
 
820 799
 distclean-tags:
821 800
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
822
-	-rm -f cscope.out cscope.in.out cscope.po.out cscope.files
823 801
 
824 802
 distdir: $(DISTFILES)
825 803
 	$(am__remove_distdir)
... ...
@@ -855,10 +793,13 @@ distdir: $(DISTFILES)
855 855
 	done
856 856
 	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
857 857
 	  if test "$$subdir" = .; then :; else \
858
-	    $(am__make_dryrun) \
859
-	      || test -d "$(distdir)/$$subdir" \
860
-	      || $(MKDIR_P) "$(distdir)/$$subdir" \
861
-	      || exit 1; \
858
+	    test -d "$(distdir)/$$subdir" \
859
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
860
+	    || exit 1; \
861
+	  fi; \
862
+	done
863
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
864
+	  if test "$$subdir" = .; then :; else \
862 865
 	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
863 866
 	    $(am__relativize); \
864 867
 	    new_distdir=$$reldir; \
... ...
@@ -890,41 +831,40 @@ distdir: $(DISTFILES)
890 890
 	|| chmod -R a+r "$(distdir)"
891 891
 dist-gzip: distdir
892 892
 	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
893
-	$(am__post_remove_distdir)
893
+	$(am__remove_distdir)
894 894
 dist-bzip2: distdir
895 895
 	tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
896
-	$(am__post_remove_distdir)
896
+	$(am__remove_distdir)
897 897
 
898 898
 dist-lzip: distdir
899 899
 	tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
900
-	$(am__post_remove_distdir)
900
+	$(am__remove_distdir)
901
+
902
+dist-lzma: distdir
903
+	tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
904
+	$(am__remove_distdir)
901 905
 
902 906
 dist-xz: distdir
903 907
 	tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
904
-	$(am__post_remove_distdir)
908
+	$(am__remove_distdir)
905 909
 
906 910
 dist-tarZ: distdir
907
-	@echo WARNING: "Support for shar distribution archives is" \
908
-	               "deprecated." >&2
909
-	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
910 911
 	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
911
-	$(am__post_remove_distdir)
912
+	$(am__remove_distdir)
912 913
 
913 914
 dist-shar: distdir
914
-	@echo WARNING: "Support for distribution archives compressed with" \
915
-		       "legacy program 'compress' is deprecated." >&2
916
-	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
917 915
 	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
918
-	$(am__post_remove_distdir)
916
+	$(am__remove_distdir)
919 917
 
920 918
 dist-zip: distdir
921 919
 	-rm -f $(distdir).zip
922 920
 	zip -rq $(distdir).zip $(distdir)
923
-	$(am__post_remove_distdir)
921
+	$(am__remove_distdir)
924 922
 
925
-dist dist-all:
926
-	$(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:'
927
-	$(am__post_remove_distdir)
923
+dist dist-all: distdir
924
+	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
925
+	tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
926
+	$(am__remove_distdir)
928 927
 
929 928
 # This target untars the dist file and tries a VPATH configuration.  Then
930 929
 # it guarantees that the distribution is self-contained by making another
... ...
@@ -935,6 +875,8 @@ distcheck: dist
935 935
 	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
936 936
 	*.tar.bz2*) \
937 937
 	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
938
+	*.tar.lzma*) \
939
+	  lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
938 940
 	*.tar.lz*) \
939 941
 	  lzip -dc $(distdir).tar.lz | $(am__untar) ;;\
940 942
 	*.tar.xz*) \
... ...
@@ -946,9 +888,9 @@ distcheck: dist
946 946
 	*.zip*) \
947 947
 	  unzip $(distdir).zip ;;\
948 948
 	esac
949
-	chmod -R a-w $(distdir)
950
-	chmod u+w $(distdir)
951
-	mkdir $(distdir)/_build $(distdir)/_inst
949
+	chmod -R a-w $(distdir); chmod a+w $(distdir)
950
+	mkdir $(distdir)/_build
951
+	mkdir $(distdir)/_inst
952 952
 	chmod a-w $(distdir)
953 953
 	test -d $(distdir)/_build || exit 0; \
954 954
 	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
... ...
@@ -980,7 +922,7 @@ distcheck: dist
980 980
 	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
981 981
 	  && cd "$$am__cwd" \
982 982
 	  || exit 1
983
-	$(am__post_remove_distdir)
983
+	$(am__remove_distdir)
984 984
 	@(echo "$(distdir) archives ready for distribution: "; \
985 985
 	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
986 986
 	  sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
... ...
@@ -1119,25 +1061,26 @@ ps-am:
1119 1119
 
1120 1120
 uninstall-am: uninstall-binSCRIPTS uninstall-pkgconfigDATA
1121 1121
 
1122
-.MAKE: $(am__recursive_targets) all install-am install-strip
1123
-
1124
-.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \
1125
-	am--refresh check check-am clean clean-cscope clean-generic \
1126
-	clean-libtool cscope cscopelist-am ctags ctags-am dist \
1127
-	dist-all dist-bzip2 dist-gzip dist-hook dist-lzip dist-shar \
1128
-	dist-tarZ dist-xz dist-zip distcheck distclean \
1129
-	distclean-generic distclean-hdr distclean-libtool \
1130
-	distclean-tags distcleancheck distdir distuninstallcheck dvi \
1131
-	dvi-am html html-am info info-am install install-am \
1132
-	install-binSCRIPTS install-data install-data-am install-dvi \
1133
-	install-dvi-am install-exec install-exec-am install-html \
1134
-	install-html-am install-info install-info-am install-man \
1135
-	install-pdf install-pdf-am install-pkgconfigDATA install-ps \
1136
-	install-ps-am install-strip installcheck installcheck-am \
1137
-	installcheck-binSCRIPTS installdirs installdirs-am \
1138
-	maintainer-clean maintainer-clean-generic mostlyclean \
1139
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
1140
-	tags tags-am uninstall uninstall-am uninstall-binSCRIPTS \
1122
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \
1123
+	ctags-recursive install-am install-strip tags-recursive
1124
+
1125
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
1126
+	all all-am am--refresh check check-am clean clean-generic \
1127
+	clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \
1128
+	dist-gzip dist-hook dist-lzip dist-lzma dist-shar dist-tarZ \
1129
+	dist-xz dist-zip distcheck distclean distclean-generic \
1130
+	distclean-hdr distclean-libtool distclean-tags distcleancheck \
1131
+	distdir distuninstallcheck dvi dvi-am html html-am info \
1132
+	info-am install install-am install-binSCRIPTS install-data \
1133
+	install-data-am install-dvi install-dvi-am install-exec \
1134
+	install-exec-am install-html install-html-am install-info \
1135
+	install-info-am install-man install-pdf install-pdf-am \
1136
+	install-pkgconfigDATA install-ps install-ps-am install-strip \
1137
+	installcheck installcheck-am installcheck-binSCRIPTS \
1138
+	installdirs installdirs-am maintainer-clean \
1139
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
1140
+	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
1141
+	uninstall uninstall-am uninstall-binSCRIPTS \
1141 1142
 	uninstall-pkgconfigDATA
1142 1143
 
1143 1144
 lcov:
... ...
@@ -1,7 +1,8 @@
1
-# generated automatically by aclocal 1.14 -*- 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], [],
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])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],
... ...
@@ -642,18 +600,21 @@ fi
642 642
 rmdir .tst 2>/dev/null
643 643
 AC_SUBST([am__leading_dot])])
644 644
 
645
-# Copyright (C) 1998-2013 Free Software Foundation, Inc.
645
+# Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2005
646
+# Free Software Foundation, Inc.
646 647
 #
647 648
 # This file is free software; the Free Software Foundation
648 649
 # gives unlimited permission to copy and/or distribute it,
649 650
 # with or without modifications, as long as this notice is preserved.
650 651
 
652
+# serial 5
653
+
651 654
 # AM_PROG_LEX
652 655
 # -----------
653 656
 # Autoconf leaves LEX=: if lex or flex can't be found.  Change that to a
654 657
 # "missing" invocation, for better error output.
655 658
 AC_DEFUN([AM_PROG_LEX],
656
-[AC_PREREQ([2.50])dnl
659
+[AC_PREREQ(2.50)dnl
657 660
 AC_REQUIRE([AM_MISSING_HAS_RUN])dnl
658 661
 AC_REQUIRE([AC_PROG_LEX])dnl
659 662
 if test "$LEX" = :; then
... ...
@@ -662,12 +623,14 @@ fi])
662 662
 
663 663
 # Check to see how 'make' treats includes.	            -*- Autoconf -*-
664 664
 
665
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
665
+# Copyright (C) 2001, 2002, 2003, 2005, 2009  Free Software Foundation, Inc.
666 666
 #
667 667
 # This file is free software; the Free Software Foundation
668 668
 # gives unlimited permission to copy and/or distribute it,
669 669
 # with or without modifications, as long as this notice is preserved.
670 670
 
671
+# serial 4
672
+
671 673
 # AM_MAKE_INCLUDE()
672 674
 # -----------------
673 675
 # Check to see how make treats includes.
... ...
@@ -685,7 +648,7 @@ am__quote=
685 685
 _am_result=none
686 686
 # First try GNU make style include.
687 687
 echo "include confinc" > confmf
688
-# Ignore all kinds of additional output from 'make'.
688
+# Ignore all kinds of additional output from `make'.
689 689
 case `$am_make -s -f confmf 2> /dev/null` in #(
690 690
 *the\ am__doit\ target*)
691 691
   am__include=include
... ...
@@ -712,12 +675,15 @@ rm -f confinc confmf
712 712
 
713 713
 # Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
714 714
 
715
-# Copyright (C) 1997-2013 Free Software Foundation, Inc.
715
+# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008
716
+# Free Software Foundation, Inc.
716 717
 #
717 718
 # This file is free software; the Free Software Foundation
718 719
 # gives unlimited permission to copy and/or distribute it,
719 720
 # with or without modifications, as long as this notice is preserved.
720 721
 
722
+# serial 6
723
+
721 724
 # AM_MISSING_PROG(NAME, PROGRAM)
722 725
 # ------------------------------
723 726
 AC_DEFUN([AM_MISSING_PROG],
... ...
@@ -725,10 +691,11 @@ AC_DEFUN([AM_MISSING_PROG],
725 725
 $1=${$1-"${am_missing_run}$2"}
726 726
 AC_SUBST($1)])
727 727
 
728
+
728 729
 # AM_MISSING_HAS_RUN
729 730
 # ------------------
730
-# Define MISSING if not defined so far and test if it is modern enough.
731
-# If it is, set am_missing_run to use it, otherwise, to nothing.
731
+# Define MISSING if not defined so far and test if it supports --run.
732
+# If it does, set am_missing_run to use it, otherwise, to nothing.
732 733
 AC_DEFUN([AM_MISSING_HAS_RUN],
733 734
 [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
734 735
 AC_REQUIRE_AUX_FILE([missing])dnl
... ...
@@ -741,22 +708,54 @@ if test x"${MISSING+set}" != xset; then
741 741
   esac
742 742
 fi
743 743
 # Use eval to expand $SHELL
744
-if eval "$MISSING --is-lightweight"; then
745
-  am_missing_run="$MISSING "
744
+if eval "$MISSING --run true"; then
745
+  am_missing_run="$MISSING --run "
746 746
 else
747 747
   am_missing_run=
748
-  AC_MSG_WARN(['missing' script is too old or missing])
748
+  AC_MSG_WARN([`missing' script is too old or missing])
749 749
 fi
750 750
 ])
751 751
 
752
+# Copyright (C) 2003, 2004, 2005, 2006, 2011 Free Software Foundation,
753
+# Inc.
754
+#
755
+# This file is free software; the Free Software Foundation
756
+# gives unlimited permission to copy and/or distribute it,
757
+# with or without modifications, as long as this notice is preserved.
758
+
759
+# serial 1
760
+
761
+# AM_PROG_MKDIR_P
762
+# ---------------
763
+# Check for `mkdir -p'.
764
+AC_DEFUN([AM_PROG_MKDIR_P],
765
+[AC_PREREQ([2.60])dnl
766
+AC_REQUIRE([AC_PROG_MKDIR_P])dnl
767
+dnl Automake 1.8 to 1.9.6 used to define mkdir_p.  We now use MKDIR_P,
768
+dnl while keeping a definition of mkdir_p for backward compatibility.
769
+dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
770
+dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
771
+dnl Makefile.ins that do not define MKDIR_P, so we do our own
772
+dnl adjustment using top_builddir (which is defined more often than
773
+dnl MKDIR_P).
774
+AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
775
+case $mkdir_p in
776
+  [[\\/$]]* | ?:[[\\/]]*) ;;
777
+  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
778
+esac
779
+])
780
+
752 781
 # Helper functions for option handling.                     -*- Autoconf -*-
753 782
 
754
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
783
+# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 Free Software
784
+# Foundation, Inc.
755 785
 #
756 786
 # This file is free software; the Free Software Foundation
757 787
 # gives unlimited permission to copy and/or distribute it,
758 788
 # with or without modifications, as long as this notice is preserved.
759 789
 
790
+# serial 5
791
+
760 792
 # _AM_MANGLE_OPTION(NAME)
761 793
 # -----------------------
762 794
 AC_DEFUN([_AM_MANGLE_OPTION],
... ...
@@ -766,7 +765,7 @@ AC_DEFUN([_AM_MANGLE_OPTION],
766 766
 # --------------------
767 767
 # Set option NAME.  Presently that only means defining a flag for this option.
768 768
 AC_DEFUN([_AM_SET_OPTION],
769
-[m4_define(_AM_MANGLE_OPTION([$1]), [1])])
769
+[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
770 770
 
771 771
 # _AM_SET_OPTIONS(OPTIONS)
772 772
 # ------------------------
... ...
@@ -780,58 +779,13 @@ AC_DEFUN([_AM_SET_OPTIONS],
780 780
 AC_DEFUN([_AM_IF_OPTION],
781 781
 [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
782 782
 
783
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
783
+# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
784 784
 #
785 785
 # This file is free software; the Free Software Foundation
786 786
 # gives unlimited permission to copy and/or distribute it,
787 787
 # with or without modifications, as long as this notice is preserved.
788 788
 
789
-# _AM_PROG_CC_C_O
790
-# ---------------
791
-# Like AC_PROG_CC_C_O, but changed for automake.  We rewrite AC_PROG_CC
792
-# to automatically call this.
793
-AC_DEFUN([_AM_PROG_CC_C_O],
794
-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
795
-AC_REQUIRE_AUX_FILE([compile])dnl
796
-AC_LANG_PUSH([C])dnl
797
-AC_CACHE_CHECK(
798
-  [whether $CC understands -c and -o together],
799
-  [am_cv_prog_cc_c_o],
800
-  [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])])
801
-  # Make sure it works both with $CC and with simple cc.
802
-  # Following AC_PROG_CC_C_O, we do the test twice because some
803
-  # compilers refuse to overwrite an existing .o file with -o,
804
-  # though they will create one.
805
-  am_cv_prog_cc_c_o=yes
806
-  for am_i in 1 2; do
807
-    if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \
808
-         && test -f conftest2.$ac_objext; then
809
-      : OK
810
-    else
811
-      am_cv_prog_cc_c_o=no
812
-      break
813
-    fi
814
-  done
815
-  rm -f core conftest*
816
-  unset am_i])
817
-if test "$am_cv_prog_cc_c_o" != yes; then
818
-   # Losing compiler, so override with the script.
819
-   # FIXME: It is wrong to rewrite CC.
820
-   # But if we don't then we get into trouble of one sort or another.
821
-   # A longer-term fix would be to have automake use am__CC in this case,
822
-   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
823
-   CC="$am_aux_dir/compile $CC"
824
-fi
825
-AC_LANG_POP([C])])
826
-
827
-# For backward compatibility.
828
-AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
829
-
830
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
831
-#
832
-# This file is free software; the Free Software Foundation
833
-# gives unlimited permission to copy and/or distribute it,
834
-# with or without modifications, as long as this notice is preserved.
789
+# serial 1
835 790
 
836 791
 # AM_RUN_LOG(COMMAND)
837 792
 # -------------------
... ...
@@ -846,16 +800,22 @@ AC_DEFUN([AM_RUN_LOG],
846 846
 
847 847
 # Check to make sure that the build environment is sane.    -*- Autoconf -*-
848 848
 
849
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
849
+# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008
850
+# Free Software Foundation, Inc.
850 851
 #
851 852
 # This file is free software; the Free Software Foundation
852 853
 # gives unlimited permission to copy and/or distribute it,
853 854
 # with or without modifications, as long as this notice is preserved.
854 855
 
856
+# serial 5
857
+
855 858
 # AM_SANITY_CHECK
856 859
 # ---------------
857 860
 AC_DEFUN([AM_SANITY_CHECK],
858 861
 [AC_MSG_CHECKING([whether build environment is sane])
862
+# Just in case
863
+sleep 1
864
+echo timestamp > conftest.file
859 865
 # Reject unsafe characters in $srcdir or the absolute working directory
860 866
 # name.  Accept space and tab only in the latter.
861 867
 am_lf='
... ...
@@ -866,40 +826,32 @@ case `pwd` in
866 866
 esac
867 867
 case $srcdir in
868 868
   *[[\\\"\#\$\&\'\`$am_lf\ \	]]*)
869
-    AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);;
869
+    AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);;
870 870
 esac
871 871
 
872
-# Do 'set' in a subshell so we don't clobber the current shell's
872
+# Do `set' in a subshell so we don't clobber the current shell's
873 873
 # arguments.  Must try -L first in case configure is actually a
874 874
 # symlink; some systems play weird games with the mod time of symlinks
875 875
 # (eg FreeBSD returns the mod time of the symlink's containing
876 876
 # directory).
877 877
 if (
878
-   am_has_slept=no
879
-   for am_try in 1 2; do
880
-     echo "timestamp, slept: $am_has_slept" > conftest.file
881
-     set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
882
-     if test "$[*]" = "X"; then
883
-	# -L didn't work.
884
-	set X `ls -t "$srcdir/configure" conftest.file`
885
-     fi
886
-     if test "$[*]" != "X $srcdir/configure conftest.file" \
887
-	&& test "$[*]" != "X conftest.file $srcdir/configure"; then
888
-
889
-	# If neither matched, then we have a broken ls.  This can happen
890
-	# if, for instance, CONFIG_SHELL is bash and it inherits a
891
-	# broken ls alias from the environment.  This has actually
892
-	# happened.  Such a system could not be considered "sane".
893
-	AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
894
-  alias in your environment])
895
-     fi
896
-     if test "$[2]" = conftest.file || test $am_try -eq 2; then
897
-       break
898
-     fi
899
-     # Just in case.
900
-     sleep 1
901
-     am_has_slept=yes
902
-   done
878
+   set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
879
+   if test "$[*]" = "X"; then
880
+      # -L didn't work.
881
+      set X `ls -t "$srcdir/configure" conftest.file`
882
+   fi
883
+   rm -f conftest.file
884
+   if test "$[*]" != "X $srcdir/configure conftest.file" \
885
+      && test "$[*]" != "X conftest.file $srcdir/configure"; then
886
+
887
+      # If neither matched, then we have a broken ls.  This can happen
888
+      # if, for instance, CONFIG_SHELL is bash and it inherits a
889
+      # broken ls alias from the environment.  This has actually
890
+      # happened.  Such a system could not be considered "sane".
891
+      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
892
+alias in your environment])
893
+   fi
894
+
903 895
    test "$[2]" = conftest.file
904 896
    )
905 897
 then
... ...
@@ -909,50 +861,31 @@ else
909 909
    AC_MSG_ERROR([newly created file is older than distributed files!
910 910
 Check your system clock])
911 911
 fi
912
-AC_MSG_RESULT([yes])
913
-# If we didn't sleep, we still need to ensure time stamps of config.status and
914
-# generated files are strictly newer.
915
-am_sleep_pid=
916
-if grep 'slept: no' conftest.file >/dev/null 2>&1; then
917
-  ( sleep 1 ) &
918
-  am_sleep_pid=$!
919
-fi
920
-AC_CONFIG_COMMANDS_PRE(
921
-  [AC_MSG_CHECKING([that generated files are newer than configure])
922
-   if test -n "$am_sleep_pid"; then
923
-     # Hide warnings about reused PIDs.
924
-     wait $am_sleep_pid 2>/dev/null
925
-   fi
926
-   AC_MSG_RESULT([done])])
927
-rm -f conftest.file
928
-])
912
+AC_MSG_RESULT(yes)])
929 913
 
930
-# Copyright (C) 2009-2013 Free Software Foundation, Inc.
914
+# Copyright (C) 2009, 2011  Free Software Foundation, Inc.
931 915
 #
932 916
 # This file is free software; the Free Software Foundation
933 917
 # gives unlimited permission to copy and/or distribute it,
934 918
 # with or without modifications, as long as this notice is preserved.
935 919
 
920
+# serial 2
921
+
936 922
 # AM_SILENT_RULES([DEFAULT])
937 923
 # --------------------------
938 924
 # Enable less verbose build rules; with the default set to DEFAULT
939
-# ("yes" being less verbose, "no" or empty being verbose).
925
+# (`yes' being less verbose, `no' or empty being verbose).
940 926
 AC_DEFUN([AM_SILENT_RULES],
941
-[AC_ARG_ENABLE([silent-rules], [dnl
942
-AS_HELP_STRING(
943
-  [--enable-silent-rules],
944
-  [less verbose build output (undo: "make V=1")])
945
-AS_HELP_STRING(
946
-  [--disable-silent-rules],
947
-  [verbose build output (undo: "make V=0")])dnl
948
-])
949
-case $enable_silent_rules in @%:@ (((
950
-  yes) AM_DEFAULT_VERBOSITY=0;;
951
-   no) AM_DEFAULT_VERBOSITY=1;;
952
-    *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);;
927
+[AC_ARG_ENABLE([silent-rules],
928
+[  --enable-silent-rules          less verbose build output (undo: `make V=1')
929
+  --disable-silent-rules         verbose build output (undo: `make V=0')])
930
+case $enable_silent_rules in
931
+yes) AM_DEFAULT_VERBOSITY=0;;
932
+no)  AM_DEFAULT_VERBOSITY=1;;
933
+*)   AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);;
953 934
 esac
954 935
 dnl
955
-dnl A few 'make' implementations (e.g., NonStop OS and NextStep)
936
+dnl A few `make' implementations (e.g., NonStop OS and NextStep)
956 937
 dnl do not support nested variable expansions.
957 938
 dnl See automake bug#9928 and bug#10237.
958 939
 am_make=${MAKE-make}
... ...
@@ -970,7 +903,7 @@ else
970 970
   am_cv_make_support_nested_variables=no
971 971
 fi])
972 972
 if test $am_cv_make_support_nested_variables = yes; then
973
-  dnl Using '$V' instead of '$(V)' breaks IRIX make.
973
+  dnl Using `$V' instead of `$(V)' breaks IRIX make.
974 974
   AM_V='$(V)'
975 975
   AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
976 976
 else
... ...
@@ -987,40 +920,44 @@ AC_SUBST([AM_BACKSLASH])dnl
987 987
 _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
988 988
 ])
989 989
 
990
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
990
+# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
991 991
 #
992 992
 # This file is free software; the Free Software Foundation
993 993
 # gives unlimited permission to copy and/or distribute it,
994 994
 # with or without modifications, as long as this notice is preserved.
995 995
 
996
+# serial 1
997
+
996 998
 # AM_PROG_INSTALL_STRIP
997 999
 # ---------------------
998
-# One issue with vendor 'install' (even GNU) is that you can't
1000
+# One issue with vendor `install' (even GNU) is that you can't
999 1001
 # specify the program used to strip binaries.  This is especially
1000 1002
 # annoying in cross-compiling environments, where the build's strip
1001 1003
 # is unlikely to handle the host's binaries.
1002 1004
 # Fortunately install-sh will honor a STRIPPROG variable, so we
1003
-# always use install-sh in "make install-strip", and initialize
1005
+# always use install-sh in `make install-strip', and initialize
1004 1006
 # STRIPPROG with the value of the STRIP variable (set by the user).
1005 1007
 AC_DEFUN([AM_PROG_INSTALL_STRIP],
1006 1008
 [AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
1007
-# Installed binaries are usually stripped using 'strip' when the user
1008
-# run "make install-strip".  However 'strip' might not be the right
1009
+# Installed binaries are usually stripped using `strip' when the user
1010
+# run `make install-strip'.  However `strip' might not be the right
1009 1011
 # tool to use in cross-compilation environments, therefore Automake
1010
-# will honor the 'STRIP' environment variable to overrule this program.
1011
-dnl Don't test for $cross_compiling = yes, because it might be 'maybe'.
1012
+# will honor the `STRIP' environment variable to overrule this program.
1013
+dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
1012 1014
 if test "$cross_compiling" != no; then
1013 1015
   AC_CHECK_TOOL([STRIP], [strip], :)
1014 1016
 fi
1015 1017
 INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
1016 1018
 AC_SUBST([INSTALL_STRIP_PROGRAM])])
1017 1019
 
1018
-# Copyright (C) 2006-2013 Free Software Foundation, Inc.
1020
+# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc.
1019 1021
 #
1020 1022
 # This file is free software; the Free Software Foundation
1021 1023
 # gives unlimited permission to copy and/or distribute it,
1022 1024
 # with or without modifications, as long as this notice is preserved.
1023 1025
 
1026
+# serial 3
1027
+
1024 1028
 # _AM_SUBST_NOTMAKE(VARIABLE)
1025 1029
 # ---------------------------
1026 1030
 # Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
... ...
@@ -1034,16 +971,18 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
1034 1034
 
1035 1035
 # Check how to create a tarball.                            -*- Autoconf -*-
1036 1036
 
1037
-# Copyright (C) 2004-2013 Free Software Foundation, Inc.
1037
+# Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc.
1038 1038
 #
1039 1039
 # This file is free software; the Free Software Foundation
1040 1040
 # gives unlimited permission to copy and/or distribute it,
1041 1041
 # with or without modifications, as long as this notice is preserved.
1042 1042
 
1043
+# serial 2
1044
+
1043 1045
 # _AM_PROG_TAR(FORMAT)
1044 1046
 # --------------------
1045 1047
 # Check how to create a tarball in format FORMAT.
1046
-# FORMAT should be one of 'v7', 'ustar', or 'pax'.
1048
+# FORMAT should be one of `v7', `ustar', or `pax'.
1047 1049
 #
1048 1050
 # Substitute a variable $(am__tar) that is a command
1049 1051
 # writing to stdout a FORMAT-tarball containing the directory
... ...
@@ -1053,114 +992,76 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
1053 1053
 # Substitute a variable $(am__untar) that extract such
1054 1054
 # a tarball read from stdin.
1055 1055
 #     $(am__untar) < result.tar
1056
-#
1057 1056
 AC_DEFUN([_AM_PROG_TAR],
1058 1057
 [# Always define AMTAR for backward compatibility.  Yes, it's still used
1059 1058
 # in the wild :-(  We should find a proper way to deprecate it ...
1060 1059
 AC_SUBST([AMTAR], ['$${TAR-tar}'])
1061
-
1062
-# We'll loop over all known methods to create a tar archive until one works.
1060
+m4_if([$1], [v7],
1061
+     [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
1062
+     [m4_case([$1], [ustar],, [pax],,
1063
+              [m4_fatal([Unknown tar format])])
1064
+AC_MSG_CHECKING([how to create a $1 tar archive])
1065
+# Loop over all known methods to create a tar archive until one works.
1063 1066
 _am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
1067
+_am_tools=${am_cv_prog_tar_$1-$_am_tools}
1068
+# Do not fold the above two line into one, because Tru64 sh and
1069
+# Solaris sh will not grok spaces in the rhs of `-'.
1070
+for _am_tool in $_am_tools
1071
+do
1072
+  case $_am_tool in
1073
+  gnutar)
1074
+    for _am_tar in tar gnutar gtar;
1075
+    do
1076
+      AM_RUN_LOG([$_am_tar --version]) && break
1077
+    done
1078
+    am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
1079
+    am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
1080
+    am__untar="$_am_tar -xf -"
1081
+    ;;
1082
+  plaintar)
1083
+    # Must skip GNU tar: if it does not support --format= it doesn't create
1084
+    # ustar tarball either.
1085
+    (tar --version) >/dev/null 2>&1 && continue
1086
+    am__tar='tar chf - "$$tardir"'
1087
+    am__tar_='tar chf - "$tardir"'
1088
+    am__untar='tar xf -'
1089
+    ;;
1090
+  pax)
1091
+    am__tar='pax -L -x $1 -w "$$tardir"'
1092
+    am__tar_='pax -L -x $1 -w "$tardir"'
1093
+    am__untar='pax -r'
1094
+    ;;
1095
+  cpio)
1096
+    am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
1097
+    am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
1098
+    am__untar='cpio -i -H $1 -d'
1099
+    ;;
1100
+  none)
1101
+    am__tar=false
1102
+    am__tar_=false
1103
+    am__untar=false
1104
+    ;;
1105
+  esac
1064 1106
 
1065
-m4_if([$1], [v7],
1066
-  [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
1067
-
1068
-  [m4_case([$1],
1069
-    [ustar],
1070
-     [# The POSIX 1988 'ustar' format is defined with fixed-size fields.
1071
-      # There is notably a 21 bits limit for the UID and the GID.  In fact,
1072
-      # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343
1073
-      # and bug#13588).
1074
-      am_max_uid=2097151 # 2^21 - 1
1075
-      am_max_gid=$am_max_uid
1076
-      # The $UID and $GID variables are not portable, so we need to resort
1077
-      # to the POSIX-mandated id(1) utility.  Errors in the 'id' calls
1078
-      # below are definitely unexpected, so allow the users to see them
1079
-      # (that is, avoid stderr redirection).
1080
-      am_uid=`id -u || echo unknown`
1081
-      am_gid=`id -g || echo unknown`
1082
-      AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format])
1083
-      if test $am_uid -le $am_max_uid; then
1084
-         AC_MSG_RESULT([yes])
1085
-      else
1086
-         AC_MSG_RESULT([no])
1087
-         _am_tools=none
1088
-      fi
1089
-      AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format])
1090
-      if test $am_gid -le $am_max_gid; then
1091
-         AC_MSG_RESULT([yes])
1092
-      else
1093
-        AC_MSG_RESULT([no])
1094
-        _am_tools=none
1095
-      fi],
1096
-
1097
-  [pax],
1098
-    [],
1099
-
1100
-  [m4_fatal([Unknown tar format])])
1101
-
1102
-  AC_MSG_CHECKING([how to create a $1 tar archive])
1103
-
1104
-  # Go ahead even if we have the value already cached.  We do so because we
1105
-  # need to set the values for the 'am__tar' and 'am__untar' variables.
1106
-  _am_tools=${am_cv_prog_tar_$1-$_am_tools}
1107
-
1108
-  for _am_tool in $_am_tools; do
1109
-    case $_am_tool in
1110
-    gnutar)
1111
-      for _am_tar in tar gnutar gtar; do
1112
-        AM_RUN_LOG([$_am_tar --version]) && break
1113
-      done
1114
-      am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
1115
-      am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
1116
-      am__untar="$_am_tar -xf -"
1117
-      ;;
1118
-    plaintar)
1119
-      # Must skip GNU tar: if it does not support --format= it doesn't create
1120
-      # ustar tarball either.
1121
-      (tar --version) >/dev/null 2>&1 && continue
1122
-      am__tar='tar chf - "$$tardir"'
1123
-      am__tar_='tar chf - "$tardir"'
1124
-      am__untar='tar xf -'
1125
-      ;;
1126
-    pax)
1127
-      am__tar='pax -L -x $1 -w "$$tardir"'
1128
-      am__tar_='pax -L -x $1 -w "$tardir"'
1129
-      am__untar='pax -r'
1130
-      ;;
1131
-    cpio)
1132
-      am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
1133
-      am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
1134
-      am__untar='cpio -i -H $1 -d'
1135
-      ;;
1136
-    none)
1137
-      am__tar=false
1138
-      am__tar_=false
1139
-      am__untar=false
1140
-      ;;
1141
-    esac
1107
+  # If the value was cached, stop now.  We just wanted to have am__tar
1108
+  # and am__untar set.
1109
+  test -n "${am_cv_prog_tar_$1}" && break
1142 1110
 
1143
-    # If the value was cached, stop now.  We just wanted to have am__tar
1144
-    # and am__untar set.
1145
-    test -n "${am_cv_prog_tar_$1}" && break
1146
-
1147
-    # tar/untar a dummy directory, and stop if the command works.
1148
-    rm -rf conftest.dir
1149
-    mkdir conftest.dir
1150
-    echo GrepMe > conftest.dir/file
1151
-    AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
1152
-    rm -rf conftest.dir
1153
-    if test -s conftest.tar; then
1154
-      AM_RUN_LOG([$am__untar <conftest.tar])
1155
-      AM_RUN_LOG([cat conftest.dir/file])
1156
-      grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
1157
-    fi
1158
-  done
1111
+  # tar/untar a dummy directory, and stop if the command works
1159 1112
   rm -rf conftest.dir
1113
+  mkdir conftest.dir
1114
+  echo GrepMe > conftest.dir/file
1115
+  AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
1116
+  rm -rf conftest.dir
1117
+  if test -s conftest.tar; then
1118
+    AM_RUN_LOG([$am__untar <conftest.tar])
1119
+    grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
1120
+  fi
1121
+done
1122
+rm -rf conftest.dir
1160 1123
 
1161
-  AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
1162
-  AC_MSG_RESULT([$am_cv_prog_tar_$1])])
1163
-
1124
+AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
1125
+AC_MSG_RESULT([$am_cv_prog_tar_$1])])
1164 1126
 AC_SUBST([am__tar])
1165 1127
 AC_SUBST([am__untar])
1166 1128
 ]) # _AM_PROG_TAR
... ...
@@ -1,8 +1,9 @@
1
-# Makefile.in generated by automake 1.14 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 \
... ...
@@ -200,19 +155,6 @@ clamav_milter_LDADD = $(LDADD)
200 200
 AM_V_lt = $(am__v_lt_@AM_V@)
201 201
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
202 202
 am__v_lt_0 = --silent
203
-am__v_lt_1 = 
204
-AM_V_P = $(am__v_P_@AM_V@)
205
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
206
-am__v_P_0 = false
207
-am__v_P_1 = :
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     " $@;
211
-am__v_GEN_1 = 
212
-AM_V_at = $(am__v_at_@AM_V@)
213
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
214
-am__v_at_0 = @
215
-am__v_at_1 = 
216 203
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
217 204
 depcomp = $(SHELL) $(top_srcdir)/config/depcomp
218 205
 am__depfiles_maybe = depfiles
... ...
@@ -225,23 +167,22 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
225 225
 	$(AM_CFLAGS) $(CFLAGS)
226 226
 AM_V_CC = $(am__v_CC_@AM_V@)
227 227
 am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
228
-am__v_CC_0 = @echo "  CC      " $@;
229
-am__v_CC_1 = 
228
+am__v_CC_0 = @echo "  CC    " $@;
229
+AM_V_at = $(am__v_at_@AM_V@)
230
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
231
+am__v_at_0 = @
230 232
 CCLD = $(CC)
231 233
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
232 234
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
233 235
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
234 236
 AM_V_CCLD = $(am__v_CCLD_@AM_V@)
235 237
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
236
-am__v_CCLD_0 = @echo "  CCLD    " $@;
237
-am__v_CCLD_1 = 
238
+am__v_CCLD_0 = @echo "  CCLD  " $@;
239
+AM_V_GEN = $(am__v_GEN_@AM_V@)
240
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
241
+am__v_GEN_0 = @echo "  GEN   " $@;
238 242
 SOURCES = $(clamav_milter_SOURCES)
239 243
 DIST_SOURCES = $(am__clamav_milter_SOURCES_DIST)
240
-am__can_run_installinfo = \
241
-  case $$AM_UPDATE_INFO_DIR in \
242
-    n|no|NO) false;; \
243
-    *) (install-info --version) >/dev/null 2>&1;; \
244
-  esac
245 244
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
246 245
 am__vpath_adj = case $$p in \
247 246
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
... ...
@@ -272,23 +213,6 @@ am__uninstall_files_from_dir = { \
272 272
 man8dir = $(mandir)/man8
273 273
 NROFF = nroff
274 274
 MANS = $(man_MANS)
275
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
276
-# Read a list of newline-separated strings from the standard input,
277
-# and print each of them once, without duplicates.  Input order is
278
-# *not* preserved.
279
-am__uniquify_input = $(AWK) '\
280
-  BEGIN { nonempty = 0; } \
281
-  { items[$$0] = 1; nonempty = 1; } \
282
-  END { if (nonempty) { for (i in items) print i; }; } \
283
-'
284
-# Make sure the list of sources is unique.  This is necessary because,
285
-# e.g., the same source file might be shared among _SOURCES variables
286
-# for different programs/libraries.
287
-am__define_uniq_tagged_files = \
288
-  list='$(am__tagged_files)'; \
289
-  unique=`for i in $$list; do \
290
-    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
291
-  done | $(am__uniquify_input)`
292 275
 ETAGS = etags
293 276
 CTAGS = ctags
294 277
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
... ...
@@ -550,19 +474,14 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
550 550
 $(am__aclocal_m4_deps):
551 551
 install-sbinPROGRAMS: $(sbin_PROGRAMS)
552 552
 	@$(NORMAL_INSTALL)
553
+	test -z "$(sbindir)" || $(MKDIR_P) "$(DESTDIR)$(sbindir)"
553 554
 	@list='$(sbin_PROGRAMS)'; test -n "$(sbindir)" || list=; \
554
-	if test -n "$$list"; then \
555
-	  echo " $(MKDIR_P) '$(DESTDIR)$(sbindir)'"; \
556
-	  $(MKDIR_P) "$(DESTDIR)$(sbindir)" || exit 1; \
557
-	fi; \
558 555
 	for p in $$list; do echo "$$p $$p"; done | \
559 556
 	sed 's/$(EXEEXT)$$//' | \
560
-	while read p p1; do if test -f $$p \
561
-	 || test -f $$p1 \
562
-	  ; then echo "$$p"; echo "$$p"; else :; fi; \
557
+	while read p p1; do if test -f $$p || test -f $$p1; \
558
+	  then echo "$$p"; echo "$$p"; else :; fi; \
563 559
 	done | \
564
-	sed -e 'p;s,.*/,,;n;h' \
565
-	    -e 's|.*|.|' \
560
+	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
566 561
 	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
567 562
 	sed 'N;N;N;s,\n, ,g' | \
568 563
 	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
... ...
@@ -583,8 +502,7 @@ uninstall-sbinPROGRAMS:
583 583
 	@list='$(sbin_PROGRAMS)'; test -n "$(sbindir)" || list=; \
584 584
 	files=`for p in $$list; do echo "$$p"; done | \
585 585
 	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
586
-	      -e 's/$$/$(EXEEXT)/' \
587
-	`; \
586
+	      -e 's/$$/$(EXEEXT)/' `; \
588 587
 	test -n "$$list" || exit 0; \
589 588
 	echo " ( cd '$(DESTDIR)$(sbindir)' && rm -f" $$files ")"; \
590 589
 	cd "$(DESTDIR)$(sbindir)" && rm -f $$files
... ...
@@ -613,7 +531,6 @@ installcheck-sbinPROGRAMS: $(sbin_PROGRAMS)
613 613
 	    else echo "$$f does not support $$opt" 1>&2; bad=1; fi; \
614 614
 	  done; \
615 615
 	done; rm -f c$${pid}_.???; exit $$bad
616
-
617 616
 clamav-milter$(EXEEXT): $(clamav_milter_OBJECTS) $(clamav_milter_DEPENDENCIES) $(EXTRA_clamav_milter_DEPENDENCIES) 
618 617
 	@rm -f clamav-milter$(EXEEXT)
619 618
 	$(AM_V_CCLD)$(LINK) $(clamav_milter_OBJECTS) $(clamav_milter_LDADD) $(LIBS)
... ...
@@ -639,14 +556,14 @@ distclean-compile:
639 639
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
640 640
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
641 641
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
642
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
642
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
643 643
 
644 644
 .c.obj:
645 645
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
646 646
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
647 647
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
648 648
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
649
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
649
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
650 650
 
651 651
 .c.lo:
652 652
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
... ...
@@ -718,18 +635,11 @@ clean-libtool:
718 718
 	-rm -rf .libs _libs
719 719
 install-man8: $(man_MANS)
720 720
 	@$(NORMAL_INSTALL)
721
-	@list1=''; \
722
-	list2='$(man_MANS)'; \
723
-	test -n "$(man8dir)" \
724
-	  && test -n "`echo $$list1$$list2`" \
725
-	  || exit 0; \
726
-	echo " $(MKDIR_P) '$(DESTDIR)$(man8dir)'"; \
727
-	$(MKDIR_P) "$(DESTDIR)$(man8dir)" || exit 1; \
728
-	{ for i in $$list1; do echo "$$i"; done;  \
729
-	if test -n "$$list2"; then \
730
-	  for i in $$list2; do echo "$$i"; done \
731
-	    | sed -n '/\.8[a-z]*$$/p'; \
732
-	fi; \
721
+	test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)"
722
+	@list=''; test -n "$(man8dir)" || exit 0; \
723
+	{ for i in $$list; do echo "$$i"; done; \
724
+	l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
725
+	  sed -n '/\.8[a-z]*$$/p'; \
733 726
 	} | while read p; do \
734 727
 	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
735 728
 	  echo "$$d$$p"; echo "$$p"; \
... ...
@@ -760,15 +670,26 @@ uninstall-man8:
760 760
 	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
761 761
 	dir='$(DESTDIR)$(man8dir)'; $(am__uninstall_files_from_dir)
762 762
 
763
-ID: $(am__tagged_files)
764
-	$(am__define_uniq_tagged_files); mkid -fID $$unique
765
-tags: tags-am
766
-TAGS: tags
767
-
768
-tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
763
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
764
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
765
+	unique=`for i in $$list; do \
766
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
767
+	  done | \
768
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
769
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
770
+	mkid -fID $$unique
771
+tags: TAGS
772
+
773
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
774
+		$(TAGS_FILES) $(LISP)
769 775
 	set x; \
770 776
 	here=`pwd`; \
771
-	$(am__define_uniq_tagged_files); \
777
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
778
+	unique=`for i in $$list; do \
779
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
780
+	  done | \
781
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
782
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
772 783
 	shift; \
773 784
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
774 785
 	  test -n "$$unique" || unique=$$empty_fix; \
... ...
@@ -780,11 +701,15 @@ tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
780 780
 	      $$unique; \
781 781
 	  fi; \
782 782
 	fi
783
-ctags: ctags-am
784
-
785
-CTAGS: ctags
786
-ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
787
-	$(am__define_uniq_tagged_files); \
783
+ctags: CTAGS
784
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
785
+		$(TAGS_FILES) $(LISP)
786
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
787
+	unique=`for i in $$list; do \
788
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
789
+	  done | \
790
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
791
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
788 792
 	test -z "$(CTAGS_ARGS)$$unique" \
789 793
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
790 794
 	     $$unique
... ...
@@ -793,26 +718,24 @@ GTAGS:
793 793
 	here=`$(am__cd) $(top_builddir) && pwd` \
794 794
 	  && $(am__cd) $(top_srcdir) \
795 795
 	  && gtags -i $(GTAGS_ARGS) "$$here"
796
-cscopelist: cscopelist-am
797
-
798
-cscopelist-am: $(am__tagged_files)
799
-	list='$(am__tagged_files)'; \
800
-	case "$(srcdir)" in \
801
-	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
802
-	  *) sdir=$(subdir)/$(srcdir) ;; \
803
-	esac; \
804
-	for i in $$list; do \
805
-	  if test -f "$$i"; then \
806
-	    echo "$(subdir)/$$i"; \
807
-	  else \
808
-	    echo "$$sdir/$$i"; \
809
-	  fi; \
810
-	done >> $(top_builddir)/cscope.files
811 796
 
812 797
 distclean-tags:
813 798
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
814 799
 
815 800
 distdir: $(DISTFILES)
801
+	@list='$(MANS)'; if test -n "$$list"; then \
802
+	  list=`for p in $$list; do \
803
+	    if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
804
+	    if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \
805
+	  if test -n "$$list" && \
806
+	    grep 'ab help2man is required to generate this page' $$list >/dev/null; then \
807
+	    echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \
808
+	    grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/         /' >&2; \
809
+	    echo "       to fix them, install help2man, remove and regenerate the man pages;" >&2; \
810
+	    echo "       typically \`make maintainer-clean' will remove them" >&2; \
811
+	    exit 1; \
812
+	  else :; fi; \
813
+	else :; fi
816 814
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
817 815
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
818 816
 	list='$(DISTFILES)'; \
... ...
@@ -955,20 +878,19 @@ uninstall-man: uninstall-man8
955 955
 
956 956
 .MAKE: install-am install-strip
957 957
 
958
-.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
959
-	clean-libtool clean-sbinPROGRAMS cscopelist-am ctags ctags-am \
960
-	distclean distclean-compile distclean-generic \
961
-	distclean-libtool distclean-tags distdir dvi dvi-am html \
962
-	html-am info info-am install install-am install-data \
963
-	install-data-am install-dvi install-dvi-am install-exec \
964
-	install-exec-am install-html install-html-am install-info \
965
-	install-info-am install-man install-man8 install-pdf \
966
-	install-pdf-am install-ps install-ps-am install-sbinPROGRAMS \
967
-	install-strip installcheck installcheck-am \
968
-	installcheck-sbinPROGRAMS installdirs maintainer-clean \
969
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
970
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
971
-	tags tags-am uninstall uninstall-am uninstall-man \
958
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
959
+	clean-libtool clean-sbinPROGRAMS ctags distclean \
960
+	distclean-compile distclean-generic distclean-libtool \
961
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
962
+	install install-am install-data install-data-am install-dvi \
963
+	install-dvi-am install-exec install-exec-am install-html \
964
+	install-html-am install-info install-info-am install-man \
965
+	install-man8 install-pdf install-pdf-am install-ps \
966
+	install-ps-am install-sbinPROGRAMS install-strip installcheck \
967
+	installcheck-am installcheck-sbinPROGRAMS installdirs \
968
+	maintainer-clean maintainer-clean-generic mostlyclean \
969
+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
970
+	pdf pdf-am ps ps-am tags uninstall uninstall-am uninstall-man \
972 971
 	uninstall-man8 uninstall-sbinPROGRAMS
973 972
 
974 973
 
... ...
@@ -1,8 +1,9 @@
1
-# Makefile.in generated by automake 1.14 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 \
... ...
@@ -166,19 +121,6 @@ clambc_LDADD = $(LDADD)
166 166
 AM_V_lt = $(am__v_lt_@AM_V@)
167 167
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
168 168
 am__v_lt_0 = --silent
169
-am__v_lt_1 = 
170
-AM_V_P = $(am__v_P_@AM_V@)
171
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
172
-am__v_P_0 = false
173
-am__v_P_1 = :
174
-AM_V_GEN = $(am__v_GEN_@AM_V@)
175
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
176
-am__v_GEN_0 = @echo "  GEN     " $@;
177
-am__v_GEN_1 = 
178
-AM_V_at = $(am__v_at_@AM_V@)
179
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
180
-am__v_at_0 = @
181
-am__v_at_1 = 
182 169
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
183 170
 depcomp = $(SHELL) $(top_srcdir)/config/depcomp
184 171
 am__depfiles_maybe = depfiles
... ...
@@ -191,40 +133,22 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
191 191
 	$(AM_CFLAGS) $(CFLAGS)
192 192
 AM_V_CC = $(am__v_CC_@AM_V@)
193 193
 am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
194
-am__v_CC_0 = @echo "  CC      " $@;
195
-am__v_CC_1 = 
194
+am__v_CC_0 = @echo "  CC    " $@;
195
+AM_V_at = $(am__v_at_@AM_V@)
196
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
197
+am__v_at_0 = @
196 198
 CCLD = $(CC)
197 199
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
198 200
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
199 201
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
200 202
 AM_V_CCLD = $(am__v_CCLD_@AM_V@)
201 203
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
202
-am__v_CCLD_0 = @echo "  CCLD    " $@;
203
-am__v_CCLD_1 = 
204
+am__v_CCLD_0 = @echo "  CCLD  " $@;
205
+AM_V_GEN = $(am__v_GEN_@AM_V@)
206
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
207
+am__v_GEN_0 = @echo "  GEN   " $@;
204 208
 SOURCES = $(clambc_SOURCES)
205 209
 DIST_SOURCES = $(clambc_SOURCES)
206
-am__can_run_installinfo = \
207
-  case $$AM_UPDATE_INFO_DIR in \
208
-    n|no|NO) false;; \
209
-    *) (install-info --version) >/dev/null 2>&1;; \
210
-  esac
211
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
212
-# Read a list of newline-separated strings from the standard input,
213
-# and print each of them once, without duplicates.  Input order is
214
-# *not* preserved.
215
-am__uniquify_input = $(AWK) '\
216
-  BEGIN { nonempty = 0; } \
217
-  { items[$$0] = 1; nonempty = 1; } \
218
-  END { if (nonempty) { for (i in items) print i; }; } \
219
-'
220
-# Make sure the list of sources is unique.  This is necessary because,
221
-# e.g., the same source file might be shared among _SOURCES variables
222
-# for different programs/libraries.
223
-am__define_uniq_tagged_files = \
224
-  list='$(am__tagged_files)'; \
225
-  unique=`for i in $$list; do \
226
-    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
227
-  done | $(am__uniquify_input)`
228 210
 ETAGS = etags
229 211
 CTAGS = ctags
230 212
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
... ...
@@ -475,19 +399,14 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
475 475
 $(am__aclocal_m4_deps):
476 476
 install-binPROGRAMS: $(bin_PROGRAMS)
477 477
 	@$(NORMAL_INSTALL)
478
+	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
478 479
 	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
479
-	if test -n "$$list"; then \
480
-	  echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
481
-	  $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
482
-	fi; \
483 480
 	for p in $$list; do echo "$$p $$p"; done | \
484 481
 	sed 's/$(EXEEXT)$$//' | \
485
-	while read p p1; do if test -f $$p \
486
-	 || test -f $$p1 \
487
-	  ; then echo "$$p"; echo "$$p"; else :; fi; \
482
+	while read p p1; do if test -f $$p || test -f $$p1; \
483
+	  then echo "$$p"; echo "$$p"; else :; fi; \
488 484
 	done | \
489
-	sed -e 'p;s,.*/,,;n;h' \
490
-	    -e 's|.*|.|' \
485
+	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
491 486
 	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
492 487
 	sed 'N;N;N;s,\n, ,g' | \
493 488
 	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
... ...
@@ -508,8 +427,7 @@ uninstall-binPROGRAMS:
508 508
 	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
509 509
 	files=`for p in $$list; do echo "$$p"; done | \
510 510
 	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
511
-	      -e 's/$$/$(EXEEXT)/' \
512
-	`; \
511
+	      -e 's/$$/$(EXEEXT)/' `; \
513 512
 	test -n "$$list" || exit 0; \
514 513
 	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
515 514
 	cd "$(DESTDIR)$(bindir)" && rm -f $$files
... ...
@@ -538,7 +456,6 @@ installcheck-binPROGRAMS: $(bin_PROGRAMS)
538 538
 	    else echo "$$f does not support $$opt" 1>&2; bad=1; fi; \
539 539
 	  done; \
540 540
 	done; rm -f c$${pid}_.???; exit $$bad
541
-
542 541
 clambc$(EXEEXT): $(clambc_OBJECTS) $(clambc_DEPENDENCIES) $(EXTRA_clambc_DEPENDENCIES) 
543 542
 	@rm -f clambc$(EXEEXT)
544 543
 	$(AM_V_CCLD)$(LINK) $(clambc_OBJECTS) $(clambc_LDADD) $(LIBS)
... ...
@@ -559,14 +476,14 @@ distclean-compile:
559 559
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
560 560
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
561 561
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
562
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
562
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
563 563
 
564 564
 .c.obj:
565 565
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
566 566
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
567 567
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
568 568
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
569
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
569
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
570 570
 
571 571
 .c.lo:
572 572
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
... ...
@@ -623,15 +540,26 @@ mostlyclean-libtool:
623 623
 clean-libtool:
624 624
 	-rm -rf .libs _libs
625 625
 
626
-ID: $(am__tagged_files)
627
-	$(am__define_uniq_tagged_files); mkid -fID $$unique
628
-tags: tags-am
629
-TAGS: tags
630
-
631
-tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
626
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
627
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
628
+	unique=`for i in $$list; do \
629
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
630
+	  done | \
631
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
632
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
633
+	mkid -fID $$unique
634
+tags: TAGS
635
+
636
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
637
+		$(TAGS_FILES) $(LISP)
632 638
 	set x; \
633 639
 	here=`pwd`; \
634
-	$(am__define_uniq_tagged_files); \
640
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
641
+	unique=`for i in $$list; do \
642
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
643
+	  done | \
644
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
645
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
635 646
 	shift; \
636 647
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
637 648
 	  test -n "$$unique" || unique=$$empty_fix; \
... ...
@@ -643,11 +571,15 @@ tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
643 643
 	      $$unique; \
644 644
 	  fi; \
645 645
 	fi
646
-ctags: ctags-am
647
-
648
-CTAGS: ctags
649
-ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
650
-	$(am__define_uniq_tagged_files); \
646
+ctags: CTAGS
647
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
648
+		$(TAGS_FILES) $(LISP)
649
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
650
+	unique=`for i in $$list; do \
651
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
652
+	  done | \
653
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
654
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
651 655
 	test -z "$(CTAGS_ARGS)$$unique" \
652 656
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
653 657
 	     $$unique
... ...
@@ -656,21 +588,6 @@ GTAGS:
656 656
 	here=`$(am__cd) $(top_builddir) && pwd` \
657 657
 	  && $(am__cd) $(top_srcdir) \
658 658
 	  && gtags -i $(GTAGS_ARGS) "$$here"
659
-cscopelist: cscopelist-am
660
-
661
-cscopelist-am: $(am__tagged_files)
662
-	list='$(am__tagged_files)'; \
663
-	case "$(srcdir)" in \
664
-	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
665
-	  *) sdir=$(subdir)/$(srcdir) ;; \
666
-	esac; \
667
-	for i in $$list; do \
668
-	  if test -f "$$i"; then \
669
-	    echo "$(subdir)/$$i"; \
670
-	  else \
671
-	    echo "$$sdir/$$i"; \
672
-	  fi; \
673
-	done >> $(top_builddir)/cscope.files
674 659
 
675 660
 distclean-tags:
676 661
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
... ...
@@ -815,20 +732,19 @@ uninstall-am: uninstall-binPROGRAMS
815 815
 
816 816
 .MAKE: install-am install-strip
817 817
 
818
-.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \
819
-	clean-binPROGRAMS clean-generic clean-libtool cscopelist-am \
820
-	ctags ctags-am distclean distclean-compile distclean-generic \
821
-	distclean-libtool distclean-tags distdir dvi dvi-am html \
822
-	html-am info info-am install install-am install-binPROGRAMS \
823
-	install-data install-data-am install-dvi install-dvi-am \
824
-	install-exec install-exec-am install-html install-html-am \
825
-	install-info install-info-am install-man install-pdf \
826
-	install-pdf-am install-ps install-ps-am install-strip \
827
-	installcheck installcheck-am installcheck-binPROGRAMS \
828
-	installdirs maintainer-clean maintainer-clean-generic \
829
-	mostlyclean mostlyclean-compile mostlyclean-generic \
830
-	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
831
-	uninstall-am uninstall-binPROGRAMS
818
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
819
+	clean-generic clean-libtool ctags distclean distclean-compile \
820
+	distclean-generic distclean-libtool distclean-tags distdir dvi \
821
+	dvi-am html html-am info info-am install install-am \
822
+	install-binPROGRAMS install-data install-data-am install-dvi \
823
+	install-dvi-am install-exec install-exec-am install-html \
824
+	install-html-am install-info install-info-am install-man \
825
+	install-pdf install-pdf-am install-ps install-ps-am \
826
+	install-strip installcheck installcheck-am \
827
+	installcheck-binPROGRAMS installdirs maintainer-clean \
828
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
829
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
830
+	tags uninstall uninstall-am uninstall-binPROGRAMS
832 831
 
833 832
 
834 833
 # 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 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 \
... ...
@@ -184,19 +139,6 @@ clamconf_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 +151,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 = $(clamconf_SOURCES)
223 227
 DIST_SOURCES = $(clamconf_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)
... ...
@@ -498,19 +422,14 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
498 498
 $(am__aclocal_m4_deps):
499 499
 install-binPROGRAMS: $(bin_PROGRAMS)
500 500
 	@$(NORMAL_INSTALL)
501
+	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
501 502
 	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
502
-	if test -n "$$list"; then \
503
-	  echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
504
-	  $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
505
-	fi; \
506 503
 	for p in $$list; do echo "$$p $$p"; done | \
507 504
 	sed 's/$(EXEEXT)$$//' | \
508
-	while read p p1; do if test -f $$p \
509
-	 || test -f $$p1 \
510
-	  ; then echo "$$p"; echo "$$p"; else :; fi; \
505
+	while read p p1; do if test -f $$p || test -f $$p1; \
506
+	  then echo "$$p"; echo "$$p"; else :; fi; \
511 507
 	done | \
512
-	sed -e 'p;s,.*/,,;n;h' \
513
-	    -e 's|.*|.|' \
508
+	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
514 509
 	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
515 510
 	sed 'N;N;N;s,\n, ,g' | \
516 511
 	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
... ...
@@ -531,8 +450,7 @@ uninstall-binPROGRAMS:
531 531
 	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
532 532
 	files=`for p in $$list; do echo "$$p"; done | \
533 533
 	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
534
-	      -e 's/$$/$(EXEEXT)/' \
535
-	`; \
534
+	      -e 's/$$/$(EXEEXT)/' `; \
536 535
 	test -n "$$list" || exit 0; \
537 536
 	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
538 537
 	cd "$(DESTDIR)$(bindir)" && rm -f $$files
... ...
@@ -561,7 +479,6 @@ installcheck-binPROGRAMS: $(bin_PROGRAMS)
561 561
 	    else echo "$$f does not support $$opt" 1>&2; bad=1; fi; \
562 562
 	  done; \
563 563
 	done; rm -f c$${pid}_.???; exit $$bad
564
-
565 564
 clamconf$(EXEEXT): $(clamconf_OBJECTS) $(clamconf_DEPENDENCIES) $(EXTRA_clamconf_DEPENDENCIES) 
566 565
 	@rm -f clamconf$(EXEEXT)
567 566
 	$(AM_V_CCLD)$(LINK) $(clamconf_OBJECTS) $(clamconf_LDADD) $(LIBS)
... ...
@@ -582,14 +499,14 @@ distclean-compile:
582 582
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
583 583
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
584 584
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
585
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
585
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
586 586
 
587 587
 .c.obj:
588 588
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
589 589
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
590 590
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
591 591
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
592
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
592
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
593 593
 
594 594
 .c.lo:
595 595
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
... ...
@@ -646,15 +563,26 @@ mostlyclean-libtool:
646 646
 clean-libtool:
647 647
 	-rm -rf .libs _libs
648 648
 
649
-ID: $(am__tagged_files)
650
-	$(am__define_uniq_tagged_files); mkid -fID $$unique
651
-tags: tags-am
652
-TAGS: tags
653
-
654
-tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
649
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_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; }; }'`; \
656
+	mkid -fID $$unique
657
+tags: TAGS
658
+
659
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
660
+		$(TAGS_FILES) $(LISP)
655 661
 	set x; \
656 662
 	here=`pwd`; \
657
-	$(am__define_uniq_tagged_files); \
663
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
664
+	unique=`for i in $$list; do \
665
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
666
+	  done | \
667
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
668
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
658 669
 	shift; \
659 670
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
660 671
 	  test -n "$$unique" || unique=$$empty_fix; \
... ...
@@ -666,11 +594,15 @@ tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
666 666
 	      $$unique; \
667 667
 	  fi; \
668 668
 	fi
669
-ctags: ctags-am
670
-
671
-CTAGS: ctags
672
-ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
673
-	$(am__define_uniq_tagged_files); \
669
+ctags: CTAGS
670
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
671
+		$(TAGS_FILES) $(LISP)
672
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
673
+	unique=`for i in $$list; do \
674
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
675
+	  done | \
676
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
677
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
674 678
 	test -z "$(CTAGS_ARGS)$$unique" \
675 679
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
676 680
 	     $$unique
... ...
@@ -679,21 +611,6 @@ GTAGS:
679 679
 	here=`$(am__cd) $(top_builddir) && pwd` \
680 680
 	  && $(am__cd) $(top_srcdir) \
681 681
 	  && gtags -i $(GTAGS_ARGS) "$$here"
682
-cscopelist: cscopelist-am
683
-
684
-cscopelist-am: $(am__tagged_files)
685
-	list='$(am__tagged_files)'; \
686
-	case "$(srcdir)" in \
687
-	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
688
-	  *) sdir=$(subdir)/$(srcdir) ;; \
689
-	esac; \
690
-	for i in $$list; do \
691
-	  if test -f "$$i"; then \
692
-	    echo "$(subdir)/$$i"; \
693
-	  else \
694
-	    echo "$$sdir/$$i"; \
695
-	  fi; \
696
-	done >> $(top_builddir)/cscope.files
697 682
 
698 683
 distclean-tags:
699 684
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
... ...
@@ -838,20 +755,19 @@ uninstall-am: uninstall-binPROGRAMS
838 838
 
839 839
 .MAKE: install-am install-strip
840 840
 
841
-.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \
842
-	clean-binPROGRAMS clean-generic clean-libtool cscopelist-am \
843
-	ctags ctags-am distclean distclean-compile distclean-generic \
844
-	distclean-libtool distclean-tags distdir dvi dvi-am html \
845
-	html-am info info-am install install-am install-binPROGRAMS \
846
-	install-data install-data-am install-dvi install-dvi-am \
847
-	install-exec install-exec-am install-html install-html-am \
848
-	install-info install-info-am install-man install-pdf \
849
-	install-pdf-am install-ps install-ps-am install-strip \
850
-	installcheck installcheck-am installcheck-binPROGRAMS \
851
-	installdirs maintainer-clean maintainer-clean-generic \
852
-	mostlyclean mostlyclean-compile mostlyclean-generic \
853
-	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
854
-	uninstall-am uninstall-binPROGRAMS
841
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
842
+	clean-generic clean-libtool ctags distclean distclean-compile \
843
+	distclean-generic distclean-libtool distclean-tags distdir dvi \
844
+	dvi-am html html-am info info-am install install-am \
845
+	install-binPROGRAMS install-data install-data-am install-dvi \
846
+	install-dvi-am install-exec install-exec-am install-html \
847
+	install-html-am install-info install-info-am install-man \
848
+	install-pdf install-pdf-am install-ps install-ps-am \
849
+	install-strip installcheck installcheck-am \
850
+	installcheck-binPROGRAMS installdirs maintainer-clean \
851
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
852
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
853
+	tags uninstall uninstall-am uninstall-binPROGRAMS
855 854
 
856 855
 
857 856
 # 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 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 \
... ...
@@ -197,19 +152,6 @@ clamd_LDADD = $(LDADD)
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
-AM_V_P = $(am__v_P_@AM_V@)
202
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
203
-am__v_P_0 = false
204
-am__v_P_1 = :
205
-AM_V_GEN = $(am__v_GEN_@AM_V@)
206
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
207
-am__v_GEN_0 = @echo "  GEN     " $@;
208
-am__v_GEN_1 = 
209
-AM_V_at = $(am__v_at_@AM_V@)
210
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
211
-am__v_at_0 = @
212
-am__v_at_1 = 
213 200
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
214 201
 depcomp = $(SHELL) $(top_srcdir)/config/depcomp
215 202
 am__depfiles_maybe = depfiles
... ...
@@ -222,40 +164,22 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
222 222
 	$(AM_CFLAGS) $(CFLAGS)
223 223
 AM_V_CC = $(am__v_CC_@AM_V@)
224 224
 am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
225
-am__v_CC_0 = @echo "  CC      " $@;
226
-am__v_CC_1 = 
225
+am__v_CC_0 = @echo "  CC    " $@;
226
+AM_V_at = $(am__v_at_@AM_V@)
227
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
228
+am__v_at_0 = @
227 229
 CCLD = $(CC)
228 230
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
229 231
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
230 232
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
231 233
 AM_V_CCLD = $(am__v_CCLD_@AM_V@)
232 234
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
233
-am__v_CCLD_0 = @echo "  CCLD    " $@;
234
-am__v_CCLD_1 = 
235
+am__v_CCLD_0 = @echo "  CCLD  " $@;
236
+AM_V_GEN = $(am__v_GEN_@AM_V@)
237
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
238
+am__v_GEN_0 = @echo "  GEN   " $@;
235 239
 SOURCES = $(clamd_SOURCES)
236 240
 DIST_SOURCES = $(am__clamd_SOURCES_DIST)
237
-am__can_run_installinfo = \
238
-  case $$AM_UPDATE_INFO_DIR in \
239
-    n|no|NO) false;; \
240
-    *) (install-info --version) >/dev/null 2>&1;; \
241
-  esac
242
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
243
-# Read a list of newline-separated strings from the standard input,
244
-# and print each of them once, without duplicates.  Input order is
245
-# *not* preserved.
246
-am__uniquify_input = $(AWK) '\
247
-  BEGIN { nonempty = 0; } \
248
-  { items[$$0] = 1; nonempty = 1; } \
249
-  END { if (nonempty) { for (i in items) print i; }; } \
250
-'
251
-# Make sure the list of sources is unique.  This is necessary because,
252
-# e.g., the same source file might be shared among _SOURCES variables
253
-# for different programs/libraries.
254
-am__define_uniq_tagged_files = \
255
-  list='$(am__tagged_files)'; \
256
-  unique=`for i in $$list; do \
257
-    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
258
-  done | $(am__uniquify_input)`
259 241
 ETAGS = etags
260 242
 CTAGS = ctags
261 243
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
... ...
@@ -529,19 +453,14 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
529 529
 $(am__aclocal_m4_deps):
530 530
 install-sbinPROGRAMS: $(sbin_PROGRAMS)
531 531
 	@$(NORMAL_INSTALL)
532
+	test -z "$(sbindir)" || $(MKDIR_P) "$(DESTDIR)$(sbindir)"
532 533
 	@list='$(sbin_PROGRAMS)'; test -n "$(sbindir)" || list=; \
533
-	if test -n "$$list"; then \
534
-	  echo " $(MKDIR_P) '$(DESTDIR)$(sbindir)'"; \
535
-	  $(MKDIR_P) "$(DESTDIR)$(sbindir)" || exit 1; \
536
-	fi; \
537 534
 	for p in $$list; do echo "$$p $$p"; done | \
538 535
 	sed 's/$(EXEEXT)$$//' | \
539
-	while read p p1; do if test -f $$p \
540
-	 || test -f $$p1 \
541
-	  ; then echo "$$p"; echo "$$p"; else :; fi; \
536
+	while read p p1; do if test -f $$p || test -f $$p1; \
537
+	  then echo "$$p"; echo "$$p"; else :; fi; \
542 538
 	done | \
543
-	sed -e 'p;s,.*/,,;n;h' \
544
-	    -e 's|.*|.|' \
539
+	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
545 540
 	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
546 541
 	sed 'N;N;N;s,\n, ,g' | \
547 542
 	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
... ...
@@ -562,8 +481,7 @@ uninstall-sbinPROGRAMS:
562 562
 	@list='$(sbin_PROGRAMS)'; test -n "$(sbindir)" || list=; \
563 563
 	files=`for p in $$list; do echo "$$p"; done | \
564 564
 	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
565
-	      -e 's/$$/$(EXEEXT)/' \
566
-	`; \
565
+	      -e 's/$$/$(EXEEXT)/' `; \
567 566
 	test -n "$$list" || exit 0; \
568 567
 	echo " ( cd '$(DESTDIR)$(sbindir)' && rm -f" $$files ")"; \
569 568
 	cd "$(DESTDIR)$(sbindir)" && rm -f $$files
... ...
@@ -592,7 +510,6 @@ installcheck-sbinPROGRAMS: $(sbin_PROGRAMS)
592 592
 	    else echo "$$f does not support $$opt" 1>&2; bad=1; fi; \
593 593
 	  done; \
594 594
 	done; rm -f c$${pid}_.???; exit $$bad
595
-
596 595
 clamd$(EXEEXT): $(clamd_OBJECTS) $(clamd_DEPENDENCIES) $(EXTRA_clamd_DEPENDENCIES) 
597 596
 	@rm -f clamd$(EXEEXT)
598 597
 	$(AM_V_CCLD)$(LINK) $(clamd_OBJECTS) $(clamd_LDADD) $(LIBS)
... ...
@@ -622,14 +539,14 @@ distclean-compile:
622 622
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
623 623
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
624 624
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
625
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
625
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
626 626
 
627 627
 .c.obj:
628 628
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
629 629
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
630 630
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
631 631
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
632
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
632
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
633 633
 
634 634
 .c.lo:
635 635
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
... ...
@@ -700,15 +617,26 @@ mostlyclean-libtool:
700 700
 clean-libtool:
701 701
 	-rm -rf .libs _libs
702 702
 
703
-ID: $(am__tagged_files)
704
-	$(am__define_uniq_tagged_files); mkid -fID $$unique
705
-tags: tags-am
706
-TAGS: tags
707
-
708
-tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
703
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
704
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
705
+	unique=`for i in $$list; do \
706
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
707
+	  done | \
708
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
709
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
710
+	mkid -fID $$unique
711
+tags: TAGS
712
+
713
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
714
+		$(TAGS_FILES) $(LISP)
709 715
 	set x; \
710 716
 	here=`pwd`; \
711
-	$(am__define_uniq_tagged_files); \
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; }; }'`; \
712 723
 	shift; \
713 724
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
714 725
 	  test -n "$$unique" || unique=$$empty_fix; \
... ...
@@ -720,11 +648,15 @@ tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
720 720
 	      $$unique; \
721 721
 	  fi; \
722 722
 	fi
723
-ctags: ctags-am
724
-
725
-CTAGS: ctags
726
-ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
727
-	$(am__define_uniq_tagged_files); \
723
+ctags: CTAGS
724
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
725
+		$(TAGS_FILES) $(LISP)
726
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
727
+	unique=`for i in $$list; do \
728
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
729
+	  done | \
730
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
731
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
728 732
 	test -z "$(CTAGS_ARGS)$$unique" \
729 733
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
730 734
 	     $$unique
... ...
@@ -733,21 +665,6 @@ GTAGS:
733 733
 	here=`$(am__cd) $(top_builddir) && pwd` \
734 734
 	  && $(am__cd) $(top_srcdir) \
735 735
 	  && gtags -i $(GTAGS_ARGS) "$$here"
736
-cscopelist: cscopelist-am
737
-
738
-cscopelist-am: $(am__tagged_files)
739
-	list='$(am__tagged_files)'; \
740
-	case "$(srcdir)" in \
741
-	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
742
-	  *) sdir=$(subdir)/$(srcdir) ;; \
743
-	esac; \
744
-	for i in $$list; do \
745
-	  if test -f "$$i"; then \
746
-	    echo "$(subdir)/$$i"; \
747
-	  else \
748
-	    echo "$$sdir/$$i"; \
749
-	  fi; \
750
-	done >> $(top_builddir)/cscope.files
751 736
 
752 737
 distclean-tags:
753 738
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
... ...
@@ -893,20 +810,20 @@ uninstall-am: uninstall-sbinPROGRAMS
893 893
 
894 894
 .MAKE: install-am install-strip
895 895
 
896
-.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
897
-	clean-libtool clean-sbinPROGRAMS cscopelist-am ctags ctags-am \
898
-	distclean distclean-compile distclean-generic \
899
-	distclean-libtool distclean-tags distdir dvi dvi-am html \
900
-	html-am info info-am install install-am install-data \
901
-	install-data-am install-dvi install-dvi-am install-exec \
902
-	install-exec-am install-html install-html-am install-info \
903
-	install-info-am install-man install-pdf install-pdf-am \
904
-	install-ps install-ps-am install-sbinPROGRAMS install-strip \
905
-	installcheck installcheck-am installcheck-sbinPROGRAMS \
906
-	installdirs maintainer-clean maintainer-clean-generic \
907
-	mostlyclean mostlyclean-compile mostlyclean-generic \
908
-	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
909
-	uninstall-am uninstall-sbinPROGRAMS
896
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
897
+	clean-libtool clean-sbinPROGRAMS ctags distclean \
898
+	distclean-compile distclean-generic distclean-libtool \
899
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
900
+	install install-am install-data install-data-am install-dvi \
901
+	install-dvi-am install-exec install-exec-am install-html \
902
+	install-html-am install-info install-info-am install-man \
903
+	install-pdf install-pdf-am install-ps install-ps-am \
904
+	install-sbinPROGRAMS install-strip installcheck \
905
+	installcheck-am installcheck-sbinPROGRAMS installdirs \
906
+	maintainer-clean maintainer-clean-generic mostlyclean \
907
+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
908
+	pdf pdf-am ps ps-am tags uninstall uninstall-am \
909
+	uninstall-sbinPROGRAMS
910 910
 
911 911
 
912 912
 # 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 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 \
... ...
@@ -195,19 +150,6 @@ clamdscan_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 +162,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 = $(clamdscan_SOURCES)
234 238
 DIST_SOURCES = $(am__clamdscan_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)
... ...
@@ -515,19 +439,14 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
515 515
 $(am__aclocal_m4_deps):
516 516
 install-binPROGRAMS: $(bin_PROGRAMS)
517 517
 	@$(NORMAL_INSTALL)
518
+	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
518 519
 	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
519
-	if test -n "$$list"; then \
520
-	  echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
521
-	  $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
522
-	fi; \
523 520
 	for p in $$list; do echo "$$p $$p"; done | \
524 521
 	sed 's/$(EXEEXT)$$//' | \
525
-	while read p p1; do if test -f $$p \
526
-	 || test -f $$p1 \
527
-	  ; then echo "$$p"; echo "$$p"; else :; fi; \
522
+	while read p p1; do if test -f $$p || test -f $$p1; \
523
+	  then echo "$$p"; echo "$$p"; else :; fi; \
528 524
 	done | \
529
-	sed -e 'p;s,.*/,,;n;h' \
530
-	    -e 's|.*|.|' \
525
+	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
531 526
 	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
532 527
 	sed 'N;N;N;s,\n, ,g' | \
533 528
 	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
... ...
@@ -548,8 +467,7 @@ uninstall-binPROGRAMS:
548 548
 	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
549 549
 	files=`for p in $$list; do echo "$$p"; done | \
550 550
 	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
551
-	      -e 's/$$/$(EXEEXT)/' \
552
-	`; \
551
+	      -e 's/$$/$(EXEEXT)/' `; \
553 552
 	test -n "$$list" || exit 0; \
554 553
 	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
555 554
 	cd "$(DESTDIR)$(bindir)" && rm -f $$files
... ...
@@ -578,7 +496,6 @@ installcheck-binPROGRAMS: $(bin_PROGRAMS)
578 578
 	    else echo "$$f does not support $$opt" 1>&2; bad=1; fi; \
579 579
 	  done; \
580 580
 	done; rm -f c$${pid}_.???; exit $$bad
581
-
582 581
 clamdscan$(EXEEXT): $(clamdscan_OBJECTS) $(clamdscan_DEPENDENCIES) $(EXTRA_clamdscan_DEPENDENCIES) 
583 582
 	@rm -f clamdscan$(EXEEXT)
584 583
 	$(AM_V_CCLD)$(LINK) $(clamdscan_OBJECTS) $(clamdscan_LDADD) $(LIBS)
... ...
@@ -604,14 +521,14 @@ distclean-compile:
604 604
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
605 605
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
606 606
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
607
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
607
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
608 608
 
609 609
 .c.obj:
610 610
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
611 611
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
612 612
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
613 613
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
614
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
614
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
615 615
 
616 616
 .c.lo:
617 617
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
... ...
@@ -710,15 +627,26 @@ mostlyclean-libtool:
710 710
 clean-libtool:
711 711
 	-rm -rf .libs _libs
712 712
 
713
-ID: $(am__tagged_files)
714
-	$(am__define_uniq_tagged_files); mkid -fID $$unique
715
-tags: tags-am
716
-TAGS: tags
717
-
718
-tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
713
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
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; }; }'`; \
720
+	mkid -fID $$unique
721
+tags: TAGS
722
+
723
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
724
+		$(TAGS_FILES) $(LISP)
719 725
 	set x; \
720 726
 	here=`pwd`; \
721
-	$(am__define_uniq_tagged_files); \
727
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
728
+	unique=`for i in $$list; do \
729
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
730
+	  done | \
731
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
732
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
722 733
 	shift; \
723 734
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
724 735
 	  test -n "$$unique" || unique=$$empty_fix; \
... ...
@@ -730,11 +658,15 @@ tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
730 730
 	      $$unique; \
731 731
 	  fi; \
732 732
 	fi
733
-ctags: ctags-am
734
-
735
-CTAGS: ctags
736
-ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
737
-	$(am__define_uniq_tagged_files); \
733
+ctags: CTAGS
734
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
735
+		$(TAGS_FILES) $(LISP)
736
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
737
+	unique=`for i in $$list; do \
738
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
739
+	  done | \
740
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
741
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
738 742
 	test -z "$(CTAGS_ARGS)$$unique" \
739 743
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
740 744
 	     $$unique
... ...
@@ -743,21 +675,6 @@ GTAGS:
743 743
 	here=`$(am__cd) $(top_builddir) && pwd` \
744 744
 	  && $(am__cd) $(top_srcdir) \
745 745
 	  && gtags -i $(GTAGS_ARGS) "$$here"
746
-cscopelist: cscopelist-am
747
-
748
-cscopelist-am: $(am__tagged_files)
749
-	list='$(am__tagged_files)'; \
750
-	case "$(srcdir)" in \
751
-	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
752
-	  *) sdir=$(subdir)/$(srcdir) ;; \
753
-	esac; \
754
-	for i in $$list; do \
755
-	  if test -f "$$i"; then \
756
-	    echo "$(subdir)/$$i"; \
757
-	  else \
758
-	    echo "$$sdir/$$i"; \
759
-	  fi; \
760
-	done >> $(top_builddir)/cscope.files
761 746
 
762 747
 distclean-tags:
763 748
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
... ...
@@ -902,20 +819,19 @@ uninstall-am: uninstall-binPROGRAMS
902 902
 
903 903
 .MAKE: install-am install-strip
904 904
 
905
-.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \
906
-	clean-binPROGRAMS clean-generic clean-libtool cscopelist-am \
907
-	ctags ctags-am distclean distclean-compile distclean-generic \
908
-	distclean-libtool distclean-tags distdir dvi dvi-am html \
909
-	html-am info info-am install install-am install-binPROGRAMS \
910
-	install-data install-data-am install-dvi install-dvi-am \
911
-	install-exec install-exec-am install-html install-html-am \
912
-	install-info install-info-am install-man install-pdf \
913
-	install-pdf-am install-ps install-ps-am install-strip \
914
-	installcheck installcheck-am installcheck-binPROGRAMS \
915
-	installdirs maintainer-clean maintainer-clean-generic \
916
-	mostlyclean mostlyclean-compile mostlyclean-generic \
917
-	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
918
-	uninstall-am uninstall-binPROGRAMS
905
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
906
+	clean-generic clean-libtool ctags distclean distclean-compile \
907
+	distclean-generic distclean-libtool distclean-tags distdir dvi \
908
+	dvi-am html html-am info info-am install install-am \
909
+	install-binPROGRAMS install-data install-data-am install-dvi \
910
+	install-dvi-am install-exec install-exec-am install-html \
911
+	install-html-am install-info install-info-am install-man \
912
+	install-pdf install-pdf-am install-ps install-ps-am \
913
+	install-strip installcheck installcheck-am \
914
+	installcheck-binPROGRAMS installdirs maintainer-clean \
915
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
916
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
917
+	tags uninstall uninstall-am uninstall-binPROGRAMS
919 918
 
920 919
 
921 920
 # 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 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 \
... ...
@@ -171,19 +126,6 @@ clamdtop_OBJECTS = $(am_clamdtop_OBJECTS)
171 171
 AM_V_lt = $(am__v_lt_@AM_V@)
172 172
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
173 173
 am__v_lt_0 = --silent
174
-am__v_lt_1 = 
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
-AM_V_GEN = $(am__v_GEN_@AM_V@)
180
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
181
-am__v_GEN_0 = @echo "  GEN     " $@;
182
-am__v_GEN_1 = 
183
-AM_V_at = $(am__v_at_@AM_V@)
184
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
185
-am__v_at_0 = @
186
-am__v_at_1 = 
187 174
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
188 175
 depcomp = $(SHELL) $(top_srcdir)/config/depcomp
189 176
 am__depfiles_maybe = depfiles
... ...
@@ -196,23 +138,22 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
196 196
 	$(AM_CFLAGS) $(CFLAGS)
197 197
 AM_V_CC = $(am__v_CC_@AM_V@)
198 198
 am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
199
-am__v_CC_0 = @echo "  CC      " $@;
200
-am__v_CC_1 = 
199
+am__v_CC_0 = @echo "  CC    " $@;
200
+AM_V_at = $(am__v_at_@AM_V@)
201
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
202
+am__v_at_0 = @
201 203
 CCLD = $(CC)
202 204
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
203 205
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
204 206
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
205 207
 AM_V_CCLD = $(am__v_CCLD_@AM_V@)
206 208
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
207
-am__v_CCLD_0 = @echo "  CCLD    " $@;
208
-am__v_CCLD_1 = 
209
+am__v_CCLD_0 = @echo "  CCLD  " $@;
210
+AM_V_GEN = $(am__v_GEN_@AM_V@)
211
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
212
+am__v_GEN_0 = @echo "  GEN   " $@;
209 213
 SOURCES = $(clamdtop_SOURCES)
210 214
 DIST_SOURCES = $(am__clamdtop_SOURCES_DIST)
211
-am__can_run_installinfo = \
212
-  case $$AM_UPDATE_INFO_DIR in \
213
-    n|no|NO) false;; \
214
-    *) (install-info --version) >/dev/null 2>&1;; \
215
-  esac
216 215
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
217 216
 am__vpath_adj = case $$p in \
218 217
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
... ...
@@ -243,23 +184,6 @@ am__uninstall_files_from_dir = { \
243 243
 man1dir = $(mandir)/man1
244 244
 NROFF = nroff
245 245
 MANS = $(man_MANS)
246
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
247
-# Read a list of newline-separated strings from the standard input,
248
-# and print each of them once, without duplicates.  Input order is
249
-# *not* preserved.
250
-am__uniquify_input = $(AWK) '\
251
-  BEGIN { nonempty = 0; } \
252
-  { items[$$0] = 1; nonempty = 1; } \
253
-  END { if (nonempty) { for (i in items) print i; }; } \
254
-'
255
-# Make sure the list of sources is unique.  This is necessary because,
256
-# e.g., the same source file might be shared among _SOURCES variables
257
-# for different programs/libraries.
258
-am__define_uniq_tagged_files = \
259
-  list='$(am__tagged_files)'; \
260
-  unique=`for i in $$list; do \
261
-    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
262
-  done | $(am__uniquify_input)`
263 246
 ETAGS = etags
264 247
 CTAGS = ctags
265 248
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
... ...
@@ -512,19 +436,14 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
512 512
 $(am__aclocal_m4_deps):
513 513
 install-binPROGRAMS: $(bin_PROGRAMS)
514 514
 	@$(NORMAL_INSTALL)
515
+	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
515 516
 	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
516
-	if test -n "$$list"; then \
517
-	  echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
518
-	  $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
519
-	fi; \
520 517
 	for p in $$list; do echo "$$p $$p"; done | \
521 518
 	sed 's/$(EXEEXT)$$//' | \
522
-	while read p p1; do if test -f $$p \
523
-	 || test -f $$p1 \
524
-	  ; then echo "$$p"; echo "$$p"; else :; fi; \
519
+	while read p p1; do if test -f $$p || test -f $$p1; \
520
+	  then echo "$$p"; echo "$$p"; else :; fi; \
525 521
 	done | \
526
-	sed -e 'p;s,.*/,,;n;h' \
527
-	    -e 's|.*|.|' \
522
+	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
528 523
 	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
529 524
 	sed 'N;N;N;s,\n, ,g' | \
530 525
 	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
... ...
@@ -545,8 +464,7 @@ uninstall-binPROGRAMS:
545 545
 	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
546 546
 	files=`for p in $$list; do echo "$$p"; done | \
547 547
 	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
548
-	      -e 's/$$/$(EXEEXT)/' \
549
-	`; \
548
+	      -e 's/$$/$(EXEEXT)/' `; \
550 549
 	test -n "$$list" || exit 0; \
551 550
 	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
552 551
 	cd "$(DESTDIR)$(bindir)" && rm -f $$files
... ...
@@ -575,7 +493,6 @@ installcheck-binPROGRAMS: $(bin_PROGRAMS)
575 575
 	    else echo "$$f does not support $$opt" 1>&2; bad=1; fi; \
576 576
 	  done; \
577 577
 	done; rm -f c$${pid}_.???; exit $$bad
578
-
579 578
 clamdtop$(EXEEXT): $(clamdtop_OBJECTS) $(clamdtop_DEPENDENCIES) $(EXTRA_clamdtop_DEPENDENCIES) 
580 579
 	@rm -f clamdtop$(EXEEXT)
581 580
 	$(AM_V_CCLD)$(LINK) $(clamdtop_OBJECTS) $(clamdtop_LDADD) $(LIBS)
... ...
@@ -596,14 +513,14 @@ distclean-compile:
596 596
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
597 597
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
598 598
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
599
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
599
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
600 600
 
601 601
 .c.obj:
602 602
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
603 603
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
604 604
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
605 605
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
606
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
606
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
607 607
 
608 608
 .c.lo:
609 609
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
... ...
@@ -661,18 +578,11 @@ clean-libtool:
661 661
 	-rm -rf .libs _libs
662 662
 install-man1: $(man_MANS)
663 663
 	@$(NORMAL_INSTALL)
664
-	@list1=''; \
665
-	list2='$(man_MANS)'; \
666
-	test -n "$(man1dir)" \
667
-	  && test -n "`echo $$list1$$list2`" \
668
-	  || exit 0; \
669
-	echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \
670
-	$(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \
671
-	{ for i in $$list1; do echo "$$i"; done;  \
672
-	if test -n "$$list2"; then \
673
-	  for i in $$list2; do echo "$$i"; done \
674
-	    | sed -n '/\.1[a-z]*$$/p'; \
675
-	fi; \
664
+	test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
665
+	@list=''; test -n "$(man1dir)" || exit 0; \
666
+	{ for i in $$list; do echo "$$i"; done; \
667
+	l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
668
+	  sed -n '/\.1[a-z]*$$/p'; \
676 669
 	} | while read p; do \
677 670
 	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
678 671
 	  echo "$$d$$p"; echo "$$p"; \
... ...
@@ -703,15 +613,26 @@ uninstall-man1:
703 703
 	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
704 704
 	dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
705 705
 
706
-ID: $(am__tagged_files)
707
-	$(am__define_uniq_tagged_files); mkid -fID $$unique
708
-tags: tags-am
709
-TAGS: tags
710
-
711
-tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
706
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
707
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
708
+	unique=`for i in $$list; do \
709
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
710
+	  done | \
711
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
712
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
713
+	mkid -fID $$unique
714
+tags: TAGS
715
+
716
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
717
+		$(TAGS_FILES) $(LISP)
712 718
 	set x; \
713 719
 	here=`pwd`; \
714
-	$(am__define_uniq_tagged_files); \
720
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
721
+	unique=`for i in $$list; do \
722
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
723
+	  done | \
724
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
725
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
715 726
 	shift; \
716 727
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
717 728
 	  test -n "$$unique" || unique=$$empty_fix; \
... ...
@@ -723,11 +644,15 @@ tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
723 723
 	      $$unique; \
724 724
 	  fi; \
725 725
 	fi
726
-ctags: ctags-am
727
-
728
-CTAGS: ctags
729
-ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
730
-	$(am__define_uniq_tagged_files); \
726
+ctags: CTAGS
727
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
728
+		$(TAGS_FILES) $(LISP)
729
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
730
+	unique=`for i in $$list; do \
731
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
732
+	  done | \
733
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
734
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
731 735
 	test -z "$(CTAGS_ARGS)$$unique" \
732 736
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
733 737
 	     $$unique
... ...
@@ -736,26 +661,24 @@ GTAGS:
736 736
 	here=`$(am__cd) $(top_builddir) && pwd` \
737 737
 	  && $(am__cd) $(top_srcdir) \
738 738
 	  && gtags -i $(GTAGS_ARGS) "$$here"
739
-cscopelist: cscopelist-am
740
-
741
-cscopelist-am: $(am__tagged_files)
742
-	list='$(am__tagged_files)'; \
743
-	case "$(srcdir)" in \
744
-	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
745
-	  *) sdir=$(subdir)/$(srcdir) ;; \
746
-	esac; \
747
-	for i in $$list; do \
748
-	  if test -f "$$i"; then \
749
-	    echo "$(subdir)/$$i"; \
750
-	  else \
751
-	    echo "$$sdir/$$i"; \
752
-	  fi; \
753
-	done >> $(top_builddir)/cscope.files
754 739
 
755 740
 distclean-tags:
756 741
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
757 742
 
758 743
 distdir: $(DISTFILES)
744
+	@list='$(MANS)'; if test -n "$$list"; then \
745
+	  list=`for p in $$list; do \
746
+	    if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
747
+	    if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \
748
+	  if test -n "$$list" && \
749
+	    grep 'ab help2man is required to generate this page' $$list >/dev/null; then \
750
+	    echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \
751
+	    grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/         /' >&2; \
752
+	    echo "       to fix them, install help2man, remove and regenerate the man pages;" >&2; \
753
+	    echo "       typically \`make maintainer-clean' will remove them" >&2; \
754
+	    exit 1; \
755
+	  else :; fi; \
756
+	else :; fi
759 757
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
760 758
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
761 759
 	list='$(DISTFILES)'; \
... ...
@@ -896,20 +819,19 @@ uninstall-man: uninstall-man1
896 896
 
897 897
 .MAKE: install-am install-strip
898 898
 
899
-.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \
900
-	clean-binPROGRAMS clean-generic clean-libtool cscopelist-am \
901
-	ctags ctags-am distclean distclean-compile distclean-generic \
902
-	distclean-libtool distclean-tags distdir dvi dvi-am html \
903
-	html-am info info-am install install-am install-binPROGRAMS \
904
-	install-data install-data-am install-dvi install-dvi-am \
905
-	install-exec install-exec-am install-html install-html-am \
906
-	install-info install-info-am install-man install-man1 \
907
-	install-pdf install-pdf-am install-ps install-ps-am \
908
-	install-strip installcheck installcheck-am \
899
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
900
+	clean-generic clean-libtool ctags distclean distclean-compile \
901
+	distclean-generic distclean-libtool distclean-tags distdir dvi \
902
+	dvi-am html html-am info info-am install install-am \
903
+	install-binPROGRAMS install-data install-data-am install-dvi \
904
+	install-dvi-am install-exec install-exec-am install-html \
905
+	install-html-am install-info install-info-am install-man \
906
+	install-man1 install-pdf install-pdf-am install-ps \
907
+	install-ps-am install-strip installcheck installcheck-am \
909 908
 	installcheck-binPROGRAMS installdirs maintainer-clean \
910 909
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
911 910
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
912
-	tags tags-am uninstall uninstall-am uninstall-binPROGRAMS \
911
+	tags uninstall uninstall-am uninstall-binPROGRAMS \
913 912
 	uninstall-man uninstall-man1
914 913
 
915 914
 
... ...
@@ -1,8 +1,9 @@
1
-# Makefile.in generated by automake 1.14 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 \
... ...
@@ -186,19 +141,6 @@ clamscan_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 +153,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 = $(clamscan_SOURCES)
225 229
 DIST_SOURCES = $(clamscan_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)
... ...
@@ -502,19 +426,14 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
502 502
 $(am__aclocal_m4_deps):
503 503
 install-binPROGRAMS: $(bin_PROGRAMS)
504 504
 	@$(NORMAL_INSTALL)
505
+	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
505 506
 	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
506
-	if test -n "$$list"; then \
507
-	  echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
508
-	  $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
509
-	fi; \
510 507
 	for p in $$list; do echo "$$p $$p"; done | \
511 508
 	sed 's/$(EXEEXT)$$//' | \
512
-	while read p p1; do if test -f $$p \
513
-	 || test -f $$p1 \
514
-	  ; then echo "$$p"; echo "$$p"; else :; fi; \
509
+	while read p p1; do if test -f $$p || test -f $$p1; \
510
+	  then echo "$$p"; echo "$$p"; else :; fi; \
515 511
 	done | \
516
-	sed -e 'p;s,.*/,,;n;h' \
517
-	    -e 's|.*|.|' \
512
+	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
518 513
 	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
519 514
 	sed 'N;N;N;s,\n, ,g' | \
520 515
 	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
... ...
@@ -535,8 +454,7 @@ uninstall-binPROGRAMS:
535 535
 	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
536 536
 	files=`for p in $$list; do echo "$$p"; done | \
537 537
 	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
538
-	      -e 's/$$/$(EXEEXT)/' \
539
-	`; \
538
+	      -e 's/$$/$(EXEEXT)/' `; \
540 539
 	test -n "$$list" || exit 0; \
541 540
 	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
542 541
 	cd "$(DESTDIR)$(bindir)" && rm -f $$files
... ...
@@ -565,7 +483,6 @@ installcheck-binPROGRAMS: $(bin_PROGRAMS)
565 565
 	    else echo "$$f does not support $$opt" 1>&2; bad=1; fi; \
566 566
 	  done; \
567 567
 	done; rm -f c$${pid}_.???; exit $$bad
568
-
569 568
 clamscan$(EXEEXT): $(clamscan_OBJECTS) $(clamscan_DEPENDENCIES) $(EXTRA_clamscan_DEPENDENCIES) 
570 569
 	@rm -f clamscan$(EXEEXT)
571 570
 	$(AM_V_CCLD)$(LINK) $(clamscan_OBJECTS) $(clamscan_LDADD) $(LIBS)
... ...
@@ -589,14 +506,14 @@ distclean-compile:
589 589
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
590 590
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
591 591
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
592
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
592
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
593 593
 
594 594
 .c.obj:
595 595
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
596 596
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
597 597
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
598 598
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
599
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
599
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
600 600
 
601 601
 .c.lo:
602 602
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
... ...
@@ -681,15 +598,26 @@ mostlyclean-libtool:
681 681
 clean-libtool:
682 682
 	-rm -rf .libs _libs
683 683
 
684
-ID: $(am__tagged_files)
685
-	$(am__define_uniq_tagged_files); mkid -fID $$unique
686
-tags: tags-am
687
-TAGS: tags
688
-
689
-tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
684
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
685
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
686
+	unique=`for i in $$list; do \
687
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
688
+	  done | \
689
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
690
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
691
+	mkid -fID $$unique
692
+tags: TAGS
693
+
694
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
695
+		$(TAGS_FILES) $(LISP)
690 696
 	set x; \
691 697
 	here=`pwd`; \
692
-	$(am__define_uniq_tagged_files); \
698
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
699
+	unique=`for i in $$list; do \
700
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
701
+	  done | \
702
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
703
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
693 704
 	shift; \
694 705
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
695 706
 	  test -n "$$unique" || unique=$$empty_fix; \
... ...
@@ -701,11 +629,15 @@ tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
701 701
 	      $$unique; \
702 702
 	  fi; \
703 703
 	fi
704
-ctags: ctags-am
705
-
706
-CTAGS: ctags
707
-ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
708
-	$(am__define_uniq_tagged_files); \
704
+ctags: CTAGS
705
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
706
+		$(TAGS_FILES) $(LISP)
707
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
708
+	unique=`for i in $$list; do \
709
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
710
+	  done | \
711
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
712
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
709 713
 	test -z "$(CTAGS_ARGS)$$unique" \
710 714
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
711 715
 	     $$unique
... ...
@@ -714,21 +646,6 @@ GTAGS:
714 714
 	here=`$(am__cd) $(top_builddir) && pwd` \
715 715
 	  && $(am__cd) $(top_srcdir) \
716 716
 	  && gtags -i $(GTAGS_ARGS) "$$here"
717
-cscopelist: cscopelist-am
718
-
719
-cscopelist-am: $(am__tagged_files)
720
-	list='$(am__tagged_files)'; \
721
-	case "$(srcdir)" in \
722
-	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
723
-	  *) sdir=$(subdir)/$(srcdir) ;; \
724
-	esac; \
725
-	for i in $$list; do \
726
-	  if test -f "$$i"; then \
727
-	    echo "$(subdir)/$$i"; \
728
-	  else \
729
-	    echo "$$sdir/$$i"; \
730
-	  fi; \
731
-	done >> $(top_builddir)/cscope.files
732 717
 
733 718
 distclean-tags:
734 719
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
... ...
@@ -873,20 +790,19 @@ uninstall-am: uninstall-binPROGRAMS
873 873
 
874 874
 .MAKE: install-am install-strip
875 875
 
876
-.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \
877
-	clean-binPROGRAMS clean-generic clean-libtool cscopelist-am \
878
-	ctags ctags-am distclean distclean-compile distclean-generic \
879
-	distclean-libtool distclean-tags distdir dvi dvi-am html \
880
-	html-am info info-am install install-am install-binPROGRAMS \
881
-	install-data install-data-am install-dvi install-dvi-am \
882
-	install-exec install-exec-am install-html install-html-am \
883
-	install-info install-info-am install-man install-pdf \
884
-	install-pdf-am install-ps install-ps-am install-strip \
885
-	installcheck installcheck-am installcheck-binPROGRAMS \
886
-	installdirs maintainer-clean maintainer-clean-generic \
887
-	mostlyclean mostlyclean-compile mostlyclean-generic \
888
-	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
889
-	uninstall-am uninstall-binPROGRAMS
876
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
877
+	clean-generic clean-libtool ctags distclean distclean-compile \
878
+	distclean-generic distclean-libtool distclean-tags distdir dvi \
879
+	dvi-am html html-am info info-am install install-am \
880
+	install-binPROGRAMS install-data install-data-am install-dvi \
881
+	install-dvi-am install-exec install-exec-am install-html \
882
+	install-html-am install-info install-info-am install-man \
883
+	install-pdf install-pdf-am install-ps install-ps-am \
884
+	install-strip installcheck installcheck-am \
885
+	installcheck-binPROGRAMS installdirs maintainer-clean \
886
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
887
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
888
+	tags uninstall uninstall-am uninstall-binPROGRAMS
890 889
 
891 890
 
892 891
 # 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 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 \
... ...
@@ -184,19 +139,6 @@ clamsubmit_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 +151,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 = $(clamsubmit_SOURCES)
223 227
 DIST_SOURCES = $(clamsubmit_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)
... ...
@@ -496,19 +420,14 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
496 496
 $(am__aclocal_m4_deps):
497 497
 install-binPROGRAMS: $(bin_PROGRAMS)
498 498
 	@$(NORMAL_INSTALL)
499
+	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
499 500
 	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
500
-	if test -n "$$list"; then \
501
-	  echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
502
-	  $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
503
-	fi; \
504 501
 	for p in $$list; do echo "$$p $$p"; done | \
505 502
 	sed 's/$(EXEEXT)$$//' | \
506
-	while read p p1; do if test -f $$p \
507
-	 || test -f $$p1 \
508
-	  ; then echo "$$p"; echo "$$p"; else :; fi; \
503
+	while read p p1; do if test -f $$p || test -f $$p1; \
504
+	  then echo "$$p"; echo "$$p"; else :; fi; \
509 505
 	done | \
510
-	sed -e 'p;s,.*/,,;n;h' \
511
-	    -e 's|.*|.|' \
506
+	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
512 507
 	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
513 508
 	sed 'N;N;N;s,\n, ,g' | \
514 509
 	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
... ...
@@ -529,8 +448,7 @@ uninstall-binPROGRAMS:
529 529
 	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
530 530
 	files=`for p in $$list; do echo "$$p"; done | \
531 531
 	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
532
-	      -e 's/$$/$(EXEEXT)/' \
533
-	`; \
532
+	      -e 's/$$/$(EXEEXT)/' `; \
534 533
 	test -n "$$list" || exit 0; \
535 534
 	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
536 535
 	cd "$(DESTDIR)$(bindir)" && rm -f $$files
... ...
@@ -559,7 +477,6 @@ installcheck-binPROGRAMS: $(bin_PROGRAMS)
559 559
 	    else echo "$$f does not support $$opt" 1>&2; bad=1; fi; \
560 560
 	  done; \
561 561
 	done; rm -f c$${pid}_.???; exit $$bad
562
-
563 562
 clamsubmit$(EXEEXT): $(clamsubmit_OBJECTS) $(clamsubmit_DEPENDENCIES) $(EXTRA_clamsubmit_DEPENDENCIES) 
564 563
 	@rm -f clamsubmit$(EXEEXT)
565 564
 	$(AM_V_CCLD)$(LINK) $(clamsubmit_OBJECTS) $(clamsubmit_LDADD) $(LIBS)
... ...
@@ -581,14 +498,14 @@ distclean-compile:
581 581
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
582 582
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
583 583
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
584
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
584
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
585 585
 
586 586
 .c.obj:
587 587
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
588 588
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
589 589
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
590 590
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
591
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
591
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
592 592
 
593 593
 .c.lo:
594 594
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
... ...
@@ -659,15 +576,26 @@ mostlyclean-libtool:
659 659
 clean-libtool:
660 660
 	-rm -rf .libs _libs
661 661
 
662
-ID: $(am__tagged_files)
663
-	$(am__define_uniq_tagged_files); mkid -fID $$unique
664
-tags: tags-am
665
-TAGS: tags
666
-
667
-tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
662
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
663
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
664
+	unique=`for i in $$list; do \
665
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
666
+	  done | \
667
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
668
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
669
+	mkid -fID $$unique
670
+tags: TAGS
671
+
672
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
673
+		$(TAGS_FILES) $(LISP)
668 674
 	set x; \
669 675
 	here=`pwd`; \
670
-	$(am__define_uniq_tagged_files); \
676
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
677
+	unique=`for i in $$list; do \
678
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
679
+	  done | \
680
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
681
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
671 682
 	shift; \
672 683
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
673 684
 	  test -n "$$unique" || unique=$$empty_fix; \
... ...
@@ -679,11 +607,15 @@ tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
679 679
 	      $$unique; \
680 680
 	  fi; \
681 681
 	fi
682
-ctags: ctags-am
683
-
684
-CTAGS: ctags
685
-ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
686
-	$(am__define_uniq_tagged_files); \
682
+ctags: CTAGS
683
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
684
+		$(TAGS_FILES) $(LISP)
685
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
686
+	unique=`for i in $$list; do \
687
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
688
+	  done | \
689
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
690
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
687 691
 	test -z "$(CTAGS_ARGS)$$unique" \
688 692
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
689 693
 	     $$unique
... ...
@@ -692,21 +624,6 @@ GTAGS:
692 692
 	here=`$(am__cd) $(top_builddir) && pwd` \
693 693
 	  && $(am__cd) $(top_srcdir) \
694 694
 	  && gtags -i $(GTAGS_ARGS) "$$here"
695
-cscopelist: cscopelist-am
696
-
697
-cscopelist-am: $(am__tagged_files)
698
-	list='$(am__tagged_files)'; \
699
-	case "$(srcdir)" in \
700
-	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
701
-	  *) sdir=$(subdir)/$(srcdir) ;; \
702
-	esac; \
703
-	for i in $$list; do \
704
-	  if test -f "$$i"; then \
705
-	    echo "$(subdir)/$$i"; \
706
-	  else \
707
-	    echo "$$sdir/$$i"; \
708
-	  fi; \
709
-	done >> $(top_builddir)/cscope.files
710 695
 
711 696
 distclean-tags:
712 697
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
... ...
@@ -851,20 +768,19 @@ uninstall-am: uninstall-binPROGRAMS
851 851
 
852 852
 .MAKE: install-am install-strip
853 853
 
854
-.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \
855
-	clean-binPROGRAMS clean-generic clean-libtool cscopelist-am \
856
-	ctags ctags-am distclean distclean-compile distclean-generic \
857
-	distclean-libtool distclean-tags distdir dvi dvi-am html \
858
-	html-am info info-am install install-am install-binPROGRAMS \
859
-	install-data install-data-am install-dvi install-dvi-am \
860
-	install-exec install-exec-am install-html install-html-am \
861
-	install-info install-info-am install-man install-pdf \
862
-	install-pdf-am install-ps install-ps-am install-strip \
863
-	installcheck installcheck-am installcheck-binPROGRAMS \
864
-	installdirs maintainer-clean maintainer-clean-generic \
865
-	mostlyclean mostlyclean-compile mostlyclean-generic \
866
-	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
867
-	uninstall-am uninstall-binPROGRAMS
854
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
855
+	clean-generic clean-libtool ctags distclean distclean-compile \
856
+	distclean-generic distclean-libtool distclean-tags distdir dvi \
857
+	dvi-am html html-am info info-am install install-am \
858
+	install-binPROGRAMS install-data install-data-am install-dvi \
859
+	install-dvi-am install-exec install-exec-am install-html \
860
+	install-html-am install-info install-info-am install-man \
861
+	install-pdf install-pdf-am install-ps install-ps-am \
862
+	install-strip installcheck installcheck-am \
863
+	installcheck-binPROGRAMS installdirs maintainer-clean \
864
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
865
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
866
+	tags uninstall uninstall-am uninstall-binPROGRAMS
868 867
 
869 868
 
870 869
 # 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'"
... ...
@@ -1393,6 +1373,8 @@ target=$target_alias
1393 1393
 if test "x$host_alias" != x; then
1394 1394
   if test "x$build_alias" = x; then
1395 1395
     cross_compiling=maybe
1396
+    $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
1397
+    If a cross compiler is detected then cross compile mode will be used" >&2
1396 1398
   elif test "x$build_alias" != "x$host_alias"; then
1397 1399
     cross_compiling=yes
1398 1400
   fi
... ...
@@ -1557,12 +1539,10 @@ Optional Features:
1557 1557
   --disable-option-checking  ignore unrecognized --enable/--with options
1558 1558
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
1559 1559
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
1560
-  --enable-silent-rules   less verbose build output (undo: "make V=1")
1561
-  --disable-silent-rules  verbose build output (undo: "make V=0")
1562
-  --enable-dependency-tracking
1563
-                          do not reject slow dependency extractors
1564
-  --disable-dependency-tracking
1565
-                          speeds up one-time build
1560
+  --enable-silent-rules          less verbose build output (undo: `make V=1')
1561
+  --disable-silent-rules         verbose build output (undo: `make V=0')
1562
+  --disable-dependency-tracking  speeds up one-time build
1563
+  --enable-dependency-tracking   do not reject slow dependency extractors
1566 1564
   --enable-static[=PKGS]  build static libraries [default=no]
1567 1565
   --enable-shared[=PKGS]  build shared libraries [default=yes]
1568 1566
   --enable-fast-install[=PKGS]
... ...
@@ -1736,9 +1716,9 @@ test -n "$ac_init_help" && exit $ac_status
1736 1736
 if $ac_init_version; then
1737 1737
   cat <<\_ACEOF
1738 1738
 ClamAV configure devel
1739
-generated by GNU Autoconf 2.69
1739
+generated by GNU Autoconf 2.68
1740 1740
 
1741
-Copyright (C) 2012 Free Software Foundation, Inc.
1741
+Copyright (C) 2010 Free Software Foundation, Inc.
1742 1742
 This configure script is free software; the Free Software Foundation
1743 1743
 gives unlimited permission to copy, distribute and modify it.
1744 1744
 _ACEOF
... ...
@@ -2015,7 +1995,7 @@ $as_echo "$ac_try_echo"; } >&5
2015 2015
 	 test ! -s conftest.err
2016 2016
        } && test -s conftest$ac_exeext && {
2017 2017
 	 test "$cross_compiling" = yes ||
2018
-	 test -x conftest$ac_exeext
2018
+	 $as_test_x conftest$ac_exeext
2019 2019
        }; then :
2020 2020
   ac_retval=0
2021 2021
 else
... ...
@@ -2205,7 +2185,7 @@ This file contains any messages produced by compilers while
2205 2205
 running configure, to aid debugging if configure makes a mistake.
2206 2206
 
2207 2207
 It was created by ClamAV $as_me devel, which was
2208
-generated by GNU Autoconf 2.69.  Invocation command line was
2208
+generated by GNU Autoconf 2.68.  Invocation command line was
2209 2209
 
2210 2210
   $ $0 $@
2211 2211
 
... ...
@@ -2887,7 +2867,7 @@ done
2887 2887
 
2888 2888
 
2889 2889
 
2890
-am__api_version='1.14'
2890
+am__api_version='1.11'
2891 2891
 
2892 2892
 # Find a good install program.  We prefer a C program (faster),
2893 2893
 # so one script is as good as another.  But avoid the broken or
... ...
@@ -2926,7 +2906,7 @@ case $as_dir/ in #((
2926 2926
     # by default.
2927 2927
     for ac_prog in ginstall scoinst install; do
2928 2928
       for ac_exec_ext in '' $ac_executable_extensions; do
2929
-	if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
2929
+	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
2930 2930
 	  if test $ac_prog = install &&
2931 2931
 	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
2932 2932
 	    # AIX install.  It has an incompatible calling convention.
... ...
@@ -2984,6 +2964,9 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
2984 2984
 
2985 2985
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
2986 2986
 $as_echo_n "checking whether build environment is sane... " >&6; }
2987
+# Just in case
2988
+sleep 1
2989
+echo timestamp > conftest.file
2987 2990
 # Reject unsafe characters in $srcdir or the absolute working directory
2988 2991
 # name.  Accept space and tab only in the latter.
2989 2992
 am_lf='
... ...
@@ -2994,40 +2977,32 @@ case `pwd` in
2994 2994
 esac
2995 2995
 case $srcdir in
2996 2996
   *[\\\"\#\$\&\'\`$am_lf\ \	]*)
2997
-    as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;;
2997
+    as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
2998 2998
 esac
2999 2999
 
3000
-# Do 'set' in a subshell so we don't clobber the current shell's
3000
+# Do `set' in a subshell so we don't clobber the current shell's
3001 3001
 # arguments.  Must try -L first in case configure is actually a
3002 3002
 # symlink; some systems play weird games with the mod time of symlinks
3003 3003
 # (eg FreeBSD returns the mod time of the symlink's containing
3004 3004
 # directory).
3005 3005
 if (
3006
-   am_has_slept=no
3007
-   for am_try in 1 2; do
3008
-     echo "timestamp, slept: $am_has_slept" > conftest.file
3009
-     set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
3010
-     if test "$*" = "X"; then
3011
-	# -L didn't work.
3012
-	set X `ls -t "$srcdir/configure" conftest.file`
3013
-     fi
3014
-     if test "$*" != "X $srcdir/configure conftest.file" \
3015
-	&& test "$*" != "X conftest.file $srcdir/configure"; then
3016
-
3017
-	# If neither matched, then we have a broken ls.  This can happen
3018
-	# if, for instance, CONFIG_SHELL is bash and it inherits a
3019
-	# broken ls alias from the environment.  This has actually
3020
-	# happened.  Such a system could not be considered "sane".
3021
-	as_fn_error $? "ls -t appears to fail.  Make sure there is not a broken
3022
-  alias in your environment" "$LINENO" 5
3023
-     fi
3024
-     if test "$2" = conftest.file || test $am_try -eq 2; then
3025
-       break
3026
-     fi
3027
-     # Just in case.
3028
-     sleep 1
3029
-     am_has_slept=yes
3030
-   done
3006
+   set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
3007
+   if test "$*" = "X"; then
3008
+      # -L didn't work.
3009
+      set X `ls -t "$srcdir/configure" conftest.file`
3010
+   fi
3011
+   rm -f conftest.file
3012
+   if test "$*" != "X $srcdir/configure conftest.file" \
3013
+      && test "$*" != "X conftest.file $srcdir/configure"; then
3014
+
3015
+      # If neither matched, then we have a broken ls.  This can happen
3016
+      # if, for instance, CONFIG_SHELL is bash and it inherits a
3017
+      # broken ls alias from the environment.  This has actually
3018
+      # happened.  Such a system could not be considered "sane".
3019
+      as_fn_error $? "ls -t appears to fail.  Make sure there is not a broken
3020
+alias in your environment" "$LINENO" 5
3021
+   fi
3022
+
3031 3023
    test "$2" = conftest.file
3032 3024
    )
3033 3025
 then
... ...
@@ -3039,16 +3014,6 @@ Check your system clock" "$LINENO" 5
3039 3039
 fi
3040 3040
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
3041 3041
 $as_echo "yes" >&6; }
3042
-# If we didn't sleep, we still need to ensure time stamps of config.status and
3043
-# generated files are strictly newer.
3044
-am_sleep_pid=
3045
-if grep 'slept: no' conftest.file >/dev/null 2>&1; then
3046
-  ( sleep 1 ) &
3047
-  am_sleep_pid=$!
3048
-fi
3049
-
3050
-rm -f conftest.file
3051
-
3052 3042
 test "$program_prefix" != NONE &&
3053 3043
   program_transform_name="s&^&$program_prefix&;$program_transform_name"
3054 3044
 # Use a double $ so make ignores it.
... ...
@@ -3071,12 +3036,12 @@ if test x"${MISSING+set}" != xset; then
3071 3071
   esac
3072 3072
 fi
3073 3073
 # Use eval to expand $SHELL
3074
-if eval "$MISSING --is-lightweight"; then
3075
-  am_missing_run="$MISSING "
3074
+if eval "$MISSING --run true"; then
3075
+  am_missing_run="$MISSING --run "
3076 3076
 else
3077 3077
   am_missing_run=
3078
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5
3079
-$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
3078
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5
3079
+$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
3080 3080
 fi
3081 3081
 
3082 3082
 if test x"${install_sh}" != xset; then
... ...
@@ -3088,10 +3053,10 @@ if test x"${install_sh}" != xset; then
3088 3088
   esac
3089 3089
 fi
3090 3090
 
3091
-# Installed binaries are usually stripped using 'strip' when the user
3092
-# run "make install-strip".  However 'strip' might not be the right
3091
+# Installed binaries are usually stripped using `strip' when the user
3092
+# run `make install-strip'.  However `strip' might not be the right
3093 3093
 # tool to use in cross-compilation environments, therefore Automake
3094
-# will honor the 'STRIP' environment variable to overrule this program.
3094
+# will honor the `STRIP' environment variable to overrule this program.
3095 3095
 if test "$cross_compiling" != no; then
3096 3096
   if test -n "$ac_tool_prefix"; then
3097 3097
   # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
... ...
@@ -3110,7 +3075,7 @@ do
3110 3110
   IFS=$as_save_IFS
3111 3111
   test -z "$as_dir" && as_dir=.
3112 3112
     for ac_exec_ext in '' $ac_executable_extensions; do
3113
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
3113
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
3114 3114
     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
3115 3115
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
3116 3116
     break 2
... ...
@@ -3150,7 +3115,7 @@ do
3150 3150
   IFS=$as_save_IFS
3151 3151
   test -z "$as_dir" && as_dir=.
3152 3152
     for ac_exec_ext in '' $ac_executable_extensions; do
3153
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
3153
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
3154 3154
     ac_cv_prog_ac_ct_STRIP="strip"
3155 3155
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
3156 3156
     break 2
... ...
@@ -3201,7 +3166,7 @@ do
3201 3201
   test -z "$as_dir" && as_dir=.
3202 3202
     for ac_prog in mkdir gmkdir; do
3203 3203
 	 for ac_exec_ext in '' $ac_executable_extensions; do
3204
-	   as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue
3204
+	   { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
3205 3205
 	   case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
3206 3206
 	     'mkdir (GNU coreutils) '* | \
3207 3207
 	     'mkdir (coreutils) '* | \
... ...
@@ -3230,6 +3195,12 @@ fi
3230 3230
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
3231 3231
 $as_echo "$MKDIR_P" >&6; }
3232 3232
 
3233
+mkdir_p="$MKDIR_P"
3234
+case $mkdir_p in
3235
+  [\\/$]* | ?:[\\/]*) ;;
3236
+  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
3237
+esac
3238
+
3233 3239
 for ac_prog in gawk mawk nawk awk
3234 3240
 do
3235 3241
   # Extract the first word of "$ac_prog", so it can be a program name with args.
... ...
@@ -3248,7 +3219,7 @@ do
3248 3248
   IFS=$as_save_IFS
3249 3249
   test -z "$as_dir" && as_dir=.
3250 3250
     for ac_exec_ext in '' $ac_executable_extensions; do
3251
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
3251
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
3252 3252
     ac_cv_prog_AWK="$ac_prog"
3253 3253
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
3254 3254
     break 2
... ...
@@ -3312,45 +3283,6 @@ else
3312 3312
 fi
3313 3313
 rmdir .tst 2>/dev/null
3314 3314
 
3315
-# Check whether --enable-silent-rules was given.
3316
-if test "${enable_silent_rules+set}" = set; then :
3317
-  enableval=$enable_silent_rules;
3318
-fi
3319
-
3320
-case $enable_silent_rules in # (((
3321
-  yes) AM_DEFAULT_VERBOSITY=0;;
3322
-   no) AM_DEFAULT_VERBOSITY=1;;
3323
-    *) AM_DEFAULT_VERBOSITY=1;;
3324
-esac
3325
-am_make=${MAKE-make}
3326
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
3327
-$as_echo_n "checking whether $am_make supports nested variables... " >&6; }
3328
-if ${am_cv_make_support_nested_variables+:} false; then :
3329
-  $as_echo_n "(cached) " >&6
3330
-else
3331
-  if $as_echo 'TRUE=$(BAR$(V))
3332
-BAR0=false
3333
-BAR1=true
3334
-V=1
3335
-am__doit:
3336
-	@$(TRUE)
3337
-.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then
3338
-  am_cv_make_support_nested_variables=yes
3339
-else
3340
-  am_cv_make_support_nested_variables=no
3341
-fi
3342
-fi
3343
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
3344
-$as_echo "$am_cv_make_support_nested_variables" >&6; }
3345
-if test $am_cv_make_support_nested_variables = yes; then
3346
-    AM_V='$(V)'
3347
-  AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
3348
-else
3349
-  AM_V=$AM_DEFAULT_VERBOSITY
3350
-  AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
3351
-fi
3352
-AM_BACKSLASH='\'
3353
-
3354 3315
 if test "`cd $srcdir && pwd`" != "`pwd`"; then
3355 3316
   # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
3356 3317
   # is not polluted with repeated "-I."
... ...
@@ -3392,12 +3324,6 @@ AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
3392 3392
 
3393 3393
 MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
3394 3394
 
3395
-# For better backward compatibility.  To be removed once Automake 1.9.x
3396
-# dies out for good.  For more background, see:
3397
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
3398
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
3399
-mkdir_p='$(MKDIR_P)'
3400
-
3401 3395
 # We need awk for the "check" target.  The system "awk" is bad on
3402 3396
 # some platforms.
3403 3397
 # Always define AMTAR for backward compatibility.  Yes, it's still used
... ...
@@ -3405,182 +3331,101 @@ mkdir_p='$(MKDIR_P)'
3405 3405
 AMTAR='$${TAR-tar}'
3406 3406
 
3407 3407
 
3408
-# We'll loop over all known methods to create a tar archive until one works.
3409
-_am_tools='gnutar plaintar pax cpio none'
3410
-
3411
-# The POSIX 1988 'ustar' format is defined with fixed-size fields.
3412
-      # There is notably a 21 bits limit for the UID and the GID.  In fact,
3413
-      # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343
3414
-      # and bug#13588).
3415
-      am_max_uid=2097151 # 2^21 - 1
3416
-      am_max_gid=$am_max_uid
3417
-      # The $UID and $GID variables are not portable, so we need to resort
3418
-      # to the POSIX-mandated id(1) utility.  Errors in the 'id' calls
3419
-      # below are definitely unexpected, so allow the users to see them
3420
-      # (that is, avoid stderr redirection).
3421
-      am_uid=`id -u || echo unknown`
3422
-      am_gid=`id -g || echo unknown`
3423
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether UID '$am_uid' is supported by ustar format" >&5
3424
-$as_echo_n "checking whether UID '$am_uid' is supported by ustar format... " >&6; }
3425
-      if test $am_uid -le $am_max_uid; then
3426
-         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
3427
-$as_echo "yes" >&6; }
3428
-      else
3429
-         { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
3430
-$as_echo "no" >&6; }
3431
-         _am_tools=none
3432
-      fi
3433
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether GID '$am_gid' is supported by ustar format" >&5
3434
-$as_echo_n "checking whether GID '$am_gid' is supported by ustar format... " >&6; }
3435
-      if test $am_gid -le $am_max_gid; then
3436
-         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
3437
-$as_echo "yes" >&6; }
3438
-      else
3439
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
3440
-$as_echo "no" >&6; }
3441
-        _am_tools=none
3442
-      fi
3443
-
3444
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to create a ustar tar archive" >&5
3408
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to create a ustar tar archive" >&5
3445 3409
 $as_echo_n "checking how to create a ustar tar archive... " >&6; }
3446
-
3447
-  # Go ahead even if we have the value already cached.  We do so because we
3448
-  # need to set the values for the 'am__tar' and 'am__untar' variables.
3449
-  _am_tools=${am_cv_prog_tar_ustar-$_am_tools}
3450
-
3451
-  for _am_tool in $_am_tools; do
3452
-    case $_am_tool in
3453
-    gnutar)
3454
-      for _am_tar in tar gnutar gtar; do
3455
-        { echo "$as_me:$LINENO: $_am_tar --version" >&5
3410
+# Loop over all known methods to create a tar archive until one works.
3411
+_am_tools='gnutar plaintar pax cpio none'
3412
+_am_tools=${am_cv_prog_tar_ustar-$_am_tools}
3413
+# Do not fold the above two line into one, because Tru64 sh and
3414
+# Solaris sh will not grok spaces in the rhs of `-'.
3415
+for _am_tool in $_am_tools
3416
+do
3417
+  case $_am_tool in
3418
+  gnutar)
3419
+    for _am_tar in tar gnutar gtar;
3420
+    do
3421
+      { echo "$as_me:$LINENO: $_am_tar --version" >&5
3456 3422
    ($_am_tar --version) >&5 2>&5
3457 3423
    ac_status=$?
3458 3424
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
3459 3425
    (exit $ac_status); } && break
3460
-      done
3461
-      am__tar="$_am_tar --format=ustar -chf - "'"$$tardir"'
3462
-      am__tar_="$_am_tar --format=ustar -chf - "'"$tardir"'
3463
-      am__untar="$_am_tar -xf -"
3464
-      ;;
3465
-    plaintar)
3466
-      # Must skip GNU tar: if it does not support --format= it doesn't create
3467
-      # ustar tarball either.
3468
-      (tar --version) >/dev/null 2>&1 && continue
3469
-      am__tar='tar chf - "$$tardir"'
3470
-      am__tar_='tar chf - "$tardir"'
3471
-      am__untar='tar xf -'
3472
-      ;;
3473
-    pax)
3474
-      am__tar='pax -L -x ustar -w "$$tardir"'
3475
-      am__tar_='pax -L -x ustar -w "$tardir"'
3476
-      am__untar='pax -r'
3477
-      ;;
3478
-    cpio)
3479
-      am__tar='find "$$tardir" -print | cpio -o -H ustar -L'
3480
-      am__tar_='find "$tardir" -print | cpio -o -H ustar -L'
3481
-      am__untar='cpio -i -H ustar -d'
3482
-      ;;
3483
-    none)
3484
-      am__tar=false
3485
-      am__tar_=false
3486
-      am__untar=false
3487
-      ;;
3488
-    esac
3426
+    done
3427
+    am__tar="$_am_tar --format=ustar -chf - "'"$$tardir"'
3428
+    am__tar_="$_am_tar --format=ustar -chf - "'"$tardir"'
3429
+    am__untar="$_am_tar -xf -"
3430
+    ;;
3431
+  plaintar)
3432
+    # Must skip GNU tar: if it does not support --format= it doesn't create
3433
+    # ustar tarball either.
3434
+    (tar --version) >/dev/null 2>&1 && continue
3435
+    am__tar='tar chf - "$$tardir"'
3436
+    am__tar_='tar chf - "$tardir"'
3437
+    am__untar='tar xf -'
3438
+    ;;
3439
+  pax)
3440
+    am__tar='pax -L -x ustar -w "$$tardir"'
3441
+    am__tar_='pax -L -x ustar -w "$tardir"'
3442
+    am__untar='pax -r'
3443
+    ;;
3444
+  cpio)
3445
+    am__tar='find "$$tardir" -print | cpio -o -H ustar -L'
3446
+    am__tar_='find "$tardir" -print | cpio -o -H ustar -L'
3447
+    am__untar='cpio -i -H ustar -d'
3448
+    ;;
3449
+  none)
3450
+    am__tar=false
3451
+    am__tar_=false
3452
+    am__untar=false
3453
+    ;;
3454
+  esac
3489 3455
 
3490
-    # If the value was cached, stop now.  We just wanted to have am__tar
3491
-    # and am__untar set.
3492
-    test -n "${am_cv_prog_tar_ustar}" && break
3456
+  # If the value was cached, stop now.  We just wanted to have am__tar
3457
+  # and am__untar set.
3458
+  test -n "${am_cv_prog_tar_ustar}" && break
3493 3459
 
3494
-    # tar/untar a dummy directory, and stop if the command works.
3495
-    rm -rf conftest.dir
3496
-    mkdir conftest.dir
3497
-    echo GrepMe > conftest.dir/file
3498
-    { echo "$as_me:$LINENO: tardir=conftest.dir && eval $am__tar_ >conftest.tar" >&5
3460
+  # tar/untar a dummy directory, and stop if the command works
3461
+  rm -rf conftest.dir
3462
+  mkdir conftest.dir
3463
+  echo GrepMe > conftest.dir/file
3464
+  { echo "$as_me:$LINENO: tardir=conftest.dir && eval $am__tar_ >conftest.tar" >&5
3499 3465
    (tardir=conftest.dir && eval $am__tar_ >conftest.tar) >&5 2>&5
3500 3466
    ac_status=$?
3501 3467
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
3502 3468
    (exit $ac_status); }
3503
-    rm -rf conftest.dir
3504
-    if test -s conftest.tar; then
3505
-      { echo "$as_me:$LINENO: $am__untar <conftest.tar" >&5
3469
+  rm -rf conftest.dir
3470
+  if test -s conftest.tar; then
3471
+    { echo "$as_me:$LINENO: $am__untar <conftest.tar" >&5
3506 3472
    ($am__untar <conftest.tar) >&5 2>&5
3507 3473
    ac_status=$?
3508 3474
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
3509 3475
    (exit $ac_status); }
3510
-      { echo "$as_me:$LINENO: cat conftest.dir/file" >&5
3511
-   (cat conftest.dir/file) >&5 2>&5
3512
-   ac_status=$?
3513
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
3514
-   (exit $ac_status); }
3515
-      grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
3516
-    fi
3517
-  done
3518
-  rm -rf conftest.dir
3476
+    grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
3477
+  fi
3478
+done
3479
+rm -rf conftest.dir
3519 3480
 
3520
-  if ${am_cv_prog_tar_ustar+:} false; then :
3481
+if ${am_cv_prog_tar_ustar+:} false; then :
3521 3482
   $as_echo_n "(cached) " >&6
3522 3483
 else
3523 3484
   am_cv_prog_tar_ustar=$_am_tool
3524 3485
 fi
3525 3486
 
3526
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_tar_ustar" >&5
3487
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_tar_ustar" >&5
3527 3488
 $as_echo "$am_cv_prog_tar_ustar" >&6; }
3528 3489
 
3529 3490
 
3530 3491
 
3531 3492
 
3532 3493
 
3533
-
3534
-# POSIX will say in a future version that running "rm -f" with no argument
3535
-# is OK; and we want to be able to make that assumption in our Makefile
3536
-# recipes.  So use an aggressive probe to check that the usage we want is
3537
-# actually supported "in the wild" to an acceptable degree.
3538
-# See automake bug#10828.
3539
-# To make any issue more visible, cause the running configure to be aborted
3540
-# by default if the 'rm' program in use doesn't match our expectations; the
3541
-# user can still override this though.
3542
-if rm -f && rm -fr && rm -rf; then : OK; else
3543
-  cat >&2 <<'END'
3544
-Oops!
3545
-
3546
-Your 'rm' program seems unable to run without file operands specified
3547
-on the command line, even when the '-f' option is present.  This is contrary
3548
-to the behaviour of most rm programs out there, and not conforming with
3549
-the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
3550
-
3551
-Please tell bug-automake@gnu.org about your system, including the value
3552
-of your $PATH and any error possibly output before this message.  This
3553
-can help us improve future automake versions.
3554
-
3555
-END
3556
-  if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
3557
-    echo 'Configuration will proceed anyway, since you have set the' >&2
3558
-    echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
3559
-    echo >&2
3560
-  else
3561
-    cat >&2 <<'END'
3562
-Aborting the configuration process, to ensure you take notice of the issue.
3563
-
3564
-You can download and install GNU coreutils to get an 'rm' implementation
3565
-that behaves properly: <http://www.gnu.org/software/coreutils/>.
3566
-
3567
-If you want to complete the configuration process using your problematic
3568
-'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
3569
-to "yes", and re-run configure.
3570
-
3571
-END
3572
-    as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5
3573
-  fi
3574
-fi
3575 3494
 # Check whether --enable-silent-rules was given.
3576 3495
 if test "${enable_silent_rules+set}" = set; then :
3577 3496
   enableval=$enable_silent_rules;
3578 3497
 fi
3579 3498
 
3580
-case $enable_silent_rules in # (((
3581
-  yes) AM_DEFAULT_VERBOSITY=0;;
3582
-   no) AM_DEFAULT_VERBOSITY=1;;
3583
-    *) AM_DEFAULT_VERBOSITY=0;;
3499
+case $enable_silent_rules in
3500
+yes) AM_DEFAULT_VERBOSITY=0;;
3501
+no)  AM_DEFAULT_VERBOSITY=1;;
3502
+*)   AM_DEFAULT_VERBOSITY=0;;
3584 3503
 esac
3585 3504
 am_make=${MAKE-make}
3586 3505
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
... ...
@@ -3634,7 +3479,7 @@ am__quote=
3634 3634
 _am_result=none
3635 3635
 # First try GNU make style include.
3636 3636
 echo "include confinc" > confmf
3637
-# Ignore all kinds of additional output from 'make'.
3637
+# Ignore all kinds of additional output from `make'.
3638 3638
 case `$am_make -s -f confmf 2> /dev/null` in #(
3639 3639
 *the\ am__doit\ target*)
3640 3640
   am__include=include
... ...
@@ -3700,7 +3545,7 @@ do
3700 3700
   IFS=$as_save_IFS
3701 3701
   test -z "$as_dir" && as_dir=.
3702 3702
     for ac_exec_ext in '' $ac_executable_extensions; do
3703
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
3703
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
3704 3704
     ac_cv_prog_CC="${ac_tool_prefix}gcc"
3705 3705
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
3706 3706
     break 2
... ...
@@ -3740,7 +3585,7 @@ do
3740 3740
   IFS=$as_save_IFS
3741 3741
   test -z "$as_dir" && as_dir=.
3742 3742
     for ac_exec_ext in '' $ac_executable_extensions; do
3743
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
3743
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
3744 3744
     ac_cv_prog_ac_ct_CC="gcc"
3745 3745
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
3746 3746
     break 2
... ...
@@ -3793,7 +3638,7 @@ do
3793 3793
   IFS=$as_save_IFS
3794 3794
   test -z "$as_dir" && as_dir=.
3795 3795
     for ac_exec_ext in '' $ac_executable_extensions; do
3796
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
3796
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
3797 3797
     ac_cv_prog_CC="${ac_tool_prefix}cc"
3798 3798
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
3799 3799
     break 2
... ...
@@ -3834,7 +3679,7 @@ do
3834 3834
   IFS=$as_save_IFS
3835 3835
   test -z "$as_dir" && as_dir=.
3836 3836
     for ac_exec_ext in '' $ac_executable_extensions; do
3837
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
3837
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
3838 3838
     if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
3839 3839
        ac_prog_rejected=yes
3840 3840
        continue
... ...
@@ -3892,7 +3737,7 @@ do
3892 3892
   IFS=$as_save_IFS
3893 3893
   test -z "$as_dir" && as_dir=.
3894 3894
     for ac_exec_ext in '' $ac_executable_extensions; do
3895
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
3895
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
3896 3896
     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
3897 3897
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
3898 3898
     break 2
... ...
@@ -3936,7 +3781,7 @@ do
3936 3936
   IFS=$as_save_IFS
3937 3937
   test -z "$as_dir" && as_dir=.
3938 3938
     for ac_exec_ext in '' $ac_executable_extensions; do
3939
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
3939
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
3940 3940
     ac_cv_prog_ac_ct_CC="$ac_prog"
3941 3941
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
3942 3942
     break 2
... ...
@@ -4382,7 +4227,8 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
4382 4382
 /* end confdefs.h.  */
4383 4383
 #include <stdarg.h>
4384 4384
 #include <stdio.h>
4385
-struct stat;
4385
+#include <sys/types.h>
4386
+#include <sys/stat.h>
4386 4387
 /* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
4387 4388
 struct buf { int x; };
4388 4389
 FILE * (*rcsopen) (struct buf *, struct stat *, int);
... ...
@@ -4467,65 +4313,6 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
4467 4467
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
4468 4468
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
4469 4469
 
4470
-ac_ext=c
4471
-ac_cpp='$CPP $CPPFLAGS'
4472
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
4473
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
4474
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
4475
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5
4476
-$as_echo_n "checking whether $CC understands -c and -o together... " >&6; }
4477
-if ${am_cv_prog_cc_c_o+:} false; then :
4478
-  $as_echo_n "(cached) " >&6
4479
-else
4480
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
4481
-/* end confdefs.h.  */
4482
-
4483
-int
4484
-main ()
4485
-{
4486
-
4487
-  ;
4488
-  return 0;
4489
-}
4490
-_ACEOF
4491
-  # Make sure it works both with $CC and with simple cc.
4492
-  # Following AC_PROG_CC_C_O, we do the test twice because some
4493
-  # compilers refuse to overwrite an existing .o file with -o,
4494
-  # though they will create one.
4495
-  am_cv_prog_cc_c_o=yes
4496
-  for am_i in 1 2; do
4497
-    if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5
4498
-   ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5
4499
-   ac_status=$?
4500
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
4501
-   (exit $ac_status); } \
4502
-         && test -f conftest2.$ac_objext; then
4503
-      : OK
4504
-    else
4505
-      am_cv_prog_cc_c_o=no
4506
-      break
4507
-    fi
4508
-  done
4509
-  rm -f core conftest*
4510
-  unset am_i
4511
-fi
4512
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5
4513
-$as_echo "$am_cv_prog_cc_c_o" >&6; }
4514
-if test "$am_cv_prog_cc_c_o" != yes; then
4515
-   # Losing compiler, so override with the script.
4516
-   # FIXME: It is wrong to rewrite CC.
4517
-   # But if we don't then we get into trouble of one sort or another.
4518
-   # A longer-term fix would be to have automake use am__CC in this case,
4519
-   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
4520
-   CC="$am_aux_dir/compile $CC"
4521
-fi
4522
-ac_ext=c
4523
-ac_cpp='$CPP $CPPFLAGS'
4524
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
4525
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
4526
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
4527
-
4528
-
4529 4470
 depcc="$CC"   am_compiler_list=
4530 4471
 
4531 4472
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
... ...
@@ -4537,8 +4324,8 @@ else
4537 4537
   # We make a subdir and do the tests there.  Otherwise we can end up
4538 4538
   # making bogus files that we don't know about and never remove.  For
4539 4539
   # instance it was reported that on HP-UX the gcc test will end up
4540
-  # making a dummy file named 'D' -- because '-MD' means "put the output
4541
-  # in D".
4540
+  # making a dummy file named `D' -- because `-MD' means `put the output
4541
+  # in D'.
4542 4542
   rm -rf conftest.dir
4543 4543
   mkdir conftest.dir
4544 4544
   # Copy depcomp to subdir because otherwise we won't find it if we're
... ...
@@ -4573,16 +4360,16 @@ else
4573 4573
     : > sub/conftest.c
4574 4574
     for i in 1 2 3 4 5 6; do
4575 4575
       echo '#include "conftst'$i'.h"' >> sub/conftest.c
4576
-      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
4577
-      # Solaris 10 /bin/sh.
4578
-      echo '/* dummy */' > sub/conftst$i.h
4576
+      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
4577
+      # Solaris 8's {/usr,}/bin/sh.
4578
+      touch sub/conftst$i.h
4579 4579
     done
4580 4580
     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
4581 4581
 
4582
-    # We check with '-c' and '-o' for the sake of the "dashmstdout"
4582
+    # We check with `-c' and `-o' for the sake of the "dashmstdout"
4583 4583
     # mode.  It turns out that the SunPro C++ compiler does not properly
4584
-    # handle '-M -o', and we need to detect this.  Also, some Intel
4585
-    # versions had trouble with output in subdirs.
4584
+    # handle `-M -o', and we need to detect this.  Also, some Intel
4585
+    # versions had trouble with output in subdirs
4586 4586
     am__obj=sub/conftest.${OBJEXT-o}
4587 4587
     am__minus_obj="-o $am__obj"
4588 4588
     case $depmode in
... ...
@@ -4591,8 +4378,8 @@ else
4591 4591
       test "$am__universal" = false || continue
4592 4592
       ;;
4593 4593
     nosideeffect)
4594
-      # After this tag, mechanisms are not by side-effect, so they'll
4595
-      # only be used when explicitly requested.
4594
+      # after this tag, mechanisms are not by side-effect, so they'll
4595
+      # only be used when explicitly requested
4596 4596
       if test "x$enable_dependency_tracking" = xyes; then
4597 4597
 	continue
4598 4598
       else
... ...
@@ -4600,7 +4387,7 @@ else
4600 4600
       fi
4601 4601
       ;;
4602 4602
     msvc7 | msvc7msys | msvisualcpp | msvcmsys)
4603
-      # This compiler won't grok '-c -o', but also, the minuso test has
4603
+      # This compiler won't grok `-c -o', but also, the minuso test has
4604 4604
       # not run yet.  These depmodes are late enough in the game, and
4605 4605
       # so weak that their functioning should not be impacted.
4606 4606
       am__obj=conftest.${OBJEXT-o}
... ...
@@ -4809,7 +4596,7 @@ do
4809 4809
     for ac_prog in grep ggrep; do
4810 4810
     for ac_exec_ext in '' $ac_executable_extensions; do
4811 4811
       ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
4812
-      as_fn_executable_p "$ac_path_GREP" || continue
4812
+      { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
4813 4813
 # Check for GNU ac_path_GREP and select it if it is found.
4814 4814
   # Check for GNU $ac_path_GREP
4815 4815
 case `"$ac_path_GREP" --version 2>&1` in
... ...
@@ -4875,7 +4662,7 @@ do
4875 4875
     for ac_prog in egrep; do
4876 4876
     for ac_exec_ext in '' $ac_executable_extensions; do
4877 4877
       ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
4878
-      as_fn_executable_p "$ac_path_EGREP" || continue
4878
+      { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
4879 4879
 # Check for GNU ac_path_EGREP and select it if it is found.
4880 4880
   # Check for GNU $ac_path_EGREP
4881 4881
 case `"$ac_path_EGREP" --version 2>&1` in
... ...
@@ -5082,8 +4869,8 @@ else
5082 5082
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
5083 5083
 /* end confdefs.h.  */
5084 5084
 
5085
-#         define __EXTENSIONS__ 1
5086
-          $ac_includes_default
5085
+#	  define __EXTENSIONS__ 1
5086
+	  $ac_includes_default
5087 5087
 int
5088 5088
 main ()
5089 5089
 {
... ...
@@ -5271,7 +5058,7 @@ do
5271 5271
     for ac_prog in sed gsed; do
5272 5272
     for ac_exec_ext in '' $ac_executable_extensions; do
5273 5273
       ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
5274
-      as_fn_executable_p "$ac_path_SED" || continue
5274
+      { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
5275 5275
 # Check for GNU ac_path_SED and select it if it is found.
5276 5276
   # Check for GNU $ac_path_SED
5277 5277
 case `"$ac_path_SED" --version 2>&1` in
... ...
@@ -5350,7 +5137,7 @@ do
5350 5350
     for ac_prog in fgrep; do
5351 5351
     for ac_exec_ext in '' $ac_executable_extensions; do
5352 5352
       ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
5353
-      as_fn_executable_p "$ac_path_FGREP" || continue
5353
+      { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue
5354 5354
 # Check for GNU ac_path_FGREP and select it if it is found.
5355 5355
   # Check for GNU $ac_path_FGREP
5356 5356
 case `"$ac_path_FGREP" --version 2>&1` in
... ...
@@ -5606,7 +5393,7 @@ do
5606 5606
   IFS=$as_save_IFS
5607 5607
   test -z "$as_dir" && as_dir=.
5608 5608
     for ac_exec_ext in '' $ac_executable_extensions; do
5609
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
5609
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
5610 5610
     ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog"
5611 5611
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
5612 5612
     break 2
... ...
@@ -5650,7 +5437,7 @@ do
5650 5650
   IFS=$as_save_IFS
5651 5651
   test -z "$as_dir" && as_dir=.
5652 5652
     for ac_exec_ext in '' $ac_executable_extensions; do
5653
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
5653
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
5654 5654
     ac_cv_prog_ac_ct_DUMPBIN="$ac_prog"
5655 5655
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
5656 5656
     break 2
... ...
@@ -6074,7 +5861,7 @@ do
6074 6074
   IFS=$as_save_IFS
6075 6075
   test -z "$as_dir" && as_dir=.
6076 6076
     for ac_exec_ext in '' $ac_executable_extensions; do
6077
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
6077
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
6078 6078
     ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
6079 6079
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
6080 6080
     break 2
... ...
@@ -6114,7 +5901,7 @@ do
6114 6114
   IFS=$as_save_IFS
6115 6115
   test -z "$as_dir" && as_dir=.
6116 6116
     for ac_exec_ext in '' $ac_executable_extensions; do
6117
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
6117
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
6118 6118
     ac_cv_prog_ac_ct_OBJDUMP="objdump"
6119 6119
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
6120 6120
     break 2
... ...
@@ -6420,7 +6207,7 @@ do
6420 6420
   IFS=$as_save_IFS
6421 6421
   test -z "$as_dir" && as_dir=.
6422 6422
     for ac_exec_ext in '' $ac_executable_extensions; do
6423
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
6423
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
6424 6424
     ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
6425 6425
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
6426 6426
     break 2
... ...
@@ -6460,7 +6247,7 @@ do
6460 6460
   IFS=$as_save_IFS
6461 6461
   test -z "$as_dir" && as_dir=.
6462 6462
     for ac_exec_ext in '' $ac_executable_extensions; do
6463
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
6463
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
6464 6464
     ac_cv_prog_ac_ct_DLLTOOL="dlltool"
6465 6465
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
6466 6466
     break 2
... ...
@@ -6563,7 +6350,7 @@ do
6563 6563
   IFS=$as_save_IFS
6564 6564
   test -z "$as_dir" && as_dir=.
6565 6565
     for ac_exec_ext in '' $ac_executable_extensions; do
6566
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
6566
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
6567 6567
     ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
6568 6568
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
6569 6569
     break 2
... ...
@@ -6607,7 +6394,7 @@ do
6607 6607
   IFS=$as_save_IFS
6608 6608
   test -z "$as_dir" && as_dir=.
6609 6609
     for ac_exec_ext in '' $ac_executable_extensions; do
6610
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
6610
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
6611 6611
     ac_cv_prog_ac_ct_AR="$ac_prog"
6612 6612
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
6613 6613
     break 2
... ...
@@ -6732,7 +6519,7 @@ do
6732 6732
   IFS=$as_save_IFS
6733 6733
   test -z "$as_dir" && as_dir=.
6734 6734
     for ac_exec_ext in '' $ac_executable_extensions; do
6735
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
6735
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
6736 6736
     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
6737 6737
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
6738 6738
     break 2
... ...
@@ -6772,7 +6559,7 @@ do
6772 6772
   IFS=$as_save_IFS
6773 6773
   test -z "$as_dir" && as_dir=.
6774 6774
     for ac_exec_ext in '' $ac_executable_extensions; do
6775
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
6775
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
6776 6776
     ac_cv_prog_ac_ct_STRIP="strip"
6777 6777
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
6778 6778
     break 2
... ...
@@ -6831,7 +6618,7 @@ do
6831 6831
   IFS=$as_save_IFS
6832 6832
   test -z "$as_dir" && as_dir=.
6833 6833
     for ac_exec_ext in '' $ac_executable_extensions; do
6834
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
6834
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
6835 6835
     ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
6836 6836
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
6837 6837
     break 2
... ...
@@ -6871,7 +6658,7 @@ do
6871 6871
   IFS=$as_save_IFS
6872 6872
   test -z "$as_dir" && as_dir=.
6873 6873
     for ac_exec_ext in '' $ac_executable_extensions; do
6874
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
6874
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
6875 6875
     ac_cv_prog_ac_ct_RANLIB="ranlib"
6876 6876
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
6877 6877
     break 2
... ...
@@ -7520,7 +7307,7 @@ do
7520 7520
   IFS=$as_save_IFS
7521 7521
   test -z "$as_dir" && as_dir=.
7522 7522
     for ac_exec_ext in '' $ac_executable_extensions; do
7523
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
7523
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7524 7524
     ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
7525 7525
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7526 7526
     break 2
... ...
@@ -7560,7 +7347,7 @@ do
7560 7560
   IFS=$as_save_IFS
7561 7561
   test -z "$as_dir" && as_dir=.
7562 7562
     for ac_exec_ext in '' $ac_executable_extensions; do
7563
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
7563
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7564 7564
     ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
7565 7565
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7566 7566
     break 2
... ...
@@ -7640,7 +7427,7 @@ do
7640 7640
   IFS=$as_save_IFS
7641 7641
   test -z "$as_dir" && as_dir=.
7642 7642
     for ac_exec_ext in '' $ac_executable_extensions; do
7643
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
7643
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7644 7644
     ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
7645 7645
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7646 7646
     break 2
... ...
@@ -7680,7 +7467,7 @@ do
7680 7680
   IFS=$as_save_IFS
7681 7681
   test -z "$as_dir" && as_dir=.
7682 7682
     for ac_exec_ext in '' $ac_executable_extensions; do
7683
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
7683
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7684 7684
     ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
7685 7685
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7686 7686
     break 2
... ...
@@ -7732,7 +7519,7 @@ do
7732 7732
   IFS=$as_save_IFS
7733 7733
   test -z "$as_dir" && as_dir=.
7734 7734
     for ac_exec_ext in '' $ac_executable_extensions; do
7735
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
7735
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7736 7736
     ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
7737 7737
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7738 7738
     break 2
... ...
@@ -7772,7 +7559,7 @@ do
7772 7772
   IFS=$as_save_IFS
7773 7773
   test -z "$as_dir" && as_dir=.
7774 7774
     for ac_exec_ext in '' $ac_executable_extensions; do
7775
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
7775
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7776 7776
     ac_cv_prog_ac_ct_NMEDIT="nmedit"
7777 7777
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7778 7778
     break 2
... ...
@@ -7824,7 +7611,7 @@ do
7824 7824
   IFS=$as_save_IFS
7825 7825
   test -z "$as_dir" && as_dir=.
7826 7826
     for ac_exec_ext in '' $ac_executable_extensions; do
7827
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
7827
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7828 7828
     ac_cv_prog_LIPO="${ac_tool_prefix}lipo"
7829 7829
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7830 7830
     break 2
... ...
@@ -7864,7 +7651,7 @@ do
7864 7864
   IFS=$as_save_IFS
7865 7865
   test -z "$as_dir" && as_dir=.
7866 7866
     for ac_exec_ext in '' $ac_executable_extensions; do
7867
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
7867
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7868 7868
     ac_cv_prog_ac_ct_LIPO="lipo"
7869 7869
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7870 7870
     break 2
... ...
@@ -7916,7 +7703,7 @@ do
7916 7916
   IFS=$as_save_IFS
7917 7917
   test -z "$as_dir" && as_dir=.
7918 7918
     for ac_exec_ext in '' $ac_executable_extensions; do
7919
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
7919
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7920 7920
     ac_cv_prog_OTOOL="${ac_tool_prefix}otool"
7921 7921
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7922 7922
     break 2
... ...
@@ -7956,7 +7743,7 @@ do
7956 7956
   IFS=$as_save_IFS
7957 7957
   test -z "$as_dir" && as_dir=.
7958 7958
     for ac_exec_ext in '' $ac_executable_extensions; do
7959
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
7959
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7960 7960
     ac_cv_prog_ac_ct_OTOOL="otool"
7961 7961
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7962 7962
     break 2
... ...
@@ -8008,7 +7795,7 @@ do
8008 8008
   IFS=$as_save_IFS
8009 8009
   test -z "$as_dir" && as_dir=.
8010 8010
     for ac_exec_ext in '' $ac_executable_extensions; do
8011
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
8011
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
8012 8012
     ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64"
8013 8013
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
8014 8014
     break 2
... ...
@@ -8048,7 +7835,7 @@ do
8048 8048
   IFS=$as_save_IFS
8049 8049
   test -z "$as_dir" && as_dir=.
8050 8050
     for ac_exec_ext in '' $ac_executable_extensions; do
8051
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
8051
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
8052 8052
     ac_cv_prog_ac_ct_OTOOL64="otool64"
8053 8053
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
8054 8054
     break 2
... ...
@@ -13359,7 +13146,7 @@ do
13359 13359
   IFS=$as_save_IFS
13360 13360
   test -z "$as_dir" && as_dir=.
13361 13361
     for ac_exec_ext in '' $ac_executable_extensions; do
13362
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
13362
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
13363 13363
     ac_cv_prog_CC="${ac_tool_prefix}gcc"
13364 13364
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
13365 13365
     break 2
... ...
@@ -13399,7 +13186,7 @@ do
13399 13399
   IFS=$as_save_IFS
13400 13400
   test -z "$as_dir" && as_dir=.
13401 13401
     for ac_exec_ext in '' $ac_executable_extensions; do
13402
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
13402
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
13403 13403
     ac_cv_prog_ac_ct_CC="gcc"
13404 13404
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
13405 13405
     break 2
... ...
@@ -13452,7 +13239,7 @@ do
13452 13452
   IFS=$as_save_IFS
13453 13453
   test -z "$as_dir" && as_dir=.
13454 13454
     for ac_exec_ext in '' $ac_executable_extensions; do
13455
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
13455
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
13456 13456
     ac_cv_prog_CC="${ac_tool_prefix}cc"
13457 13457
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
13458 13458
     break 2
... ...
@@ -13493,7 +13280,7 @@ do
13493 13493
   IFS=$as_save_IFS
13494 13494
   test -z "$as_dir" && as_dir=.
13495 13495
     for ac_exec_ext in '' $ac_executable_extensions; do
13496
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
13496
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
13497 13497
     if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
13498 13498
        ac_prog_rejected=yes
13499 13499
        continue
... ...
@@ -13551,7 +13338,7 @@ do
13551 13551
   IFS=$as_save_IFS
13552 13552
   test -z "$as_dir" && as_dir=.
13553 13553
     for ac_exec_ext in '' $ac_executable_extensions; do
13554
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
13554
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
13555 13555
     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
13556 13556
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
13557 13557
     break 2
... ...
@@ -13595,7 +13382,7 @@ do
13595 13595
   IFS=$as_save_IFS
13596 13596
   test -z "$as_dir" && as_dir=.
13597 13597
     for ac_exec_ext in '' $ac_executable_extensions; do
13598
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
13598
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
13599 13599
     ac_cv_prog_ac_ct_CC="$ac_prog"
13600 13600
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
13601 13601
     break 2
... ...
@@ -13791,7 +13578,8 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
13791 13791
 /* end confdefs.h.  */
13792 13792
 #include <stdarg.h>
13793 13793
 #include <stdio.h>
13794
-struct stat;
13794
+#include <sys/types.h>
13795
+#include <sys/stat.h>
13795 13796
 /* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
13796 13797
 struct buf { int x; };
13797 13798
 FILE * (*rcsopen) (struct buf *, struct stat *, int);
... ...
@@ -13876,65 +13664,6 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
13876 13876
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
13877 13877
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
13878 13878
 
13879
-ac_ext=c
13880
-ac_cpp='$CPP $CPPFLAGS'
13881
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
13882
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
13883
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
13884
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5
13885
-$as_echo_n "checking whether $CC understands -c and -o together... " >&6; }
13886
-if ${am_cv_prog_cc_c_o+:} false; then :
13887
-  $as_echo_n "(cached) " >&6
13888
-else
13889
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
13890
-/* end confdefs.h.  */
13891
-
13892
-int
13893
-main ()
13894
-{
13895
-
13896
-  ;
13897
-  return 0;
13898
-}
13899
-_ACEOF
13900
-  # Make sure it works both with $CC and with simple cc.
13901
-  # Following AC_PROG_CC_C_O, we do the test twice because some
13902
-  # compilers refuse to overwrite an existing .o file with -o,
13903
-  # though they will create one.
13904
-  am_cv_prog_cc_c_o=yes
13905
-  for am_i in 1 2; do
13906
-    if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5
13907
-   ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5
13908
-   ac_status=$?
13909
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
13910
-   (exit $ac_status); } \
13911
-         && test -f conftest2.$ac_objext; then
13912
-      : OK
13913
-    else
13914
-      am_cv_prog_cc_c_o=no
13915
-      break
13916
-    fi
13917
-  done
13918
-  rm -f core conftest*
13919
-  unset am_i
13920
-fi
13921
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5
13922
-$as_echo "$am_cv_prog_cc_c_o" >&6; }
13923
-if test "$am_cv_prog_cc_c_o" != yes; then
13924
-   # Losing compiler, so override with the script.
13925
-   # FIXME: It is wrong to rewrite CC.
13926
-   # But if we don't then we get into trouble of one sort or another.
13927
-   # A longer-term fix would be to have automake use am__CC in this case,
13928
-   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
13929
-   CC="$am_aux_dir/compile $CC"
13930
-fi
13931
-ac_ext=c
13932
-ac_cpp='$CPP $CPPFLAGS'
13933
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
13934
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
13935
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
13936
-
13937
-
13938 13879
 depcc="$CC"   am_compiler_list=
13939 13880
 
13940 13881
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
... ...
@@ -13946,8 +13675,8 @@ else
13946 13946
   # We make a subdir and do the tests there.  Otherwise we can end up
13947 13947
   # making bogus files that we don't know about and never remove.  For
13948 13948
   # instance it was reported that on HP-UX the gcc test will end up
13949
-  # making a dummy file named 'D' -- because '-MD' means "put the output
13950
-  # in D".
13949
+  # making a dummy file named `D' -- because `-MD' means `put the output
13950
+  # in D'.
13951 13951
   rm -rf conftest.dir
13952 13952
   mkdir conftest.dir
13953 13953
   # Copy depcomp to subdir because otherwise we won't find it if we're
... ...
@@ -13982,16 +13711,16 @@ else
13982 13982
     : > sub/conftest.c
13983 13983
     for i in 1 2 3 4 5 6; do
13984 13984
       echo '#include "conftst'$i'.h"' >> sub/conftest.c
13985
-      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
13986
-      # Solaris 10 /bin/sh.
13987
-      echo '/* dummy */' > sub/conftst$i.h
13985
+      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
13986
+      # Solaris 8's {/usr,}/bin/sh.
13987
+      touch sub/conftst$i.h
13988 13988
     done
13989 13989
     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
13990 13990
 
13991
-    # We check with '-c' and '-o' for the sake of the "dashmstdout"
13991
+    # We check with `-c' and `-o' for the sake of the "dashmstdout"
13992 13992
     # mode.  It turns out that the SunPro C++ compiler does not properly
13993
-    # handle '-M -o', and we need to detect this.  Also, some Intel
13994
-    # versions had trouble with output in subdirs.
13993
+    # handle `-M -o', and we need to detect this.  Also, some Intel
13994
+    # versions had trouble with output in subdirs
13995 13995
     am__obj=sub/conftest.${OBJEXT-o}
13996 13996
     am__minus_obj="-o $am__obj"
13997 13997
     case $depmode in
... ...
@@ -14000,8 +13729,8 @@ else
14000 14000
       test "$am__universal" = false || continue
14001 14001
       ;;
14002 14002
     nosideeffect)
14003
-      # After this tag, mechanisms are not by side-effect, so they'll
14004
-      # only be used when explicitly requested.
14003
+      # after this tag, mechanisms are not by side-effect, so they'll
14004
+      # only be used when explicitly requested
14005 14005
       if test "x$enable_dependency_tracking" = xyes; then
14006 14006
 	continue
14007 14007
       else
... ...
@@ -14009,7 +13738,7 @@ else
14009 14009
       fi
14010 14010
       ;;
14011 14011
     msvc7 | msvc7msys | msvisualcpp | msvcmsys)
14012
-      # This compiler won't grok '-c -o', but also, the minuso test has
14012
+      # This compiler won't grok `-c -o', but also, the minuso test has
14013 14013
       # not run yet.  These depmodes are late enough in the game, and
14014 14014
       # so weak that their functioning should not be impacted.
14015 14015
       am__obj=conftest.${OBJEXT-o}
... ...
@@ -14081,7 +13810,7 @@ do
14081 14081
   IFS=$as_save_IFS
14082 14082
   test -z "$as_dir" && as_dir=.
14083 14083
     for ac_exec_ext in '' $ac_executable_extensions; do
14084
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
14084
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
14085 14085
     ac_cv_prog_LEX="$ac_prog"
14086 14086
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
14087 14087
     break 2
... ...
@@ -14113,8 +13842,7 @@ a { ECHO; }
14113 14113
 b { REJECT; }
14114 14114
 c { yymore (); }
14115 14115
 d { yyless (1); }
14116
-e { /* IRIX 6.5 flex 2.5.4 underquotes its yyless argument.  */
14117
-    yyless ((input () != 0)); }
14116
+e { yyless (input () != 0); }
14118 14117
 f { unput (yytext[0]); }
14119 14118
 . { BEGIN INITIAL; }
14120 14119
 %%
... ...
@@ -14243,7 +13971,7 @@ do
14243 14243
   IFS=$as_save_IFS
14244 14244
   test -z "$as_dir" && as_dir=.
14245 14245
     for ac_exec_ext in '' $ac_executable_extensions; do
14246
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
14246
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
14247 14247
     ac_cv_prog_YACC="$ac_prog"
14248 14248
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
14249 14249
     break 2
... ...
@@ -14585,11 +14313,11 @@ else
14585 14585
 int
14586 14586
 main ()
14587 14587
 {
14588
-
14588
+/* FIXME: Include the comments suggested by Paul. */
14589 14589
 #ifndef __cplusplus
14590
-  /* Ultrix mips cc rejects this sort of thing.  */
14590
+  /* Ultrix mips cc rejects this.  */
14591 14591
   typedef int charset[2];
14592
-  const charset cs = { 0, 0 };
14592
+  const charset cs;
14593 14593
   /* SunOS 4.1.1 cc rejects this.  */
14594 14594
   char const *const *pcpcc;
14595 14595
   char **ppc;
... ...
@@ -14606,9 +14334,8 @@ main ()
14606 14606
   ++pcpcc;
14607 14607
   ppc = (char**) pcpcc;
14608 14608
   pcpcc = (char const *const *) ppc;
14609
-  { /* SCO 3.2v4 cc rejects this sort of thing.  */
14610
-    char tx;
14611
-    char *t = &tx;
14609
+  { /* SCO 3.2v4 cc rejects this.  */
14610
+    char *t;
14612 14611
     char const *s = 0 ? (char *) 0 : (char const *) 0;
14613 14612
 
14614 14613
     *t++ = 0;
... ...
@@ -14624,10 +14351,10 @@ main ()
14624 14624
     iptr p = 0;
14625 14625
     ++p;
14626 14626
   }
14627
-  { /* AIX XL C 1.02.0.0 rejects this sort of thing, saying
14627
+  { /* AIX XL C 1.02.0.0 rejects this saying
14628 14628
        "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
14629
-    struct s { int j; const int *ap[3]; } bx;
14630
-    struct s *b = &bx; b->j = 5;
14629
+    struct s { int j; const int *ap[3]; };
14630
+    struct s *b; b->j = 5;
14631 14631
   }
14632 14632
   { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
14633 14633
     const int foo = 10;
... ...
@@ -16856,7 +16583,7 @@ do
16856 16856
   IFS=$as_save_IFS
16857 16857
   test -z "$as_dir" && as_dir=.
16858 16858
     for ac_exec_ext in '' $ac_executable_extensions; do
16859
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
16859
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
16860 16860
     ac_cv_prog_GCOV="$ac_prog"
16861 16861
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
16862 16862
     break 2
... ...
@@ -16899,7 +16626,7 @@ do
16899 16899
   IFS=$as_save_IFS
16900 16900
   test -z "$as_dir" && as_dir=.
16901 16901
     for ac_exec_ext in '' $ac_executable_extensions; do
16902
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
16902
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
16903 16903
     ac_cv_prog_LCOV="$ac_prog"
16904 16904
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
16905 16905
     break 2
... ...
@@ -16942,7 +16669,7 @@ do
16942 16942
   IFS=$as_save_IFS
16943 16943
   test -z "$as_dir" && as_dir=.
16944 16944
     for ac_exec_ext in '' $ac_executable_extensions; do
16945
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
16945
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
16946 16946
     ac_cv_prog_GENHTML="$ac_prog"
16947 16947
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
16948 16948
     break 2
... ...
@@ -20159,7 +19886,7 @@ do
20159 20159
   IFS=$as_save_IFS
20160 20160
   test -z "$as_dir" && as_dir=.
20161 20161
     for ac_exec_ext in '' $ac_executable_extensions; do
20162
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
20162
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
20163 20163
     ac_cv_path_GETENT="$as_dir/$ac_word$ac_exec_ext"
20164 20164
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
20165 20165
     break 2
... ...
@@ -23069,14 +22796,6 @@ LIBOBJS=$ac_libobjs
23069 23069
 LTLIBOBJS=$ac_ltlibobjs
23070 23070
 
23071 23071
 
23072
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5
23073
-$as_echo_n "checking that generated files are newer than configure... " >&6; }
23074
-   if test -n "$am_sleep_pid"; then
23075
-     # Hide warnings about reused PIDs.
23076
-     wait $am_sleep_pid 2>/dev/null
23077
-   fi
23078
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5
23079
-$as_echo "done" >&6; }
23080 23072
  if test -n "$EXEEXT"; then
23081 23073
   am__EXEEXT_TRUE=
23082 23074
   am__EXEEXT_FALSE='#'
... ...
@@ -23465,16 +23184,16 @@ if (echo >conf$$.file) 2>/dev/null; then
23465 23465
     # ... but there are two gotchas:
23466 23466
     # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
23467 23467
     # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
23468
-    # In both cases, we have to default to `cp -pR'.
23468
+    # In both cases, we have to default to `cp -p'.
23469 23469
     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
23470
-      as_ln_s='cp -pR'
23470
+      as_ln_s='cp -p'
23471 23471
   elif ln conf$$.file conf$$ 2>/dev/null; then
23472 23472
     as_ln_s=ln
23473 23473
   else
23474
-    as_ln_s='cp -pR'
23474
+    as_ln_s='cp -p'
23475 23475
   fi
23476 23476
 else
23477
-  as_ln_s='cp -pR'
23477
+  as_ln_s='cp -p'
23478 23478
 fi
23479 23479
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
23480 23480
 rmdir conf$$.dir 2>/dev/null
... ...
@@ -23534,16 +23253,28 @@ else
23534 23534
   as_mkdir_p=false
23535 23535
 fi
23536 23536
 
23537
-
23538
-# as_fn_executable_p FILE
23539
-# -----------------------
23540
-# Test if FILE is an executable regular file.
23541
-as_fn_executable_p ()
23542
-{
23543
-  test -f "$1" && test -x "$1"
23544
-} # as_fn_executable_p
23545
-as_test_x='test -x'
23546
-as_executable_p=as_fn_executable_p
23537
+if test -x / >/dev/null 2>&1; then
23538
+  as_test_x='test -x'
23539
+else
23540
+  if ls -dL / >/dev/null 2>&1; then
23541
+    as_ls_L_option=L
23542
+  else
23543
+    as_ls_L_option=
23544
+  fi
23545
+  as_test_x='
23546
+    eval sh -c '\''
23547
+      if test -d "$1"; then
23548
+	test -d "$1/.";
23549
+      else
23550
+	case $1 in #(
23551
+	-*)set "./$1";;
23552
+	esac;
23553
+	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
23554
+	???[sx]*):;;*)false;;esac;fi
23555
+    '\'' sh
23556
+  '
23557
+fi
23558
+as_executable_p=$as_test_x
23547 23559
 
23548 23560
 # Sed expression to map a string onto a valid CPP name.
23549 23561
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
... ...
@@ -23565,7 +23296,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
23565 23565
 # values after options handling.
23566 23566
 ac_log="
23567 23567
 This file was extended by ClamAV $as_me devel, which was
23568
-generated by GNU Autoconf 2.69.  Invocation command line was
23568
+generated by GNU Autoconf 2.68.  Invocation command line was
23569 23569
 
23570 23570
   CONFIG_FILES    = $CONFIG_FILES
23571 23571
   CONFIG_HEADERS  = $CONFIG_HEADERS
... ...
@@ -23632,10 +23363,10 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
23632 23632
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
23633 23633
 ac_cs_version="\\
23634 23634
 ClamAV config.status devel
23635
-configured by $0, generated by GNU Autoconf 2.69,
23635
+configured by $0, generated by GNU Autoconf 2.68,
23636 23636
   with options \\"\$ac_cs_config\\"
23637 23637
 
23638
-Copyright (C) 2012 Free Software Foundation, Inc.
23638
+Copyright (C) 2010 Free Software Foundation, Inc.
23639 23639
 This config.status script is free software; the Free Software Foundation
23640 23640
 gives unlimited permission to copy, distribute and modify it."
23641 23641
 
... ...
@@ -23726,7 +23457,7 @@ fi
23726 23726
 _ACEOF
23727 23727
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
23728 23728
 if \$ac_cs_recheck; then
23729
-  set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
23729
+  set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
23730 23730
   shift
23731 23731
   \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
23732 23732
   CONFIG_SHELL='$SHELL'
... ...
@@ -24669,7 +24400,7 @@ $as_echo "$as_me: executing $ac_file commands" >&6;}
24669 24669
 
24670 24670
   case $ac_file$ac_mode in
24671 24671
     "depfiles":C) test x"$AMDEP_TRUE" != x"" || {
24672
-  # Older Autoconf quotes --file arguments for eval, but not when files
24672
+  # Autoconf 2.62 quotes --file arguments for eval, but not when files
24673 24673
   # are listed without --file.  Let's play safe and only enable the eval
24674 24674
   # if we detect the quoting.
24675 24675
   case $CONFIG_FILES in
... ...
@@ -24682,7 +24413,7 @@ $as_echo "$as_me: executing $ac_file commands" >&6;}
24682 24682
     # Strip MF so we end up with the name of the file.
24683 24683
     mf=`echo "$mf" | sed -e 's/:.*$//'`
24684 24684
     # Check whether this is an Automake generated Makefile or not.
24685
-    # We used to match only the files named 'Makefile.in', but
24685
+    # We used to match only the files named `Makefile.in', but
24686 24686
     # some people rename them; so instead we look at the file content.
24687 24687
     # Grep'ing the first line is not enough: some people post-process
24688 24688
     # each Makefile.in and add a new line on top of each file to say so.
... ...
@@ -24716,19 +24447,21 @@ $as_echo X"$mf" |
24716 24716
       continue
24717 24717
     fi
24718 24718
     # Extract the definition of DEPDIR, am__include, and am__quote
24719
-    # from the Makefile without running 'make'.
24719
+    # from the Makefile without running `make'.
24720 24720
     DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
24721 24721
     test -z "$DEPDIR" && continue
24722 24722
     am__include=`sed -n 's/^am__include = //p' < "$mf"`
24723
-    test -z "$am__include" && continue
24723
+    test -z "am__include" && continue
24724 24724
     am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
24725
+    # When using ansi2knr, U may be empty or an underscore; expand it
24726
+    U=`sed -n 's/^U = //p' < "$mf"`
24725 24727
     # Find all dependency output files, they are included files with
24726 24728
     # $(DEPDIR) in their names.  We invoke sed twice because it is the
24727 24729
     # simplest approach to changing $(DEPDIR) to its actual value in the
24728 24730
     # expansion.
24729 24731
     for file in `sed -n "
24730 24732
       s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
24731
-	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
24733
+	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
24732 24734
       # Make sure the directory exists.
24733 24735
       test -f "$dirpart/$file" && continue
24734 24736
       fdir=`$as_dirname -- "$file" ||
... ...
@@ -25701,14 +25434,6 @@ LIBOBJS=$ac_libobjs
25701 25701
 LTLIBOBJS=$ac_ltlibobjs
25702 25702
 
25703 25703
 
25704
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5
25705
-$as_echo_n "checking that generated files are newer than configure... " >&6; }
25706
-   if test -n "$am_sleep_pid"; then
25707
-     # Hide warnings about reused PIDs.
25708
-     wait $am_sleep_pid 2>/dev/null
25709
-   fi
25710
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5
25711
-$as_echo "done" >&6; }
25712 25704
  if test -n "$EXEEXT"; then
25713 25705
   am__EXEEXT_TRUE=
25714 25706
   am__EXEEXT_FALSE='#'
... ...
@@ -26105,16 +25830,16 @@ if (echo >conf$$.file) 2>/dev/null; then
26105 26105
     # ... but there are two gotchas:
26106 26106
     # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
26107 26107
     # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
26108
-    # In both cases, we have to default to `cp -pR'.
26108
+    # In both cases, we have to default to `cp -p'.
26109 26109
     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
26110
-      as_ln_s='cp -pR'
26110
+      as_ln_s='cp -p'
26111 26111
   elif ln conf$$.file conf$$ 2>/dev/null; then
26112 26112
     as_ln_s=ln
26113 26113
   else
26114
-    as_ln_s='cp -pR'
26114
+    as_ln_s='cp -p'
26115 26115
   fi
26116 26116
 else
26117
-  as_ln_s='cp -pR'
26117
+  as_ln_s='cp -p'
26118 26118
 fi
26119 26119
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
26120 26120
 rmdir conf$$.dir 2>/dev/null
... ...
@@ -26174,16 +25899,28 @@ else
26174 26174
   as_mkdir_p=false
26175 26175
 fi
26176 26176
 
26177
-
26178
-# as_fn_executable_p FILE
26179
-# -----------------------
26180
-# Test if FILE is an executable regular file.
26181
-as_fn_executable_p ()
26182
-{
26183
-  test -f "$1" && test -x "$1"
26184
-} # as_fn_executable_p
26185
-as_test_x='test -x'
26186
-as_executable_p=as_fn_executable_p
26177
+if test -x / >/dev/null 2>&1; then
26178
+  as_test_x='test -x'
26179
+else
26180
+  if ls -dL / >/dev/null 2>&1; then
26181
+    as_ls_L_option=L
26182
+  else
26183
+    as_ls_L_option=
26184
+  fi
26185
+  as_test_x='
26186
+    eval sh -c '\''
26187
+      if test -d "$1"; then
26188
+	test -d "$1/.";
26189
+      else
26190
+	case $1 in #(
26191
+	-*)set "./$1";;
26192
+	esac;
26193
+	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
26194
+	???[sx]*):;;*)false;;esac;fi
26195
+    '\'' sh
26196
+  '
26197
+fi
26198
+as_executable_p=$as_test_x
26187 26199
 
26188 26200
 # Sed expression to map a string onto a valid CPP name.
26189 26201
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
... ...
@@ -26205,7 +25942,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
26205 26205
 # values after options handling.
26206 26206
 ac_log="
26207 26207
 This file was extended by ClamAV $as_me devel, which was
26208
-generated by GNU Autoconf 2.69.  Invocation command line was
26208
+generated by GNU Autoconf 2.68.  Invocation command line was
26209 26209
 
26210 26210
   CONFIG_FILES    = $CONFIG_FILES
26211 26211
   CONFIG_HEADERS  = $CONFIG_HEADERS
... ...
@@ -26272,10 +26009,10 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
26272 26272
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
26273 26273
 ac_cs_version="\\
26274 26274
 ClamAV config.status devel
26275
-configured by $0, generated by GNU Autoconf 2.69,
26275
+configured by $0, generated by GNU Autoconf 2.68,
26276 26276
   with options \\"\$ac_cs_config\\"
26277 26277
 
26278
-Copyright (C) 2012 Free Software Foundation, Inc.
26278
+Copyright (C) 2010 Free Software Foundation, Inc.
26279 26279
 This config.status script is free software; the Free Software Foundation
26280 26280
 gives unlimited permission to copy, distribute and modify it."
26281 26281
 
... ...
@@ -26366,7 +26103,7 @@ fi
26366 26366
 _ACEOF
26367 26367
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
26368 26368
 if \$ac_cs_recheck; then
26369
-  set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
26369
+  set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
26370 26370
   shift
26371 26371
   \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
26372 26372
   CONFIG_SHELL='$SHELL'
... ...
@@ -27311,7 +27048,7 @@ $as_echo "$as_me: executing $ac_file commands" >&6;}
27311 27311
 
27312 27312
   case $ac_file$ac_mode in
27313 27313
     "depfiles":C) test x"$AMDEP_TRUE" != x"" || {
27314
-  # Older Autoconf quotes --file arguments for eval, but not when files
27314
+  # Autoconf 2.62 quotes --file arguments for eval, but not when files
27315 27315
   # are listed without --file.  Let's play safe and only enable the eval
27316 27316
   # if we detect the quoting.
27317 27317
   case $CONFIG_FILES in
... ...
@@ -27324,7 +27061,7 @@ $as_echo "$as_me: executing $ac_file commands" >&6;}
27324 27324
     # Strip MF so we end up with the name of the file.
27325 27325
     mf=`echo "$mf" | sed -e 's/:.*$//'`
27326 27326
     # Check whether this is an Automake generated Makefile or not.
27327
-    # We used to match only the files named 'Makefile.in', but
27327
+    # We used to match only the files named `Makefile.in', but
27328 27328
     # some people rename them; so instead we look at the file content.
27329 27329
     # Grep'ing the first line is not enough: some people post-process
27330 27330
     # each Makefile.in and add a new line on top of each file to say so.
... ...
@@ -27358,19 +27095,21 @@ $as_echo X"$mf" |
27358 27358
       continue
27359 27359
     fi
27360 27360
     # Extract the definition of DEPDIR, am__include, and am__quote
27361
-    # from the Makefile without running 'make'.
27361
+    # from the Makefile without running `make'.
27362 27362
     DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
27363 27363
     test -z "$DEPDIR" && continue
27364 27364
     am__include=`sed -n 's/^am__include = //p' < "$mf"`
27365
-    test -z "$am__include" && continue
27365
+    test -z "am__include" && continue
27366 27366
     am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
27367
+    # When using ansi2knr, U may be empty or an underscore; expand it
27368
+    U=`sed -n 's/^U = //p' < "$mf"`
27367 27369
     # Find all dependency output files, they are included files with
27368 27370
     # $(DEPDIR) in their names.  We invoke sed twice because it is the
27369 27371
     # simplest approach to changing $(DEPDIR) to its actual value in the
27370 27372
     # expansion.
27371 27373
     for file in `sed -n "
27372 27374
       s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
27373
-	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
27375
+	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
27374 27376
       # Make sure the directory exists.
27375 27377
       test -f "$dirpart/$file" && continue
27376 27378
       fdir=`$as_dirname -- "$file" ||
... ...
@@ -28229,8 +27968,8 @@ cat <<EOF
28229 28229
               pthreads    : $have_pthreads ($THREAD_LIBS)
28230 28230
 EOF
28231 28231
 
28232
-{ $as_echo "$as_me:${as_lineno-$LINENO}: Summary of miscellaneous  features" >&5
28233
-$as_echo "$as_me: Summary of miscellaneous  features" >&6;}
28232
+{ $as_echo "$as_me:${as_lineno-$LINENO}: Summary of miscellaneous features" >&5
28233
+$as_echo "$as_me: Summary of miscellaneous features" >&6;}
28234 28234
 if test "x$CHECK_LIBS" = "x"; then
28235 28235
     check_libs="no"
28236 28236
 else
... ...
@@ -28347,8 +28086,8 @@ else
28347 28347
 fi
28348 28348
 
28349 28349
 
28350
-{ $as_echo "$as_me:${as_lineno-$LINENO}: Summary of engine performance features)" >&5
28351
-$as_echo "$as_me: Summary of engine performance features)" >&6;}
28350
+{ $as_echo "$as_me:${as_lineno-$LINENO}: Summary of engine performance features" >&5
28351
+$as_echo "$as_me: Summary of engine performance features" >&6;}
28352 28352
 if test "x$enable_debug" = "xyes"; then
28353 28353
 
28354 28354
 
... ...
@@ -1,8 +1,9 @@
1
-# Makefile.in generated by automake 1.14 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 \
... ...
@@ -173,26 +129,14 @@ mkinstalldirs = $(install_sh) -d
173 173
 CONFIG_HEADER = $(top_builddir)/clamav-config.h
174 174
 CONFIG_CLEAN_FILES =
175 175
 CONFIG_CLEAN_VPATH_FILES =
176
-AM_V_P = $(am__v_P_@AM_V@)
177
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
178
-am__v_P_0 = false
179
-am__v_P_1 = :
180 176
 AM_V_GEN = $(am__v_GEN_@AM_V@)
181 177
 am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
182
-am__v_GEN_0 = @echo "  GEN     " $@;
183
-am__v_GEN_1 = 
178
+am__v_GEN_0 = @echo "  GEN   " $@;
184 179
 AM_V_at = $(am__v_at_@AM_V@)
185 180
 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
186 181
 am__v_at_0 = @
187
-am__v_at_1 = 
188 182
 SOURCES =
189 183
 DIST_SOURCES =
190
-am__can_run_installinfo = \
191
-  case $$AM_UPDATE_INFO_DIR in \
192
-    n|no|NO) false;; \
193
-    *) (install-info --version) >/dev/null 2>&1;; \
194
-  esac
195
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
196 184
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
197 185
 ACLOCAL = @ACLOCAL@
198 186
 AMTAR = @AMTAR@
... ...
@@ -434,11 +378,11 @@ mostlyclean-libtool:
434 434
 
435 435
 clean-libtool:
436 436
 	-rm -rf .libs _libs
437
-tags TAGS:
438
-
439
-ctags CTAGS:
437
+tags: TAGS
438
+TAGS:
440 439
 
441
-cscope cscopelist:
440
+ctags: CTAGS
441
+CTAGS:
442 442
 
443 443
 
444 444
 distdir: $(DISTFILES)
... ...
@@ -574,17 +518,16 @@ uninstall-am:
574 574
 .MAKE: install-am install-strip
575 575
 
576 576
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
577
-	cscopelist-am ctags-am distclean distclean-generic \
578
-	distclean-libtool distdir dvi dvi-am html html-am info info-am \
579
-	install install-am install-data install-data-am \
580
-	install-data-local install-dvi install-dvi-am install-exec \
581
-	install-exec-am install-html install-html-am install-info \
582
-	install-info-am install-man install-pdf install-pdf-am \
583
-	install-ps install-ps-am install-strip installcheck \
584
-	installcheck-am installdirs maintainer-clean \
585
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
586
-	mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \
587
-	uninstall-am
577
+	distclean distclean-generic distclean-libtool distdir dvi \
578
+	dvi-am html html-am info info-am install install-am \
579
+	install-data install-data-am install-data-local install-dvi \
580
+	install-dvi-am install-exec install-exec-am install-html \
581
+	install-html-am install-info install-info-am install-man \
582
+	install-pdf install-pdf-am install-ps install-ps-am \
583
+	install-strip installcheck installcheck-am installdirs \
584
+	maintainer-clean maintainer-clean-generic mostlyclean \
585
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
586
+	uninstall uninstall-am
588 587
 
589 588
 
590 589
 install-data-local:
... ...
@@ -1,8 +1,9 @@
1
-# Makefile.in generated by automake 1.14 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@
... ...
@@ -98,7 +54,7 @@ host_triplet = @host@
98 98
 target_triplet = @target@
99 99
 @ENABLE_CLAMSUBMIT_TRUE@am__append_1 = man/clamsubmit.1
100 100
 subdir = docs
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 \
... ...
@@ -173,25 +129,14 @@ mkinstalldirs = $(install_sh) -d
173 173
 CONFIG_HEADER = $(top_builddir)/clamav-config.h
174 174
 CONFIG_CLEAN_FILES =
175 175
 CONFIG_CLEAN_VPATH_FILES =
176
-AM_V_P = $(am__v_P_@AM_V@)
177
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
178
-am__v_P_0 = false
179
-am__v_P_1 = :
180 176
 AM_V_GEN = $(am__v_GEN_@AM_V@)
181 177
 am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
182
-am__v_GEN_0 = @echo "  GEN     " $@;
183
-am__v_GEN_1 = 
178
+am__v_GEN_0 = @echo "  GEN   " $@;
184 179
 AM_V_at = $(am__v_at_@AM_V@)
185 180
 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
186 181
 am__v_at_0 = @
187
-am__v_at_1 = 
188 182
 SOURCES =
189 183
 DIST_SOURCES =
190
-am__can_run_installinfo = \
191
-  case $$AM_UPDATE_INFO_DIR in \
192
-    n|no|NO) false;; \
193
-    *) (install-info --version) >/dev/null 2>&1;; \
194
-  esac
195 184
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
196 185
 am__vpath_adj = case $$p in \
197 186
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
... ...
@@ -226,7 +171,6 @@ man5dir = $(mandir)/man5
226 226
 man8dir = $(mandir)/man8
227 227
 NROFF = nroff
228 228
 MANS = $(man_MANS)
229
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
230 229
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
231 230
 ACLOCAL = @ACLOCAL@
232 231
 AMTAR = @AMTAR@
... ...
@@ -473,18 +417,11 @@ clean-libtool:
473 473
 	-rm -rf .libs _libs
474 474
 install-man1: $(man_MANS)
475 475
 	@$(NORMAL_INSTALL)
476
-	@list1=''; \
477
-	list2='$(man_MANS)'; \
478
-	test -n "$(man1dir)" \
479
-	  && test -n "`echo $$list1$$list2`" \
480
-	  || exit 0; \
481
-	echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \
482
-	$(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \
483
-	{ for i in $$list1; do echo "$$i"; done;  \
484
-	if test -n "$$list2"; then \
485
-	  for i in $$list2; do echo "$$i"; done \
486
-	    | sed -n '/\.1[a-z]*$$/p'; \
487
-	fi; \
476
+	test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
477
+	@list=''; test -n "$(man1dir)" || exit 0; \
478
+	{ for i in $$list; do echo "$$i"; done; \
479
+	l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
480
+	  sed -n '/\.1[a-z]*$$/p'; \
488 481
 	} | while read p; do \
489 482
 	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
490 483
 	  echo "$$d$$p"; echo "$$p"; \
... ...
@@ -516,18 +453,11 @@ uninstall-man1:
516 516
 	dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
517 517
 install-man5: $(man_MANS)
518 518
 	@$(NORMAL_INSTALL)
519
-	@list1=''; \
520
-	list2='$(man_MANS)'; \
521
-	test -n "$(man5dir)" \
522
-	  && test -n "`echo $$list1$$list2`" \
523
-	  || exit 0; \
524
-	echo " $(MKDIR_P) '$(DESTDIR)$(man5dir)'"; \
525
-	$(MKDIR_P) "$(DESTDIR)$(man5dir)" || exit 1; \
526
-	{ for i in $$list1; do echo "$$i"; done;  \
527
-	if test -n "$$list2"; then \
528
-	  for i in $$list2; do echo "$$i"; done \
529
-	    | sed -n '/\.5[a-z]*$$/p'; \
530
-	fi; \
519
+	test -z "$(man5dir)" || $(MKDIR_P) "$(DESTDIR)$(man5dir)"
520
+	@list=''; test -n "$(man5dir)" || exit 0; \
521
+	{ for i in $$list; do echo "$$i"; done; \
522
+	l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
523
+	  sed -n '/\.5[a-z]*$$/p'; \
531 524
 	} | while read p; do \
532 525
 	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
533 526
 	  echo "$$d$$p"; echo "$$p"; \
... ...
@@ -559,18 +489,11 @@ uninstall-man5:
559 559
 	dir='$(DESTDIR)$(man5dir)'; $(am__uninstall_files_from_dir)
560 560
 install-man8: $(man_MANS)
561 561
 	@$(NORMAL_INSTALL)
562
-	@list1=''; \
563
-	list2='$(man_MANS)'; \
564
-	test -n "$(man8dir)" \
565
-	  && test -n "`echo $$list1$$list2`" \
566
-	  || exit 0; \
567
-	echo " $(MKDIR_P) '$(DESTDIR)$(man8dir)'"; \
568
-	$(MKDIR_P) "$(DESTDIR)$(man8dir)" || exit 1; \
569
-	{ for i in $$list1; do echo "$$i"; done;  \
570
-	if test -n "$$list2"; then \
571
-	  for i in $$list2; do echo "$$i"; done \
572
-	    | sed -n '/\.8[a-z]*$$/p'; \
573
-	fi; \
562
+	test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)"
563
+	@list=''; test -n "$(man8dir)" || exit 0; \
564
+	{ for i in $$list; do echo "$$i"; done; \
565
+	l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
566
+	  sed -n '/\.8[a-z]*$$/p'; \
574 567
 	} | while read p; do \
575 568
 	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
576 569
 	  echo "$$d$$p"; echo "$$p"; \
... ...
@@ -600,14 +523,27 @@ uninstall-man8:
600 600
 	} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \
601 601
 	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
602 602
 	dir='$(DESTDIR)$(man8dir)'; $(am__uninstall_files_from_dir)
603
-tags TAGS:
604
-
605
-ctags CTAGS:
603
+tags: TAGS
604
+TAGS:
606 605
 
607
-cscope cscopelist:
606
+ctags: CTAGS
607
+CTAGS:
608 608
 
609 609
 
610 610
 distdir: $(DISTFILES)
611
+	@list='$(MANS)'; if test -n "$$list"; then \
612
+	  list=`for p in $$list; do \
613
+	    if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
614
+	    if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \
615
+	  if test -n "$$list" && \
616
+	    grep 'ab help2man is required to generate this page' $$list >/dev/null; then \
617
+	    echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \
618
+	    grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/         /' >&2; \
619
+	    echo "       to fix them, install help2man, remove and regenerate the man pages;" >&2; \
620
+	    echo "       typically \`make maintainer-clean' will remove them" >&2; \
621
+	    exit 1; \
622
+	  else :; fi; \
623
+	else :; fi
611 624
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
612 625
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
613 626
 	list='$(DISTFILES)'; \
... ...
@@ -745,18 +681,17 @@ uninstall-man: uninstall-man1 uninstall-man5 uninstall-man8
745 745
 .MAKE: install-am install-strip
746 746
 
747 747
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
748
-	cscopelist-am ctags-am distclean distclean-generic \
749
-	distclean-libtool distdir dvi dvi-am html html-am info info-am \
750
-	install install-am install-data install-data-am install-dvi \
751
-	install-dvi-am install-exec install-exec-am install-html \
752
-	install-html-am install-info install-info-am install-man \
753
-	install-man1 install-man5 install-man8 install-pdf \
754
-	install-pdf-am install-ps install-ps-am install-strip \
755
-	installcheck installcheck-am installdirs maintainer-clean \
748
+	distclean distclean-generic distclean-libtool distdir dvi \
749
+	dvi-am html html-am info info-am install install-am \
750
+	install-data install-data-am install-dvi install-dvi-am \
751
+	install-exec install-exec-am install-html install-html-am \
752
+	install-info install-info-am install-man install-man1 \
753
+	install-man5 install-man8 install-pdf install-pdf-am \
754
+	install-ps install-ps-am install-strip installcheck \
755
+	installcheck-am installdirs maintainer-clean \
756 756
 	maintainer-clean-generic mostlyclean mostlyclean-generic \
757
-	mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \
758
-	uninstall-am uninstall-man uninstall-man1 uninstall-man5 \
759
-	uninstall-man8
757
+	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
758
+	uninstall-man uninstall-man1 uninstall-man5 uninstall-man8
760 759
 
761 760
 
762 761
 # 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 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 \
... ...
@@ -174,25 +130,14 @@ mkinstalldirs = $(install_sh) -d
174 174
 CONFIG_HEADER = $(top_builddir)/clamav-config.h
175 175
 CONFIG_CLEAN_FILES =
176 176
 CONFIG_CLEAN_VPATH_FILES =
177
-AM_V_P = $(am__v_P_@AM_V@)
178
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
179
-am__v_P_0 = false
180
-am__v_P_1 = :
181 177
 AM_V_GEN = $(am__v_GEN_@AM_V@)
182 178
 am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
183
-am__v_GEN_0 = @echo "  GEN     " $@;
184
-am__v_GEN_1 = 
179
+am__v_GEN_0 = @echo "  GEN   " $@;
185 180
 AM_V_at = $(am__v_at_@AM_V@)
186 181
 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
187 182
 am__v_at_0 = @
188
-am__v_at_1 = 
189 183
 SOURCES =
190 184
 DIST_SOURCES =
191
-am__can_run_installinfo = \
192
-  case $$AM_UPDATE_INFO_DIR in \
193
-    n|no|NO) false;; \
194
-    *) (install-info --version) >/dev/null 2>&1;; \
195
-  esac
196 185
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
197 186
 am__vpath_adj = case $$p in \
198 187
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
... ...
@@ -222,7 +167,6 @@ am__uninstall_files_from_dir = { \
222 222
   }
223 223
 am__installdirs = "$(DESTDIR)$(sysconfdir)"
224 224
 DATA = $(sysconf_DATA)
225
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
226 225
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
227 226
 ACLOCAL = @ACLOCAL@
228 227
 AMTAR = @AMTAR@
... ...
@@ -467,11 +411,8 @@ clean-libtool:
467 467
 	-rm -rf .libs _libs
468 468
 install-sysconfDATA: $(sysconf_DATA)
469 469
 	@$(NORMAL_INSTALL)
470
+	test -z "$(sysconfdir)" || $(MKDIR_P) "$(DESTDIR)$(sysconfdir)"
470 471
 	@list='$(sysconf_DATA)'; test -n "$(sysconfdir)" || list=; \
471
-	if test -n "$$list"; then \
472
-	  echo " $(MKDIR_P) '$(DESTDIR)$(sysconfdir)'"; \
473
-	  $(MKDIR_P) "$(DESTDIR)$(sysconfdir)" || exit 1; \
474
-	fi; \
475 472
 	for p in $$list; do \
476 473
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
477 474
 	  echo "$$d$$p"; \
... ...
@@ -486,11 +427,11 @@ uninstall-sysconfDATA:
486 486
 	@list='$(sysconf_DATA)'; test -n "$(sysconfdir)" || list=; \
487 487
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
488 488
 	dir='$(DESTDIR)$(sysconfdir)'; $(am__uninstall_files_from_dir)
489
-tags TAGS:
490
-
491
-ctags CTAGS:
489
+tags: TAGS
490
+TAGS:
492 491
 
493
-cscope cscopelist:
492
+ctags: CTAGS
493
+CTAGS:
494 494
 
495 495
 
496 496
 distdir: $(DISTFILES)
... ...
@@ -629,16 +570,16 @@ uninstall-am: uninstall-sysconfDATA
629 629
 .MAKE: install-am install-strip
630 630
 
631 631
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
632
-	cscopelist-am ctags-am distclean distclean-generic \
633
-	distclean-libtool distdir dvi dvi-am html html-am info info-am \
634
-	install install-am install-data install-data-am install-dvi \
635
-	install-dvi-am install-exec install-exec-am install-html \
636
-	install-html-am install-info install-info-am install-man \
637
-	install-pdf install-pdf-am install-ps install-ps-am \
638
-	install-strip install-sysconfDATA installcheck installcheck-am \
639
-	installdirs maintainer-clean maintainer-clean-generic \
640
-	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
641
-	ps ps-am tags-am uninstall uninstall-am uninstall-sysconfDATA
632
+	distclean distclean-generic distclean-libtool distdir dvi \
633
+	dvi-am html html-am info info-am install install-am \
634
+	install-data install-data-am install-dvi install-dvi-am \
635
+	install-exec install-exec-am install-html install-html-am \
636
+	install-info install-info-am install-man install-pdf \
637
+	install-pdf-am install-ps install-ps-am install-strip \
638
+	install-sysconfDATA installcheck installcheck-am installdirs \
639
+	maintainer-clean maintainer-clean-generic mostlyclean \
640
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
641
+	uninstall uninstall-am uninstall-sysconfDATA
642 642
 
643 643
 
644 644
 # 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 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 \
... ...
@@ -188,19 +143,6 @@ freshclam_LDADD = $(LDADD)
188 188
 AM_V_lt = $(am__v_lt_@AM_V@)
189 189
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
190 190
 am__v_lt_0 = --silent
191
-am__v_lt_1 = 
192
-AM_V_P = $(am__v_P_@AM_V@)
193
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
194
-am__v_P_0 = false
195
-am__v_P_1 = :
196
-AM_V_GEN = $(am__v_GEN_@AM_V@)
197
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
198
-am__v_GEN_0 = @echo "  GEN     " $@;
199
-am__v_GEN_1 = 
200
-AM_V_at = $(am__v_at_@AM_V@)
201
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
202
-am__v_at_0 = @
203
-am__v_at_1 = 
204 191
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
205 192
 depcomp = $(SHELL) $(top_srcdir)/config/depcomp
206 193
 am__depfiles_maybe = depfiles
... ...
@@ -213,40 +155,22 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
213 213
 	$(AM_CFLAGS) $(CFLAGS)
214 214
 AM_V_CC = $(am__v_CC_@AM_V@)
215 215
 am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
216
-am__v_CC_0 = @echo "  CC      " $@;
217
-am__v_CC_1 = 
216
+am__v_CC_0 = @echo "  CC    " $@;
217
+AM_V_at = $(am__v_at_@AM_V@)
218
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
219
+am__v_at_0 = @
218 220
 CCLD = $(CC)
219 221
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
220 222
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
221 223
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
222 224
 AM_V_CCLD = $(am__v_CCLD_@AM_V@)
223 225
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
224
-am__v_CCLD_0 = @echo "  CCLD    " $@;
225
-am__v_CCLD_1 = 
226
+am__v_CCLD_0 = @echo "  CCLD  " $@;
227
+AM_V_GEN = $(am__v_GEN_@AM_V@)
228
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
229
+am__v_GEN_0 = @echo "  GEN   " $@;
226 230
 SOURCES = $(freshclam_SOURCES)
227 231
 DIST_SOURCES = $(freshclam_SOURCES)
228
-am__can_run_installinfo = \
229
-  case $$AM_UPDATE_INFO_DIR in \
230
-    n|no|NO) false;; \
231
-    *) (install-info --version) >/dev/null 2>&1;; \
232
-  esac
233
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
234
-# Read a list of newline-separated strings from the standard input,
235
-# and print each of them once, without duplicates.  Input order is
236
-# *not* preserved.
237
-am__uniquify_input = $(AWK) '\
238
-  BEGIN { nonempty = 0; } \
239
-  { items[$$0] = 1; nonempty = 1; } \
240
-  END { if (nonempty) { for (i in items) print i; }; } \
241
-'
242
-# Make sure the list of sources is unique.  This is necessary because,
243
-# e.g., the same source file might be shared among _SOURCES variables
244
-# for different programs/libraries.
245
-am__define_uniq_tagged_files = \
246
-  list='$(am__tagged_files)'; \
247
-  unique=`for i in $$list; do \
248
-    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
249
-  done | $(am__uniquify_input)`
250 232
 ETAGS = etags
251 233
 CTAGS = ctags
252 234
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
... ...
@@ -519,19 +443,14 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
519 519
 $(am__aclocal_m4_deps):
520 520
 install-binPROGRAMS: $(bin_PROGRAMS)
521 521
 	@$(NORMAL_INSTALL)
522
+	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
522 523
 	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
523
-	if test -n "$$list"; then \
524
-	  echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
525
-	  $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
526
-	fi; \
527 524
 	for p in $$list; do echo "$$p $$p"; done | \
528 525
 	sed 's/$(EXEEXT)$$//' | \
529
-	while read p p1; do if test -f $$p \
530
-	 || test -f $$p1 \
531
-	  ; then echo "$$p"; echo "$$p"; else :; fi; \
526
+	while read p p1; do if test -f $$p || test -f $$p1; \
527
+	  then echo "$$p"; echo "$$p"; else :; fi; \
532 528
 	done | \
533
-	sed -e 'p;s,.*/,,;n;h' \
534
-	    -e 's|.*|.|' \
529
+	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
535 530
 	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
536 531
 	sed 'N;N;N;s,\n, ,g' | \
537 532
 	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
... ...
@@ -552,8 +471,7 @@ uninstall-binPROGRAMS:
552 552
 	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
553 553
 	files=`for p in $$list; do echo "$$p"; done | \
554 554
 	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
555
-	      -e 's/$$/$(EXEEXT)/' \
556
-	`; \
555
+	      -e 's/$$/$(EXEEXT)/' `; \
557 556
 	test -n "$$list" || exit 0; \
558 557
 	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
559 558
 	cd "$(DESTDIR)$(bindir)" && rm -f $$files
... ...
@@ -582,7 +500,6 @@ installcheck-binPROGRAMS: $(bin_PROGRAMS)
582 582
 	    else echo "$$f does not support $$opt" 1>&2; bad=1; fi; \
583 583
 	  done; \
584 584
 	done; rm -f c$${pid}_.???; exit $$bad
585
-
586 585
 freshclam$(EXEEXT): $(freshclam_OBJECTS) $(freshclam_DEPENDENCIES) $(EXTRA_freshclam_DEPENDENCIES) 
587 586
 	@rm -f freshclam$(EXEEXT)
588 587
 	$(AM_V_CCLD)$(LINK) $(freshclam_OBJECTS) $(freshclam_LDADD) $(LIBS)
... ...
@@ -613,14 +530,14 @@ distclean-compile:
613 613
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
614 614
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
615 615
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
616
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
616
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
617 617
 
618 618
 .c.obj:
619 619
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
620 620
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
621 621
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
622 622
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
623
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
623
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
624 624
 
625 625
 .c.lo:
626 626
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
... ...
@@ -733,15 +650,26 @@ mostlyclean-libtool:
733 733
 clean-libtool:
734 734
 	-rm -rf .libs _libs
735 735
 
736
-ID: $(am__tagged_files)
737
-	$(am__define_uniq_tagged_files); mkid -fID $$unique
738
-tags: tags-am
739
-TAGS: tags
740
-
741
-tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
736
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
737
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
738
+	unique=`for i in $$list; do \
739
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
740
+	  done | \
741
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
742
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
743
+	mkid -fID $$unique
744
+tags: TAGS
745
+
746
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
747
+		$(TAGS_FILES) $(LISP)
742 748
 	set x; \
743 749
 	here=`pwd`; \
744
-	$(am__define_uniq_tagged_files); \
750
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
751
+	unique=`for i in $$list; do \
752
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
753
+	  done | \
754
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
755
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
745 756
 	shift; \
746 757
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
747 758
 	  test -n "$$unique" || unique=$$empty_fix; \
... ...
@@ -753,11 +681,15 @@ tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
753 753
 	      $$unique; \
754 754
 	  fi; \
755 755
 	fi
756
-ctags: ctags-am
757
-
758
-CTAGS: ctags
759
-ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
760
-	$(am__define_uniq_tagged_files); \
756
+ctags: CTAGS
757
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
758
+		$(TAGS_FILES) $(LISP)
759
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
760
+	unique=`for i in $$list; do \
761
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
762
+	  done | \
763
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
764
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
761 765
 	test -z "$(CTAGS_ARGS)$$unique" \
762 766
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
763 767
 	     $$unique
... ...
@@ -766,21 +698,6 @@ GTAGS:
766 766
 	here=`$(am__cd) $(top_builddir) && pwd` \
767 767
 	  && $(am__cd) $(top_srcdir) \
768 768
 	  && gtags -i $(GTAGS_ARGS) "$$here"
769
-cscopelist: cscopelist-am
770
-
771
-cscopelist-am: $(am__tagged_files)
772
-	list='$(am__tagged_files)'; \
773
-	case "$(srcdir)" in \
774
-	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
775
-	  *) sdir=$(subdir)/$(srcdir) ;; \
776
-	esac; \
777
-	for i in $$list; do \
778
-	  if test -f "$$i"; then \
779
-	    echo "$(subdir)/$$i"; \
780
-	  else \
781
-	    echo "$$sdir/$$i"; \
782
-	  fi; \
783
-	done >> $(top_builddir)/cscope.files
784 769
 
785 770
 distclean-tags:
786 771
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
... ...
@@ -925,20 +842,19 @@ uninstall-am: uninstall-binPROGRAMS
925 925
 
926 926
 .MAKE: install-am install-strip
927 927
 
928
-.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \
929
-	clean-binPROGRAMS clean-generic clean-libtool cscopelist-am \
930
-	ctags ctags-am distclean distclean-compile distclean-generic \
931
-	distclean-libtool distclean-tags distdir dvi dvi-am html \
932
-	html-am info info-am install install-am install-binPROGRAMS \
933
-	install-data install-data-am install-dvi install-dvi-am \
934
-	install-exec install-exec-am install-html install-html-am \
935
-	install-info install-info-am install-man install-pdf \
936
-	install-pdf-am install-ps install-ps-am install-strip \
937
-	installcheck installcheck-am installcheck-binPROGRAMS \
938
-	installdirs maintainer-clean maintainer-clean-generic \
939
-	mostlyclean mostlyclean-compile mostlyclean-generic \
940
-	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
941
-	uninstall-am uninstall-binPROGRAMS
928
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
929
+	clean-generic clean-libtool ctags distclean distclean-compile \
930
+	distclean-generic distclean-libtool distclean-tags distdir dvi \
931
+	dvi-am html html-am info info-am install install-am \
932
+	install-binPROGRAMS install-data install-data-am install-dvi \
933
+	install-dvi-am install-exec install-exec-am install-html \
934
+	install-html-am install-info install-info-am install-man \
935
+	install-pdf install-pdf-am install-ps install-ps-am \
936
+	install-strip installcheck installcheck-am \
937
+	installcheck-binPROGRAMS installdirs maintainer-clean \
938
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
939
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
940
+	tags uninstall uninstall-am uninstall-binPROGRAMS
942 941
 
943 942
 
944 943
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
... ...
@@ -445,6 +445,10 @@ libclamav_la_SOURCES = \
445 445
 	hostid.h \
446 446
 	openioc.c \
447 447
 	openioc.h \
448
+	yara_arena.c \
449
+	yara_areana.h \
450
+	yara_hash.c \
451
+	yara_hash.h \
448 452
 	yara_grammar.y \
449 453
 	yara_lexer.l \
450 454
 	yara_lexer.h \
... ...
@@ -1,8 +1,9 @@
1
-# Makefile.in generated by automake 1.14 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,10 +65,9 @@ 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
-	yara_grammar.h yara_grammar.c yara_lexer.c \
114
-	$(top_srcdir)/config/depcomp $(top_srcdir)/config/ylwrap \
115
-	$(include_HEADERS)
112
+DIST_COMMON = $(include_HEADERS) $(srcdir)/Makefile.am \
113
+	$(srcdir)/Makefile.in yara_grammar.c yara_grammar.h \
114
+	yara_lexer.c
116 115
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
117 116
 am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
118 117
 	$(top_srcdir)/m4/argz.m4 \
... ...
@@ -284,6 +239,7 @@ am_libclamav_la_OBJECTS = libclamav_la-matcher-ac.lo \
284 284
 	libclamav_la-asn1.lo libclamav_la-fpu.lo libclamav_la-stats.lo \
285 285
 	libclamav_la-www.lo libclamav_la-stats_json.lo \
286 286
 	libclamav_la-hostid.lo libclamav_la-openioc.lo \
287
+	libclamav_la-yara_arena.lo libclamav_la-yara_hash.lo \
287 288
 	libclamav_la-yara_grammar.lo libclamav_la-yara_lexer.lo \
288 289
 	libclamav_la-yara_parser.lo libclamav_la-msdoc.lo \
289 290
 	libclamav_la-matcher-pcre.lo libclamav_la-regex_pcre.lo \
... ...
@@ -342,7 +298,6 @@ libclamav_la_OBJECTS = $(am_libclamav_la_OBJECTS)
342 342
 AM_V_lt = $(am__v_lt_@AM_V@)
343 343
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
344 344
 am__v_lt_0 = --silent
345
-am__v_lt_1 = 
346 345
 libclamav_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
347 346
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(libclamav_la_CFLAGS) \
348 347
 	$(CFLAGS) $(libclamav_la_LDFLAGS) $(LDFLAGS) -o $@
... ...
@@ -425,18 +380,6 @@ libclamunrar_iface_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
425 425
 	$(AM_CFLAGS) $(CFLAGS) $(libclamunrar_iface_la_LDFLAGS) \
426 426
 	$(LDFLAGS) -o $@
427 427
 @ENABLE_UNRAR_TRUE@am_libclamunrar_iface_la_rpath = -rpath $(libdir)
428
-AM_V_P = $(am__v_P_@AM_V@)
429
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
430
-am__v_P_0 = false
431
-am__v_P_1 = :
432
-AM_V_GEN = $(am__v_GEN_@AM_V@)
433
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
434
-am__v_GEN_0 = @echo "  GEN     " $@;
435
-am__v_GEN_1 = 
436
-AM_V_at = $(am__v_at_@AM_V@)
437
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
438
-am__v_at_0 = @
439
-am__v_at_1 = 
440 428
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
441 429
 depcomp = $(SHELL) $(top_srcdir)/config/depcomp
442 430
 am__depfiles_maybe = depfiles
... ...
@@ -449,35 +392,35 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
449 449
 	$(AM_CFLAGS) $(CFLAGS)
450 450
 AM_V_CC = $(am__v_CC_@AM_V@)
451 451
 am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
452
-am__v_CC_0 = @echo "  CC      " $@;
453
-am__v_CC_1 = 
452
+am__v_CC_0 = @echo "  CC    " $@;
453
+AM_V_at = $(am__v_at_@AM_V@)
454
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
455
+am__v_at_0 = @
454 456
 CCLD = $(CC)
455 457
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
456 458
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
457 459
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
458 460
 AM_V_CCLD = $(am__v_CCLD_@AM_V@)
459 461
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
460
-am__v_CCLD_0 = @echo "  CCLD    " $@;
461
-am__v_CCLD_1 = 
462
+am__v_CCLD_0 = @echo "  CCLD  " $@;
462 463
 @MAINTAINER_MODE_FALSE@am__skiplex = test -f $@ ||
463 464
 LEXCOMPILE = $(LEX) $(AM_LFLAGS) $(LFLAGS)
464 465
 LTLEXCOMPILE = $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) \
465 466
 	$(LIBTOOLFLAGS) --mode=compile $(LEX) $(AM_LFLAGS) $(LFLAGS)
466 467
 AM_V_LEX = $(am__v_LEX_@AM_V@)
467 468
 am__v_LEX_ = $(am__v_LEX_@AM_DEFAULT_V@)
468
-am__v_LEX_0 = @echo "  LEX     " $@;
469
-am__v_LEX_1 = 
469
+am__v_LEX_0 = @echo "  LEX   " $@;
470 470
 YLWRAP = $(top_srcdir)/config/ylwrap
471 471
 @MAINTAINER_MODE_FALSE@am__skipyacc = test -f $@ ||
472
-am__yacc_c2h = sed -e s/cc$$/hh/ -e s/cpp$$/hpp/ -e s/cxx$$/hxx/ \
473
-		   -e s/c++$$/h++/ -e s/c$$/h/
474 472
 YACCCOMPILE = $(YACC) $(AM_YFLAGS) $(YFLAGS)
475 473
 LTYACCCOMPILE = $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) \
476 474
 	$(LIBTOOLFLAGS) --mode=compile $(YACC) $(AM_YFLAGS) $(YFLAGS)
477 475
 AM_V_YACC = $(am__v_YACC_@AM_V@)
478 476
 am__v_YACC_ = $(am__v_YACC_@AM_DEFAULT_V@)
479
-am__v_YACC_0 = @echo "  YACC    " $@;
480
-am__v_YACC_1 = 
477
+am__v_YACC_0 = @echo "  YACC  " $@;
478
+AM_V_GEN = $(am__v_GEN_@AM_V@)
479
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
480
+am__v_GEN_0 = @echo "  GEN   " $@;
481 481
 SOURCES = $(libclamav_la_SOURCES) \
482 482
 	$(libclamav_internal_utils_la_SOURCES) \
483 483
 	$(libclamav_internal_utils_nothreads_la_SOURCES) \
... ...
@@ -489,45 +432,19 @@ DIST_SOURCES = $(libclamav_la_SOURCES) \
489 489
 	$(libclamav_nocxx_la_SOURCES) \
490 490
 	$(am__libclamunrar_la_SOURCES_DIST) \
491 491
 	$(am__libclamunrar_iface_la_SOURCES_DIST)
492
-RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
493
-	ctags-recursive dvi-recursive html-recursive info-recursive \
494
-	install-data-recursive install-dvi-recursive \
495
-	install-exec-recursive install-html-recursive \
496
-	install-info-recursive install-pdf-recursive \
497
-	install-ps-recursive install-recursive installcheck-recursive \
498
-	installdirs-recursive pdf-recursive ps-recursive \
499
-	tags-recursive uninstall-recursive
500
-am__can_run_installinfo = \
501
-  case $$AM_UPDATE_INFO_DIR in \
502
-    n|no|NO) false;; \
503
-    *) (install-info --version) >/dev/null 2>&1;; \
504
-  esac
492
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
493
+	html-recursive info-recursive install-data-recursive \
494
+	install-dvi-recursive install-exec-recursive \
495
+	install-html-recursive install-info-recursive \
496
+	install-pdf-recursive install-ps-recursive install-recursive \
497
+	installcheck-recursive installdirs-recursive pdf-recursive \
498
+	ps-recursive uninstall-recursive
505 499
 HEADERS = $(include_HEADERS)
506 500
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
507 501
   distclean-recursive maintainer-clean-recursive
508
-am__recursive_targets = \
509
-  $(RECURSIVE_TARGETS) \
510
-  $(RECURSIVE_CLEAN_TARGETS) \
511
-  $(am__extra_recursive_targets)
512
-AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
502
+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
503
+	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
513 504
 	distdir
514
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
515
-# Read a list of newline-separated strings from the standard input,
516
-# and print each of them once, without duplicates.  Input order is
517
-# *not* preserved.
518
-am__uniquify_input = $(AWK) '\
519
-  BEGIN { nonempty = 0; } \
520
-  { items[$$0] = 1; nonempty = 1; } \
521
-  END { if (nonempty) { for (i in items) print i; }; } \
522
-'
523
-# Make sure the list of sources is unique.  This is necessary because,
524
-# e.g., the same source file might be shared among _SOURCES variables
525
-# for different programs/libraries.
526
-am__define_uniq_tagged_files = \
527
-  list='$(am__tagged_files)'; \
528
-  unique=`for i in $$list; do \
529
-    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
530
-  done | $(am__uniquify_input)`
531 505
 ETAGS = etags
532 506
 CTAGS = ctags
533 507
 DIST_SUBDIRS = c++
... ...
@@ -918,10 +835,11 @@ libclamav_la_SOURCES = matcher-ac.c matcher-ac.h matcher-bm.c \
918 918
 	iso9660.h arc4.c arc4.h rijndael.c rijndael.h crtmgr.c \
919 919
 	crtmgr.h asn1.c asn1.h fpu.c fpu.h stats.c stats.h www.c www.h \
920 920
 	stats_json.c stats_json.h hostid.c hostid.h openioc.c \
921
-	openioc.h yara_grammar.y yara_lexer.l yara_lexer.h \
922
-	yara_parser.c yara_parser.h yara_clam.h msdoc.c msdoc.h \
923
-	matcher-pcre.c matcher-pcre.h regex_pcre.c regex_pcre.h \
924
-	bignum.h bignum_fast.h tomsfastmath/addsub/fp_add.c \
921
+	openioc.h yara_arena.c yara_areana.h yara_hash.c yara_hash.h \
922
+	yara_grammar.y yara_lexer.l yara_lexer.h yara_parser.c \
923
+	yara_parser.h yara_clam.h msdoc.c msdoc.h matcher-pcre.c \
924
+	matcher-pcre.h regex_pcre.c regex_pcre.h bignum.h \
925
+	bignum_fast.h tomsfastmath/addsub/fp_add.c \
925 926
 	tomsfastmath/addsub/fp_add_d.c tomsfastmath/addsub/fp_addmod.c \
926 927
 	tomsfastmath/addsub/fp_cmp.c tomsfastmath/addsub/fp_cmp_d.c \
927 928
 	tomsfastmath/addsub/fp_cmp_mag.c tomsfastmath/addsub/fp_sub.c \
... ...
@@ -1025,9 +943,9 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
1025 1025
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
1026 1026
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
1027 1027
 $(am__aclocal_m4_deps):
1028
-
1029 1028
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
1030 1029
 	@$(NORMAL_INSTALL)
1030
+	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
1031 1031
 	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
1032 1032
 	list2=; for p in $$list; do \
1033 1033
 	  if test -f $$p; then \
... ...
@@ -1035,8 +953,6 @@ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
1035 1035
 	  else :; fi; \
1036 1036
 	done; \
1037 1037
 	test -z "$$list2" || { \
1038
-	  echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \
1039
-	  $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \
1040 1038
 	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \
1041 1039
 	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \
1042 1040
 	}
... ...
@@ -1052,44 +968,34 @@ uninstall-libLTLIBRARIES:
1052 1052
 
1053 1053
 clean-libLTLIBRARIES:
1054 1054
 	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
1055
-	@list='$(lib_LTLIBRARIES)'; \
1056
-	locs=`for p in $$list; do echo $$p; done | \
1057
-	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
1058
-	      sort -u`; \
1059
-	test -z "$$locs" || { \
1060
-	  echo rm -f $${locs}; \
1061
-	  rm -f $${locs}; \
1062
-	}
1055
+	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
1056
+	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
1057
+	  test "$$dir" != "$$p" || dir=.; \
1058
+	  echo "rm -f \"$${dir}/so_locations\""; \
1059
+	  rm -f "$${dir}/so_locations"; \
1060
+	done
1063 1061
 
1064 1062
 clean-noinstLTLIBRARIES:
1065 1063
 	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
1066
-	@list='$(noinst_LTLIBRARIES)'; \
1067
-	locs=`for p in $$list; do echo $$p; done | \
1068
-	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
1069
-	      sort -u`; \
1070
-	test -z "$$locs" || { \
1071
-	  echo rm -f $${locs}; \
1072
-	  rm -f $${locs}; \
1073
-	}
1064
+	@list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
1065
+	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
1066
+	  test "$$dir" != "$$p" || dir=.; \
1067
+	  echo "rm -f \"$${dir}/so_locations\""; \
1068
+	  rm -f "$${dir}/so_locations"; \
1069
+	done
1074 1070
 yara_grammar.h: yara_grammar.c
1075 1071
 	@if test ! -f $@; then rm -f yara_grammar.c; else :; fi
1076 1072
 	@if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) yara_grammar.c; else :; fi
1077
-
1078 1073
 libclamav.la: $(libclamav_la_OBJECTS) $(libclamav_la_DEPENDENCIES) $(EXTRA_libclamav_la_DEPENDENCIES) 
1079 1074
 	$(AM_V_CCLD)$(libclamav_la_LINK) -rpath $(libdir) $(libclamav_la_OBJECTS) $(libclamav_la_LIBADD) $(LIBS)
1080
-
1081 1075
 libclamav_internal_utils.la: $(libclamav_internal_utils_la_OBJECTS) $(libclamav_internal_utils_la_DEPENDENCIES) $(EXTRA_libclamav_internal_utils_la_DEPENDENCIES) 
1082 1076
 	$(AM_V_CCLD)$(libclamav_internal_utils_la_LINK)  $(libclamav_internal_utils_la_OBJECTS) $(libclamav_internal_utils_la_LIBADD) $(LIBS)
1083
-
1084 1077
 libclamav_internal_utils_nothreads.la: $(libclamav_internal_utils_nothreads_la_OBJECTS) $(libclamav_internal_utils_nothreads_la_DEPENDENCIES) $(EXTRA_libclamav_internal_utils_nothreads_la_DEPENDENCIES) 
1085 1078
 	$(AM_V_CCLD)$(libclamav_internal_utils_nothreads_la_LINK)  $(libclamav_internal_utils_nothreads_la_OBJECTS) $(libclamav_internal_utils_nothreads_la_LIBADD) $(LIBS)
1086
-
1087 1079
 libclamav_nocxx.la: $(libclamav_nocxx_la_OBJECTS) $(libclamav_nocxx_la_DEPENDENCIES) $(EXTRA_libclamav_nocxx_la_DEPENDENCIES) 
1088 1080
 	$(AM_V_CCLD)$(libclamav_nocxx_la_LINK)  $(libclamav_nocxx_la_OBJECTS) $(libclamav_nocxx_la_LIBADD) $(LIBS)
1089
-
1090 1081
 libclamunrar.la: $(libclamunrar_la_OBJECTS) $(libclamunrar_la_DEPENDENCIES) $(EXTRA_libclamunrar_la_DEPENDENCIES) 
1091 1082
 	$(AM_V_CCLD)$(libclamunrar_la_LINK) $(am_libclamunrar_la_rpath) $(libclamunrar_la_OBJECTS) $(libclamunrar_la_LIBADD) $(LIBS)
1092
-
1093 1083
 libclamunrar_iface.la: $(libclamunrar_iface_la_OBJECTS) $(libclamunrar_iface_la_DEPENDENCIES) $(EXTRA_libclamunrar_iface_la_DEPENDENCIES) 
1094 1084
 	$(AM_V_CCLD)$(libclamunrar_iface_la_LINK) $(am_libclamunrar_iface_la_rpath) $(libclamunrar_iface_la_OBJECTS) $(libclamunrar_iface_la_LIBADD) $(LIBS)
1095 1085
 
... ...
@@ -1343,7 +1249,9 @@ distclean-compile:
1343 1343
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_la-xar.Plo@am__quote@
1344 1344
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_la-xdp.Plo@am__quote@
1345 1345
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_la-xz_iface.Plo@am__quote@
1346
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_la-yara_arena.Plo@am__quote@
1346 1347
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_la-yara_grammar.Plo@am__quote@
1348
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_la-yara_hash.Plo@am__quote@
1347 1349
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_la-yara_lexer.Plo@am__quote@
1348 1350
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_la-yara_parser.Plo@am__quote@
1349 1351
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_la-yc.Plo@am__quote@
... ...
@@ -1363,14 +1271,14 @@ distclean-compile:
1363 1363
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
1364 1364
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
1365 1365
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1366
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
1366
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
1367 1367
 
1368 1368
 .c.obj:
1369 1369
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
1370 1370
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
1371 1371
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
1372 1372
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1373
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
1373
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
1374 1374
 
1375 1375
 .c.lo:
1376 1376
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
... ...
@@ -2338,6 +2246,20 @@ libclamav_la-openioc.lo: openioc.c
2338 2338
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
2339 2339
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_la_CFLAGS) $(CFLAGS) -c -o libclamav_la-openioc.lo `test -f 'openioc.c' || echo '$(srcdir)/'`openioc.c
2340 2340
 
2341
+libclamav_la-yara_arena.lo: yara_arena.c
2342
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_la_CFLAGS) $(CFLAGS) -MT libclamav_la-yara_arena.lo -MD -MP -MF $(DEPDIR)/libclamav_la-yara_arena.Tpo -c -o libclamav_la-yara_arena.lo `test -f 'yara_arena.c' || echo '$(srcdir)/'`yara_arena.c
2343
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libclamav_la-yara_arena.Tpo $(DEPDIR)/libclamav_la-yara_arena.Plo
2344
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='yara_arena.c' object='libclamav_la-yara_arena.lo' libtool=yes @AMDEPBACKSLASH@
2345
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
2346
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_la_CFLAGS) $(CFLAGS) -c -o libclamav_la-yara_arena.lo `test -f 'yara_arena.c' || echo '$(srcdir)/'`yara_arena.c
2347
+
2348
+libclamav_la-yara_hash.lo: yara_hash.c
2349
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_la_CFLAGS) $(CFLAGS) -MT libclamav_la-yara_hash.lo -MD -MP -MF $(DEPDIR)/libclamav_la-yara_hash.Tpo -c -o libclamav_la-yara_hash.lo `test -f 'yara_hash.c' || echo '$(srcdir)/'`yara_hash.c
2350
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libclamav_la-yara_hash.Tpo $(DEPDIR)/libclamav_la-yara_hash.Plo
2351
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='yara_hash.c' object='libclamav_la-yara_hash.lo' libtool=yes @AMDEPBACKSLASH@
2352
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
2353
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_la_CFLAGS) $(CFLAGS) -c -o libclamav_la-yara_hash.lo `test -f 'yara_hash.c' || echo '$(srcdir)/'`yara_hash.c
2354
+
2341 2355
 libclamav_la-yara_grammar.lo: yara_grammar.c
2342 2356
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_la_CFLAGS) $(CFLAGS) -MT libclamav_la-yara_grammar.lo -MD -MP -MF $(DEPDIR)/libclamav_la-yara_grammar.Tpo -c -o libclamav_la-yara_grammar.lo `test -f 'yara_grammar.c' || echo '$(srcdir)/'`yara_grammar.c
2343 2357
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libclamav_la-yara_grammar.Tpo $(DEPDIR)/libclamav_la-yara_grammar.Plo
... ...
@@ -3189,7 +3111,7 @@ unrar_iface.lo: ../libclamunrar_iface/unrar_iface.c
3189 3189
 	$(AM_V_LEX)$(am__skiplex) $(SHELL) $(YLWRAP) $< $(LEX_OUTPUT_ROOT).c $@ -- $(LEXCOMPILE)
3190 3190
 
3191 3191
 .y.c:
3192
-	$(AM_V_YACC)$(am__skipyacc) $(SHELL) $(YLWRAP) $< y.tab.c $@ y.tab.h `echo $@ | $(am__yacc_c2h)` y.output $*.output -- $(YACCCOMPILE)
3192
+	$(AM_V_YACC)$(am__skipyacc) $(SHELL) $(YLWRAP) $< y.tab.c $@ y.tab.h $*.h y.output $*.output -- $(YACCCOMPILE)
3193 3193
 
3194 3194
 mostlyclean-libtool:
3195 3195
 	-rm -f *.lo
... ...
@@ -3198,11 +3120,8 @@ clean-libtool:
3198 3198
 	-rm -rf .libs _libs
3199 3199
 install-includeHEADERS: $(include_HEADERS)
3200 3200
 	@$(NORMAL_INSTALL)
3201
+	test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)"
3201 3202
 	@list='$(include_HEADERS)'; test -n "$(includedir)" || list=; \
3202
-	if test -n "$$list"; then \
3203
-	  echo " $(MKDIR_P) '$(DESTDIR)$(includedir)'"; \
3204
-	  $(MKDIR_P) "$(DESTDIR)$(includedir)" || exit 1; \
3205
-	fi; \
3206 3203
 	for p in $$list; do \
3207 3204
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
3208 3205
 	  echo "$$d$$p"; \
... ...
@@ -3219,25 +3138,22 @@ uninstall-includeHEADERS:
3219 3219
 	dir='$(DESTDIR)$(includedir)'; $(am__uninstall_files_from_dir)
3220 3220
 
3221 3221
 # This directory's subdirectories are mostly independent; you can cd
3222
-# into them and run 'make' without going through this Makefile.
3223
-# To change the values of 'make' variables: instead of editing Makefiles,
3224
-# (1) if the variable is set in 'config.status', edit 'config.status'
3225
-#     (which will cause the Makefiles to be regenerated when you run 'make');
3226
-# (2) otherwise, pass the desired values on the 'make' command line.
3227
-$(am__recursive_targets):
3228
-	@fail=; \
3229
-	if $(am__make_keepgoing); then \
3230
-	  failcom='fail=yes'; \
3231
-	else \
3232
-	  failcom='exit 1'; \
3233
-	fi; \
3222
+# into them and run `make' without going through this Makefile.
3223
+# To change the values of `make' variables: instead of editing Makefiles,
3224
+# (1) if the variable is set in `config.status', edit `config.status'
3225
+#     (which will cause the Makefiles to be regenerated when you run `make');
3226
+# (2) otherwise, pass the desired values on the `make' command line.
3227
+$(RECURSIVE_TARGETS):
3228
+	@fail= failcom='exit 1'; \
3229
+	for f in x $$MAKEFLAGS; do \
3230
+	  case $$f in \
3231
+	    *=* | --[!k]*);; \
3232
+	    *k*) failcom='fail=yes';; \
3233
+	  esac; \
3234
+	done; \
3234 3235
 	dot_seen=no; \
3235 3236
 	target=`echo $@ | sed s/-recursive//`; \
3236
-	case "$@" in \
3237
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
3238
-	  *) list='$(SUBDIRS)' ;; \
3239
-	esac; \
3240
-	for subdir in $$list; do \
3237
+	list='$(SUBDIRS)'; for subdir in $$list; do \
3241 3238
 	  echo "Making $$target in $$subdir"; \
3242 3239
 	  if test "$$subdir" = "."; then \
3243 3240
 	    dot_seen=yes; \
... ...
@@ -3252,12 +3168,57 @@ $(am__recursive_targets):
3252 3252
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
3253 3253
 	fi; test -z "$$fail"
3254 3254
 
3255
-ID: $(am__tagged_files)
3256
-	$(am__define_uniq_tagged_files); mkid -fID $$unique
3257
-tags: tags-recursive
3258
-TAGS: tags
3255
+$(RECURSIVE_CLEAN_TARGETS):
3256
+	@fail= failcom='exit 1'; \
3257
+	for f in x $$MAKEFLAGS; do \
3258
+	  case $$f in \
3259
+	    *=* | --[!k]*);; \
3260
+	    *k*) failcom='fail=yes';; \
3261
+	  esac; \
3262
+	done; \
3263
+	dot_seen=no; \
3264
+	case "$@" in \
3265
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
3266
+	  *) list='$(SUBDIRS)' ;; \
3267
+	esac; \
3268
+	rev=''; for subdir in $$list; do \
3269
+	  if test "$$subdir" = "."; then :; else \
3270
+	    rev="$$subdir $$rev"; \
3271
+	  fi; \
3272
+	done; \
3273
+	rev="$$rev ."; \
3274
+	target=`echo $@ | sed s/-recursive//`; \
3275
+	for subdir in $$rev; do \
3276
+	  echo "Making $$target in $$subdir"; \
3277
+	  if test "$$subdir" = "."; then \
3278
+	    local_target="$$target-am"; \
3279
+	  else \
3280
+	    local_target="$$target"; \
3281
+	  fi; \
3282
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
3283
+	  || eval $$failcom; \
3284
+	done && test -z "$$fail"
3285
+tags-recursive:
3286
+	list='$(SUBDIRS)'; for subdir in $$list; do \
3287
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
3288
+	done
3289
+ctags-recursive:
3290
+	list='$(SUBDIRS)'; for subdir in $$list; do \
3291
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
3292
+	done
3259 3293
 
3260
-tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
3294
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
3295
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
3296
+	unique=`for i in $$list; do \
3297
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
3298
+	  done | \
3299
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
3300
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
3301
+	mkid -fID $$unique
3302
+tags: TAGS
3303
+
3304
+TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
3305
+		$(TAGS_FILES) $(LISP)
3261 3306
 	set x; \
3262 3307
 	here=`pwd`; \
3263 3308
 	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
... ...
@@ -3273,7 +3234,12 @@ tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
3273 3273
 	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
3274 3274
 	  fi; \
3275 3275
 	done; \
3276
-	$(am__define_uniq_tagged_files); \
3276
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
3277
+	unique=`for i in $$list; do \
3278
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
3279
+	  done | \
3280
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
3281
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
3277 3282
 	shift; \
3278 3283
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
3279 3284
 	  test -n "$$unique" || unique=$$empty_fix; \
... ...
@@ -3285,11 +3251,15 @@ tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
3285 3285
 	      $$unique; \
3286 3286
 	  fi; \
3287 3287
 	fi
3288
-ctags: ctags-recursive
3289
-
3290
-CTAGS: ctags
3291
-ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
3292
-	$(am__define_uniq_tagged_files); \
3288
+ctags: CTAGS
3289
+CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
3290
+		$(TAGS_FILES) $(LISP)
3291
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
3292
+	unique=`for i in $$list; do \
3293
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
3294
+	  done | \
3295
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
3296
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
3293 3297
 	test -z "$(CTAGS_ARGS)$$unique" \
3294 3298
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
3295 3299
 	     $$unique
... ...
@@ -3298,21 +3268,6 @@ GTAGS:
3298 3298
 	here=`$(am__cd) $(top_builddir) && pwd` \
3299 3299
 	  && $(am__cd) $(top_srcdir) \
3300 3300
 	  && gtags -i $(GTAGS_ARGS) "$$here"
3301
-cscopelist: cscopelist-recursive
3302
-
3303
-cscopelist-am: $(am__tagged_files)
3304
-	list='$(am__tagged_files)'; \
3305
-	case "$(srcdir)" in \
3306
-	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
3307
-	  *) sdir=$(subdir)/$(srcdir) ;; \
3308
-	esac; \
3309
-	for i in $$list; do \
3310
-	  if test -f "$$i"; then \
3311
-	    echo "$(subdir)/$$i"; \
3312
-	  else \
3313
-	    echo "$$sdir/$$i"; \
3314
-	  fi; \
3315
-	done >> $(top_builddir)/cscope.files
3316 3301
 
3317 3302
 distclean-tags:
3318 3303
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
... ...
@@ -3349,10 +3304,13 @@ distdir: $(DISTFILES)
3349 3349
 	done
3350 3350
 	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
3351 3351
 	  if test "$$subdir" = .; then :; else \
3352
-	    $(am__make_dryrun) \
3353
-	      || test -d "$(distdir)/$$subdir" \
3354
-	      || $(MKDIR_P) "$(distdir)/$$subdir" \
3355
-	      || exit 1; \
3352
+	    test -d "$(distdir)/$$subdir" \
3353
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
3354
+	    || exit 1; \
3355
+	  fi; \
3356
+	done
3357
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
3358
+	  if test "$$subdir" = .; then :; else \
3356 3359
 	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
3357 3360
 	    $(am__relativize); \
3358 3361
 	    new_distdir=$$reldir; \
... ...
@@ -3488,25 +3446,26 @@ ps-am:
3488 3488
 
3489 3489
 uninstall-am: uninstall-includeHEADERS uninstall-libLTLIBRARIES
3490 3490
 
3491
-.MAKE: $(am__recursive_targets) all check install install-am \
3492
-	install-strip
3493
-
3494
-.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \
3495
-	check-am clean clean-generic clean-libLTLIBRARIES \
3496
-	clean-libtool clean-noinstLTLIBRARIES cscopelist-am ctags \
3497
-	ctags-am distclean distclean-compile distclean-generic \
3498
-	distclean-libtool distclean-tags distdir dvi dvi-am html \
3499
-	html-am info info-am install install-am install-data \
3500
-	install-data-am install-dvi install-dvi-am install-exec \
3501
-	install-exec-am install-html install-html-am \
3491
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all check \
3492
+	ctags-recursive install install-am install-strip \
3493
+	tags-recursive
3494
+
3495
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
3496
+	all all-am check check-am clean clean-generic \
3497
+	clean-libLTLIBRARIES clean-libtool clean-noinstLTLIBRARIES \
3498
+	ctags ctags-recursive distclean distclean-compile \
3499
+	distclean-generic distclean-libtool distclean-tags distdir dvi \
3500
+	dvi-am html html-am info info-am install install-am \
3501
+	install-data install-data-am install-dvi install-dvi-am \
3502
+	install-exec install-exec-am install-html install-html-am \
3502 3503
 	install-includeHEADERS install-info install-info-am \
3503 3504
 	install-libLTLIBRARIES install-man install-pdf install-pdf-am \
3504 3505
 	install-ps install-ps-am install-strip installcheck \
3505 3506
 	installcheck-am installdirs installdirs-am maintainer-clean \
3506 3507
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
3507 3508
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
3508
-	tags tags-am uninstall uninstall-am uninstall-includeHEADERS \
3509
-	uninstall-libLTLIBRARIES
3509
+	tags tags-recursive uninstall uninstall-am \
3510
+	uninstall-includeHEADERS uninstall-libLTLIBRARIES
3510 3511
 
3511 3512
 @ENABLE_LLVM_FALSE@c++/Makefile: c++/Makefile.nollvm.in
3512 3513
 @ENABLE_LLVM_FALSE@	$(AM_V_at) cp $< $@
... ...
@@ -1,8 +1,9 @@
1
-# Makefile.in generated by automake 1.14 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@
... ...
@@ -107,16 +63,11 @@ target_triplet = @target@
107 107
 @BUILD_EXTERNAL_LLVM_FALSE@@MAINTAINER_MODE_TRUE@am__append_9 = $(TBLGENFILES)
108 108
 @BUILD_EXTERNAL_LLVM_FALSE@@MAINTAINER_MODE_TRUE@noinst_PROGRAMS = tblgen$(EXEEXT)
109 109
 subdir = .
110
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
111
-	$(top_srcdir)/configure $(am__configure_deps) \
112
-	$(srcdir)/clamavcxx-config.h.in $(top_srcdir)/config/depcomp \
113
-	config/compile config/config.guess config/config.sub \
114
-	config/depcomp config/install-sh config/missing \
115
-	config/ltmain.sh $(top_srcdir)/config/compile \
116
-	$(top_srcdir)/config/config.guess \
117
-	$(top_srcdir)/config/config.sub \
118
-	$(top_srcdir)/config/install-sh $(top_srcdir)/config/ltmain.sh \
119
-	$(top_srcdir)/config/missing
110
+DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \
111
+	$(srcdir)/Makefile.in $(srcdir)/clamavcxx-config.h.in \
112
+	$(top_srcdir)/configure config/compile config/config.guess \
113
+	config/config.sub config/depcomp config/install-sh \
114
+	config/ltmain.sh config/missing
120 115
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
121 116
 am__aclocal_m4_deps = $(top_srcdir)/m4/check_gnu_make.m4 \
122 117
 	$(top_srcdir)/m4/cxx_flag_check.m4 $(top_srcdir)/m4/libtool.m4 \
... ...
@@ -145,7 +96,6 @@ libclamavcxx_la_OBJECTS = $(am_libclamavcxx_la_OBJECTS)
145 145
 AM_V_lt = $(am__v_lt_@AM_V@)
146 146
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
147 147
 am__v_lt_0 = --silent
148
-am__v_lt_1 = 
149 148
 libclamavcxx_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
150 149
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
151 150
 	$(libclamavcxx_la_CXXFLAGS) $(CXXFLAGS) \
... ...
@@ -811,18 +761,6 @@ tblgen_LDADD = $(LDADD)
811 811
 tblgen_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
812 812
 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(tblgen_CXXFLAGS) \
813 813
 	$(CXXFLAGS) $(tblgen_LDFLAGS) $(LDFLAGS) -o $@
814
-AM_V_P = $(am__v_P_@AM_V@)
815
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
816
-am__v_P_0 = false
817
-am__v_P_1 = :
818
-AM_V_GEN = $(am__v_GEN_@AM_V@)
819
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
820
-am__v_GEN_0 = @echo "  GEN     " $@;
821
-am__v_GEN_1 = 
822
-AM_V_at = $(am__v_at_@AM_V@)
823
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
824
-am__v_at_0 = @
825
-am__v_at_1 = 
826 814
 DEFAULT_INCLUDES = -I.@am__isrc@
827 815
 depcomp = $(SHELL) $(top_srcdir)/config/depcomp
828 816
 am__depfiles_maybe = depfiles
... ...
@@ -835,16 +773,17 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
835 835
 	$(AM_CFLAGS) $(CFLAGS)
836 836
 AM_V_CC = $(am__v_CC_@AM_V@)
837 837
 am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
838
-am__v_CC_0 = @echo "  CC      " $@;
839
-am__v_CC_1 = 
838
+am__v_CC_0 = @echo "  CC    " $@;
839
+AM_V_at = $(am__v_at_@AM_V@)
840
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
841
+am__v_at_0 = @
840 842
 CCLD = $(CC)
841 843
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
842 844
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
843 845
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
844 846
 AM_V_CCLD = $(am__v_CCLD_@AM_V@)
845 847
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
846
-am__v_CCLD_0 = @echo "  CCLD    " $@;
847
-am__v_CCLD_1 = 
848
+am__v_CCLD_0 = @echo "  CCLD  " $@;
848 849
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
849 850
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
850 851
 LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
... ...
@@ -853,16 +792,17 @@ LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
853 853
 	$(AM_CXXFLAGS) $(CXXFLAGS)
854 854
 AM_V_CXX = $(am__v_CXX_@AM_V@)
855 855
 am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@)
856
-am__v_CXX_0 = @echo "  CXX     " $@;
857
-am__v_CXX_1 = 
856
+am__v_CXX_0 = @echo "  CXX   " $@;
858 857
 CXXLD = $(CXX)
859 858
 CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
860 859
 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
861 860
 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
862 861
 AM_V_CXXLD = $(am__v_CXXLD_@AM_V@)
863 862
 am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@)
864
-am__v_CXXLD_0 = @echo "  CXXLD   " $@;
865
-am__v_CXXLD_1 = 
863
+am__v_CXXLD_0 = @echo "  CXXLD " $@;
864
+AM_V_GEN = $(am__v_GEN_@AM_V@)
865
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
866
+am__v_GEN_0 = @echo "  GEN   " $@;
866 867
 SOURCES = $(libclamavcxx_la_SOURCES) $(libllvmcodegen_la_SOURCES) \
867 868
 	$(libllvmjit_la_SOURCES) $(libllvmpowerpccodegen_la_SOURCES) \
868 869
 	$(libllvmsystem_la_SOURCES) $(libllvmx86codegen_la_SOURCES) \
... ...
@@ -874,33 +814,8 @@ DIST_SOURCES = $(am__libclamavcxx_la_SOURCES_DIST) \
874 874
 	$(am__libllvmsystem_la_SOURCES_DIST) \
875 875
 	$(am__libllvmx86codegen_la_SOURCES_DIST) \
876 876
 	$(am__tblgen_SOURCES_DIST)
877
-am__can_run_installinfo = \
878
-  case $$AM_UPDATE_INFO_DIR in \
879
-    n|no|NO) false;; \
880
-    *) (install-info --version) >/dev/null 2>&1;; \
881
-  esac
882
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \
883
-	$(LISP)clamavcxx-config.h.in
884
-# Read a list of newline-separated strings from the standard input,
885
-# and print each of them once, without duplicates.  Input order is
886
-# *not* preserved.
887
-am__uniquify_input = $(AWK) '\
888
-  BEGIN { nonempty = 0; } \
889
-  { items[$$0] = 1; nonempty = 1; } \
890
-  END { if (nonempty) { for (i in items) print i; }; } \
891
-'
892
-# Make sure the list of sources is unique.  This is necessary because,
893
-# e.g., the same source file might be shared among _SOURCES variables
894
-# for different programs/libraries.
895
-am__define_uniq_tagged_files = \
896
-  list='$(am__tagged_files)'; \
897
-  unique=`for i in $$list; do \
898
-    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
899
-  done | $(am__uniquify_input)`
900 877
 ETAGS = etags
901 878
 CTAGS = ctags
902
-CSCOPE = cscope
903
-AM_RECURSIVE_TARGETS = cscope
904 879
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
905 880
 distdir = $(PACKAGE)-$(VERSION)
906 881
 top_distdir = $(distdir)
... ...
@@ -910,10 +825,8 @@ am__remove_distdir = \
910 910
       && rm -rf "$(distdir)" \
911 911
       || { sleep 5 && rm -rf "$(distdir)"; }; \
912 912
   else :; fi
913
-am__post_remove_distdir = $(am__remove_distdir)
914 913
 DIST_ARCHIVES = $(distdir).tar.gz
915 914
 GZIP_ENV = --best
916
-DIST_TARGETS = dist-gzip
917 915
 distuninstallcheck_listfiles = find . -type f -print
918 916
 am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
919 917
   | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
... ...
@@ -1567,8 +1480,8 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
1567 1567
 $(am__aclocal_m4_deps):
1568 1568
 
1569 1569
 clamavcxx-config.h: stamp-h1
1570
-	@test -f $@ || rm -f stamp-h1
1571
-	@test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1
1570
+	@if test ! -f $@; then rm -f stamp-h1; else :; fi
1571
+	@if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi
1572 1572
 
1573 1573
 stamp-h1: $(srcdir)/clamavcxx-config.h.in $(top_builddir)/config.status
1574 1574
 	@rm -f stamp-h1
... ...
@@ -1583,30 +1496,22 @@ distclean-hdr:
1583 1583
 
1584 1584
 clean-noinstLTLIBRARIES:
1585 1585
 	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
1586
-	@list='$(noinst_LTLIBRARIES)'; \
1587
-	locs=`for p in $$list; do echo $$p; done | \
1588
-	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
1589
-	      sort -u`; \
1590
-	test -z "$$locs" || { \
1591
-	  echo rm -f $${locs}; \
1592
-	  rm -f $${locs}; \
1593
-	}
1594
-
1586
+	@list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
1587
+	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
1588
+	  test "$$dir" != "$$p" || dir=.; \
1589
+	  echo "rm -f \"$${dir}/so_locations\""; \
1590
+	  rm -f "$${dir}/so_locations"; \
1591
+	done
1595 1592
 libclamavcxx.la: $(libclamavcxx_la_OBJECTS) $(libclamavcxx_la_DEPENDENCIES) $(EXTRA_libclamavcxx_la_DEPENDENCIES) 
1596 1593
 	$(AM_V_CXXLD)$(libclamavcxx_la_LINK) $(am_libclamavcxx_la_rpath) $(libclamavcxx_la_OBJECTS) $(libclamavcxx_la_LIBADD) $(LIBS)
1597
-
1598 1594
 libllvmcodegen.la: $(libllvmcodegen_la_OBJECTS) $(libllvmcodegen_la_DEPENDENCIES) $(EXTRA_libllvmcodegen_la_DEPENDENCIES) 
1599 1595
 	$(AM_V_CXXLD)$(CXXLINK) $(am_libllvmcodegen_la_rpath) $(libllvmcodegen_la_OBJECTS) $(libllvmcodegen_la_LIBADD) $(LIBS)
1600
-
1601 1596
 libllvmjit.la: $(libllvmjit_la_OBJECTS) $(libllvmjit_la_DEPENDENCIES) $(EXTRA_libllvmjit_la_DEPENDENCIES) 
1602 1597
 	$(AM_V_CXXLD)$(CXXLINK) $(am_libllvmjit_la_rpath) $(libllvmjit_la_OBJECTS) $(libllvmjit_la_LIBADD) $(LIBS)
1603
-
1604 1598
 libllvmpowerpccodegen.la: $(libllvmpowerpccodegen_la_OBJECTS) $(libllvmpowerpccodegen_la_DEPENDENCIES) $(EXTRA_libllvmpowerpccodegen_la_DEPENDENCIES) 
1605 1599
 	$(AM_V_CXXLD)$(CXXLINK) $(am_libllvmpowerpccodegen_la_rpath) $(libllvmpowerpccodegen_la_OBJECTS) $(libllvmpowerpccodegen_la_LIBADD) $(LIBS)
1606
-
1607 1600
 libllvmsystem.la: $(libllvmsystem_la_OBJECTS) $(libllvmsystem_la_DEPENDENCIES) $(EXTRA_libllvmsystem_la_DEPENDENCIES) 
1608 1601
 	$(AM_V_CXXLD)$(libllvmsystem_la_LINK) $(am_libllvmsystem_la_rpath) $(libllvmsystem_la_OBJECTS) $(libllvmsystem_la_LIBADD) $(LIBS)
1609
-
1610 1602
 libllvmx86codegen.la: $(libllvmx86codegen_la_OBJECTS) $(libllvmx86codegen_la_DEPENDENCIES) $(EXTRA_libllvmx86codegen_la_DEPENDENCIES) 
1611 1603
 	$(AM_V_CXXLD)$(CXXLINK) $(am_libllvmx86codegen_la_rpath) $(libllvmx86codegen_la_OBJECTS) $(libllvmx86codegen_la_LIBADD) $(LIBS)
1612 1604
 
... ...
@@ -1618,7 +1523,6 @@ clean-noinstPROGRAMS:
1618 1618
 	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
1619 1619
 	echo " rm -f" $$list; \
1620 1620
 	rm -f $$list
1621
-
1622 1621
 tblgen$(EXEEXT): $(tblgen_OBJECTS) $(tblgen_DEPENDENCIES) $(EXTRA_tblgen_DEPENDENCIES) 
1623 1622
 	@rm -f tblgen$(EXEEXT)
1624 1623
 	$(AM_V_CXXLD)$(tblgen_LINK) $(tblgen_OBJECTS) $(tblgen_LDADD) $(LIBS)
... ...
@@ -2029,14 +1933,14 @@ distclean-compile:
2029 2029
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
2030 2030
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
2031 2031
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
2032
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
2032
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
2033 2033
 
2034 2034
 .c.obj:
2035 2035
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
2036 2036
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
2037 2037
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
2038 2038
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
2039
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
2039
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
2040 2040
 
2041 2041
 .c.lo:
2042 2042
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
... ...
@@ -5484,15 +5388,26 @@ clean-libtool:
5484 5484
 distclean-libtool:
5485 5485
 	-rm -f libtool config.lt
5486 5486
 
5487
-ID: $(am__tagged_files)
5488
-	$(am__define_uniq_tagged_files); mkid -fID $$unique
5489
-tags: tags-am
5490
-TAGS: tags
5491
-
5492
-tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
5487
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
5488
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
5489
+	unique=`for i in $$list; do \
5490
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
5491
+	  done | \
5492
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
5493
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
5494
+	mkid -fID $$unique
5495
+tags: TAGS
5496
+
5497
+TAGS:  $(HEADERS) $(SOURCES) clamavcxx-config.h.in $(TAGS_DEPENDENCIES) \
5498
+		$(TAGS_FILES) $(LISP)
5493 5499
 	set x; \
5494 5500
 	here=`pwd`; \
5495
-	$(am__define_uniq_tagged_files); \
5501
+	list='$(SOURCES) $(HEADERS) clamavcxx-config.h.in $(LISP) $(TAGS_FILES)'; \
5502
+	unique=`for i in $$list; do \
5503
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
5504
+	  done | \
5505
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
5506
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
5496 5507
 	shift; \
5497 5508
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
5498 5509
 	  test -n "$$unique" || unique=$$empty_fix; \
... ...
@@ -5504,11 +5419,15 @@ tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
5504 5504
 	      $$unique; \
5505 5505
 	  fi; \
5506 5506
 	fi
5507
-ctags: ctags-am
5508
-
5509
-CTAGS: ctags
5510
-ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
5511
-	$(am__define_uniq_tagged_files); \
5507
+ctags: CTAGS
5508
+CTAGS:  $(HEADERS) $(SOURCES) clamavcxx-config.h.in $(TAGS_DEPENDENCIES) \
5509
+		$(TAGS_FILES) $(LISP)
5510
+	list='$(SOURCES) $(HEADERS) clamavcxx-config.h.in $(LISP) $(TAGS_FILES)'; \
5511
+	unique=`for i in $$list; do \
5512
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
5513
+	  done | \
5514
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
5515
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
5512 5516
 	test -z "$(CTAGS_ARGS)$$unique" \
5513 5517
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
5514 5518
 	     $$unique
... ...
@@ -5517,31 +5436,9 @@ GTAGS:
5517 5517
 	here=`$(am__cd) $(top_builddir) && pwd` \
5518 5518
 	  && $(am__cd) $(top_srcdir) \
5519 5519
 	  && gtags -i $(GTAGS_ARGS) "$$here"
5520
-cscope: cscope.files
5521
-	test ! -s cscope.files \
5522
-	  || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS)
5523
-clean-cscope:
5524
-	-rm -f cscope.files
5525
-cscope.files: clean-cscope cscopelist
5526
-cscopelist: cscopelist-am
5527
-
5528
-cscopelist-am: $(am__tagged_files)
5529
-	list='$(am__tagged_files)'; \
5530
-	case "$(srcdir)" in \
5531
-	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
5532
-	  *) sdir=$(subdir)/$(srcdir) ;; \
5533
-	esac; \
5534
-	for i in $$list; do \
5535
-	  if test -f "$$i"; then \
5536
-	    echo "$(subdir)/$$i"; \
5537
-	  else \
5538
-	    echo "$$sdir/$$i"; \
5539
-	  fi; \
5540
-	done >> $(top_builddir)/cscope.files
5541 5520
 
5542 5521
 distclean-tags:
5543 5522
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
5544
-	-rm -f cscope.out cscope.in.out cscope.po.out cscope.files
5545 5523
 
5546 5524
 distdir: $(DISTFILES)
5547 5525
 	$(am__remove_distdir)
... ...
@@ -5587,42 +5484,40 @@ distdir: $(DISTFILES)
5587 5587
 	|| chmod -R a+r "$(distdir)"
5588 5588
 dist-gzip: distdir
5589 5589
 	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
5590
-	$(am__post_remove_distdir)
5590
+	$(am__remove_distdir)
5591 5591
 
5592 5592
 dist-bzip2: distdir
5593 5593
 	tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
5594
-	$(am__post_remove_distdir)
5594
+	$(am__remove_distdir)
5595 5595
 
5596 5596
 dist-lzip: distdir
5597 5597
 	tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
5598
-	$(am__post_remove_distdir)
5598
+	$(am__remove_distdir)
5599
+
5600
+dist-lzma: distdir
5601
+	tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
5602
+	$(am__remove_distdir)
5599 5603
 
5600 5604
 dist-xz: distdir
5601 5605
 	tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
5602
-	$(am__post_remove_distdir)
5606
+	$(am__remove_distdir)
5603 5607
 
5604 5608
 dist-tarZ: distdir
5605
-	@echo WARNING: "Support for shar distribution archives is" \
5606
-	               "deprecated." >&2
5607
-	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
5608 5609
 	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
5609
-	$(am__post_remove_distdir)
5610
+	$(am__remove_distdir)
5610 5611
 
5611 5612
 dist-shar: distdir
5612
-	@echo WARNING: "Support for distribution archives compressed with" \
5613
-		       "legacy program 'compress' is deprecated." >&2
5614
-	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
5615 5613
 	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
5616
-	$(am__post_remove_distdir)
5614
+	$(am__remove_distdir)
5617 5615
 
5618 5616
 dist-zip: distdir
5619 5617
 	-rm -f $(distdir).zip
5620 5618
 	zip -rq $(distdir).zip $(distdir)
5621
-	$(am__post_remove_distdir)
5619
+	$(am__remove_distdir)
5622 5620
 
5623
-dist dist-all:
5624
-	$(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:'
5625
-	$(am__post_remove_distdir)
5621
+dist dist-all: distdir
5622
+	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
5623
+	$(am__remove_distdir)
5626 5624
 
5627 5625
 # This target untars the dist file and tries a VPATH configuration.  Then
5628 5626
 # it guarantees that the distribution is self-contained by making another
... ...
@@ -5633,6 +5528,8 @@ distcheck: dist
5633 5633
 	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
5634 5634
 	*.tar.bz2*) \
5635 5635
 	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
5636
+	*.tar.lzma*) \
5637
+	  lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
5636 5638
 	*.tar.lz*) \
5637 5639
 	  lzip -dc $(distdir).tar.lz | $(am__untar) ;;\
5638 5640
 	*.tar.xz*) \
... ...
@@ -5644,9 +5541,9 @@ distcheck: dist
5644 5644
 	*.zip*) \
5645 5645
 	  unzip $(distdir).zip ;;\
5646 5646
 	esac
5647
-	chmod -R a-w $(distdir)
5648
-	chmod u+w $(distdir)
5649
-	mkdir $(distdir)/_build $(distdir)/_inst
5647
+	chmod -R a-w $(distdir); chmod a+w $(distdir)
5648
+	mkdir $(distdir)/_build
5649
+	mkdir $(distdir)/_inst
5650 5650
 	chmod a-w $(distdir)
5651 5651
 	test -d $(distdir)/_build || exit 0; \
5652 5652
 	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
... ...
@@ -5678,7 +5575,7 @@ distcheck: dist
5678 5678
 	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
5679 5679
 	  && cd "$$am__cwd" \
5680 5680
 	  || exit 1
5681
-	$(am__post_remove_distdir)
5681
+	$(am__remove_distdir)
5682 5682
 	@(echo "$(distdir) archives ready for distribution: "; \
5683 5683
 	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
5684 5684
 	  sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
... ...
@@ -5823,23 +5720,23 @@ uninstall-am:
5823 5823
 
5824 5824
 .MAKE: all check install install-am install-strip
5825 5825
 
5826
-.PHONY: CTAGS GTAGS TAGS all all-am am--refresh check check-am clean \
5827
-	clean-cscope clean-generic clean-libtool clean-local \
5828
-	clean-noinstLTLIBRARIES clean-noinstPROGRAMS cscope \
5829
-	cscopelist-am ctags ctags-am dist dist-all dist-bzip2 \
5830
-	dist-gzip dist-hook dist-lzip dist-shar dist-tarZ dist-xz \
5831
-	dist-zip distcheck distclean distclean-compile \
5832
-	distclean-generic distclean-hdr distclean-libtool \
5833
-	distclean-local distclean-tags distcleancheck distdir \
5834
-	distuninstallcheck dvi dvi-am html html-am info info-am \
5835
-	install install-am install-data install-data-am install-dvi \
5836
-	install-dvi-am install-exec install-exec-am install-html \
5837
-	install-html-am install-info install-info-am install-man \
5838
-	install-pdf install-pdf-am install-ps install-ps-am \
5839
-	install-strip installcheck installcheck-am installdirs \
5840
-	maintainer-clean maintainer-clean-generic mostlyclean \
5841
-	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
5842
-	pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am
5826
+.PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \
5827
+	clean-generic clean-libtool clean-local \
5828
+	clean-noinstLTLIBRARIES clean-noinstPROGRAMS ctags dist \
5829
+	dist-all dist-bzip2 dist-gzip dist-hook dist-lzip dist-lzma \
5830
+	dist-shar dist-tarZ dist-xz dist-zip distcheck distclean \
5831
+	distclean-compile distclean-generic distclean-hdr \
5832
+	distclean-libtool distclean-local distclean-tags \
5833
+	distcleancheck distdir distuninstallcheck dvi dvi-am html \
5834
+	html-am info info-am install install-am install-data \
5835
+	install-data-am install-dvi install-dvi-am install-exec \
5836
+	install-exec-am install-html install-html-am install-info \
5837
+	install-info-am install-man install-pdf install-pdf-am \
5838
+	install-ps install-ps-am install-strip installcheck \
5839
+	installcheck-am installdirs maintainer-clean \
5840
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
5841
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
5842
+	tags uninstall uninstall-am
5843 5843
 
5844 5844
 
5845 5845
 @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 -*- 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], [],
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])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'"
... ...
@@ -1268,6 +1248,8 @@ target=$target_alias
1268 1268
 if test "x$host_alias" != x; then
1269 1269
   if test "x$build_alias" = x; then
1270 1270
     cross_compiling=maybe
1271
+    $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
1272
+    If a cross compiler is detected then cross compile mode will be used" >&2
1271 1273
   elif test "x$build_alias" != "x$host_alias"; then
1272 1274
     cross_compiling=yes
1273 1275
   fi
... ...
@@ -1432,15 +1414,12 @@ Optional Features:
1432 1432
   --disable-option-checking  ignore unrecognized --enable/--with options
1433 1433
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
1434 1434
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
1435
-  --enable-silent-rules   less verbose build output (undo: "make V=1")
1436
-  --disable-silent-rules  verbose build output (undo: "make V=0")
1437
-  --enable-dependency-tracking
1438
-                          do not reject slow dependency extractors
1439
-  --disable-dependency-tracking
1440
-                          speeds up one-time build
1441
-  --enable-maintainer-mode
1442
-                          enable make rules and dependencies not useful (and
1443
-                          sometimes confusing) to the casual installer
1435
+  --enable-silent-rules          less verbose build output (undo: `make V=1')
1436
+  --disable-silent-rules         verbose build output (undo: `make V=0')
1437
+  --disable-dependency-tracking  speeds up one-time build
1438
+  --enable-dependency-tracking   do not reject slow dependency extractors
1439
+  --enable-maintainer-mode  enable make rules and dependencies not useful
1440
+			  (and sometimes confusing) to the casual installer
1444 1441
   --enable-static[=PKGS]  build static libraries [default=no]
1445 1442
   --enable-shared[=PKGS]  build shared libraries [default=yes]
1446 1443
   --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
... ...
@@ -6170,7 +5987,7 @@ do
6170 6170
   IFS=$as_save_IFS
6171 6171
   test -z "$as_dir" && as_dir=.
6172 6172
     for ac_exec_ext in '' $ac_executable_extensions; do
6173
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
6173
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
6174 6174
     ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
6175 6175
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
6176 6176
     break 2
... ...
@@ -6210,7 +6027,7 @@ do
6210 6210
   IFS=$as_save_IFS
6211 6211
   test -z "$as_dir" && as_dir=.
6212 6212
     for ac_exec_ext in '' $ac_executable_extensions; do
6213
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
6213
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
6214 6214
     ac_cv_prog_ac_ct_OBJDUMP="objdump"
6215 6215
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
6216 6216
     break 2
... ...
@@ -6516,7 +6333,7 @@ do
6516 6516
   IFS=$as_save_IFS
6517 6517
   test -z "$as_dir" && as_dir=.
6518 6518
     for ac_exec_ext in '' $ac_executable_extensions; do
6519
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
6519
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
6520 6520
     ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
6521 6521
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
6522 6522
     break 2
... ...
@@ -6556,7 +6373,7 @@ do
6556 6556
   IFS=$as_save_IFS
6557 6557
   test -z "$as_dir" && as_dir=.
6558 6558
     for ac_exec_ext in '' $ac_executable_extensions; do
6559
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
6559
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
6560 6560
     ac_cv_prog_ac_ct_DLLTOOL="dlltool"
6561 6561
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
6562 6562
     break 2
... ...
@@ -6659,7 +6476,7 @@ do
6659 6659
   IFS=$as_save_IFS
6660 6660
   test -z "$as_dir" && as_dir=.
6661 6661
     for ac_exec_ext in '' $ac_executable_extensions; do
6662
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
6662
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
6663 6663
     ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
6664 6664
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
6665 6665
     break 2
... ...
@@ -6703,7 +6520,7 @@ do
6703 6703
   IFS=$as_save_IFS
6704 6704
   test -z "$as_dir" && as_dir=.
6705 6705
     for ac_exec_ext in '' $ac_executable_extensions; do
6706
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
6706
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
6707 6707
     ac_cv_prog_ac_ct_AR="$ac_prog"
6708 6708
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
6709 6709
     break 2
... ...
@@ -6828,7 +6645,7 @@ do
6828 6828
   IFS=$as_save_IFS
6829 6829
   test -z "$as_dir" && as_dir=.
6830 6830
     for ac_exec_ext in '' $ac_executable_extensions; do
6831
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
6831
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
6832 6832
     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
6833 6833
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
6834 6834
     break 2
... ...
@@ -6868,7 +6685,7 @@ do
6868 6868
   IFS=$as_save_IFS
6869 6869
   test -z "$as_dir" && as_dir=.
6870 6870
     for ac_exec_ext in '' $ac_executable_extensions; do
6871
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
6871
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
6872 6872
     ac_cv_prog_ac_ct_STRIP="strip"
6873 6873
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
6874 6874
     break 2
... ...
@@ -6927,7 +6744,7 @@ do
6927 6927
   IFS=$as_save_IFS
6928 6928
   test -z "$as_dir" && as_dir=.
6929 6929
     for ac_exec_ext in '' $ac_executable_extensions; do
6930
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
6930
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
6931 6931
     ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
6932 6932
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
6933 6933
     break 2
... ...
@@ -6967,7 +6784,7 @@ do
6967 6967
   IFS=$as_save_IFS
6968 6968
   test -z "$as_dir" && as_dir=.
6969 6969
     for ac_exec_ext in '' $ac_executable_extensions; do
6970
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
6970
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
6971 6971
     ac_cv_prog_ac_ct_RANLIB="ranlib"
6972 6972
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
6973 6973
     break 2
... ...
@@ -7616,7 +7433,7 @@ do
7616 7616
   IFS=$as_save_IFS
7617 7617
   test -z "$as_dir" && as_dir=.
7618 7618
     for ac_exec_ext in '' $ac_executable_extensions; do
7619
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
7619
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7620 7620
     ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
7621 7621
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7622 7622
     break 2
... ...
@@ -7656,7 +7473,7 @@ do
7656 7656
   IFS=$as_save_IFS
7657 7657
   test -z "$as_dir" && as_dir=.
7658 7658
     for ac_exec_ext in '' $ac_executable_extensions; do
7659
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
7659
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7660 7660
     ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
7661 7661
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7662 7662
     break 2
... ...
@@ -7736,7 +7553,7 @@ do
7736 7736
   IFS=$as_save_IFS
7737 7737
   test -z "$as_dir" && as_dir=.
7738 7738
     for ac_exec_ext in '' $ac_executable_extensions; do
7739
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
7739
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7740 7740
     ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
7741 7741
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7742 7742
     break 2
... ...
@@ -7776,7 +7593,7 @@ do
7776 7776
   IFS=$as_save_IFS
7777 7777
   test -z "$as_dir" && as_dir=.
7778 7778
     for ac_exec_ext in '' $ac_executable_extensions; do
7779
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
7779
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7780 7780
     ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
7781 7781
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7782 7782
     break 2
... ...
@@ -7828,7 +7645,7 @@ do
7828 7828
   IFS=$as_save_IFS
7829 7829
   test -z "$as_dir" && as_dir=.
7830 7830
     for ac_exec_ext in '' $ac_executable_extensions; do
7831
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
7831
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7832 7832
     ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
7833 7833
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7834 7834
     break 2
... ...
@@ -7868,7 +7685,7 @@ do
7868 7868
   IFS=$as_save_IFS
7869 7869
   test -z "$as_dir" && as_dir=.
7870 7870
     for ac_exec_ext in '' $ac_executable_extensions; do
7871
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
7871
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7872 7872
     ac_cv_prog_ac_ct_NMEDIT="nmedit"
7873 7873
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7874 7874
     break 2
... ...
@@ -7920,7 +7737,7 @@ do
7920 7920
   IFS=$as_save_IFS
7921 7921
   test -z "$as_dir" && as_dir=.
7922 7922
     for ac_exec_ext in '' $ac_executable_extensions; do
7923
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
7923
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7924 7924
     ac_cv_prog_LIPO="${ac_tool_prefix}lipo"
7925 7925
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7926 7926
     break 2
... ...
@@ -7960,7 +7777,7 @@ do
7960 7960
   IFS=$as_save_IFS
7961 7961
   test -z "$as_dir" && as_dir=.
7962 7962
     for ac_exec_ext in '' $ac_executable_extensions; do
7963
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
7963
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7964 7964
     ac_cv_prog_ac_ct_LIPO="lipo"
7965 7965
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7966 7966
     break 2
... ...
@@ -8012,7 +7829,7 @@ do
8012 8012
   IFS=$as_save_IFS
8013 8013
   test -z "$as_dir" && as_dir=.
8014 8014
     for ac_exec_ext in '' $ac_executable_extensions; do
8015
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
8015
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
8016 8016
     ac_cv_prog_OTOOL="${ac_tool_prefix}otool"
8017 8017
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
8018 8018
     break 2
... ...
@@ -8052,7 +7869,7 @@ do
8052 8052
   IFS=$as_save_IFS
8053 8053
   test -z "$as_dir" && as_dir=.
8054 8054
     for ac_exec_ext in '' $ac_executable_extensions; do
8055
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
8055
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
8056 8056
     ac_cv_prog_ac_ct_OTOOL="otool"
8057 8057
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
8058 8058
     break 2
... ...
@@ -8104,7 +7921,7 @@ do
8104 8104
   IFS=$as_save_IFS
8105 8105
   test -z "$as_dir" && as_dir=.
8106 8106
     for ac_exec_ext in '' $ac_executable_extensions; do
8107
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
8107
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
8108 8108
     ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64"
8109 8109
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
8110 8110
     break 2
... ...
@@ -8144,7 +7961,7 @@ do
8144 8144
   IFS=$as_save_IFS
8145 8145
   test -z "$as_dir" && as_dir=.
8146 8146
     for ac_exec_ext in '' $ac_executable_extensions; do
8147
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
8147
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
8148 8148
     ac_cv_prog_ac_ct_OTOOL64="otool64"
8149 8149
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
8150 8150
     break 2
... ...
@@ -16032,14 +15849,6 @@ LIBOBJS=$ac_libobjs
16032 16032
 LTLIBOBJS=$ac_ltlibobjs
16033 16033
 
16034 16034
 
16035
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5
16036
-$as_echo_n "checking that generated files are newer than configure... " >&6; }
16037
-   if test -n "$am_sleep_pid"; then
16038
-     # Hide warnings about reused PIDs.
16039
-     wait $am_sleep_pid 2>/dev/null
16040
-   fi
16041
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5
16042
-$as_echo "done" >&6; }
16043 16035
  if test -n "$EXEEXT"; then
16044 16036
   am__EXEEXT_TRUE=
16045 16037
   am__EXEEXT_FALSE='#'
... ...
@@ -16379,16 +16188,16 @@ if (echo >conf$$.file) 2>/dev/null; then
16379 16379
     # ... but there are two gotchas:
16380 16380
     # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
16381 16381
     # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
16382
-    # In both cases, we have to default to `cp -pR'.
16382
+    # In both cases, we have to default to `cp -p'.
16383 16383
     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
16384
-      as_ln_s='cp -pR'
16384
+      as_ln_s='cp -p'
16385 16385
   elif ln conf$$.file conf$$ 2>/dev/null; then
16386 16386
     as_ln_s=ln
16387 16387
   else
16388
-    as_ln_s='cp -pR'
16388
+    as_ln_s='cp -p'
16389 16389
   fi
16390 16390
 else
16391
-  as_ln_s='cp -pR'
16391
+  as_ln_s='cp -p'
16392 16392
 fi
16393 16393
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
16394 16394
 rmdir conf$$.dir 2>/dev/null
... ...
@@ -16448,16 +16257,28 @@ else
16448 16448
   as_mkdir_p=false
16449 16449
 fi
16450 16450
 
16451
-
16452
-# as_fn_executable_p FILE
16453
-# -----------------------
16454
-# Test if FILE is an executable regular file.
16455
-as_fn_executable_p ()
16456
-{
16457
-  test -f "$1" && test -x "$1"
16458
-} # as_fn_executable_p
16459
-as_test_x='test -x'
16460
-as_executable_p=as_fn_executable_p
16451
+if test -x / >/dev/null 2>&1; then
16452
+  as_test_x='test -x'
16453
+else
16454
+  if ls -dL / >/dev/null 2>&1; then
16455
+    as_ls_L_option=L
16456
+  else
16457
+    as_ls_L_option=
16458
+  fi
16459
+  as_test_x='
16460
+    eval sh -c '\''
16461
+      if test -d "$1"; then
16462
+	test -d "$1/.";
16463
+      else
16464
+	case $1 in #(
16465
+	-*)set "./$1";;
16466
+	esac;
16467
+	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
16468
+	???[sx]*):;;*)false;;esac;fi
16469
+    '\'' sh
16470
+  '
16471
+fi
16472
+as_executable_p=$as_test_x
16461 16473
 
16462 16474
 # Sed expression to map a string onto a valid CPP name.
16463 16475
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
... ...
@@ -16479,7 +16300,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
16479 16479
 # values after options handling.
16480 16480
 ac_log="
16481 16481
 This file was extended by libclamavc++ $as_me devel, which was
16482
-generated by GNU Autoconf 2.69.  Invocation command line was
16482
+generated by GNU Autoconf 2.68.  Invocation command line was
16483 16483
 
16484 16484
   CONFIG_FILES    = $CONFIG_FILES
16485 16485
   CONFIG_HEADERS  = $CONFIG_HEADERS
... ...
@@ -16545,10 +16366,10 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
16545 16545
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
16546 16546
 ac_cs_version="\\
16547 16547
 libclamavc++ config.status devel
16548
-configured by $0, generated by GNU Autoconf 2.69,
16548
+configured by $0, generated by GNU Autoconf 2.68,
16549 16549
   with options \\"\$ac_cs_config\\"
16550 16550
 
16551
-Copyright (C) 2012 Free Software Foundation, Inc.
16551
+Copyright (C) 2010 Free Software Foundation, Inc.
16552 16552
 This config.status script is free software; the Free Software Foundation
16553 16553
 gives unlimited permission to copy, distribute and modify it."
16554 16554
 
... ...
@@ -16639,7 +16460,7 @@ fi
16639 16639
 _ACEOF
16640 16640
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
16641 16641
 if \$ac_cs_recheck; then
16642
-  set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
16642
+  set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
16643 16643
   shift
16644 16644
   \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
16645 16645
   CONFIG_SHELL='$SHELL'
... ...
@@ -17648,7 +17469,7 @@ $as_echo "$as_me: executing $ac_file commands" >&6;}
17648 17648
 
17649 17649
   case $ac_file$ac_mode in
17650 17650
     "depfiles":C) test x"$AMDEP_TRUE" != x"" || {
17651
-  # Older Autoconf quotes --file arguments for eval, but not when files
17651
+  # Autoconf 2.62 quotes --file arguments for eval, but not when files
17652 17652
   # are listed without --file.  Let's play safe and only enable the eval
17653 17653
   # if we detect the quoting.
17654 17654
   case $CONFIG_FILES in
... ...
@@ -17661,7 +17482,7 @@ $as_echo "$as_me: executing $ac_file commands" >&6;}
17661 17661
     # Strip MF so we end up with the name of the file.
17662 17662
     mf=`echo "$mf" | sed -e 's/:.*$//'`
17663 17663
     # Check whether this is an Automake generated Makefile or not.
17664
-    # We used to match only the files named 'Makefile.in', but
17664
+    # We used to match only the files named `Makefile.in', but
17665 17665
     # some people rename them; so instead we look at the file content.
17666 17666
     # Grep'ing the first line is not enough: some people post-process
17667 17667
     # each Makefile.in and add a new line on top of each file to say so.
... ...
@@ -17695,19 +17516,21 @@ $as_echo X"$mf" |
17695 17695
       continue
17696 17696
     fi
17697 17697
     # Extract the definition of DEPDIR, am__include, and am__quote
17698
-    # from the Makefile without running 'make'.
17698
+    # from the Makefile without running `make'.
17699 17699
     DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
17700 17700
     test -z "$DEPDIR" && continue
17701 17701
     am__include=`sed -n 's/^am__include = //p' < "$mf"`
17702
-    test -z "$am__include" && continue
17702
+    test -z "am__include" && continue
17703 17703
     am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
17704
+    # When using ansi2knr, U may be empty or an underscore; expand it
17705
+    U=`sed -n 's/^U = //p' < "$mf"`
17704 17706
     # Find all dependency output files, they are included files with
17705 17707
     # $(DEPDIR) in their names.  We invoke sed twice because it is the
17706 17708
     # simplest approach to changing $(DEPDIR) to its actual value in the
17707 17709
     # expansion.
17708 17710
     for file in `sed -n "
17709 17711
       s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
17710
-	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
17712
+	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
17711 17713
       # Make sure the directory exists.
17712 17714
       test -f "$dirpart/$file" && continue
17713 17715
       fdir=`$as_dirname -- "$file" ||
... ...
@@ -2846,17 +2846,6 @@ static char *parse_yara_hex_string(YR_STRING *string, int *ret)
2846 2846
 
2847 2847
 static inline void free_yararule(YR_RULE *rule)
2848 2848
 {
2849
-    YR_STRING *string;
2850
-
2851
-    while (!STAILQ_EMPTY(&rule->strings)) {
2852
-        string = STAILQ_FIRST(&rule->strings);
2853
-        STAILQ_REMOVE(&rule->strings, string, _yc_string, link);
2854
-
2855
-        free(string->id);
2856
-        free(string->string);
2857
-        free(string);
2858
-    }
2859
-
2860 2849
     free(rule->id);
2861 2850
     free(rule);
2862 2851
 }
... ...
@@ -3093,7 +3082,7 @@ static int load_oneyara(YR_RULE *rule, struct cl_engine *engine, unsigned int op
3093 3093
 
3094 3094
         /* string type handler */
3095 3095
         if (STRING_IS_NULL(string)) {
3096
-            cli_warnmsg("load_oneyara: skipping NULL string %s\n", string->id);
3096
+            cli_warnmsg("load_oneyara: skipping NULL string %s\n", string->identifier);
3097 3097
             //str_error++; /* kill the insertion? */
3098 3098
             continue;
3099 3099
 #ifdef YARA_FINISHED
... ...
@@ -3113,7 +3102,7 @@ static int load_oneyara(YR_RULE *rule, struct cl_engine *engine, unsigned int op
3113 3113
             }
3114 3114
 
3115 3115
             if (strlen(substr)/2 < CLI_DEFAULT_AC_MINDEPTH) {
3116
-                cli_warnmsg("load_oneyara: string is too short %s\n", string->id);
3116
+                cli_warnmsg("load_oneyara: string is too short %s\n", string->identifier);
3117 3117
                 str_error++;
3118 3118
                 free(substr);
3119 3119
                 continue;
... ...
@@ -3149,7 +3138,7 @@ static int load_oneyara(YR_RULE *rule, struct cl_engine *engine, unsigned int op
3149 3149
             size_t totsize = 2*length+1;
3150 3150
 
3151 3151
             if (length < CLI_DEFAULT_AC_MINDEPTH) {
3152
-                cli_warnmsg("load_oneyara: string is too short %s\n", string->id);
3152
+                cli_warnmsg("load_oneyara: string is too short %s\n", string->identifier);
3153 3153
                 str_error++;
3154 3154
                 continue;
3155 3155
             }
... ...
@@ -3410,19 +3399,34 @@ static int cli_loadyara(FILE *fs, struct cl_engine *engine, unsigned int *signo,
3410 3410
         return rc;
3411 3411
 
3412 3412
     compiler.last_result = ERROR_SUCCESS;
3413
-    STAILQ_INIT(&compiler.rules);
3414
-    STAILQ_INIT(&compiler.current_rule_strings);
3413
+    STAILQ_INIT(&compiler.rule_q);
3414
+    STAILQ_INIT(&compiler.current_rule_string_q);
3415
+
3416
+    rc = yr_hash_table_create(10007, &compiler.rules_table);
3417
+    if (rc == ERROR_SUCCESS)
3418
+        rc = yr_arena_create(65536, 0, &compiler.sz_arena);
3419
+    if (rc == ERROR_SUCCESS)
3420
+        rc = yr_arena_create(65536, 0, &compiler.code_arena);
3421
+    if (rc == ERROR_SUCCESS)
3422
+        rc = yr_arena_create(65536, 0, &compiler.strings_arena);
3423
+    if (rc != ERROR_SUCCESS)
3424
+        return CL_EMEM;
3425
+
3415 3426
 
3416 3427
     rc = yr_lex_parse_rules_file(fs, &compiler);
3417 3428
     if (rc > 0) { /* rc = number of errors */
3418 3429
         /* TODO - handle the various errors? */
3419 3430
         cli_errmsg("cli_loadyara: failed to parse rules file\n");
3431
+        yr_hash_table_destroy(compiler.rules_table, NULL);
3432
+        yr_arena_destroy(compiler.sz_arena);
3433
+        yr_arena_destroy(compiler.code_arena);
3434
+        yr_arena_destroy(compiler.strings_arena);
3420 3435
         return CL_EMALFDB;
3421 3436
     }
3422 3437
 
3423
-    while (!STAILQ_EMPTY(&compiler.rules)) {
3424
-        rule = STAILQ_FIRST(&compiler.rules);
3425
-        STAILQ_REMOVE(&compiler.rules, rule, _yc_rule, link);
3438
+    while (!STAILQ_EMPTY(&compiler.rule_q)) {
3439
+        rule = STAILQ_FIRST(&compiler.rule_q);
3440
+        STAILQ_REMOVE(&compiler.rule_q, rule, _yc_rule, link);
3426 3441
 
3427 3442
         rules++;
3428 3443
         sigs++; /* can be decremented by load_oneyara */
... ...
@@ -3432,20 +3436,16 @@ static int cli_loadyara(FILE *fs, struct cl_engine *engine, unsigned int *signo,
3432 3432
         if (rc != CL_SUCCESS) {
3433 3433
             cli_warnmsg("cli_loadyara: problem parsing yara rule %s\n", rule->id);
3434 3434
 #ifdef YARA_FINISHED
3435
-            free_yararule(rule);
3436 3435
             break;
3437 3436
 #endif
3438 3437
         }
3439
-
3440
-        free_yararule(rule);
3441 3438
     }
3442 3439
 
3443
-    /* clean up rules queue on error */
3444
-    while (!STAILQ_EMPTY(&compiler.rules)) {
3445
-        rule = STAILQ_FIRST(&compiler.rules);
3446
-        STAILQ_REMOVE(&compiler.rules, rule, _yc_rule, link);
3447
-        free_yararule(rule);
3448
-    }
3440
+    yr_hash_table_destroy(compiler.rules_table, NULL);
3441
+    yr_arena_destroy(compiler.sz_arena);
3442
+    yr_arena_destroy(compiler.code_arena);
3443
+    yr_arena_destroy(compiler.strings_arena);
3444
+
3449 3445
 
3450 3446
 #ifdef YARA_FINISHED
3451 3447
     if(rc)
3452 3448
new file mode 100644
... ...
@@ -0,0 +1,1092 @@
0
+/*
1
+Copyright (c) 2013. The YARA Authors. All Rights Reserved.
2
+
3
+Licensed under the Apache License, Version 2.0 (the "License");
4
+you may not use this file except in compliance with the License.
5
+You may obtain a copy of the License at
6
+
7
+   http://www.apache.org/licenses/LICENSE-2.0
8
+
9
+Unless required by applicable law or agreed to in writing, software
10
+distributed under the License is distributed on an "AS IS" BASIS,
11
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12
+See the License for the specific language governing permissions and
13
+limitations under the License.
14
+*/
15
+
16
+/*
17
+
18
+This module implements a structure I've called "arena". An arena is a data
19
+container composed of a set of pages. The arena grows automatically when
20
+needed by adding new pages to hold new data. Arenas can be saved and loaded
21
+from files.
22
+
23
+*/
24
+
25
+#include <string.h>
26
+#include <assert.h>
27
+#include <stdlib.h>
28
+#include <stdarg.h>
29
+#include <stddef.h>
30
+#include <time.h>
31
+#include <stdint.h>
32
+
33
+#include "yara_clam.h"
34
+#include <yara_arena.h>
35
+#if REAL_YARA
36
+#include <yara/mem.h>
37
+#include <yara/error.h>
38
+#include <yara/limits.h>
39
+#endif
40
+
41
+#define ARENA_FILE_VERSION      3
42
+
43
+
44
+#pragma pack(push)
45
+#pragma pack(1)
46
+
47
+typedef struct _ARENA_FILE_HEADER
48
+{
49
+  char      magic[4];
50
+  uint32_t  size;
51
+  uint8_t   version;
52
+
53
+} ARENA_FILE_HEADER;
54
+
55
+#pragma pack(pop)
56
+
57
+
58
+#define free_space(page) \
59
+    ((page)->size - (page)->used)
60
+
61
+
62
+//
63
+// _yr_arena_new_page
64
+//
65
+// Creates a new arena page of a given size
66
+//
67
+// Args:
68
+//    size_t size  - Size of the page
69
+//
70
+// Returns:
71
+//    A pointer to the newly created YR_ARENA_PAGE structure
72
+//
73
+
74
+YR_ARENA_PAGE* _yr_arena_new_page(
75
+    size_t size)
76
+{
77
+  YR_ARENA_PAGE* new_page;
78
+
79
+  new_page = (YR_ARENA_PAGE*) yr_malloc(sizeof(YR_ARENA_PAGE));
80
+
81
+  if (new_page == NULL)
82
+    return NULL;
83
+
84
+  new_page->address = yr_malloc(size);
85
+
86
+  if (new_page->address == NULL)
87
+  {
88
+    yr_free(new_page);
89
+    return NULL;
90
+  }
91
+
92
+  new_page->size = size;
93
+  new_page->used = 0;
94
+  new_page->next = NULL;
95
+  new_page->prev = NULL;
96
+  new_page->reloc_list_head = NULL;
97
+  new_page->reloc_list_tail = NULL;
98
+
99
+  return new_page;
100
+}
101
+
102
+
103
+//
104
+// _yr_arena_page_for_address
105
+//
106
+// Returns the page within he arena where an address reside.
107
+//
108
+// Args:
109
+//    YR_ARENA* arena   - Pointer to the arena
110
+//    void* address  - Address to be located
111
+//
112
+// Returns:
113
+//    A pointer the corresponding YR_ARENA_PAGE structure where the address
114
+//    resides.
115
+//
116
+
117
+YR_ARENA_PAGE* _yr_arena_page_for_address(
118
+    YR_ARENA* arena,
119
+    void* address)
120
+{
121
+  YR_ARENA_PAGE* page;
122
+
123
+  // Most of the times this function is called with an address within
124
+  // the current page, let's check the current page first to avoid
125
+  // looping through the page list.
126
+
127
+  page = arena->current_page;
128
+
129
+  if (page != NULL &&
130
+      (uint8_t*) address >= page->address &&
131
+      (uint8_t*) address < page->address + page->used)
132
+    return page;
133
+
134
+  page = arena->page_list_head;
135
+
136
+  while (page != NULL)
137
+  {
138
+    if ((uint8_t*) address >= page->address &&
139
+        (uint8_t*) address < page->address + page->used)
140
+      return page;
141
+    page = page->next;
142
+  }
143
+
144
+  return NULL;
145
+}
146
+
147
+
148
+//
149
+// _yr_arena_make_relocatable
150
+//
151
+// Tells the arena that certain addresses contains a relocatable pointer.
152
+//
153
+// Args:
154
+//    YR_ARENA* arena    - Pointer the arena
155
+//    void* address      - Base address
156
+//    va_list offsets    - List of offsets relative to base address
157
+//
158
+// Returns:
159
+//    ERROR_SUCCESS if succeed or the corresponding error code otherwise.
160
+//
161
+
162
+int _yr_arena_make_relocatable(
163
+    YR_ARENA* arena,
164
+    void* base,
165
+    va_list offsets)
166
+{
167
+  YR_RELOC* reloc;
168
+  YR_ARENA_PAGE* page;
169
+
170
+  size_t offset;
171
+  size_t base_offset;
172
+
173
+  int result = ERROR_SUCCESS;
174
+
175
+  page = _yr_arena_page_for_address(arena, base);
176
+
177
+  assert(page != NULL);
178
+
179
+  base_offset = (uint8_t*) base - page->address;
180
+  offset = va_arg(offsets, size_t);
181
+
182
+  while (offset != -1)
183
+  {
184
+    assert(base_offset + offset <= page->used - sizeof(int64_t));
185
+
186
+    reloc = yr_malloc(sizeof(YR_RELOC));
187
+
188
+    if (reloc == NULL)
189
+      return ERROR_INSUFICIENT_MEMORY;
190
+
191
+    reloc->offset = base_offset + offset;
192
+    reloc->next = NULL;
193
+
194
+    if (page->reloc_list_head == NULL)
195
+      page->reloc_list_head = reloc;
196
+
197
+    if (page->reloc_list_tail != NULL)
198
+      page->reloc_list_tail->next = reloc;
199
+
200
+    page->reloc_list_tail = reloc;
201
+    offset = va_arg(offsets, size_t);
202
+  }
203
+
204
+  return result;
205
+}
206
+
207
+
208
+//
209
+// yr_arena_create
210
+//
211
+// Creates a new arena.
212
+//
213
+// Args:
214
+//    size_t initial_size  - Initial size
215
+//    int flags            - Flags
216
+//    YR_ARENA** arena     - Address where a pointer to the new arena will be
217
+//                           written to.
218
+//
219
+// Returns:
220
+//    ERROR_SUCCESS if succeed or the corresponding error code otherwise.
221
+//
222
+
223
+int yr_arena_create(
224
+    size_t initial_size,
225
+    int flags,
226
+    YR_ARENA** arena)
227
+{
228
+  YR_ARENA* new_arena;
229
+  YR_ARENA_PAGE* new_page;
230
+
231
+  *arena = NULL;
232
+  new_arena = (YR_ARENA*) yr_malloc(sizeof(YR_ARENA));
233
+
234
+  if (new_arena == NULL)
235
+    return ERROR_INSUFICIENT_MEMORY;
236
+
237
+  new_page = _yr_arena_new_page(initial_size);
238
+
239
+  if (new_page == NULL)
240
+  {
241
+    yr_free(new_arena);
242
+    return ERROR_INSUFICIENT_MEMORY;
243
+  }
244
+
245
+  new_arena->page_list_head = new_page;
246
+  new_arena->current_page = new_page;
247
+  new_arena->flags = flags | ARENA_FLAGS_COALESCED;
248
+
249
+  *arena = new_arena;
250
+  return ERROR_SUCCESS;
251
+}
252
+
253
+
254
+//
255
+// yr_arena_destroy
256
+//
257
+// Destroys an arena releasing its resource.
258
+//
259
+// Args:
260
+//    YR_ARENA* arena  - Pointer to the arena.
261
+//
262
+// Returns:
263
+//    ERROR_SUCCESS if succeed or the corresponding error code otherwise.
264
+//
265
+
266
+void yr_arena_destroy(
267
+    YR_ARENA* arena)
268
+{
269
+  YR_RELOC* reloc;
270
+  YR_RELOC* next_reloc;
271
+  YR_ARENA_PAGE* page;
272
+  YR_ARENA_PAGE* next_page;
273
+
274
+  page = arena->page_list_head;
275
+
276
+  while(page != NULL)
277
+  {
278
+    next_page = page->next;
279
+    reloc = page->reloc_list_head;
280
+
281
+    while (reloc != NULL)
282
+    {
283
+      next_reloc = reloc->next;
284
+      yr_free(reloc);
285
+      reloc = next_reloc;
286
+    }
287
+
288
+    yr_free(page->address);
289
+    yr_free(page);
290
+
291
+    page = next_page;
292
+  }
293
+
294
+  yr_free(arena);
295
+}
296
+
297
+#if REAL_YARA
298
+//
299
+// yr_arena_base_address
300
+//
301
+// Returns the base address for the arena.
302
+//
303
+// Args:
304
+//    YR_ARENA* arena  - Pointer to the arena.
305
+//
306
+// Returns:
307
+//    A pointer
308
+//
309
+
310
+void* yr_arena_base_address(
311
+  YR_ARENA* arena)
312
+{
313
+  return arena->page_list_head->address;
314
+}
315
+
316
+
317
+//
318
+// yr_arena_next_address
319
+//
320
+// Given an address and an offset, returns the address where
321
+// address + offset resides. The arena is a collection of non-contigous
322
+// regions of memory (pages), if address is pointing at the end of a page,
323
+// address + offset could cross the page boundary and point at somewhere
324
+// within the next page, this function handles these situations. It works
325
+// also with negative offsets.
326
+//
327
+// Args:
328
+//    YR_ARENA* arena  - Pointer to the arena.
329
+//    void* address    - Base address.
330
+//    int offset       - Offset.
331
+//
332
+// Returns:
333
+//    A pointer
334
+//
335
+#endif
336
+
337
+void* yr_arena_next_address(
338
+  YR_ARENA* arena,
339
+  void* address,
340
+  int offset)
341
+{
342
+  YR_ARENA_PAGE* page;
343
+
344
+  page = _yr_arena_page_for_address(arena, address);
345
+
346
+  assert(page != NULL);
347
+
348
+  if ((uint8_t*) address + offset >= page->address &&
349
+      (uint8_t*) address + offset < page->address + page->used)
350
+  {
351
+    return (uint8_t*) address + offset;
352
+  }
353
+
354
+  if (offset > 0)
355
+  {
356
+    offset -= page->address + page->used - (uint8_t*) address;
357
+    page = page->next;
358
+
359
+    while (page != NULL)
360
+    {
361
+      if (offset < page->used)
362
+        return page->address + offset;
363
+
364
+      offset -= page->used;
365
+      page = page->next;
366
+    }
367
+  }
368
+  else
369
+  {
370
+    offset += page->used;
371
+    page = page->prev;
372
+
373
+    while (page != NULL)
374
+    {
375
+      if (offset < page->used)
376
+        return page->address + page->used + offset;
377
+
378
+      offset += page->used;
379
+      page = page->prev;
380
+    }
381
+  }
382
+
383
+  return NULL;
384
+}
385
+
386
+#if REAL_YARA
387
+//
388
+// yr_arena_coalesce
389
+//
390
+// Coalesce the arena into a single page. This is a required step before
391
+// saving the arena to a file.
392
+//
393
+// Args:
394
+//    YR_ARENA* arena  - Pointer to the arena.
395
+//
396
+// Returns:
397
+//    ERROR_SUCCESS if succeed or the corresponding error code otherwise.
398
+//
399
+
400
+int yr_arena_coalesce(
401
+    YR_ARENA* arena)
402
+{
403
+  YR_ARENA_PAGE* page;
404
+  YR_ARENA_PAGE* big_page;
405
+  YR_ARENA_PAGE* next_page;
406
+  YR_RELOC* reloc;
407
+
408
+  uint8_t** reloc_address;
409
+  uint8_t* reloc_target;
410
+  int total_size = 0;
411
+
412
+  page = arena->page_list_head;
413
+
414
+  while(page != NULL)
415
+  {
416
+    total_size += page->used;
417
+    page = page->next;
418
+  }
419
+
420
+  // Create a new page that will contain the entire arena.
421
+  big_page = _yr_arena_new_page(total_size);
422
+
423
+  if (big_page == NULL)
424
+    return ERROR_INSUFICIENT_MEMORY;
425
+
426
+  // Copy data from current pages to the big page and adjust relocs.
427
+  page = arena->page_list_head;
428
+
429
+  while (page != NULL)
430
+  {
431
+    page->new_address = big_page->address + big_page->used;
432
+    memcpy(page->new_address, page->address, page->used);
433
+
434
+    reloc = page->reloc_list_head;
435
+
436
+    while(reloc != NULL)
437
+    {
438
+      reloc->offset += big_page->used;
439
+      reloc = reloc->next;
440
+    }
441
+
442
+    if (big_page->reloc_list_head == NULL)
443
+      big_page->reloc_list_head = page->reloc_list_head;
444
+
445
+    if (big_page->reloc_list_tail != NULL)
446
+      big_page->reloc_list_tail->next = page->reloc_list_head;
447
+
448
+    if (page->reloc_list_tail != NULL)
449
+      big_page->reloc_list_tail = page->reloc_list_tail;
450
+
451
+    big_page->used += page->used;
452
+    page = page->next;
453
+  }
454
+
455
+  // Relocate pointers.
456
+  reloc = big_page->reloc_list_head;
457
+
458
+  while (reloc != NULL)
459
+  {
460
+    reloc_address = (uint8_t**) (big_page->address + reloc->offset);
461
+    reloc_target = *reloc_address;
462
+
463
+    if (reloc_target != NULL)
464
+    {
465
+      page = _yr_arena_page_for_address(arena, reloc_target);
466
+      assert(page != NULL);
467
+      *reloc_address = page->new_address + (reloc_target - page->address);
468
+    }
469
+
470
+    reloc = reloc->next;
471
+  }
472
+
473
+  // Release current pages.
474
+  page = arena->page_list_head;
475
+
476
+  while(page != NULL)
477
+  {
478
+    next_page = page->next;
479
+    yr_free(page->address);
480
+    yr_free(page);
481
+    page = next_page;
482
+  }
483
+
484
+  arena->page_list_head = big_page;
485
+  arena->current_page = big_page;
486
+  arena->flags |= ARENA_FLAGS_COALESCED;
487
+
488
+  return ERROR_SUCCESS;
489
+}
490
+#endif
491
+
492
+//
493
+// yr_arena_reserve_memory
494
+//
495
+// Ensures that the arena have enough contiguous memory for future allocations.
496
+// if the available space in the current page is lower than "size", a new page
497
+// is allocated.
498
+//
499
+// Args:
500
+//    YR_ARENA* arena         - Pointer to the arena.
501
+//    size_t size             - Size of the region to be reserved.
502
+//
503
+// Returns:
504
+//    ERROR_SUCCESS if succeed or the corresponding error code otherwise.
505
+//
506
+
507
+
508
+int yr_arena_reserve_memory(
509
+    YR_ARENA* arena,
510
+    size_t size)
511
+{
512
+  YR_ARENA_PAGE* new_page;
513
+  size_t new_page_size;
514
+  void* new_page_address;
515
+
516
+  if (size > free_space(arena->current_page))
517
+  {
518
+    if (arena->flags & ARENA_FLAGS_FIXED_SIZE)
519
+      return ERROR_INSUFICIENT_MEMORY;
520
+
521
+    // Requested space is bigger than current page's empty space,
522
+    // lets calculate the size for a new page.
523
+
524
+    new_page_size = arena->current_page->size * 2;
525
+
526
+    while (new_page_size < size)
527
+      new_page_size *= 2;
528
+
529
+    if (arena->current_page->used == 0)
530
+    {
531
+      // Current page is not used at all, it can be reallocated.
532
+
533
+      new_page_address = yr_realloc(
534
+          arena->current_page->address,
535
+          new_page_size);
536
+
537
+      if (new_page_address == NULL)
538
+        return ERROR_INSUFICIENT_MEMORY;
539
+
540
+      arena->current_page->address = new_page_address;
541
+      arena->current_page->size = new_page_size;
542
+    }
543
+    else
544
+    {
545
+      new_page = _yr_arena_new_page(new_page_size);
546
+
547
+      if (new_page == NULL)
548
+        return ERROR_INSUFICIENT_MEMORY;
549
+
550
+      new_page->prev = arena->current_page;
551
+      arena->current_page->next = new_page;
552
+      arena->current_page = new_page;
553
+      arena->flags &= ~ARENA_FLAGS_COALESCED;
554
+    }
555
+  }
556
+
557
+  return ERROR_SUCCESS;
558
+}
559
+
560
+
561
+//
562
+// yr_arena_allocate_memory
563
+//
564
+// Allocates memory within the arena.
565
+//
566
+// Args:
567
+//    YR_ARENA* arena         - Pointer to the arena.
568
+//    size_t size             - Size of the region to be allocated.
569
+//    void** allocated_memory - Address of a pointer to newly allocated
570
+//                              region.
571
+// Returns:
572
+//    ERROR_SUCCESS if succeed or the corresponding error code otherwise.
573
+//
574
+
575
+int yr_arena_allocate_memory(
576
+    YR_ARENA* arena,
577
+    size_t size,
578
+    void** allocated_memory)
579
+{
580
+  FAIL_ON_ERROR(yr_arena_reserve_memory(arena, size));
581
+
582
+  *allocated_memory = arena->current_page->address + \
583
+                      arena->current_page->used;
584
+
585
+  arena->current_page->used += size;
586
+
587
+  return ERROR_SUCCESS;
588
+}
589
+
590
+
591
+//
592
+// yr_arena_allocate_struct
593
+//
594
+// Allocates a structure within the arena. This function is similar to
595
+// yr_arena_allocate_memory but additionaly receives a variable-length
596
+// list of offsets within the structure where pointers reside. This allows
597
+// the arena to keep track of pointers that must be adjusted when memory
598
+// is relocated. This is an example on how to invoke this function:
599
+//
600
+//  yr_arena_allocate_struct(
601
+//        arena,
602
+//        sizeof(MY_STRUCTURE),
603
+//        (void**) &my_structure_ptr,
604
+//        offsetof(MY_STRUCTURE, field_1),
605
+//        offsetof(MY_STRUCTURE, field_2),
606
+//        ..
607
+//        offsetof(MY_STRUCTURE, field_N),
608
+//        EOL);
609
+//
610
+// Args:
611
+//    YR_ARENA* arena         - Pointer to the arena.
612
+//    size_t size             - Size of the region to be allocated.
613
+//    void** allocated_memory - Address of a pointer to newly allocated
614
+//                              region.
615
+//    ...                     - Variable number of offsets relative to the
616
+//                              beginning of the struct. Offsets are of type
617
+//                              size_t.
618
+//
619
+// Returns:
620
+//    ERROR_SUCCESS if succeed or the corresponding error code otherwise.
621
+//
622
+
623
+int yr_arena_allocate_struct(
624
+    YR_ARENA* arena,
625
+    size_t size,
626
+    void** allocated_memory,
627
+    ...)
628
+{
629
+  int result;
630
+
631
+  va_list offsets;
632
+  va_start(offsets, allocated_memory);
633
+
634
+  result = yr_arena_allocate_memory(arena, size, allocated_memory);
635
+
636
+  if (result == ERROR_SUCCESS)
637
+    result = _yr_arena_make_relocatable(arena, *allocated_memory, offsets);
638
+
639
+  va_end(offsets);
640
+
641
+  memset(*allocated_memory, 0, size);
642
+
643
+  return result;
644
+}
645
+
646
+
647
+//
648
+// yr_arena_make_relocatable
649
+//
650
+// Tells the arena that certain addresses contains a relocatable pointer.
651
+//
652
+// Args:
653
+//    YR_ARENA* arena    - Pointer to the arena.
654
+//    void* base         - Address within the arena.
655
+//    ...                - Variable number of size_t arguments with offsets
656
+//                         relative to base.
657
+//
658
+// Returns:
659
+//    ERROR_SUCCESS if succeed or the corresponding error code otherwise.
660
+//
661
+
662
+int yr_arena_make_relocatable(
663
+    YR_ARENA* arena,
664
+    void* base,
665
+    ...)
666
+{
667
+  int result;
668
+
669
+  va_list offsets;
670
+  va_start(offsets, base);
671
+
672
+  result = _yr_arena_make_relocatable(arena, base, offsets);
673
+
674
+  va_end(offsets);
675
+
676
+  return result;
677
+}
678
+
679
+
680
+//
681
+// yr_arena_write_data
682
+//
683
+// Writes data to the arena.
684
+//
685
+// Args:
686
+//    YR_ARENA* arena        - Pointer to the arena.
687
+//    void* data             - Pointer to data to be written.
688
+//    size_t size            - Size of data.
689
+//    void** written_data    - Address where a pointer to the written data will
690
+//                             be returned.
691
+//
692
+// Returns:
693
+//    ERROR_SUCCESS if succeed or the corresponding error code otherwise.
694
+//
695
+
696
+int yr_arena_write_data(
697
+    YR_ARENA* arena,
698
+    void* data,
699
+    size_t size,
700
+    void** written_data)
701
+{
702
+  void* output;
703
+  int result;
704
+
705
+  if (size > free_space(arena->current_page))
706
+  {
707
+    result = yr_arena_allocate_memory(arena, size, &output);
708
+
709
+    if (result != ERROR_SUCCESS)
710
+      return result;
711
+  }
712
+  else
713
+  {
714
+    output = arena->current_page->address + arena->current_page->used;
715
+    arena->current_page->used += size;
716
+  }
717
+
718
+  memcpy(output, data, size);
719
+
720
+  if (written_data != NULL)
721
+    *written_data = output;
722
+
723
+  return ERROR_SUCCESS;
724
+}
725
+
726
+
727
+//
728
+// yr_arena_write_string
729
+//
730
+// Writes string to the arena.
731
+//
732
+// Args:
733
+//    YR_ARENA* arena        - Pointer to the arena.
734
+//    const char* string     - Pointer to string to be written.
735
+//    char** written_string  - Address where a pointer to the written data will
736
+//                             be returned.
737
+//
738
+// Returns:
739
+//    ERROR_SUCCESS if succeed or the corresponding error code otherwise.
740
+//
741
+
742
+int yr_arena_write_string(
743
+    YR_ARENA* arena,
744
+    const char* string,
745
+    char** written_string)
746
+{
747
+  return yr_arena_write_data(
748
+      arena,
749
+      (void*) string,
750
+      strlen(string) + 1,
751
+      (void**) written_string);
752
+}
753
+
754
+#if REAL_YARA
755
+//
756
+// yr_arena_append
757
+//
758
+// Appends source_arena to target_arena. This operation destroys source_arena,
759
+// after returning any pointer to source_arena is no longer valid.
760
+//
761
+// Args:
762
+//    YR_ARENA* target_arena    - Pointer to target the arena.
763
+//    YR_ARENA* source_arena    - Pointer to source arena.
764
+//
765
+// Returns:
766
+//    ERROR_SUCCESS if succeed or the corresponding error code otherwise.
767
+//
768
+
769
+int yr_arena_append(
770
+    YR_ARENA* target_arena,
771
+    YR_ARENA* source_arena)
772
+{
773
+  target_arena->current_page->next = source_arena->page_list_head;
774
+  source_arena->page_list_head->prev = target_arena->current_page;
775
+  target_arena->current_page = source_arena->current_page;
776
+
777
+  yr_free(source_arena);
778
+
779
+  return ERROR_SUCCESS;
780
+}
781
+#endif
782
+
783
+#if REAL_YARA
784
+//
785
+// yr_arena_duplicate
786
+//
787
+// Duplicates the arena, making an exact copy. This function requires the
788
+// arena to be coalesced.
789
+//
790
+// Args:
791
+//    YR_ARENA* arena        - Pointer to the arena.
792
+//    YR_ARENA** duplicated  - Address where a pointer to the new arena arena
793
+//                             will be returned.
794
+//
795
+// Returns:
796
+//    ERROR_SUCCESS if succeed or the corresponding error code otherwise.
797
+//
798
+
799
+int yr_arena_duplicate(
800
+    YR_ARENA* arena,
801
+    YR_ARENA** duplicated)
802
+{
803
+  YR_RELOC* reloc;
804
+  YR_RELOC* new_reloc;
805
+  YR_ARENA_PAGE* page;
806
+  YR_ARENA_PAGE* new_page;
807
+  YR_ARENA* new_arena;
808
+  uint8_t** reloc_address;
809
+  uint8_t* reloc_target;
810
+
811
+  // Only coalesced arenas can be duplicated.
812
+  assert(arena->flags & ARENA_FLAGS_COALESCED);
813
+
814
+  new_arena = (YR_ARENA*) yr_malloc(sizeof(YR_ARENA));
815
+
816
+  if (new_arena == NULL)
817
+    return ERROR_INSUFICIENT_MEMORY;
818
+
819
+  page = arena->page_list_head;
820
+  new_page = _yr_arena_new_page(page->size);
821
+
822
+  if (new_page == NULL)
823
+  {
824
+    yr_free(new_arena);
825
+    return ERROR_INSUFICIENT_MEMORY;
826
+  }
827
+
828
+  memcpy(new_page->address, page->address, page->size);
829
+
830
+  new_page->used = page->used;
831
+
832
+  reloc = page->reloc_list_head;
833
+
834
+  while (reloc != NULL)
835
+  {
836
+    new_reloc = yr_malloc(sizeof(YR_RELOC));
837
+
838
+    if (new_reloc == NULL)
839
+      return ERROR_INSUFICIENT_MEMORY;
840
+
841
+    new_reloc->offset = reloc->offset;
842
+    new_reloc->next = NULL;
843
+
844
+    if (new_page->reloc_list_head == NULL)
845
+      new_page->reloc_list_head = new_reloc;
846
+
847
+    if (new_page->reloc_list_tail != NULL)
848
+      new_page->reloc_list_tail->next = new_reloc;
849
+
850
+    new_page->reloc_list_tail = new_reloc;
851
+
852
+    reloc_address = (uint8_t**) (new_page->address + new_reloc->offset);
853
+    reloc_target = *reloc_address;
854
+
855
+    if (reloc_target != NULL)
856
+    {
857
+      assert(reloc_target >= page->address);
858
+      assert(reloc_target < page->address + page->used);
859
+
860
+      *reloc_address = reloc_target - \
861
+                       page->address + \
862
+                       new_page->address;
863
+    }
864
+
865
+    reloc = reloc->next;
866
+  }
867
+
868
+  new_arena->page_list_head = new_page;
869
+  new_arena->current_page = new_page;
870
+  new_arena->flags |= ARENA_FLAGS_COALESCED;
871
+
872
+  *duplicated = new_arena;
873
+
874
+  return ERROR_SUCCESS;
875
+}
876
+#endif
877
+
878
+#if REAL_YARA
879
+//
880
+// yr_arena_save
881
+//
882
+// Saves the arena into a file. If the file exists its overwritten. This
883
+// function requires the arena to be coalesced.
884
+//
885
+// Args:
886
+//    YR_ARENA* arena          - Pointer to the arena.
887
+//    const char* filename     - File path.
888
+//
889
+// Returns:
890
+//    ERROR_SUCCESS if succeed or the corresponding error code otherwise.
891
+//
892
+
893
+int yr_arena_save(
894
+  YR_ARENA* arena,
895
+  const char* filename)
896
+{
897
+  YR_ARENA_PAGE* page;
898
+  YR_RELOC* reloc;
899
+  FILE* fh;
900
+  ARENA_FILE_HEADER header;
901
+
902
+  int32_t end_marker = -1;
903
+  uint8_t** reloc_address;
904
+  uint8_t* reloc_target;
905
+
906
+  // Only coalesced arenas can be saved.
907
+  assert(arena->flags & ARENA_FLAGS_COALESCED);
908
+
909
+  fh = fopen(filename, "wb");
910
+
911
+  if (fh == NULL)
912
+    return ERROR_COULD_NOT_OPEN_FILE;
913
+
914
+  page = arena->page_list_head;
915
+  reloc = page->reloc_list_head;
916
+
917
+  // Convert pointers to offsets before saving.
918
+  while (reloc != NULL)
919
+  {
920
+    reloc_address = (uint8_t**) (page->address + reloc->offset);
921
+    reloc_target = *reloc_address;
922
+
923
+    if (reloc_target != NULL)
924
+    {
925
+      assert(reloc_target >= page->address);
926
+      assert(reloc_target < page->address + page->used);
927
+      *reloc_address = (void*) (*reloc_address - page->address);
928
+    }
929
+    else
930
+    {
931
+      *reloc_address = (void*) (size_t) 0xFFFABADA;
932
+    }
933
+
934
+    reloc = reloc->next;
935
+  }
936
+
937
+  header.magic[0] = 'Y';
938
+  header.magic[1] = 'A';
939
+  header.magic[2] = 'R';
940
+  header.magic[3] = 'A';
941
+  header.size = page->size;
942
+  header.version = ARENA_FILE_VERSION;
943
+
944
+  fwrite(&header, sizeof(header), 1, fh);
945
+  fwrite(page->address, sizeof(uint8_t), header.size, fh);
946
+
947
+  reloc = page->reloc_list_head;
948
+
949
+  // Convert offsets back to pointers.
950
+  while (reloc != NULL)
951
+  {
952
+    fwrite(&reloc->offset, sizeof(reloc->offset), 1, fh);
953
+
954
+    reloc_address = (uint8_t**) (page->address + reloc->offset);
955
+    reloc_target = *reloc_address;
956
+
957
+    if (reloc_target != (void*) (size_t) 0xFFFABADA)
958
+      *reloc_address += (size_t) page->address;
959
+    else
960
+      *reloc_address = 0;
961
+
962
+    reloc = reloc->next;
963
+  }
964
+
965
+  fwrite(&end_marker, sizeof(end_marker), 1, fh);
966
+  fclose(fh);
967
+
968
+  return ERROR_SUCCESS;
969
+}
970
+#endif
971
+
972
+#if REAL_YARA
973
+//
974
+// yr_arena_load
975
+//
976
+// Loads an arena from a file.
977
+//
978
+// Args:
979
+//    const char* filename  - File path.
980
+//    YR_ARENA**            - Address where a pointer to the loaded arena
981
+//                            will be returned.
982
+//
983
+// Returns:
984
+//    ERROR_SUCCESS if succeed or the corresponding error code otherwise.
985
+//
986
+
987
+int yr_arena_load(
988
+    const char* filename,
989
+    YR_ARENA** arena)
990
+{
991
+  FILE* fh;
992
+  YR_ARENA_PAGE* page;
993
+  YR_ARENA* new_arena;
994
+  ARENA_FILE_HEADER header;
995
+
996
+  int32_t reloc_offset;
997
+  uint8_t** reloc_address;
998
+  uint8_t* reloc_target;
999
+
1000
+  long file_size;
1001
+  int result;
1002
+
1003
+  fh = fopen(filename, "rb");
1004
+
1005
+  if (fh == NULL)
1006
+    return ERROR_COULD_NOT_OPEN_FILE;
1007
+
1008
+  fseek(fh, 0, SEEK_END);
1009
+  file_size = ftell(fh);
1010
+  fseek(fh, 0, SEEK_SET);
1011
+
1012
+  if (fread(&header, sizeof(header), 1, fh) != 1)
1013
+  {
1014
+    fclose(fh);
1015
+    return ERROR_INVALID_FILE;
1016
+  }
1017
+
1018
+  if (header.magic[0] != 'Y' ||
1019
+      header.magic[1] != 'A' ||
1020
+      header.magic[2] != 'R' ||
1021
+      header.magic[3] != 'A')
1022
+  {
1023
+    fclose(fh);
1024
+    return ERROR_INVALID_FILE;
1025
+  }
1026
+
1027
+  if (header.size >= file_size)
1028
+  {
1029
+    fclose(fh);
1030
+    return ERROR_CORRUPT_FILE;
1031
+  }
1032
+
1033
+  if (header.version > ARENA_FILE_VERSION)
1034
+  {
1035
+    fclose(fh);
1036
+    return ERROR_UNSUPPORTED_FILE_VERSION;
1037
+  }
1038
+
1039
+  result = yr_arena_create(header.size, 0, &new_arena);
1040
+
1041
+  if (result != ERROR_SUCCESS)
1042
+  {
1043
+    fclose(fh);
1044
+    return result;
1045
+  }
1046
+
1047
+  page = new_arena->current_page;
1048
+
1049
+  if (fread(page->address, header.size, 1, fh) != 1)
1050
+  {
1051
+    fclose(fh);
1052
+    yr_arena_destroy(new_arena);
1053
+    return ERROR_CORRUPT_FILE;
1054
+  }
1055
+
1056
+  page->used = header.size;
1057
+
1058
+  if (fread(&reloc_offset, sizeof(reloc_offset), 1, fh) != 1)
1059
+  {
1060
+    fclose(fh);
1061
+    yr_arena_destroy(new_arena);
1062
+    return ERROR_CORRUPT_FILE;
1063
+  }
1064
+
1065
+  while (reloc_offset != -1)
1066
+  {
1067
+    yr_arena_make_relocatable(new_arena, page->address, reloc_offset, EOL);
1068
+
1069
+    reloc_address = (uint8_t**) (page->address + reloc_offset);
1070
+    reloc_target = *reloc_address;
1071
+
1072
+    if (reloc_target != (uint8_t*) (size_t) 0xFFFABADA)
1073
+      *reloc_address += (size_t) page->address;
1074
+    else
1075
+      *reloc_address = 0;
1076
+
1077
+    if (fread(&reloc_offset, sizeof(reloc_offset), 1, fh) != 1)
1078
+    {
1079
+      fclose(fh);
1080
+      yr_arena_destroy(new_arena);
1081
+      return ERROR_CORRUPT_FILE;
1082
+    }
1083
+  }
1084
+
1085
+  fclose(fh);
1086
+
1087
+  *arena = new_arena;
1088
+
1089
+  return ERROR_SUCCESS;
1090
+}
1091
+#endif
0 1092
new file mode 100644
... ...
@@ -0,0 +1,150 @@
0
+/*
1
+Copyright (c) 2013. The YARA Authors. All Rights Reserved.
2
+
3
+Licensed under the Apache License, Version 2.0 (the "License");
4
+you may not use this file except in compliance with the License.
5
+You may obtain a copy of the License at
6
+
7
+   http://www.apache.org/licenses/LICENSE-2.0
8
+
9
+Unless required by applicable law or agreed to in writing, software
10
+distributed under the License is distributed on an "AS IS" BASIS,
11
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12
+See the License for the specific language governing permissions and
13
+limitations under the License.
14
+*/
15
+
16
+#ifndef YR_ARENA_H
17
+#define YR_ARENA_H
18
+
19
+#include <stdint.h>
20
+#include <stddef.h>
21
+
22
+
23
+#define ARENA_FLAGS_FIXED_SIZE   1
24
+#define ARENA_FLAGS_COALESCED    2
25
+
26
+#define EOL ((size_t) -1)
27
+
28
+
29
+typedef struct _YR_RELOC
30
+{
31
+  int32_t offset;
32
+  struct _YR_RELOC* next;
33
+
34
+} YR_RELOC;
35
+
36
+
37
+typedef struct _YR_ARENA_PAGE
38
+{
39
+
40
+  uint8_t* new_address;
41
+  uint8_t* address;
42
+
43
+  size_t size;
44
+  size_t used;
45
+
46
+  YR_RELOC* reloc_list_head;
47
+  YR_RELOC* reloc_list_tail;
48
+
49
+  struct _YR_ARENA_PAGE* next;
50
+  struct _YR_ARENA_PAGE* prev;
51
+
52
+} YR_ARENA_PAGE;
53
+
54
+
55
+typedef struct _YR_ARENA
56
+{
57
+  int flags;
58
+
59
+  YR_ARENA_PAGE* page_list_head;
60
+  YR_ARENA_PAGE* current_page;
61
+
62
+} YR_ARENA;
63
+
64
+
65
+int yr_arena_create(
66
+    size_t initial_size,
67
+    int flags,
68
+    YR_ARENA** arena);
69
+
70
+
71
+void yr_arena_destroy(
72
+    YR_ARENA* arena);
73
+
74
+
75
+void* yr_arena_base_address(
76
+    YR_ARENA* arena);
77
+
78
+
79
+void* yr_arena_next_address(
80
+    YR_ARENA* arena,
81
+    void* address,
82
+    int offset);
83
+
84
+
85
+int yr_arena_coalesce(
86
+    YR_ARENA* arena);
87
+
88
+
89
+int yr_arena_reserve_memory(
90
+    YR_ARENA* arena,
91
+    size_t size);
92
+
93
+
94
+int yr_arena_allocate_memory(
95
+    YR_ARENA* arena,
96
+    size_t size,
97
+    void** allocated_memory);
98
+
99
+
100
+int yr_arena_allocate_struct(
101
+    YR_ARENA* arena,
102
+    size_t size,
103
+    void** allocated_memory,
104
+    ...);
105
+
106
+
107
+int yr_arena_make_relocatable(
108
+    YR_ARENA* arena,
109
+    void* base,
110
+    ...);
111
+
112
+
113
+int yr_arena_write_data(
114
+    YR_ARENA* arena,
115
+    void* data,
116
+    size_t size,
117
+    void** written_data);
118
+
119
+
120
+int yr_arena_write_string(
121
+    YR_ARENA* arena,
122
+    const char* string,
123
+    char** written_string);
124
+
125
+
126
+int yr_arena_append(
127
+    YR_ARENA* target_arena,
128
+    YR_ARENA* source_arena);
129
+
130
+
131
+int yr_arena_save(
132
+    YR_ARENA* arena,
133
+    const char* filename);
134
+
135
+
136
+int yr_arena_load(
137
+    const char* filename,
138
+    YR_ARENA** arena);
139
+
140
+
141
+int yr_arena_duplicate(
142
+    YR_ARENA* arena,
143
+    YR_ARENA** duplicated);
144
+
145
+
146
+void yr_arena_print(
147
+    YR_ARENA* arena);
148
+
149
+#endif
... ...
@@ -41,6 +41,9 @@ limitations under the License.
41 41
 #define _YARA_CLAM_H_
42 42
 
43 43
 #include "shared/queue.h"
44
+#include "others.h"
45
+#include "yara_arena.h"
46
+#include "yara_hash.h"
44 47
 
45 48
 /* From libyara/include/yara/types.h            */
46 49
 #define DECLARE_REFERENCE(type, name) \
... ...
@@ -234,6 +237,12 @@ typedef struct _SIZED_STRING
234 234
 #define ERROR_TOO_MANY_ARGUMENTS                39
235 235
 #define ERROR_WRONG_NUMBER_OF_ARGUMENTS         40
236 236
 
237
+#define FAIL_ON_ERROR(x) { \
238
+  int result = (x); \
239
+  if (result != ERROR_SUCCESS) \
240
+    return result; \
241
+}
242
+
237 243
 /* From libyara/include/yara/re.h            */
238 244
 #define RE_FLAGS_FAST_HEX_REGEXP          0x02
239 245
 #define RE_FLAGS_BACKWARDS                0x04
... ...
@@ -423,8 +432,9 @@ struct RE {
423 423
 
424 424
 /* From libyara/include/yara/limits.h            */
425 425
 #define MAX_COMPILER_ERROR_EXTRA_INFO   256
426
+#define MAX_LOOP_NESTING                4
426 427
 #define MAX_FUNCTION_ARGS               128
427
-#define LOOP_LOCAL_VARS                      4
428
+#define LOOP_LOCAL_VARS                 4
428 429
 #define LEX_BUF_SIZE                    1024
429 430
 
430 431
 
... ...
@@ -451,6 +461,7 @@ struct RE {
451 451
 /* YARA to ClamAV function mappings */
452 452
 #define yr_strdup cli_strdup
453 453
 #define yr_malloc cli_malloc
454
+#define yr_realloc cli_realloc
454 455
 #define yr_free free
455 456
 #define xtoi cli_hex2num
456 457
 #define strlcpy cli_strlcpy
... ...
@@ -469,26 +480,44 @@ struct _yc_rule {
469 469
 typedef struct _yc_rule yc_rule;
470 470
 typedef struct _yc_string {
471 471
     STAILQ_ENTRY(_yc_string) link;
472
-    char * id;
473 472
     int32_t g_flags;
474 473
     int32_t length;
475 474
     
476
-    char* identifier;
477
-    uint8_t* string;
475
+    DECLARE_REFERENCE(char*, identifier);
476
+    DECLARE_REFERENCE(uint8_t*, string);
477
+    DECLARE_REFERENCE(struct _YR_STRING*, chained_to);
478 478
 } yc_string;
479 479
 
480 480
 typedef struct _yc_compiler {
481
+    int                 errors;
482
+    int                 error_line;
483
+    int                 last_error;
484
+    int                 last_error_line;
485
+    int                 last_result;
486
+
487
+    YR_ARENA*           sz_arena;
488
+    YR_ARENA*           strings_arena;
489
+    YR_ARENA*           code_arena;
490
+    YR_HASH_TABLE*      rules_table;
491
+
492
+    yc_string*          current_rule_strings;
493
+    uint32_t            current_rule_flags;
494
+
495
+    int8_t*             loop_address[MAX_LOOP_NESTING];
496
+    char*               loop_identifier[MAX_LOOP_NESTING];
497
+    int                 loop_depth;
498
+    int                 loop_for_of_mem_offset;
499
+
500
+    char                last_error_extra_info[MAX_COMPILER_ERROR_EXTRA_INFO];
501
+
481 502
     char                lex_buf[LEX_BUF_SIZE];
482 503
     char*               lex_buf_ptr;
483 504
     unsigned short      lex_buf_len;
484
-    int                 last_result;
485
-    char                last_error_extra_info[MAX_COMPILER_ERROR_EXTRA_INFO];
486 505
 
487
-    int                 loop_depth;
488
-    uint32_t            current_rule_flags;
489 506
     char *              error_msg;   
490
-    STAILQ_HEAD(rq, _yc_rule) rules;
491
-    STAILQ_HEAD(cs, _yc_string) current_rule_strings;
507
+
508
+    STAILQ_HEAD(rq, _yc_rule) rule_q;
509
+    STAILQ_HEAD(cs, _yc_string) current_rule_string_q;
492 510
 } yc_compiler;
493 511
 
494 512
 typedef yc_compiler YR_COMPILER;
... ...
@@ -655,17 +655,17 @@ static const yytype_int8 yyrhs[] =
655 655
 static const yytype_uint16 yyrline[] =
656 656
 {
657 657
        0,   226,   226,   228,   229,   230,   231,   236,   248,   267,
658
-     270,   300,   306,   336,   341,   342,   347,   348,   354,   357,
659
-     377,   394,   433,   434,   439,   455,   468,   481,   498,   499,
660
-     504,   518,   517,   536,   553,   554,   559,   560,   561,   562,
661
-     567,   663,   714,   739,   781,   784,   806,   839,   886,   904,
662
-     913,   922,   937,   951,   964,   979,   993,  1029,   992,  1150,
663
-    1149,  1229,  1235,  1241,  1247,  1255,  1264,  1273,  1282,  1291,
664
-    1318,  1345,  1372,  1376,  1384,  1385,  1390,  1412,  1424,  1440,
665
-    1439,  1445,  1457,  1458,  1463,  1468,  1477,  1478,  1485,  1496,
666
-    1500,  1509,  1524,  1535,  1546,  1557,  1568,  1579,  1590,  1599,
667
-    1624,  1637,  1650,  1670,  1705,  1714,  1723,  1732,  1741,  1750,
668
-    1759,  1768,  1777,  1785,  1794,  1803
658
+     270,   300,   304,   332,   337,   338,   343,   344,   350,   353,
659
+     373,   390,   429,   430,   435,   451,   464,   477,   494,   495,
660
+     500,   514,   513,   530,   547,   548,   553,   554,   555,   556,
661
+     561,   658,   709,   734,   776,   779,   801,   834,   881,   899,
662
+     908,   917,   932,   946,   959,   974,   988,  1022,   987,  1133,
663
+    1132,  1208,  1214,  1220,  1226,  1234,  1243,  1252,  1261,  1270,
664
+    1297,  1324,  1351,  1355,  1363,  1364,  1369,  1391,  1403,  1419,
665
+    1418,  1424,  1436,  1437,  1442,  1447,  1456,  1457,  1464,  1475,
666
+    1479,  1488,  1503,  1514,  1525,  1536,  1547,  1558,  1569,  1578,
667
+    1603,  1616,  1629,  1649,  1684,  1693,  1702,  1711,  1720,  1729,
668
+    1738,  1747,  1756,  1764,  1773,  1782
669 669
 };
670 670
 #endif
671 671
 
... ...
@@ -1918,7 +1918,7 @@ yyreduce:
1918 1918
 /* Line 1806 of yacc.c  */
1919 1919
 #line 271 "yara_grammar.y"
1920 1920
     {
1921
-#ifdef REAL_YARA
1921
+#if REAL_YARA //Meta not supported
1922 1922
         // Each rule have a list of meta-data info, consisting in a
1923 1923
         // sequence of YR_META structures. The last YR_META structure does
1924 1924
         // not represent a real meta-data, it's just a end-of-list marker
... ...
@@ -1949,18 +1949,15 @@ yyreduce:
1949 1949
 #line 300 "yara_grammar.y"
1950 1950
     {
1951 1951
         (yyval.string) = NULL;
1952
-#ifdef REAL_YARA
1953 1952
         compiler->current_rule_strings = (yyval.string);
1954
-#endif
1955 1953
       }
1956 1954
     break;
1957 1955
 
1958 1956
   case 12:
1959 1957
 
1960 1958
 /* Line 1806 of yacc.c  */
1961
-#line 307 "yara_grammar.y"
1959
+#line 305 "yara_grammar.y"
1962 1960
     {
1963
-#ifdef REAL_YARA
1964 1961
         // Each rule have a list of strings, consisting in a sequence
1965 1962
         // of YR_STRING structures. The last YR_STRING structure does not
1966 1963
         // represent a real string, it's just a end-of-list marker
... ...
@@ -1981,7 +1978,6 @@ yyreduce:
1981 1981
         ERROR_IF(compiler->last_result != ERROR_SUCCESS);
1982 1982
 
1983 1983
         compiler->current_rule_strings = (yyvsp[(3) - (3)].string);
1984
-#endif
1985 1984
         (yyval.string) = (yyvsp[(3) - (3)].string);
1986 1985
       }
1987 1986
     break;
... ...
@@ -1989,35 +1985,35 @@ yyreduce:
1989 1989
   case 14:
1990 1990
 
1991 1991
 /* Line 1806 of yacc.c  */
1992
-#line 341 "yara_grammar.y"
1992
+#line 337 "yara_grammar.y"
1993 1993
     { (yyval.integer) = 0;  }
1994 1994
     break;
1995 1995
 
1996 1996
   case 15:
1997 1997
 
1998 1998
 /* Line 1806 of yacc.c  */
1999
-#line 342 "yara_grammar.y"
1999
+#line 338 "yara_grammar.y"
2000 2000
     { (yyval.integer) = (yyvsp[(1) - (2)].integer) | (yyvsp[(2) - (2)].integer); }
2001 2001
     break;
2002 2002
 
2003 2003
   case 16:
2004 2004
 
2005 2005
 /* Line 1806 of yacc.c  */
2006
-#line 347 "yara_grammar.y"
2006
+#line 343 "yara_grammar.y"
2007 2007
     { (yyval.integer) = RULE_GFLAGS_PRIVATE; }
2008 2008
     break;
2009 2009
 
2010 2010
   case 17:
2011 2011
 
2012 2012
 /* Line 1806 of yacc.c  */
2013
-#line 348 "yara_grammar.y"
2013
+#line 344 "yara_grammar.y"
2014 2014
     { (yyval.integer) = RULE_GFLAGS_GLOBAL; }
2015 2015
     break;
2016 2016
 
2017 2017
   case 18:
2018 2018
 
2019 2019
 /* Line 1806 of yacc.c  */
2020
-#line 354 "yara_grammar.y"
2020
+#line 350 "yara_grammar.y"
2021 2021
     {
2022 2022
         (yyval.c_string) = NULL;
2023 2023
       }
... ...
@@ -2026,9 +2022,9 @@ yyreduce:
2026 2026
   case 19:
2027 2027
 
2028 2028
 /* Line 1806 of yacc.c  */
2029
-#line 358 "yara_grammar.y"
2029
+#line 354 "yara_grammar.y"
2030 2030
     {
2031
-#ifdef REAL_YARA
2031
+#if REAL_YARA //tags not supported
2032 2032
         // Tags list is represented in the arena as a sequence
2033 2033
         // of null-terminated strings, the sequence ends with an
2034 2034
         // additional null character. Here we write the ending null
... ...
@@ -2047,9 +2043,9 @@ yyreduce:
2047 2047
   case 20:
2048 2048
 
2049 2049
 /* Line 1806 of yacc.c  */
2050
-#line 378 "yara_grammar.y"
2050
+#line 374 "yara_grammar.y"
2051 2051
     {
2052
-#ifdef REAL_YARA
2052
+#if REAL_YARA //tags not supported
2053 2053
         char* identifier;
2054 2054
 
2055 2055
         compiler->last_result = yr_arena_write_string(
... ...
@@ -2058,9 +2054,9 @@ yyreduce:
2058 2058
 #endif
2059 2059
         yr_free((yyvsp[(1) - (1)].c_string));
2060 2060
 
2061
+#if REAL_YARA //tags not supported
2061 2062
         ERROR_IF(compiler->last_result != ERROR_SUCCESS);
2062 2063
 
2063
-#ifdef REAL_YARA
2064 2064
         (yyval.c_string) = identifier;
2065 2065
 #endif
2066 2066
       }
... ...
@@ -2069,9 +2065,9 @@ yyreduce:
2069 2069
   case 21:
2070 2070
 
2071 2071
 /* Line 1806 of yacc.c  */
2072
-#line 395 "yara_grammar.y"
2072
+#line 391 "yara_grammar.y"
2073 2073
     {
2074
-#ifdef REAL_YARA
2074
+#if REAL_YARA //tags not supported
2075 2075
         char* tag_name = (yyvsp[(1) - (2)].c_string);
2076 2076
         size_t tag_length = tag_name != NULL ? strlen(tag_name) : 0;
2077 2077
 
... ...
@@ -2108,21 +2104,21 @@ yyreduce:
2108 2108
   case 22:
2109 2109
 
2110 2110
 /* Line 1806 of yacc.c  */
2111
-#line 433 "yara_grammar.y"
2111
+#line 429 "yara_grammar.y"
2112 2112
     {  (yyval.meta) = (yyvsp[(1) - (1)].meta); }
2113 2113
     break;
2114 2114
 
2115 2115
   case 23:
2116 2116
 
2117 2117
 /* Line 1806 of yacc.c  */
2118
-#line 434 "yara_grammar.y"
2118
+#line 430 "yara_grammar.y"
2119 2119
     {  (yyval.meta) = (yyvsp[(1) - (2)].meta); }
2120 2120
     break;
2121 2121
 
2122 2122
   case 24:
2123 2123
 
2124 2124
 /* Line 1806 of yacc.c  */
2125
-#line 440 "yara_grammar.y"
2125
+#line 436 "yara_grammar.y"
2126 2126
     {
2127 2127
         SIZED_STRING* sized_string = (yyvsp[(3) - (3)].sized_string);
2128 2128
 
... ...
@@ -2143,7 +2139,7 @@ yyreduce:
2143 2143
   case 25:
2144 2144
 
2145 2145
 /* Line 1806 of yacc.c  */
2146
-#line 456 "yara_grammar.y"
2146
+#line 452 "yara_grammar.y"
2147 2147
     {
2148 2148
         (yyval.meta) = yr_parser_reduce_meta_declaration(
2149 2149
             yyscanner,
... ...
@@ -2161,7 +2157,7 @@ yyreduce:
2161 2161
   case 26:
2162 2162
 
2163 2163
 /* Line 1806 of yacc.c  */
2164
-#line 469 "yara_grammar.y"
2164
+#line 465 "yara_grammar.y"
2165 2165
     {
2166 2166
         (yyval.meta) = yr_parser_reduce_meta_declaration(
2167 2167
             yyscanner,
... ...
@@ -2179,7 +2175,7 @@ yyreduce:
2179 2179
   case 27:
2180 2180
 
2181 2181
 /* Line 1806 of yacc.c  */
2182
-#line 482 "yara_grammar.y"
2182
+#line 478 "yara_grammar.y"
2183 2183
     {
2184 2184
         (yyval.meta) = yr_parser_reduce_meta_declaration(
2185 2185
             yyscanner,
... ...
@@ -2197,21 +2193,21 @@ yyreduce:
2197 2197
   case 28:
2198 2198
 
2199 2199
 /* Line 1806 of yacc.c  */
2200
-#line 498 "yara_grammar.y"
2200
+#line 494 "yara_grammar.y"
2201 2201
     { (yyval.string) = (yyvsp[(1) - (1)].string); }
2202 2202
     break;
2203 2203
 
2204 2204
   case 29:
2205 2205
 
2206 2206
 /* Line 1806 of yacc.c  */
2207
-#line 499 "yara_grammar.y"
2207
+#line 495 "yara_grammar.y"
2208 2208
     { (yyval.string) = (yyvsp[(1) - (2)].string); }
2209 2209
     break;
2210 2210
 
2211 2211
   case 30:
2212 2212
 
2213 2213
 /* Line 1806 of yacc.c  */
2214
-#line 505 "yara_grammar.y"
2214
+#line 501 "yara_grammar.y"
2215 2215
     {
2216 2216
         (yyval.string) = yr_parser_reduce_string_declaration(
2217 2217
             yyscanner,
... ...
@@ -2229,18 +2225,16 @@ yyreduce:
2229 2229
   case 31:
2230 2230
 
2231 2231
 /* Line 1806 of yacc.c  */
2232
-#line 518 "yara_grammar.y"
2232
+#line 514 "yara_grammar.y"
2233 2233
     {
2234
-#ifdef REAL_YARA
2235 2234
         compiler->error_line = yyget_lineno(yyscanner);
2236
-#endif
2237 2235
       }
2238 2236
     break;
2239 2237
 
2240 2238
   case 32:
2241 2239
 
2242 2240
 /* Line 1806 of yacc.c  */
2243
-#line 524 "yara_grammar.y"
2241
+#line 518 "yara_grammar.y"
2244 2242
     {
2245 2243
         (yyval.string) = yr_parser_reduce_string_declaration(
2246 2244
             yyscanner,
... ...
@@ -2258,7 +2252,7 @@ yyreduce:
2258 2258
   case 33:
2259 2259
 
2260 2260
 /* Line 1806 of yacc.c  */
2261
-#line 537 "yara_grammar.y"
2261
+#line 531 "yara_grammar.y"
2262 2262
     {
2263 2263
         (yyval.string) = yr_parser_reduce_string_declaration(
2264 2264
             yyscanner,
... ...
@@ -2276,51 +2270,50 @@ yyreduce:
2276 2276
   case 34:
2277 2277
 
2278 2278
 /* Line 1806 of yacc.c  */
2279
-#line 553 "yara_grammar.y"
2279
+#line 547 "yara_grammar.y"
2280 2280
     { (yyval.integer) = 0; }
2281 2281
     break;
2282 2282
 
2283 2283
   case 35:
2284 2284
 
2285 2285
 /* Line 1806 of yacc.c  */
2286
-#line 554 "yara_grammar.y"
2286
+#line 548 "yara_grammar.y"
2287 2287
     { (yyval.integer) = (yyvsp[(1) - (2)].integer) | (yyvsp[(2) - (2)].integer); }
2288 2288
     break;
2289 2289
 
2290 2290
   case 36:
2291 2291
 
2292 2292
 /* Line 1806 of yacc.c  */
2293
-#line 559 "yara_grammar.y"
2293
+#line 553 "yara_grammar.y"
2294 2294
     { (yyval.integer) = STRING_GFLAGS_WIDE; }
2295 2295
     break;
2296 2296
 
2297 2297
   case 37:
2298 2298
 
2299 2299
 /* Line 1806 of yacc.c  */
2300
-#line 560 "yara_grammar.y"
2300
+#line 554 "yara_grammar.y"
2301 2301
     { (yyval.integer) = STRING_GFLAGS_ASCII; }
2302 2302
     break;
2303 2303
 
2304 2304
   case 38:
2305 2305
 
2306 2306
 /* Line 1806 of yacc.c  */
2307
-#line 561 "yara_grammar.y"
2307
+#line 555 "yara_grammar.y"
2308 2308
     { (yyval.integer) = STRING_GFLAGS_NO_CASE; }
2309 2309
     break;
2310 2310
 
2311 2311
   case 39:
2312 2312
 
2313 2313
 /* Line 1806 of yacc.c  */
2314
-#line 562 "yara_grammar.y"
2314
+#line 556 "yara_grammar.y"
2315 2315
     { (yyval.integer) = STRING_GFLAGS_FULL_WORD; }
2316 2316
     break;
2317 2317
 
2318 2318
   case 40:
2319 2319
 
2320 2320
 /* Line 1806 of yacc.c  */
2321
-#line 568 "yara_grammar.y"
2321
+#line 562 "yara_grammar.y"
2322 2322
     {
2323
-          //#ifdef REAL_YARA
2324 2323
         YR_OBJECT* object = NULL;
2325 2324
         YR_RULE* rule;
2326 2325
 
... ...
@@ -2345,7 +2338,7 @@ yyreduce:
2345 2345
         {
2346 2346
           // Search for identifier within the global namespace, where the
2347 2347
           // externals variables reside.
2348
-#if REAL_YARA
2348
+#if REAL_YARA //externals/objects/modules not supported
2349 2349
           object = (YR_OBJECT*) yr_hash_table_lookup(
2350 2350
                 compiler->objects_table,
2351 2351
                 (yyvsp[(1) - (1)].c_string),
... ...
@@ -2355,7 +2348,7 @@ yyreduce:
2355 2355
           {
2356 2356
             // If not found, search within the current namespace.
2357 2357
 
2358
-#if REAL_YARA
2358
+#if REAL_YARA //externals/objects/modules not supported
2359 2359
             ns = compiler->current_namespace->name;
2360 2360
             object = (YR_OBJECT*) yr_hash_table_lookup(
2361 2361
                 compiler->objects_table,
... ...
@@ -2366,7 +2359,7 @@ yyreduce:
2366 2366
 
2367 2367
           if (object != NULL)
2368 2368
           {
2369
-#if REAL_YARA
2369
+#if REAL_YARA //externals/objects/modules not supported
2370 2370
             compiler->last_result = yr_arena_write_string(
2371 2371
                 compiler->sz_arena,
2372 2372
                 (yyvsp[(1) - (1)].c_string),
... ...
@@ -2384,12 +2377,15 @@ yyreduce:
2384 2384
           }
2385 2385
           else
2386 2386
           {
2387
- #if REAL_YARA
2387
+              //#if REAL_YARA
2388 2388
            rule = (YR_RULE*) yr_hash_table_lookup(
2389 2389
                 compiler->rules_table,
2390 2390
                 (yyvsp[(1) - (1)].c_string),
2391
+#if REAL_YARA
2391 2392
                 compiler->current_namespace->name);
2392
-
2393
+#else
2394
+                NULL);
2395
+#endif
2393 2396
             if (rule != NULL)
2394 2397
             {
2395 2398
               compiler->last_result = yr_parser_emit_with_arg_reloc(
... ...
@@ -2403,7 +2399,7 @@ yyreduce:
2403 2403
               yr_compiler_set_error_extra_info(compiler, (yyvsp[(1) - (1)].c_string));
2404 2404
               compiler->last_result = ERROR_UNDEFINED_IDENTIFIER;
2405 2405
             }
2406
-#endif
2406
+            //#endif
2407 2407
 
2408 2408
             (yyval.object) = (YR_OBJECT*) -2;
2409 2409
           }
... ...
@@ -2412,16 +2408,15 @@ yyreduce:
2412 2412
         yr_free((yyvsp[(1) - (1)].c_string));
2413 2413
 
2414 2414
         ERROR_IF(compiler->last_result != ERROR_SUCCESS);
2415
-        //#endif
2416 2415
       }
2417 2416
     break;
2418 2417
 
2419 2418
   case 41:
2420 2419
 
2421 2420
 /* Line 1806 of yacc.c  */
2422
-#line 664 "yara_grammar.y"
2421
+#line 659 "yara_grammar.y"
2423 2422
     {
2424
-#ifdef REAL_YARA
2423
+#ifdef REAL_YARA //externals/objects/modules not supported
2425 2424
         YR_OBJECT* object = (yyvsp[(1) - (3)].object);
2426 2425
         YR_OBJECT* field = NULL;
2427 2426
 
... ...
@@ -2475,9 +2470,9 @@ yyreduce:
2475 2475
   case 42:
2476 2476
 
2477 2477
 /* Line 1806 of yacc.c  */
2478
-#line 715 "yara_grammar.y"
2478
+#line 710 "yara_grammar.y"
2479 2479
     {
2480
-#ifdef REAL_YARA
2480
+#ifdef REAL_YARA //externals/objects/modules not supported
2481 2481
         if ((yyvsp[(1) - (4)].object) != NULL && (yyvsp[(1) - (4)].object)->type == OBJECT_TYPE_ARRAY)
2482 2482
         {
2483 2483
           compiler->last_result = yr_parser_emit(
... ...
@@ -2485,7 +2480,7 @@ yyreduce:
2485 2485
               OP_INDEX_ARRAY,
2486 2486
               NULL);
2487 2487
 
2488
-          (yyval.object) = ((YR_OBJECT_ARRAY*) (yyvsp[(1) - (4)].object))->items->objects[0];
2488
+X          (yyval.object) = ((YR_OBJECT_ARRAY*) (yyvsp[(1) - (4)].object))->items->objects[0];
2489 2489
         }
2490 2490
         else
2491 2491
         {
... ...
@@ -2504,9 +2499,9 @@ yyreduce:
2504 2504
   case 43:
2505 2505
 
2506 2506
 /* Line 1806 of yacc.c  */
2507
-#line 740 "yara_grammar.y"
2507
+#line 735 "yara_grammar.y"
2508 2508
     {
2509
-#ifdef REAL_YARA
2509
+#ifdef REAL_YARA //externals/objects/modules not supported
2510 2510
         int args_count;
2511 2511
 
2512 2512
         if ((yyvsp[(1) - (4)].object) != NULL && (yyvsp[(1) - (4)].object)->type == OBJECT_TYPE_FUNCTION)
... ...
@@ -2546,7 +2541,7 @@ yyreduce:
2546 2546
   case 44:
2547 2547
 
2548 2548
 /* Line 1806 of yacc.c  */
2549
-#line 781 "yara_grammar.y"
2549
+#line 776 "yara_grammar.y"
2550 2550
     {
2551 2551
         (yyval.c_string) = yr_strdup("");
2552 2552
       }
... ...
@@ -2555,7 +2550,7 @@ yyreduce:
2555 2555
   case 45:
2556 2556
 
2557 2557
 /* Line 1806 of yacc.c  */
2558
-#line 785 "yara_grammar.y"
2558
+#line 780 "yara_grammar.y"
2559 2559
     {
2560 2560
         (yyval.c_string) = yr_malloc(MAX_FUNCTION_ARGS + 1);
2561 2561
 
... ...
@@ -2582,7 +2577,7 @@ yyreduce:
2582 2582
   case 46:
2583 2583
 
2584 2584
 /* Line 1806 of yacc.c  */
2585
-#line 807 "yara_grammar.y"
2585
+#line 802 "yara_grammar.y"
2586 2586
     {
2587 2587
         if (strlen((yyvsp[(1) - (3)].c_string)) == MAX_FUNCTION_ARGS)
2588 2588
         {
... ...
@@ -2616,7 +2611,7 @@ yyreduce:
2616 2616
   case 47:
2617 2617
 
2618 2618
 /* Line 1806 of yacc.c  */
2619
-#line 840 "yara_grammar.y"
2619
+#line 835 "yara_grammar.y"
2620 2620
     {
2621 2621
 #ifdef REAL_YARA
2622 2622
         SIZED_STRING* sized_string = (yyvsp[(1) - (1)].sized_string);
... ...
@@ -2664,7 +2659,7 @@ yyreduce:
2664 2664
   case 48:
2665 2665
 
2666 2666
 /* Line 1806 of yacc.c  */
2667
-#line 887 "yara_grammar.y"
2667
+#line 882 "yara_grammar.y"
2668 2668
     {
2669 2669
         if ((yyvsp[(1) - (1)].expression_type) == EXPRESSION_TYPE_STRING)
2670 2670
         {
... ...
@@ -2684,7 +2679,7 @@ yyreduce:
2684 2684
   case 49:
2685 2685
 
2686 2686
 /* Line 1806 of yacc.c  */
2687
-#line 905 "yara_grammar.y"
2687
+#line 900 "yara_grammar.y"
2688 2688
     {
2689 2689
         compiler->last_result = yr_parser_emit_with_arg(
2690 2690
             yyscanner, OP_PUSH, 1, NULL);
... ...
@@ -2698,7 +2693,7 @@ yyreduce:
2698 2698
   case 50:
2699 2699
 
2700 2700
 /* Line 1806 of yacc.c  */
2701
-#line 914 "yara_grammar.y"
2701
+#line 909 "yara_grammar.y"
2702 2702
     {
2703 2703
         compiler->last_result = yr_parser_emit_with_arg(
2704 2704
             yyscanner, OP_PUSH, 0, NULL);
... ...
@@ -2712,7 +2707,7 @@ yyreduce:
2712 2712
   case 51:
2713 2713
 
2714 2714
 /* Line 1806 of yacc.c  */
2715
-#line 923 "yara_grammar.y"
2715
+#line 918 "yara_grammar.y"
2716 2716
     {
2717 2717
         CHECK_TYPE((yyvsp[(1) - (3)].expression_type), EXPRESSION_TYPE_STRING, "matches");
2718 2718
         CHECK_TYPE((yyvsp[(3) - (3)].expression_type), EXPRESSION_TYPE_REGEXP, "matches");
... ...
@@ -2732,7 +2727,7 @@ yyreduce:
2732 2732
   case 52:
2733 2733
 
2734 2734
 /* Line 1806 of yacc.c  */
2735
-#line 938 "yara_grammar.y"
2735
+#line 933 "yara_grammar.y"
2736 2736
     {
2737 2737
         CHECK_TYPE((yyvsp[(1) - (3)].expression_type), EXPRESSION_TYPE_STRING, "contains");
2738 2738
         CHECK_TYPE((yyvsp[(3) - (3)].expression_type), EXPRESSION_TYPE_STRING, "contains");
... ...
@@ -2751,7 +2746,7 @@ yyreduce:
2751 2751
   case 53:
2752 2752
 
2753 2753
 /* Line 1806 of yacc.c  */
2754
-#line 952 "yara_grammar.y"
2754
+#line 947 "yara_grammar.y"
2755 2755
     {
2756 2756
         int result = yr_parser_reduce_string_identifier(
2757 2757
             yyscanner,
... ...
@@ -2769,7 +2764,7 @@ yyreduce:
2769 2769
   case 54:
2770 2770
 
2771 2771
 /* Line 1806 of yacc.c  */
2772
-#line 965 "yara_grammar.y"
2772
+#line 960 "yara_grammar.y"
2773 2773
     {
2774 2774
         CHECK_TYPE((yyvsp[(3) - (3)].expression_type), EXPRESSION_TYPE_INTEGER, "at");
2775 2775
 
... ...
@@ -2789,7 +2784,7 @@ yyreduce:
2789 2789
   case 55:
2790 2790
 
2791 2791
 /* Line 1806 of yacc.c  */
2792
-#line 980 "yara_grammar.y"
2792
+#line 975 "yara_grammar.y"
2793 2793
     {
2794 2794
         compiler->last_result = yr_parser_reduce_string_identifier(
2795 2795
             yyscanner,
... ...
@@ -2807,9 +2802,8 @@ yyreduce:
2807 2807
   case 56:
2808 2808
 
2809 2809
 /* Line 1806 of yacc.c  */
2810
-#line 993 "yara_grammar.y"
2810
+#line 988 "yara_grammar.y"
2811 2811
     {
2812
-#ifdef REAL_YARA
2813 2812
         int var_index;
2814 2813
 
2815 2814
         if (compiler->loop_depth == MAX_LOOP_NESTING)
... ...
@@ -2831,7 +2825,6 @@ yyreduce:
2831 2831
           compiler->last_result = \
2832 2832
               ERROR_DUPLICATE_LOOP_IDENTIFIER;
2833 2833
         }
2834
-#endif
2835 2834
         ERROR_IF(compiler->last_result != ERROR_SUCCESS);
2836 2835
 
2837 2836
         // Push end-of-list marker
... ...
@@ -2848,7 +2841,7 @@ yyreduce:
2848 2848
   case 57:
2849 2849
 
2850 2850
 /* Line 1806 of yacc.c  */
2851
-#line 1029 "yara_grammar.y"
2851
+#line 1022 "yara_grammar.y"
2852 2852
     {
2853 2853
         int mem_offset = LOOP_LOCAL_VARS * compiler->loop_depth;
2854 2854
 
... ...
@@ -2879,18 +2872,16 @@ yyreduce:
2879 2879
           yr_parser_emit_with_arg(
2880 2880
               yyscanner, OP_POP_M, mem_offset, NULL);
2881 2881
         }
2882
-#ifdef REAL_YARA
2883 2882
         compiler->loop_address[compiler->loop_depth] = addr;
2884 2883
         compiler->loop_identifier[compiler->loop_depth] = (yyvsp[(3) - (7)].c_string);
2885 2884
         compiler->loop_depth++;
2886
-#endif
2887 2885
       }
2888 2886
     break;
2889 2887
 
2890 2888
   case 58:
2891 2889
 
2892 2890
 /* Line 1806 of yacc.c  */
2893
-#line 1066 "yara_grammar.y"
2891
+#line 1057 "yara_grammar.y"
2894 2892
     {
2895 2893
         int mem_offset;
2896 2894
 
... ...
@@ -2913,12 +2904,8 @@ yyreduce:
2913 2913
           yr_parser_emit_with_arg_reloc(
2914 2914
               yyscanner,
2915 2915
               OP_JNUNDEF,
2916
-#ifdef REAL_YARA
2917 2916
               PTR_TO_UINT64(
2918 2917
                   compiler->loop_address[compiler->loop_depth]),
2919
-#else
2920
-              0,
2921
-#endif
2922 2918
               NULL);
2923 2919
         }
2924 2920
         else // INTEGER_SET_RANGE
... ...
@@ -2935,7 +2922,6 @@ yyreduce:
2935 2935
           yr_parser_emit_with_arg(
2936 2936
               yyscanner, OP_PUSH_M, mem_offset + 3, NULL);
2937 2937
 
2938
-#ifdef REAL_YARA
2939 2938
           // Compare higher bound with lower bound, do loop again
2940 2939
           // if lower bound is still lower or equal than higher bound
2941 2940
           yr_parser_emit_with_arg_reloc(
... ...
@@ -2944,7 +2930,6 @@ yyreduce:
2944 2944
               PTR_TO_UINT64(
2945 2945
                 compiler->loop_address[compiler->loop_depth]),
2946 2946
               NULL);
2947
-#endif
2948 2947
 
2949 2948
           yr_parser_emit(yyscanner, OP_POP, NULL);
2950 2949
           yr_parser_emit(yyscanner, OP_POP, NULL);
... ...
@@ -2967,9 +2952,7 @@ yyreduce:
2967 2967
 
2968 2968
         yr_parser_emit(yyscanner, OP_LE, NULL);
2969 2969
 
2970
-#ifdef REAL_YARA
2971 2970
         compiler->loop_identifier[compiler->loop_depth] = NULL;
2972
-#endif
2973 2971
         yr_free((yyvsp[(3) - (11)].c_string));
2974 2972
 
2975 2973
         (yyval.expression_type) = EXPRESSION_TYPE_BOOLEAN;
... ...
@@ -2979,9 +2962,8 @@ yyreduce:
2979 2979
   case 59:
2980 2980
 
2981 2981
 /* Line 1806 of yacc.c  */
2982
-#line 1150 "yara_grammar.y"
2982
+#line 1133 "yara_grammar.y"
2983 2983
     {
2984
-#ifdef REAL_YARA
2985 2984
         int mem_offset = LOOP_LOCAL_VARS * compiler->loop_depth;
2986 2985
         int8_t* addr;
2987 2986
 
... ...
@@ -3009,16 +2991,14 @@ yyreduce:
3009 3009
         compiler->loop_address[compiler->loop_depth] = addr;
3010 3010
         compiler->loop_identifier[compiler->loop_depth] = NULL;
3011 3011
         compiler->loop_depth++;
3012
-#endif
3013 3012
       }
3014 3013
     break;
3015 3014
 
3016 3015
   case 60:
3017 3016
 
3018 3017
 /* Line 1806 of yacc.c  */
3019
-#line 1182 "yara_grammar.y"
3018
+#line 1163 "yara_grammar.y"
3020 3019
     {
3021
-#ifdef REAL_YARA
3022 3020
         int mem_offset;
3023 3021
 
3024 3022
         compiler->loop_depth--;
... ...
@@ -3060,7 +3040,6 @@ yyreduce:
3060 3060
             yyscanner, OP_PUSH_M, mem_offset + 1, NULL);
3061 3061
 
3062 3062
         yr_parser_emit(yyscanner, OP_LE, NULL);
3063
-#endif
3064 3063
         (yyval.expression_type) = EXPRESSION_TYPE_BOOLEAN;
3065 3064
 
3066 3065
       }
... ...
@@ -3069,7 +3048,7 @@ yyreduce:
3069 3069
   case 61:
3070 3070
 
3071 3071
 /* Line 1806 of yacc.c  */
3072
-#line 1230 "yara_grammar.y"
3072
+#line 1209 "yara_grammar.y"
3073 3073
     {
3074 3074
         yr_parser_emit(yyscanner, OP_OF, NULL);
3075 3075
 
... ...
@@ -3080,7 +3059,7 @@ yyreduce:
3080 3080
   case 62:
3081 3081
 
3082 3082
 /* Line 1806 of yacc.c  */
3083
-#line 1236 "yara_grammar.y"
3083
+#line 1215 "yara_grammar.y"
3084 3084
     {
3085 3085
         yr_parser_emit(yyscanner, OP_NOT, NULL);
3086 3086
 
... ...
@@ -3091,7 +3070,7 @@ yyreduce:
3091 3091
   case 63:
3092 3092
 
3093 3093
 /* Line 1806 of yacc.c  */
3094
-#line 1242 "yara_grammar.y"
3094
+#line 1221 "yara_grammar.y"
3095 3095
     {
3096 3096
         yr_parser_emit(yyscanner, OP_AND, NULL);
3097 3097
 
... ...
@@ -3102,7 +3081,7 @@ yyreduce:
3102 3102
   case 64:
3103 3103
 
3104 3104
 /* Line 1806 of yacc.c  */
3105
-#line 1248 "yara_grammar.y"
3105
+#line 1227 "yara_grammar.y"
3106 3106
     {
3107 3107
         CHECK_TYPE((yyvsp[(1) - (3)].expression_type), EXPRESSION_TYPE_BOOLEAN, "or");
3108 3108
 
... ...
@@ -3115,7 +3094,7 @@ yyreduce:
3115 3115
   case 65:
3116 3116
 
3117 3117
 /* Line 1806 of yacc.c  */
3118
-#line 1256 "yara_grammar.y"
3118
+#line 1235 "yara_grammar.y"
3119 3119
     {
3120 3120
         CHECK_TYPE((yyvsp[(1) - (3)].expression_type), EXPRESSION_TYPE_INTEGER, "<");
3121 3121
         CHECK_TYPE((yyvsp[(3) - (3)].expression_type), EXPRESSION_TYPE_INTEGER, "<");
... ...
@@ -3129,7 +3108,7 @@ yyreduce:
3129 3129
   case 66:
3130 3130
 
3131 3131
 /* Line 1806 of yacc.c  */
3132
-#line 1265 "yara_grammar.y"
3132
+#line 1244 "yara_grammar.y"
3133 3133
     {
3134 3134
         CHECK_TYPE((yyvsp[(1) - (3)].expression_type), EXPRESSION_TYPE_INTEGER, ">");
3135 3135
         CHECK_TYPE((yyvsp[(3) - (3)].expression_type), EXPRESSION_TYPE_INTEGER, ">");
... ...
@@ -3143,7 +3122,7 @@ yyreduce:
3143 3143
   case 67:
3144 3144
 
3145 3145
 /* Line 1806 of yacc.c  */
3146
-#line 1274 "yara_grammar.y"
3146
+#line 1253 "yara_grammar.y"
3147 3147
     {
3148 3148
         CHECK_TYPE((yyvsp[(1) - (3)].expression_type), EXPRESSION_TYPE_INTEGER, "<=");
3149 3149
         CHECK_TYPE((yyvsp[(3) - (3)].expression_type), EXPRESSION_TYPE_INTEGER, "<=");
... ...
@@ -3157,7 +3136,7 @@ yyreduce:
3157 3157
   case 68:
3158 3158
 
3159 3159
 /* Line 1806 of yacc.c  */
3160
-#line 1283 "yara_grammar.y"
3160
+#line 1262 "yara_grammar.y"
3161 3161
     {
3162 3162
         CHECK_TYPE((yyvsp[(1) - (3)].expression_type), EXPRESSION_TYPE_INTEGER, ">=");
3163 3163
         CHECK_TYPE((yyvsp[(3) - (3)].expression_type), EXPRESSION_TYPE_INTEGER, ">=");
... ...
@@ -3171,7 +3150,7 @@ yyreduce:
3171 3171
   case 69:
3172 3172
 
3173 3173
 /* Line 1806 of yacc.c  */
3174
-#line 1292 "yara_grammar.y"
3174
+#line 1271 "yara_grammar.y"
3175 3175
     {
3176 3176
         if ((yyvsp[(1) - (3)].expression_type) != (yyvsp[(3) - (3)].expression_type))
3177 3177
         {
... ...
@@ -3203,7 +3182,7 @@ yyreduce:
3203 3203
   case 70:
3204 3204
 
3205 3205
 /* Line 1806 of yacc.c  */
3206
-#line 1319 "yara_grammar.y"
3206
+#line 1298 "yara_grammar.y"
3207 3207
     {
3208 3208
         if ((yyvsp[(1) - (3)].expression_type) != (yyvsp[(3) - (3)].expression_type))
3209 3209
         {
... ...
@@ -3235,7 +3214,7 @@ yyreduce:
3235 3235
   case 71:
3236 3236
 
3237 3237
 /* Line 1806 of yacc.c  */
3238
-#line 1346 "yara_grammar.y"
3238
+#line 1325 "yara_grammar.y"
3239 3239
     {
3240 3240
         if ((yyvsp[(1) - (3)].expression_type) != (yyvsp[(3) - (3)].expression_type))
3241 3241
         {
... ...
@@ -3267,7 +3246,7 @@ yyreduce:
3267 3267
   case 72:
3268 3268
 
3269 3269
 /* Line 1806 of yacc.c  */
3270
-#line 1373 "yara_grammar.y"
3270
+#line 1352 "yara_grammar.y"
3271 3271
     {
3272 3272
         (yyval.expression_type) = (yyvsp[(1) - (1)].expression_type);
3273 3273
       }
... ...
@@ -3276,7 +3255,7 @@ yyreduce:
3276 3276
   case 73:
3277 3277
 
3278 3278
 /* Line 1806 of yacc.c  */
3279
-#line 1377 "yara_grammar.y"
3279
+#line 1356 "yara_grammar.y"
3280 3280
     {
3281 3281
         (yyval.expression_type) = (yyvsp[(2) - (3)].expression_type);
3282 3282
       }
... ...
@@ -3285,21 +3264,21 @@ yyreduce:
3285 3285
   case 74:
3286 3286
 
3287 3287
 /* Line 1806 of yacc.c  */
3288
-#line 1384 "yara_grammar.y"
3288
+#line 1363 "yara_grammar.y"
3289 3289
     { (yyval.integer) = INTEGER_SET_ENUMERATION; }
3290 3290
     break;
3291 3291
 
3292 3292
   case 75:
3293 3293
 
3294 3294
 /* Line 1806 of yacc.c  */
3295
-#line 1385 "yara_grammar.y"
3295
+#line 1364 "yara_grammar.y"
3296 3296
     { (yyval.integer) = INTEGER_SET_RANGE; }
3297 3297
     break;
3298 3298
 
3299 3299
   case 76:
3300 3300
 
3301 3301
 /* Line 1806 of yacc.c  */
3302
-#line 1391 "yara_grammar.y"
3302
+#line 1370 "yara_grammar.y"
3303 3303
     {
3304 3304
         if ((yyvsp[(2) - (6)].expression_type) != EXPRESSION_TYPE_INTEGER)
3305 3305
         {
... ...
@@ -3322,7 +3301,7 @@ yyreduce:
3322 3322
   case 77:
3323 3323
 
3324 3324
 /* Line 1806 of yacc.c  */
3325
-#line 1413 "yara_grammar.y"
3325
+#line 1392 "yara_grammar.y"
3326 3326
     {
3327 3327
         if ((yyvsp[(1) - (1)].expression_type) != EXPRESSION_TYPE_INTEGER)
3328 3328
         {
... ...
@@ -3339,7 +3318,7 @@ yyreduce:
3339 3339
   case 78:
3340 3340
 
3341 3341
 /* Line 1806 of yacc.c  */
3342
-#line 1425 "yara_grammar.y"
3342
+#line 1404 "yara_grammar.y"
3343 3343
     {
3344 3344
         if ((yyvsp[(3) - (3)].expression_type) != EXPRESSION_TYPE_INTEGER)
3345 3345
         {
... ...
@@ -3355,7 +3334,7 @@ yyreduce:
3355 3355
   case 79:
3356 3356
 
3357 3357
 /* Line 1806 of yacc.c  */
3358
-#line 1440 "yara_grammar.y"
3358
+#line 1419 "yara_grammar.y"
3359 3359
     {
3360 3360
         // Push end-of-list marker
3361 3361
         yr_parser_emit_with_arg(yyscanner, OP_PUSH, UNDEFINED, NULL);
... ...
@@ -3365,7 +3344,7 @@ yyreduce:
3365 3365
   case 81:
3366 3366
 
3367 3367
 /* Line 1806 of yacc.c  */
3368
-#line 1446 "yara_grammar.y"
3368
+#line 1425 "yara_grammar.y"
3369 3369
     {
3370 3370
         yr_parser_emit_with_arg(yyscanner, OP_PUSH, UNDEFINED, NULL);
3371 3371
         yr_parser_emit_pushes_for_strings(yyscanner, "$*");
... ...
@@ -3378,7 +3357,7 @@ yyreduce:
3378 3378
   case 84:
3379 3379
 
3380 3380
 /* Line 1806 of yacc.c  */
3381
-#line 1464 "yara_grammar.y"
3381
+#line 1443 "yara_grammar.y"
3382 3382
     {
3383 3383
         yr_parser_emit_pushes_for_strings(yyscanner, (yyvsp[(1) - (1)].c_string));
3384 3384
         yr_free((yyvsp[(1) - (1)].c_string));
... ...
@@ -3388,7 +3367,7 @@ yyreduce:
3388 3388
   case 85:
3389 3389
 
3390 3390
 /* Line 1806 of yacc.c  */
3391
-#line 1469 "yara_grammar.y"
3391
+#line 1448 "yara_grammar.y"
3392 3392
     {
3393 3393
         yr_parser_emit_pushes_for_strings(yyscanner, (yyvsp[(1) - (1)].c_string));
3394 3394
         yr_free((yyvsp[(1) - (1)].c_string));
... ...
@@ -3398,7 +3377,7 @@ yyreduce:
3398 3398
   case 87:
3399 3399
 
3400 3400
 /* Line 1806 of yacc.c  */
3401
-#line 1479 "yara_grammar.y"
3401
+#line 1458 "yara_grammar.y"
3402 3402
     {
3403 3403
         yr_parser_emit_with_arg(yyscanner, OP_PUSH, UNDEFINED, NULL);
3404 3404
 #ifdef YARA_PROTO
... ...
@@ -3410,7 +3389,7 @@ yyreduce:
3410 3410
   case 88:
3411 3411
 
3412 3412
 /* Line 1806 of yacc.c  */
3413
-#line 1486 "yara_grammar.y"
3413
+#line 1465 "yara_grammar.y"
3414 3414
     {
3415 3415
         yr_parser_emit_with_arg(yyscanner, OP_PUSH, 1, NULL);
3416 3416
 #ifdef YARA_PROTO
... ...
@@ -3422,7 +3401,7 @@ yyreduce:
3422 3422
   case 89:
3423 3423
 
3424 3424
 /* Line 1806 of yacc.c  */
3425
-#line 1497 "yara_grammar.y"
3425
+#line 1476 "yara_grammar.y"
3426 3426
     {
3427 3427
         (yyval.expression_type) = (yyvsp[(2) - (3)].expression_type);
3428 3428
       }
... ...
@@ -3431,7 +3410,7 @@ yyreduce:
3431 3431
   case 90:
3432 3432
 
3433 3433
 /* Line 1806 of yacc.c  */
3434
-#line 1501 "yara_grammar.y"
3434
+#line 1480 "yara_grammar.y"
3435 3435
     {
3436 3436
         compiler->last_result = yr_parser_emit(
3437 3437
             yyscanner, OP_FILESIZE, NULL);
... ...
@@ -3445,7 +3424,7 @@ yyreduce:
3445 3445
   case 91:
3446 3446
 
3447 3447
 /* Line 1806 of yacc.c  */
3448
-#line 1510 "yara_grammar.y"
3448
+#line 1489 "yara_grammar.y"
3449 3449
     {
3450 3450
 #ifndef YARA_PROTO
3451 3451
         yywarning(yyscanner,
... ...
@@ -3465,7 +3444,7 @@ yyreduce:
3465 3465
   case 92:
3466 3466
 
3467 3467
 /* Line 1806 of yacc.c  */
3468
-#line 1525 "yara_grammar.y"
3468
+#line 1504 "yara_grammar.y"
3469 3469
     {
3470 3470
         CHECK_TYPE((yyvsp[(3) - (4)].expression_type), EXPRESSION_TYPE_INTEGER, "int8");
3471 3471
 
... ...
@@ -3481,7 +3460,7 @@ yyreduce:
3481 3481
   case 93:
3482 3482
 
3483 3483
 /* Line 1806 of yacc.c  */
3484
-#line 1536 "yara_grammar.y"
3484
+#line 1515 "yara_grammar.y"
3485 3485
     {
3486 3486
         CHECK_TYPE((yyvsp[(3) - (4)].expression_type), EXPRESSION_TYPE_INTEGER, "int16");
3487 3487
 
... ...
@@ -3497,7 +3476,7 @@ yyreduce:
3497 3497
   case 94:
3498 3498
 
3499 3499
 /* Line 1806 of yacc.c  */
3500
-#line 1547 "yara_grammar.y"
3500
+#line 1526 "yara_grammar.y"
3501 3501
     {
3502 3502
         CHECK_TYPE((yyvsp[(3) - (4)].expression_type), EXPRESSION_TYPE_INTEGER, "int32");
3503 3503
 
... ...
@@ -3513,7 +3492,7 @@ yyreduce:
3513 3513
   case 95:
3514 3514
 
3515 3515
 /* Line 1806 of yacc.c  */
3516
-#line 1558 "yara_grammar.y"
3516
+#line 1537 "yara_grammar.y"
3517 3517
     {
3518 3518
         CHECK_TYPE((yyvsp[(3) - (4)].expression_type), EXPRESSION_TYPE_INTEGER, "uint8");
3519 3519
 
... ...
@@ -3529,7 +3508,7 @@ yyreduce:
3529 3529
   case 96:
3530 3530
 
3531 3531
 /* Line 1806 of yacc.c  */
3532
-#line 1569 "yara_grammar.y"
3532
+#line 1548 "yara_grammar.y"
3533 3533
     {
3534 3534
         CHECK_TYPE((yyvsp[(3) - (4)].expression_type), EXPRESSION_TYPE_INTEGER, "uint16");
3535 3535
 
... ...
@@ -3545,7 +3524,7 @@ yyreduce:
3545 3545
   case 97:
3546 3546
 
3547 3547
 /* Line 1806 of yacc.c  */
3548
-#line 1580 "yara_grammar.y"
3548
+#line 1559 "yara_grammar.y"
3549 3549
     {
3550 3550
         CHECK_TYPE((yyvsp[(3) - (4)].expression_type), EXPRESSION_TYPE_INTEGER, "uint32");
3551 3551
 
... ...
@@ -3561,7 +3540,7 @@ yyreduce:
3561 3561
   case 98:
3562 3562
 
3563 3563
 /* Line 1806 of yacc.c  */
3564
-#line 1591 "yara_grammar.y"
3564
+#line 1570 "yara_grammar.y"
3565 3565
     {
3566 3566
         compiler->last_result = yr_parser_emit_with_arg(
3567 3567
             yyscanner, OP_PUSH, (yyvsp[(1) - (1)].integer), NULL);
... ...
@@ -3575,7 +3554,7 @@ yyreduce:
3575 3575
   case 99:
3576 3576
 
3577 3577
 /* Line 1806 of yacc.c  */
3578
-#line 1600 "yara_grammar.y"
3578
+#line 1579 "yara_grammar.y"
3579 3579
     {
3580 3580
         SIZED_STRING* sized_string = (yyvsp[(1) - (1)].sized_string);
3581 3581
         char* string;
... ...
@@ -3605,7 +3584,7 @@ yyreduce:
3605 3605
   case 100:
3606 3606
 
3607 3607
 /* Line 1806 of yacc.c  */
3608
-#line 1625 "yara_grammar.y"
3608
+#line 1604 "yara_grammar.y"
3609 3609
     {
3610 3610
         compiler->last_result = yr_parser_reduce_string_identifier(
3611 3611
             yyscanner,
... ...
@@ -3623,7 +3602,7 @@ yyreduce:
3623 3623
   case 101:
3624 3624
 
3625 3625
 /* Line 1806 of yacc.c  */
3626
-#line 1638 "yara_grammar.y"
3626
+#line 1617 "yara_grammar.y"
3627 3627
     {
3628 3628
         compiler->last_result = yr_parser_reduce_string_identifier(
3629 3629
             yyscanner,
... ...
@@ -3641,7 +3620,7 @@ yyreduce:
3641 3641
   case 102:
3642 3642
 
3643 3643
 /* Line 1806 of yacc.c  */
3644
-#line 1651 "yara_grammar.y"
3644
+#line 1630 "yara_grammar.y"
3645 3645
     {
3646 3646
         compiler->last_result = yr_parser_emit_with_arg(
3647 3647
             yyscanner,
... ...
@@ -3666,7 +3645,7 @@ yyreduce:
3666 3666
   case 103:
3667 3667
 
3668 3668
 /* Line 1806 of yacc.c  */
3669
-#line 1671 "yara_grammar.y"
3669
+#line 1650 "yara_grammar.y"
3670 3670
     {
3671 3671
         if ((yyvsp[(1) - (1)].object) == (YR_OBJECT*) -1)  // loop identifier
3672 3672
         {
... ...
@@ -3706,7 +3685,7 @@ yyreduce:
3706 3706
   case 104:
3707 3707
 
3708 3708
 /* Line 1806 of yacc.c  */
3709
-#line 1706 "yara_grammar.y"
3709
+#line 1685 "yara_grammar.y"
3710 3710
     {
3711 3711
         CHECK_TYPE((yyvsp[(1) - (3)].expression_type), EXPRESSION_TYPE_INTEGER, "+");
3712 3712
         CHECK_TYPE((yyvsp[(3) - (3)].expression_type), EXPRESSION_TYPE_INTEGER, "+");
... ...
@@ -3720,7 +3699,7 @@ yyreduce:
3720 3720
   case 105:
3721 3721
 
3722 3722
 /* Line 1806 of yacc.c  */
3723
-#line 1715 "yara_grammar.y"
3723
+#line 1694 "yara_grammar.y"
3724 3724
     {
3725 3725
         CHECK_TYPE((yyvsp[(1) - (3)].expression_type), EXPRESSION_TYPE_INTEGER, "-");
3726 3726
         CHECK_TYPE((yyvsp[(3) - (3)].expression_type), EXPRESSION_TYPE_INTEGER, "-");
... ...
@@ -3734,7 +3713,7 @@ yyreduce:
3734 3734
   case 106:
3735 3735
 
3736 3736
 /* Line 1806 of yacc.c  */
3737
-#line 1724 "yara_grammar.y"
3737
+#line 1703 "yara_grammar.y"
3738 3738
     {
3739 3739
         CHECK_TYPE((yyvsp[(1) - (3)].expression_type), EXPRESSION_TYPE_INTEGER, "*");
3740 3740
         CHECK_TYPE((yyvsp[(3) - (3)].expression_type), EXPRESSION_TYPE_INTEGER, "*");
... ...
@@ -3748,7 +3727,7 @@ yyreduce:
3748 3748
   case 107:
3749 3749
 
3750 3750
 /* Line 1806 of yacc.c  */
3751
-#line 1733 "yara_grammar.y"
3751
+#line 1712 "yara_grammar.y"
3752 3752
     {
3753 3753
         CHECK_TYPE((yyvsp[(1) - (3)].expression_type), EXPRESSION_TYPE_INTEGER, "\\");
3754 3754
         CHECK_TYPE((yyvsp[(3) - (3)].expression_type), EXPRESSION_TYPE_INTEGER, "\\");
... ...
@@ -3762,7 +3741,7 @@ yyreduce:
3762 3762
   case 108:
3763 3763
 
3764 3764
 /* Line 1806 of yacc.c  */
3765
-#line 1742 "yara_grammar.y"
3765
+#line 1721 "yara_grammar.y"
3766 3766
     {
3767 3767
         CHECK_TYPE((yyvsp[(1) - (3)].expression_type), EXPRESSION_TYPE_INTEGER, "%");
3768 3768
         CHECK_TYPE((yyvsp[(3) - (3)].expression_type), EXPRESSION_TYPE_INTEGER, "%");
... ...
@@ -3776,7 +3755,7 @@ yyreduce:
3776 3776
   case 109:
3777 3777
 
3778 3778
 /* Line 1806 of yacc.c  */
3779
-#line 1751 "yara_grammar.y"
3779
+#line 1730 "yara_grammar.y"
3780 3780
     {
3781 3781
         CHECK_TYPE((yyvsp[(1) - (3)].expression_type), EXPRESSION_TYPE_INTEGER, "^");
3782 3782
         CHECK_TYPE((yyvsp[(3) - (3)].expression_type), EXPRESSION_TYPE_INTEGER, "^");
... ...
@@ -3790,7 +3769,7 @@ yyreduce:
3790 3790
   case 110:
3791 3791
 
3792 3792
 /* Line 1806 of yacc.c  */
3793
-#line 1760 "yara_grammar.y"
3793
+#line 1739 "yara_grammar.y"
3794 3794
     {
3795 3795
         CHECK_TYPE((yyvsp[(1) - (3)].expression_type), EXPRESSION_TYPE_INTEGER, "^");
3796 3796
         CHECK_TYPE((yyvsp[(3) - (3)].expression_type), EXPRESSION_TYPE_INTEGER, "^");
... ...
@@ -3804,7 +3783,7 @@ yyreduce:
3804 3804
   case 111:
3805 3805
 
3806 3806
 /* Line 1806 of yacc.c  */
3807
-#line 1769 "yara_grammar.y"
3807
+#line 1748 "yara_grammar.y"
3808 3808
     {
3809 3809
         CHECK_TYPE((yyvsp[(1) - (3)].expression_type), EXPRESSION_TYPE_INTEGER, "|");
3810 3810
         CHECK_TYPE((yyvsp[(3) - (3)].expression_type), EXPRESSION_TYPE_INTEGER, "|");
... ...
@@ -3818,7 +3797,7 @@ yyreduce:
3818 3818
   case 112:
3819 3819
 
3820 3820
 /* Line 1806 of yacc.c  */
3821
-#line 1778 "yara_grammar.y"
3821
+#line 1757 "yara_grammar.y"
3822 3822
     {
3823 3823
         CHECK_TYPE((yyvsp[(2) - (2)].expression_type), EXPRESSION_TYPE_INTEGER, "~");
3824 3824
 
... ...
@@ -3831,7 +3810,7 @@ yyreduce:
3831 3831
   case 113:
3832 3832
 
3833 3833
 /* Line 1806 of yacc.c  */
3834
-#line 1786 "yara_grammar.y"
3834
+#line 1765 "yara_grammar.y"
3835 3835
     {
3836 3836
         CHECK_TYPE((yyvsp[(1) - (3)].expression_type), EXPRESSION_TYPE_INTEGER, "<<");
3837 3837
         CHECK_TYPE((yyvsp[(3) - (3)].expression_type), EXPRESSION_TYPE_INTEGER, "<<");
... ...
@@ -3845,7 +3824,7 @@ yyreduce:
3845 3845
   case 114:
3846 3846
 
3847 3847
 /* Line 1806 of yacc.c  */
3848
-#line 1795 "yara_grammar.y"
3848
+#line 1774 "yara_grammar.y"
3849 3849
     {
3850 3850
         CHECK_TYPE((yyvsp[(1) - (3)].expression_type), EXPRESSION_TYPE_INTEGER, ">>");
3851 3851
         CHECK_TYPE((yyvsp[(3) - (3)].expression_type), EXPRESSION_TYPE_INTEGER, ">>");
... ...
@@ -3859,7 +3838,7 @@ yyreduce:
3859 3859
   case 115:
3860 3860
 
3861 3861
 /* Line 1806 of yacc.c  */
3862
-#line 1804 "yara_grammar.y"
3862
+#line 1783 "yara_grammar.y"
3863 3863
     {
3864 3864
         (yyval.expression_type) = (yyvsp[(1) - (1)].expression_type);
3865 3865
       }
... ...
@@ -3868,7 +3847,7 @@ yyreduce:
3868 3868
 
3869 3869
 
3870 3870
 /* Line 1806 of yacc.c  */
3871
-#line 3872 "yara_grammar.c"
3871
+#line 3851 "yara_grammar.c"
3872 3872
       default: break;
3873 3873
     }
3874 3874
   /* User semantic actions sometimes alter yychar, and that requires
... ...
@@ -4099,6 +4078,6 @@ yyreturn:
4099 4099
 
4100 4100
 
4101 4101
 /* Line 2067 of yacc.c  */
4102
-#line 1809 "yara_grammar.y"
4102
+#line 1788 "yara_grammar.y"
4103 4103
 
4104 4104
 
... ...
@@ -269,7 +269,7 @@ meta
269 269
       }
270 270
     | _META_ ':' meta_declarations
271 271
       {
272
-#ifdef REAL_YARA
272
+#if REAL_YARA //Meta not supported
273 273
         // Each rule have a list of meta-data info, consisting in a
274 274
         // sequence of YR_META structures. The last YR_META structure does
275 275
         // not represent a real meta-data, it's just a end-of-list marker
... ...
@@ -299,13 +299,10 @@ strings
299 299
     : /* empty */
300 300
       {
301 301
         $$ = NULL;
302
-#ifdef REAL_YARA
303 302
         compiler->current_rule_strings = $$;
304
-#endif
305 303
       }
306 304
     | _STRINGS_ ':' string_declarations
307 305
       {
308
-#ifdef REAL_YARA
309 306
         // Each rule have a list of strings, consisting in a sequence
310 307
         // of YR_STRING structures. The last YR_STRING structure does not
311 308
         // represent a real string, it's just a end-of-list marker
... ...
@@ -326,7 +323,6 @@ strings
326 326
         ERROR_IF(compiler->last_result != ERROR_SUCCESS);
327 327
 
328 328
         compiler->current_rule_strings = $3;
329
-#endif
330 329
         $$ = $3;
331 330
       }
332 331
     ;
... ...
@@ -356,7 +352,7 @@ tags
356 356
       }
357 357
     | ':' tag_list
358 358
       {
359
-#ifdef REAL_YARA
359
+#if REAL_YARA //tags not supported
360 360
         // Tags list is represented in the arena as a sequence
361 361
         // of null-terminated strings, the sequence ends with an
362 362
         // additional null character. Here we write the ending null
... ...
@@ -376,7 +372,7 @@ tags
376 376
 tag_list
377 377
     : _IDENTIFIER_
378 378
       {
379
-#ifdef REAL_YARA
379
+#if REAL_YARA //tags not supported
380 380
         char* identifier;
381 381
 
382 382
         compiler->last_result = yr_arena_write_string(
... ...
@@ -385,15 +381,15 @@ tag_list
385 385
 #endif
386 386
         yr_free($1);
387 387
 
388
+#if REAL_YARA //tags not supported
388 389
         ERROR_IF(compiler->last_result != ERROR_SUCCESS);
389 390
 
390
-#ifdef REAL_YARA
391 391
         $$ = identifier;
392 392
 #endif
393 393
       }
394 394
     | tag_list _IDENTIFIER_
395 395
       {
396
-#ifdef REAL_YARA
396
+#if REAL_YARA //tags not supported
397 397
         char* tag_name = $1;
398 398
         size_t tag_length = tag_name != NULL ? strlen(tag_name) : 0;
399 399
 
... ...
@@ -516,9 +512,7 @@ string_declaration
516 516
       }
517 517
     | _STRING_IDENTIFIER_ '='
518 518
       {
519
-#ifdef REAL_YARA
520 519
         compiler->error_line = yyget_lineno(yyscanner);
521
-#endif
522 520
       }
523 521
       _REGEXP_ string_modifiers
524 522
       {
... ...
@@ -566,7 +560,6 @@ string_modifier
566 566
 identifier
567 567
     : _IDENTIFIER_
568 568
       {
569
-          //#ifdef REAL_YARA
570 569
         YR_OBJECT* object = NULL;
571 570
         YR_RULE* rule;
572 571
 
... ...
@@ -591,7 +584,7 @@ identifier
591 591
         {
592 592
           // Search for identifier within the global namespace, where the
593 593
           // externals variables reside.
594
-#if REAL_YARA
594
+#if REAL_YARA //externals/objects/modules not supported
595 595
           object = (YR_OBJECT*) yr_hash_table_lookup(
596 596
                 compiler->objects_table,
597 597
                 $1,
... ...
@@ -601,7 +594,7 @@ identifier
601 601
           {
602 602
             // If not found, search within the current namespace.
603 603
 
604
-#if REAL_YARA
604
+#if REAL_YARA //externals/objects/modules not supported
605 605
             ns = compiler->current_namespace->name;
606 606
             object = (YR_OBJECT*) yr_hash_table_lookup(
607 607
                 compiler->objects_table,
... ...
@@ -612,7 +605,7 @@ identifier
612 612
 
613 613
           if (object != NULL)
614 614
           {
615
-#if REAL_YARA
615
+#if REAL_YARA //externals/objects/modules not supported
616 616
             compiler->last_result = yr_arena_write_string(
617 617
                 compiler->sz_arena,
618 618
                 $1,
... ...
@@ -630,12 +623,15 @@ identifier
630 630
           }
631 631
           else
632 632
           {
633
- #if REAL_YARA
633
+              //#if REAL_YARA
634 634
            rule = (YR_RULE*) yr_hash_table_lookup(
635 635
                 compiler->rules_table,
636 636
                 $1,
637
+#if REAL_YARA
637 638
                 compiler->current_namespace->name);
638
-
639
+#else
640
+                NULL);
641
+#endif
639 642
             if (rule != NULL)
640 643
             {
641 644
               compiler->last_result = yr_parser_emit_with_arg_reloc(
... ...
@@ -649,7 +645,7 @@ identifier
649 649
               yr_compiler_set_error_extra_info(compiler, $1);
650 650
               compiler->last_result = ERROR_UNDEFINED_IDENTIFIER;
651 651
             }
652
-#endif
652
+            //#endif
653 653
 
654 654
             $$ = (YR_OBJECT*) -2;
655 655
           }
... ...
@@ -658,11 +654,10 @@ identifier
658 658
         yr_free($1);
659 659
 
660 660
         ERROR_IF(compiler->last_result != ERROR_SUCCESS);
661
-        //#endif
662 661
       }
663 662
     | identifier '.' _IDENTIFIER_
664 663
       {
665
-#ifdef REAL_YARA
664
+#ifdef REAL_YARA //externals/objects/modules not supported
666 665
         YR_OBJECT* object = $1;
667 666
         YR_OBJECT* field = NULL;
668 667
 
... ...
@@ -713,7 +708,7 @@ identifier
713 713
       }
714 714
     | identifier '[' primary_expression ']'
715 715
       {
716
-#ifdef REAL_YARA
716
+#ifdef REAL_YARA //externals/objects/modules not supported
717 717
         if ($1 != NULL && $1->type == OBJECT_TYPE_ARRAY)
718 718
         {
719 719
           compiler->last_result = yr_parser_emit(
... ...
@@ -721,7 +716,7 @@ identifier
721 721
               OP_INDEX_ARRAY,
722 722
               NULL);
723 723
 
724
-          $$ = ((YR_OBJECT_ARRAY*) $1)->items->objects[0];
724
+X          $$ = ((YR_OBJECT_ARRAY*) $1)->items->objects[0];
725 725
         }
726 726
         else
727 727
         {
... ...
@@ -738,7 +733,7 @@ identifier
738 738
 
739 739
     | identifier '(' arguments_list ')'
740 740
       {
741
-#ifdef REAL_YARA
741
+#ifdef REAL_YARA //externals/objects/modules not supported
742 742
         int args_count;
743 743
 
744 744
         if ($1 != NULL && $1->type == OBJECT_TYPE_FUNCTION)
... ...
@@ -991,7 +986,6 @@ expression
991 991
       }
992 992
     | _FOR_ for_expression _IDENTIFIER_ _IN_
993 993
       {
994
-#ifdef REAL_YARA
995 994
         int var_index;
996 995
 
997 996
         if (compiler->loop_depth == MAX_LOOP_NESTING)
... ...
@@ -1013,7 +1007,6 @@ expression
1013 1013
           compiler->last_result = \
1014 1014
               ERROR_DUPLICATE_LOOP_IDENTIFIER;
1015 1015
         }
1016
-#endif
1017 1016
         ERROR_IF(compiler->last_result != ERROR_SUCCESS);
1018 1017
 
1019 1018
         // Push end-of-list marker
... ...
@@ -1056,11 +1049,9 @@ expression
1056 1056
           yr_parser_emit_with_arg(
1057 1057
               yyscanner, OP_POP_M, mem_offset, NULL);
1058 1058
         }
1059
-#ifdef REAL_YARA
1060 1059
         compiler->loop_address[compiler->loop_depth] = addr;
1061 1060
         compiler->loop_identifier[compiler->loop_depth] = $3;
1062 1061
         compiler->loop_depth++;
1063
-#endif
1064 1062
       }
1065 1063
       '(' boolean_expression ')'
1066 1064
       {
... ...
@@ -1085,12 +1076,8 @@ expression
1085 1085
           yr_parser_emit_with_arg_reloc(
1086 1086
               yyscanner,
1087 1087
               OP_JNUNDEF,
1088
-#ifdef REAL_YARA
1089 1088
               PTR_TO_UINT64(
1090 1089
                   compiler->loop_address[compiler->loop_depth]),
1091
-#else
1092
-              0,
1093
-#endif
1094 1090
               NULL);
1095 1091
         }
1096 1092
         else // INTEGER_SET_RANGE
... ...
@@ -1107,7 +1094,6 @@ expression
1107 1107
           yr_parser_emit_with_arg(
1108 1108
               yyscanner, OP_PUSH_M, mem_offset + 3, NULL);
1109 1109
 
1110
-#ifdef REAL_YARA
1111 1110
           // Compare higher bound with lower bound, do loop again
1112 1111
           // if lower bound is still lower or equal than higher bound
1113 1112
           yr_parser_emit_with_arg_reloc(
... ...
@@ -1116,7 +1102,6 @@ expression
1116 1116
               PTR_TO_UINT64(
1117 1117
                 compiler->loop_address[compiler->loop_depth]),
1118 1118
               NULL);
1119
-#endif
1120 1119
 
1121 1120
           yr_parser_emit(yyscanner, OP_POP, NULL);
1122 1121
           yr_parser_emit(yyscanner, OP_POP, NULL);
... ...
@@ -1139,16 +1124,13 @@ expression
1139 1139
 
1140 1140
         yr_parser_emit(yyscanner, OP_LE, NULL);
1141 1141
 
1142
-#ifdef REAL_YARA
1143 1142
         compiler->loop_identifier[compiler->loop_depth] = NULL;
1144
-#endif
1145 1143
         yr_free($3);
1146 1144
 
1147 1145
         $$ = EXPRESSION_TYPE_BOOLEAN;
1148 1146
       }
1149 1147
     | _FOR_ for_expression _OF_ string_set ':'
1150 1148
       {
1151
-#ifdef REAL_YARA
1152 1149
         int mem_offset = LOOP_LOCAL_VARS * compiler->loop_depth;
1153 1150
         int8_t* addr;
1154 1151
 
... ...
@@ -1176,11 +1158,9 @@ expression
1176 1176
         compiler->loop_address[compiler->loop_depth] = addr;
1177 1177
         compiler->loop_identifier[compiler->loop_depth] = NULL;
1178 1178
         compiler->loop_depth++;
1179
-#endif
1180 1179
       }
1181 1180
       '(' boolean_expression ')'
1182 1181
       {
1183
-#ifdef REAL_YARA
1184 1182
         int mem_offset;
1185 1183
 
1186 1184
         compiler->loop_depth--;
... ...
@@ -1222,7 +1202,6 @@ expression
1222 1222
             yyscanner, OP_PUSH_M, mem_offset + 1, NULL);
1223 1223
 
1224 1224
         yr_parser_emit(yyscanner, OP_LE, NULL);
1225
-#endif
1226 1225
         $$ = EXPRESSION_TYPE_BOOLEAN;
1227 1226
 
1228 1227
       }
1229 1228
new file mode 100644
... ...
@@ -0,0 +1,232 @@
0
+/*
1
+Copyright (c) 2013. The YARA Authors. All Rights Reserved.
2
+
3
+Licensed under the Apache License, Version 2.0 (the "License");
4
+you may not use this file except in compliance with the License.
5
+You may obtain a copy of the License at
6
+
7
+   http://www.apache.org/licenses/LICENSE-2.0
8
+
9
+Unless required by applicable law or agreed to in writing, software
10
+distributed under the License is distributed on an "AS IS" BASIS,
11
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12
+See the License for the specific language governing permissions and
13
+limitations under the License.
14
+*/
15
+
16
+#include <stdint.h>
17
+#include <string.h>
18
+
19
+#include "yara_clam.h"
20
+#include <yara_hash.h>
21
+#if REAL_YARA
22
+#include <yara/mem.h>
23
+#include <yara/error.h>
24
+#endif
25
+
26
+#define ROTATE_INT32(x, shift) \
27
+    ((x << (shift % 32)) | (x >> (32 - (shift % 32))))
28
+
29
+
30
+uint32_t byte_to_int32[]  =
31
+{
32
+  0xC3113E7F,0x4C353C5F,0x7423810B,0x258D264E,0xDAD39DED,0x75D0B694,0x98CE1216,
33
+  0x93334482,0xC5C48EA5,0xF57E0E8B,0x5D7F3723,0x396B1B24,0xA8883D9F,0xB2A74A00,
34
+  0xF8E171AE,0x3F01FBAB,0x5C1840CB,0xDDD833C4,0x8D8CCA34,0x32EF223A,0x1A05B871,
35
+  0x9A9B6BFC,0x50406A0C,0xE7E1FC04,0x5E07D7F6,0x80B83660,0x20892A62,0xB2C6FEA6,
36
+  0x6CEC7CAA,0x182F764B,0x3B0353E7,0x57FC2520,0x4B6812D4,0xACB654E4,0x23C75C04,
37
+  0xB1DCD731,0xE3AF0733,0xF2366D39,0xC729671B,0xFF3BE6F2,0xABA37E34,0x3CDAFA38,
38
+  0xAAD18D03,0xA8D35345,0x08E9A92C,0xF9324059,0x42D821BE,0x1BC152DD,0x5588811C,
39
+  0x874A1F9A,0x6E83E9CD,0xDA6F3AF8,0x965D4670,0xA7A565C0,0x68D8A9AF,0xFC8FD8FD,
40
+  0x8FF99FF9,0x4C9B42AE,0x2D066A8D,0x4D1802F7,0x557032B2,0x12BCF371,0xDC29D5AE,
41
+  0x72EA361F,0xE2835B0B,0xDFC58966,0x13B0F34D,0x3FA02BCD,0xBF282E3D,0x7DC877F5,
42
+  0xF4848A32,0x861E35F5,0x7FFA0D7F,0x515F2E4E,0x6B235D5C,0x55F46E24,0x35AD2C99,
43
+  0x072654A8,0x05163F0F,0x9317B11A,0xAED1FC10,0x989444F0,0xDB3E1814,0x446C0CF1,
44
+  0x660BF511,0x2F227D3A,0xFDBA0539,0xC649E621,0x5204D7CE,0x5FA386D0,0xE5F22005,
45
+  0x97B6C8A1,0x4AB69EC2,0x5C7CA70D,0x39A48EC6,0x7BACF378,0x8D0ED3D1,0xE39DE582,
46
+  0xC5FBE2AB,0x37E3D2D0,0x06F44724,0x73144144,0xBA57E905,0xB05B4307,0xAEED8D97,
47
+  0xA68CCAC4,0xE30DA57E,0xED0F194B,0x8C2B9B7A,0x814575D5,0x79588493,0x81D3712A,
48
+  0x3FA892F2,0x80F0BB94,0x44EAF51A,0x4E05F1D4,0xFC69F858,0x775E8D60,0x22B20DD7,
49
+  0x170A87EA,0x1077DE52,0x3D5EC9FB,0x0B6EB1E5,0xF2F9CCAF,0xA76C7DEB,0xD8C2D873,
50
+  0xF438C592,0x6239FEEC,0x26D3D2A9,0x30F6FADF,0x4B2984CC,0x6257F3DA,0x0E0583E2,
51
+  0x143E5E61,0xBB2732BF,0x9653217A,0x027A84EA,0x95C9AE8B,0x89B8B82B,0x9F286485,
52
+  0x29F622FE,0x52A3196B,0x8392D95F,0x33A79167,0xF5DEE92A,0x6E397DB9,0x11931C01,
53
+  0x8DD2CD3B,0xF9E6003D,0xAB955AF4,0xD38725F9,0xDCF6F8AE,0x7667A958,0xE67AD995,
54
+  0xB7CF979A,0xD88EBE5B,0x5BA889F0,0x078BDD90,0x447238F9,0x3135F672,0x187B95A8,
55
+  0x0B7D5751,0xACD59D2A,0x9C5D1929,0x579E5022,0xEA90499B,0x59901800,0x82237DB5,
56
+  0x7A375509,0xACA9A22A,0xEC96E649,0x69339DB0,0x081D0D9B,0xD72FB8B9,0xA4184653,
57
+  0xC057321D,0xED19CAB9,0xB48F1E3E,0xB9DAC51E,0xDAED2FC7,0x7598CBBD,0x208DF346,
58
+  0x044BE6EC,0x1C63E6EB,0xA15F64C1,0xE024A061,0x68309584,0x0758A68D,0xF274E9AE,
59
+  0x0ABEA0CC,0xED4FB267,0x63D6EC46,0x9F28E026,0xF0694A17,0x9D6E9115,0xC4600FAD,
60
+  0x5B121E99,0xD6B4A13B,0xF5364B8A,0x8514B254,0x0182F8DD,0xDB09F90B,0x78C70B32,
61
+  0xD8EC3B02,0x8CD7084D,0xA4439838,0x72F35A3D,0x200B48A5,0xE2351444,0xA5552F5F,
62
+  0xD8C1E746,0x0FE5EF3C,0xB6A47063,0x61F4E68B,0x08FED99B,0x7E461445,0x43CB8380,
63
+  0x28BA03C8,0x21A7A2E2,0x43437ED6,0x2A9E6670,0x89B4A106,0xC6C2F4EE,0x9C4063CC,
64
+  0x2FA0DF6C,0xB54DC409,0xCF01538F,0x616431D7,0x02CB0E4D,0x44FFF425,0xAAD5188E,
65
+  0x0742E9BC,0xFFF41353,0x130F0A15,0x787BDC10,0x4A327B72,0x702989F7,0x5F704798,
66
+  0x8156A1BB,0x2BCA3E74,0x1911A8C4,0x5E1F27D3,0x07949DC7,0xF24C2056,0xB4299EE6,
67
+  0x9C7045D9,0xA8BF6307,0x7454AAD2,0x256425E5,0xD87DEF67,0xCFE95452,0xE7548DF7,
68
+  0xA84956C7,0xD8402C60,0xCFBD0373,0x6B6CDAFE
69
+};
70
+
71
+
72
+uint32_t hash(
73
+    uint32_t seed,
74
+    uint8_t* buffer,
75
+    int len)
76
+{
77
+  int i;
78
+  uint32_t result = seed;
79
+
80
+  for (i = len - 1; i > 0; i--)
81
+  {
82
+    result ^= ROTATE_INT32(byte_to_int32[*buffer], i);
83
+    buffer++;
84
+  }
85
+
86
+  result ^= byte_to_int32[*buffer];
87
+  return result;
88
+}
89
+
90
+
91
+int yr_hash_table_create(
92
+    int size,
93
+    YR_HASH_TABLE** table)
94
+{
95
+  YR_HASH_TABLE* new_table;
96
+  int i;
97
+
98
+  new_table = yr_malloc(
99
+      sizeof(YR_HASH_TABLE) + size * sizeof(YR_HASH_TABLE_ENTRY*));
100
+
101
+  if (new_table == NULL)
102
+    return ERROR_INSUFICIENT_MEMORY;
103
+
104
+  new_table->size = size;
105
+
106
+  for (i = 0; i < size; i++)
107
+    new_table->buckets[i] = NULL;
108
+
109
+  *table = new_table;
110
+
111
+  return ERROR_SUCCESS;
112
+}
113
+
114
+void yr_hash_table_destroy(
115
+    YR_HASH_TABLE* table,
116
+    YR_HASH_TABLE_FREE_VALUE_FUNC free_value)
117
+{
118
+  YR_HASH_TABLE_ENTRY* entry;
119
+  YR_HASH_TABLE_ENTRY* next_entry;
120
+
121
+  int i;
122
+
123
+  for (i = 0; i < table->size; i++)
124
+  {
125
+    entry = table->buckets[i];
126
+
127
+    while (entry != NULL)
128
+    {
129
+      next_entry = entry->next;
130
+
131
+      if (free_value != NULL)
132
+        free_value(entry->value);
133
+
134
+      if (entry->ns != NULL)
135
+        yr_free(entry->ns);
136
+
137
+      yr_free(entry->key);
138
+      yr_free(entry);
139
+
140
+      entry = next_entry;
141
+    }
142
+  }
143
+
144
+  yr_free(table);
145
+}
146
+
147
+
148
+void* yr_hash_table_lookup(
149
+    YR_HASH_TABLE* table,
150
+    const char* key,
151
+    const char* ns)
152
+{
153
+  YR_HASH_TABLE_ENTRY* entry;
154
+  uint32_t bucket_index;
155
+
156
+  bucket_index = hash(0, (uint8_t*) key, strlen(key));
157
+
158
+  if (ns != NULL)
159
+    bucket_index = hash(bucket_index, (uint8_t*) ns, strlen(ns));
160
+
161
+  bucket_index = bucket_index % table->size;
162
+
163
+  entry = table->buckets[bucket_index];
164
+
165
+  while (entry != NULL)
166
+  {
167
+    if (strcmp(entry->key, key) == 0 &&
168
+        (entry->ns == ns ||
169
+         strcmp(entry->ns, ns) == 0))
170
+    {
171
+      return entry->value;
172
+    }
173
+
174
+    entry = entry->next;
175
+  }
176
+
177
+  return NULL;
178
+}
179
+
180
+int yr_hash_table_add(
181
+    YR_HASH_TABLE* table,
182
+    const char* key,
183
+    const char* ns,
184
+    void* value)
185
+{
186
+  YR_HASH_TABLE_ENTRY* entry;
187
+  uint32_t bucket_index;
188
+
189
+  entry = (YR_HASH_TABLE_ENTRY*) yr_malloc(sizeof(YR_HASH_TABLE_ENTRY));
190
+
191
+  if (entry == NULL)
192
+    return ERROR_INSUFICIENT_MEMORY;
193
+
194
+  entry->key = yr_strdup(key);
195
+
196
+  if (entry->key == NULL)
197
+  {
198
+    yr_free(entry);
199
+    return ERROR_INSUFICIENT_MEMORY;
200
+  }
201
+
202
+  if (ns != NULL)
203
+  {
204
+    entry->ns = yr_strdup(ns);
205
+
206
+    if (entry->ns == NULL)
207
+    {
208
+      yr_free(entry->key);
209
+      yr_free(entry);
210
+
211
+      return ERROR_INSUFICIENT_MEMORY;
212
+    }
213
+  }
214
+  else
215
+  {
216
+    entry->ns = NULL;
217
+  }
218
+
219
+  entry->value = value;
220
+  bucket_index = hash(0, (uint8_t*) key, strlen(key));
221
+
222
+  if (ns != NULL)
223
+    bucket_index = hash(bucket_index, (uint8_t*) ns, strlen(ns));
224
+
225
+  bucket_index = bucket_index % table->size;
226
+
227
+  entry->next = table->buckets[bucket_index];
228
+  table->buckets[bucket_index] = entry;
229
+
230
+  return ERROR_SUCCESS;
231
+}
0 232
new file mode 100644
... ...
@@ -0,0 +1,66 @@
0
+/*
1
+Copyright (c) 2013. The YARA Authors. All Rights Reserved.
2
+
3
+Licensed under the Apache License, Version 2.0 (the "License");
4
+you may not use this file except in compliance with the License.
5
+You may obtain a copy of the License at
6
+
7
+   http://www.apache.org/licenses/LICENSE-2.0
8
+
9
+Unless required by applicable law or agreed to in writing, software
10
+distributed under the License is distributed on an "AS IS" BASIS,
11
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12
+See the License for the specific language governing permissions and
13
+limitations under the License.
14
+*/
15
+
16
+#ifndef YR_HASH_H
17
+#define YR_HASH_H
18
+
19
+
20
+typedef struct _YR_HASH_TABLE_ENTRY
21
+{
22
+  char* key;
23
+  char* ns;
24
+  void* value;
25
+
26
+  struct _YR_HASH_TABLE_ENTRY* next;
27
+
28
+} YR_HASH_TABLE_ENTRY;
29
+
30
+
31
+typedef struct _YR_HASH_TABLE
32
+{
33
+  int size;
34
+
35
+  YR_HASH_TABLE_ENTRY* buckets[0];
36
+
37
+} YR_HASH_TABLE;
38
+
39
+
40
+typedef int (*YR_HASH_TABLE_FREE_VALUE_FUNC)(void* value);
41
+
42
+
43
+int yr_hash_table_create(
44
+    int size,
45
+    YR_HASH_TABLE** table);
46
+
47
+
48
+void yr_hash_table_destroy(
49
+    YR_HASH_TABLE* table,
50
+    YR_HASH_TABLE_FREE_VALUE_FUNC free_value);
51
+
52
+
53
+void* yr_hash_table_lookup(
54
+    YR_HASH_TABLE* table,
55
+    const char* key,
56
+    const char* ns);
57
+
58
+
59
+int yr_hash_table_add(
60
+    YR_HASH_TABLE* table,
61
+    const char* key,
62
+    const char* ns,
63
+    void* value);
64
+
65
+#endif
... ...
@@ -68,15 +68,11 @@ int yr_parser_emit(
68 68
     int8_t instruction,
69 69
     int8_t** instruction_address)
70 70
 {
71
-#ifdef REAL_YARA
72 71
   return yr_arena_write_data(
73 72
       yyget_extra(yyscanner)->code_arena,
74 73
       &instruction,
75 74
       sizeof(int8_t),
76 75
       (void**) instruction_address);
77
-#else
78
-  return ERROR_SUCCESS;
79
-#endif
80 76
 }
81 77
 
82 78
 
... ...
@@ -86,7 +82,6 @@ int yr_parser_emit_with_arg(
86 86
     int64_t argument,
87 87
     int8_t** instruction_address)
88 88
 {
89
-#ifdef REAL_YARA
90 89
   int result = yr_arena_write_data(
91 90
       yyget_extra(yyscanner)->code_arena,
92 91
       &instruction,
... ...
@@ -101,9 +96,6 @@ int yr_parser_emit_with_arg(
101 101
         NULL);
102 102
 
103 103
   return result;
104
-#else
105
-  return ERROR_SUCCESS;
106
-#endif
107 104
 }
108 105
 
109 106
 
... ...
@@ -115,7 +107,6 @@ int yr_parser_emit_with_arg_reloc(
115 115
 {
116 116
   void* ptr;
117 117
 
118
-#ifdef REAL_YARA
119 118
   int result = yr_arena_write_data(
120 119
       yyget_extra(yyscanner)->code_arena,
121 120
       &instruction,
... ...
@@ -137,9 +128,6 @@ int yr_parser_emit_with_arg_reloc(
137 137
         EOL);
138 138
 
139 139
   return result;
140
-#else
141
-  return ERROR_SUCCESS;
142
-#endif
143 140
 }
144 141
 
145 142
 
... ...
@@ -148,7 +136,7 @@ int yr_parser_emit_pushes_for_strings(
148 148
     const char* identifier)
149 149
 {
150 150
   YR_COMPILER* compiler = yyget_extra(yyscanner);
151
-#ifdef REAL_YARA
151
+#ifdef REAL_YARA  //crashes because string->identifier is NULL
152 152
   YR_STRING* string = compiler->current_rule_strings;
153 153
 
154 154
   const char* string_identifier;
... ...
@@ -272,7 +260,6 @@ YR_STRING* yr_parser_lookup_string(
272 272
   YR_STRING* string;
273 273
   YR_COMPILER* compiler = yyget_extra(yyscanner);
274 274
 
275
-#ifdef REAL_YARA
276 275
   string = compiler->current_rule_strings;
277 276
 
278 277
   while(!STRING_IS_NULL(string))
... ...
@@ -298,9 +285,6 @@ YR_STRING* yr_parser_lookup_string(
298 298
   compiler->last_result = ERROR_UNDEFINED_STRING;
299 299
 
300 300
   return NULL;
301
-#else
302
-  return ERROR_SUCCESS;
303
-#endif
304 301
 }
305 302
 
306 303
 
... ...
@@ -311,7 +295,6 @@ int yr_parser_lookup_loop_variable(
311 311
   YR_COMPILER* compiler = yyget_extra(yyscanner);
312 312
   int i;
313 313
 
314
-#ifdef REAL_YARA
315 314
   for (i = 0; i < compiler->loop_depth; i++)
316 315
   {
317 316
     if (compiler->loop_identifier[i] != NULL &&
... ...
@@ -320,9 +303,6 @@ int yr_parser_lookup_loop_variable(
320 320
   }
321 321
 
322 322
   return -1;
323
-#else
324
-  return ERROR_SUCCESS;
325
-#endif
326 323
 }
327 324
 
328 325
 
... ...
@@ -335,12 +315,13 @@ int _yr_parser_write_string(
335 335
     YR_STRING** string,
336 336
     int* min_atom_length)
337 337
 {
338
-#ifdef REAL_YARA
339 338
   SIZED_STRING* literal_string;
339
+#ifdef REAL_YARA
340 340
   YR_AC_MATCH* new_match;
341 341
 
342 342
   YR_ATOM_LIST_ITEM* atom;
343 343
   YR_ATOM_LIST_ITEM* atom_list = NULL;
344
+#endif
344 345
 
345 346
   int result;
346 347
   int max_string_len;
... ...
@@ -368,6 +349,7 @@ int _yr_parser_write_string(
368 368
   if (result != ERROR_SUCCESS)
369 369
     return result;
370 370
 
371
+#if REAL_YARA
371 372
   if (flags & STRING_GFLAGS_HEXADECIMAL ||
372 373
       flags & STRING_GFLAGS_REGEXP)
373 374
   {
... ...
@@ -384,6 +366,9 @@ int _yr_parser_write_string(
384 384
     literal_string = str;
385 385
     flags |= STRING_GFLAGS_LITERAL;
386 386
   }
387
+#else
388
+    literal_string = str;
389
+#endif
387 390
 
388 391
   (*string)->g_flags = flags;
389 392
   (*string)->chained_to = NULL;
... ...
@@ -392,6 +377,7 @@ int _yr_parser_write_string(
392 392
   (*string)->clock_ticks = 0;
393 393
   #endif
394 394
 
395
+#if REAL_YARA
395 396
   memset((*string)->matches, 0,
396 397
          sizeof((*string)->matches));
397 398
 
... ...
@@ -491,11 +477,17 @@ int _yr_parser_write_string(
491 491
 
492 492
   if (atom_list != NULL)
493 493
     yr_atoms_list_destroy(atom_list);
494
-
495
-  return result;
496 494
 #else
497
-  return ERROR_SUCCESS;
495
+  (*string)->length = literal_string->length;
496
+  
497
+  result = yr_arena_write_data(
498
+        compiler->sz_arena,
499
+        literal_string->c_string,
500
+        literal_string->length,
501
+        (void*) &(*string)->string);
502
+
498 503
 #endif
504
+  return result;
499 505
 }
500 506
 
501 507
 
... ...
@@ -554,10 +546,10 @@ YR_STRING* yr_parser_reduce_string_declaration(
554 554
 
555 555
   string_flags |= STRING_GFLAGS_SINGLE_MATCH;
556 556
 
557
+#if REAL_YARA
557 558
   if (string_flags & STRING_GFLAGS_HEXADECIMAL ||
558 559
       string_flags & STRING_GFLAGS_REGEXP)
559 560
   {
560
-#if REAL_YARA
561 561
     if (string_flags & STRING_GFLAGS_HEXADECIMAL)
562 562
       compiler->last_result = yr_re_parse_hex(
563 563
           str->c_string, re_flags, &re, &re_error);
... ...
@@ -590,7 +582,7 @@ YR_STRING* yr_parser_reduce_string_declaration(
590 590
 
591 591
     if (compiler->last_result != ERROR_SUCCESS)
592 592
       goto _exit;
593
-#endif
593
+
594 594
     compiler->last_result = _yr_parser_write_string(
595 595
         identifier,
596 596
         string_flags,
... ...
@@ -602,7 +594,7 @@ YR_STRING* yr_parser_reduce_string_declaration(
602 602
 
603 603
     if (compiler->last_result != ERROR_SUCCESS)
604 604
       goto _exit;
605
-#if REAL_YARA
605
+
606 606
     if (remainder_re != NULL)
607 607
     {
608 608
       string->g_flags |= STRING_GFLAGS_CHAIN_TAIL | STRING_GFLAGS_CHAIN_PART;
... ...
@@ -651,10 +643,10 @@ YR_STRING* yr_parser_reduce_string_declaration(
651 651
 
652 652
       prev_string->chained_to = aux_string;
653 653
     }
654
-#endif
655 654
   }
656 655
   else
657 656
   {
657
+#endif
658 658
     compiler->last_result = _yr_parser_write_string(
659 659
         identifier,
660 660
         string_flags,
... ...
@@ -666,28 +658,18 @@ YR_STRING* yr_parser_reduce_string_declaration(
666 666
 
667 667
     if (compiler->last_result != ERROR_SUCCESS)
668 668
       goto _exit;
669
+#if REAL_YARA
669 670
   }
671
+#endif
670 672
 
671
-
672
-  string = cli_calloc(1, sizeof(struct _yc_string));
673
+    //  string = cli_calloc(1, sizeof(struct _yc_string));
673 674
   if (string == NULL) {
674 675
       cli_errmsg("yara_parser: no mem for struct _yc_string.\n");
675 676
       compiler->last_result = CL_EMEM;
676 677
       return NULL;
677 678
   } 
678 679
 
679
-  string->id = cli_strdup(identifier);
680
-  if (str->length > 0) {
681
-      string->string = cli_calloc(1, str->length+1);
682
-      if (string->string == NULL) {
683
-          cli_errmsg("yara_parser: no mem for string->string.\n");
684
-          compiler->last_result = CL_EMEM;
685
-          return NULL;
686
-      } 
687
-      memcpy(string->string, (char *)&str->c_string, str->length);
688
-      string->g_flags = string_flags;
689
-  }
690
-  STAILQ_INSERT_TAIL(&compiler->current_rule_strings, string, link);
680
+  STAILQ_INSERT_TAIL(&compiler->current_rule_string_q, string, link);
691 681
 
692 682
 #if REAL_YARA
693 683
   if (min_atom_length < 2 && compiler->callback != NULL)
... ...
@@ -730,15 +712,18 @@ int yr_parser_reduce_rule_declaration(
730 730
   YR_RULE* rule;
731 731
   YR_STRING* string;
732 732
 
733
-#if REAL_YARA
734 733
   if (yr_hash_table_lookup(
735 734
         compiler->rules_table,
736 735
         identifier,
736
+#if REAL_YARA
737 737
         compiler->current_namespace->name) != NULL ||
738 738
       yr_hash_table_lookup(
739 739
         compiler->objects_table,
740 740
         identifier,
741 741
         compiler->current_namespace->name) != NULL)
742
+#else
743
+        NULL) != NULL)
744
+#endif
742 745
   {
743 746
     // A rule or variable with the same identifier already exists, return the
744 747
     // appropriate error.
... ...
@@ -747,17 +732,10 @@ int yr_parser_reduce_rule_declaration(
747 747
     compiler->last_result = ERROR_DUPLICATE_IDENTIFIER;
748 748
     return compiler->last_result;
749 749
   }
750
-#else
751
-  //TBD: Scan the queue for duplicate.
752
-#endif
753 750
 
754 751
   // Check for unreferenced (unused) strings.
755 752
 
756
-#if REAL_YARA
757 753
   string = compiler->current_rule_strings;
758
-#else
759
-  string = STAILQ_FIRST(&compiler->current_rule_strings);
760
-#endif
761 754
 
762 755
   while(!STRING_IS_NULL(string))
763 756
   {
... ...
@@ -765,7 +743,6 @@ int yr_parser_reduce_rule_declaration(
765 765
     // chained_to == NULL) must be referenced. All other fragments
766 766
     // are never marked as referenced.
767 767
 
768
-#if REAL_YARA
769 768
     if (!STRING_IS_REFERENCED(string) &&
770 769
         string->chained_to == NULL)
771 770
     {
... ...
@@ -778,11 +755,6 @@ int yr_parser_reduce_rule_declaration(
778 778
         compiler->strings_arena,
779 779
         string,
780 780
         sizeof(YR_STRING));
781
-#else
782
-  //TBD: String link.
783
-    //    STAILQ_REMOVE_HEAD(&compiler->current_rule_strings, link);
784
-    string = STAILQ_NEXT(string, link);
785
-#endif
786 781
   }
787 782
 
788 783
   if (compiler->last_result != ERROR_SUCCESS)
... ...
@@ -806,8 +778,8 @@ int yr_parser_reduce_rule_declaration(
806 806
       return CL_EMEM;
807 807
   }
808 808
   STAILQ_INIT(&rule->strings);
809
-  STAILQ_CONCAT(&rule->strings, &compiler->current_rule_strings);
810
-  STAILQ_INIT(&compiler->current_rule_strings);
809
+  STAILQ_CONCAT(&rule->strings, &compiler->current_rule_string_q);
810
+  STAILQ_INIT(&compiler->current_rule_string_q);
811 811
   rule->id = cli_strdup(identifier);
812 812
 #endif
813 813
 
... ...
@@ -843,7 +815,7 @@ int yr_parser_reduce_rule_declaration(
843 843
   compiler->current_rule_strings = NULL;
844 844
 #else
845 845
   compiler->current_rule_flags = 0;
846
-   STAILQ_INSERT_TAIL(&compiler->rules, rule, link); 
846
+   STAILQ_INSERT_TAIL(&compiler->rule_q, rule, link); 
847 847
 #endif
848 848
   return compiler->last_result;
849 849
 }
... ...
@@ -856,7 +828,6 @@ int yr_parser_reduce_string_identifier(
856 856
   YR_STRING* string;
857 857
   YR_COMPILER* compiler = yyget_extra(yyscanner);
858 858
 
859
-#if REAL_YARA
860 859
   if (strcmp(identifier, "$") == 0)
861 860
   {
862 861
     if (compiler->loop_for_of_mem_offset >= 0)
... ...
@@ -908,7 +879,6 @@ int yr_parser_reduce_string_identifier(
908 908
       string->g_flags |= STRING_GFLAGS_REFERENCED;
909 909
     }
910 910
   }
911
-#endif
912 911
   return compiler->last_result;
913 912
 }
914 913
 
... ...
@@ -1,8 +1,9 @@
1
-# Makefile.in generated by automake 1.14 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 \
... ...
@@ -199,7 +155,6 @@ dld_link_la_OBJECTS = $(am_dld_link_la_OBJECTS)
199 199
 AM_V_lt = $(am__v_lt_@AM_V@)
200 200
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
201 201
 am__v_lt_0 = --silent
202
-am__v_lt_1 = 
203 202
 dld_link_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
204 203
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
205 204
 	$(dld_link_la_LDFLAGS) $(LDFLAGS) -o $@
... ...
@@ -254,18 +209,6 @@ shl_load_la_OBJECTS = $(am_shl_load_la_OBJECTS)
254 254
 shl_load_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
255 255
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
256 256
 	$(shl_load_la_LDFLAGS) $(LDFLAGS) -o $@
257
-AM_V_P = $(am__v_P_@AM_V@)
258
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
259
-am__v_P_0 = false
260
-am__v_P_1 = :
261
-AM_V_GEN = $(am__v_GEN_@AM_V@)
262
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
263
-am__v_GEN_0 = @echo "  GEN     " $@;
264
-am__v_GEN_1 = 
265
-AM_V_at = $(am__v_at_@AM_V@)
266
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
267
-am__v_at_0 = @
268
-am__v_at_1 = 
269 257
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
270 258
 depcomp = $(SHELL) $(top_srcdir)/config/depcomp
271 259
 am__depfiles_maybe = depfiles
... ...
@@ -278,16 +221,20 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
278 278
 	$(AM_CFLAGS) $(CFLAGS)
279 279
 AM_V_CC = $(am__v_CC_@AM_V@)
280 280
 am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
281
-am__v_CC_0 = @echo "  CC      " $@;
282
-am__v_CC_1 = 
281
+am__v_CC_0 = @echo "  CC    " $@;
282
+AM_V_at = $(am__v_at_@AM_V@)
283
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
284
+am__v_at_0 = @
283 285
 CCLD = $(CC)
284 286
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
285 287
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
286 288
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
287 289
 AM_V_CCLD = $(am__v_CCLD_@AM_V@)
288 290
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
289
-am__v_CCLD_0 = @echo "  CCLD    " $@;
290
-am__v_CCLD_1 = 
291
+am__v_CCLD_0 = @echo "  CCLD  " $@;
292
+AM_V_GEN = $(am__v_GEN_@AM_V@)
293
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
294
+am__v_GEN_0 = @echo "  GEN   " $@;
291 295
 SOURCES = $(dld_link_la_SOURCES) $(dlopen_la_SOURCES) \
292 296
 	$(dyld_la_SOURCES) $(libltdl_la_SOURCES) \
293 297
 	$(libltdlc_la_SOURCES) $(load_add_on_la_SOURCES) \
... ...
@@ -296,32 +243,10 @@ DIST_SOURCES = $(dld_link_la_SOURCES) $(dlopen_la_SOURCES) \
296 296
 	$(dyld_la_SOURCES) $(libltdl_la_SOURCES) \
297 297
 	$(libltdlc_la_SOURCES) $(load_add_on_la_SOURCES) \
298 298
 	$(loadlibrary_la_SOURCES) $(shl_load_la_SOURCES)
299
-am__can_run_installinfo = \
300
-  case $$AM_UPDATE_INFO_DIR in \
301
-    n|no|NO) false;; \
302
-    *) (install-info --version) >/dev/null 2>&1;; \
303
-  esac
304 299
 am__include_HEADERS_DIST = ltdl.h
305 300
 am__ltdlinclude_HEADERS_DIST = libltdl/lt_system.h libltdl/lt_error.h \
306 301
 	libltdl/lt_dlloader.h
307 302
 HEADERS = $(include_HEADERS) $(ltdlinclude_HEADERS)
308
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
309
-# Read a list of newline-separated strings from the standard input,
310
-# and print each of them once, without duplicates.  Input order is
311
-# *not* preserved.
312
-am__uniquify_input = $(AWK) '\
313
-  BEGIN { nonempty = 0; } \
314
-  { items[$$0] = 1; nonempty = 1; } \
315
-  END { if (nonempty) { for (i in items) print i; }; } \
316
-'
317
-# Make sure the list of sources is unique.  This is necessary because,
318
-# e.g., the same source file might be shared among _SOURCES variables
319
-# for different programs/libraries.
320
-am__define_uniq_tagged_files = \
321
-  list='$(am__tagged_files)'; \
322
-  unique=`for i in $$list; do \
323
-    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
324
-  done | $(am__uniquify_input)`
325 303
 ETAGS = etags
326 304
 CTAGS = ctags
327 305
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
... ...
@@ -624,9 +549,9 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
624 624
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
625 625
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
626 626
 $(am__aclocal_m4_deps):
627
-
628 627
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
629 628
 	@$(NORMAL_INSTALL)
629
+	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
630 630
 	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
631 631
 	list2=; for p in $$list; do \
632 632
 	  if test -f $$p; then \
... ...
@@ -634,8 +559,6 @@ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
634 634
 	  else :; fi; \
635 635
 	done; \
636 636
 	test -z "$$list2" || { \
637
-	  echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \
638
-	  $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \
639 637
 	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \
640 638
 	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \
641 639
 	}
... ...
@@ -651,47 +574,35 @@ uninstall-libLTLIBRARIES:
651 651
 
652 652
 clean-libLTLIBRARIES:
653 653
 	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
654
-	@list='$(lib_LTLIBRARIES)'; \
655
-	locs=`for p in $$list; do echo $$p; done | \
656
-	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
657
-	      sort -u`; \
658
-	test -z "$$locs" || { \
659
-	  echo rm -f $${locs}; \
660
-	  rm -f $${locs}; \
661
-	}
654
+	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
655
+	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
656
+	  test "$$dir" != "$$p" || dir=.; \
657
+	  echo "rm -f \"$${dir}/so_locations\""; \
658
+	  rm -f "$${dir}/so_locations"; \
659
+	done
662 660
 
663 661
 clean-noinstLTLIBRARIES:
664 662
 	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
665
-	@list='$(noinst_LTLIBRARIES)'; \
666
-	locs=`for p in $$list; do echo $$p; done | \
667
-	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
668
-	      sort -u`; \
669
-	test -z "$$locs" || { \
670
-	  echo rm -f $${locs}; \
671
-	  rm -f $${locs}; \
672
-	}
673
-
663
+	@list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
664
+	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
665
+	  test "$$dir" != "$$p" || dir=.; \
666
+	  echo "rm -f \"$${dir}/so_locations\""; \
667
+	  rm -f "$${dir}/so_locations"; \
668
+	done
674 669
 dld_link.la: $(dld_link_la_OBJECTS) $(dld_link_la_DEPENDENCIES) $(EXTRA_dld_link_la_DEPENDENCIES) 
675 670
 	$(AM_V_CCLD)$(dld_link_la_LINK)  $(dld_link_la_OBJECTS) $(dld_link_la_LIBADD) $(LIBS)
676
-
677 671
 dlopen.la: $(dlopen_la_OBJECTS) $(dlopen_la_DEPENDENCIES) $(EXTRA_dlopen_la_DEPENDENCIES) 
678 672
 	$(AM_V_CCLD)$(dlopen_la_LINK)  $(dlopen_la_OBJECTS) $(dlopen_la_LIBADD) $(LIBS)
679
-
680 673
 dyld.la: $(dyld_la_OBJECTS) $(dyld_la_DEPENDENCIES) $(EXTRA_dyld_la_DEPENDENCIES) 
681 674
 	$(AM_V_CCLD)$(dyld_la_LINK)  $(dyld_la_OBJECTS) $(dyld_la_LIBADD) $(LIBS)
682
-
683 675
 libltdl.la: $(libltdl_la_OBJECTS) $(libltdl_la_DEPENDENCIES) $(EXTRA_libltdl_la_DEPENDENCIES) 
684 676
 	$(AM_V_CCLD)$(libltdl_la_LINK) $(am_libltdl_la_rpath) $(libltdl_la_OBJECTS) $(libltdl_la_LIBADD) $(LIBS)
685
-
686 677
 libltdlc.la: $(libltdlc_la_OBJECTS) $(libltdlc_la_DEPENDENCIES) $(EXTRA_libltdlc_la_DEPENDENCIES) 
687 678
 	$(AM_V_CCLD)$(libltdlc_la_LINK) $(am_libltdlc_la_rpath) $(libltdlc_la_OBJECTS) $(libltdlc_la_LIBADD) $(LIBS)
688
-
689 679
 load_add_on.la: $(load_add_on_la_OBJECTS) $(load_add_on_la_DEPENDENCIES) $(EXTRA_load_add_on_la_DEPENDENCIES) 
690 680
 	$(AM_V_CCLD)$(load_add_on_la_LINK)  $(load_add_on_la_OBJECTS) $(load_add_on_la_LIBADD) $(LIBS)
691
-
692 681
 loadlibrary.la: $(loadlibrary_la_OBJECTS) $(loadlibrary_la_DEPENDENCIES) $(EXTRA_loadlibrary_la_DEPENDENCIES) 
693 682
 	$(AM_V_CCLD)$(loadlibrary_la_LINK)  $(loadlibrary_la_OBJECTS) $(loadlibrary_la_LIBADD) $(LIBS)
694
-
695 683
 shl_load.la: $(shl_load_la_OBJECTS) $(shl_load_la_DEPENDENCIES) $(EXTRA_shl_load_la_DEPENDENCIES) 
696 684
 	$(AM_V_CCLD)$(shl_load_la_LINK)  $(shl_load_la_OBJECTS) $(shl_load_la_LIBADD) $(LIBS)
697 685
 
... ...
@@ -725,14 +636,14 @@ distclean-compile:
725 725
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
726 726
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
727 727
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
728
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
728
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
729 729
 
730 730
 .c.obj:
731 731
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
732 732
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
733 733
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
734 734
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
735
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
735
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
736 736
 
737 737
 .c.lo:
738 738
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
... ...
@@ -874,11 +785,8 @@ clean-libtool:
874 874
 	-rm -rf .libs _libs
875 875
 install-includeHEADERS: $(include_HEADERS)
876 876
 	@$(NORMAL_INSTALL)
877
+	test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)"
877 878
 	@list='$(include_HEADERS)'; test -n "$(includedir)" || list=; \
878
-	if test -n "$$list"; then \
879
-	  echo " $(MKDIR_P) '$(DESTDIR)$(includedir)'"; \
880
-	  $(MKDIR_P) "$(DESTDIR)$(includedir)" || exit 1; \
881
-	fi; \
882 879
 	for p in $$list; do \
883 880
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
884 881
 	  echo "$$d$$p"; \
... ...
@@ -895,11 +803,8 @@ uninstall-includeHEADERS:
895 895
 	dir='$(DESTDIR)$(includedir)'; $(am__uninstall_files_from_dir)
896 896
 install-ltdlincludeHEADERS: $(ltdlinclude_HEADERS)
897 897
 	@$(NORMAL_INSTALL)
898
+	test -z "$(ltdlincludedir)" || $(MKDIR_P) "$(DESTDIR)$(ltdlincludedir)"
898 899
 	@list='$(ltdlinclude_HEADERS)'; test -n "$(ltdlincludedir)" || list=; \
899
-	if test -n "$$list"; then \
900
-	  echo " $(MKDIR_P) '$(DESTDIR)$(ltdlincludedir)'"; \
901
-	  $(MKDIR_P) "$(DESTDIR)$(ltdlincludedir)" || exit 1; \
902
-	fi; \
903 900
 	for p in $$list; do \
904 901
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
905 902
 	  echo "$$d$$p"; \
... ...
@@ -915,15 +820,26 @@ uninstall-ltdlincludeHEADERS:
915 915
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
916 916
 	dir='$(DESTDIR)$(ltdlincludedir)'; $(am__uninstall_files_from_dir)
917 917
 
918
-ID: $(am__tagged_files)
919
-	$(am__define_uniq_tagged_files); mkid -fID $$unique
920
-tags: tags-am
921
-TAGS: tags
922
-
923
-tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
918
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
919
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
920
+	unique=`for i in $$list; do \
921
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
922
+	  done | \
923
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
924
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
925
+	mkid -fID $$unique
926
+tags: TAGS
927
+
928
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
929
+		$(TAGS_FILES) $(LISP)
924 930
 	set x; \
925 931
 	here=`pwd`; \
926
-	$(am__define_uniq_tagged_files); \
932
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
933
+	unique=`for i in $$list; do \
934
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
935
+	  done | \
936
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
937
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
927 938
 	shift; \
928 939
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
929 940
 	  test -n "$$unique" || unique=$$empty_fix; \
... ...
@@ -935,11 +851,15 @@ tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
935 935
 	      $$unique; \
936 936
 	  fi; \
937 937
 	fi
938
-ctags: ctags-am
939
-
940
-CTAGS: ctags
941
-ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
942
-	$(am__define_uniq_tagged_files); \
938
+ctags: CTAGS
939
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
940
+		$(TAGS_FILES) $(LISP)
941
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
942
+	unique=`for i in $$list; do \
943
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
944
+	  done | \
945
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
946
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
943 947
 	test -z "$(CTAGS_ARGS)$$unique" \
944 948
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
945 949
 	     $$unique
... ...
@@ -948,21 +868,6 @@ GTAGS:
948 948
 	here=`$(am__cd) $(top_builddir) && pwd` \
949 949
 	  && $(am__cd) $(top_srcdir) \
950 950
 	  && gtags -i $(GTAGS_ARGS) "$$here"
951
-cscopelist: cscopelist-am
952
-
953
-cscopelist-am: $(am__tagged_files)
954
-	list='$(am__tagged_files)'; \
955
-	case "$(srcdir)" in \
956
-	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
957
-	  *) sdir=$(subdir)/$(srcdir) ;; \
958
-	esac; \
959
-	for i in $$list; do \
960
-	  if test -f "$$i"; then \
961
-	    echo "$(subdir)/$$i"; \
962
-	  else \
963
-	    echo "$$sdir/$$i"; \
964
-	  fi; \
965
-	done >> $(top_builddir)/cscope.files
966 951
 
967 952
 distclean-tags:
968 953
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
... ...
@@ -1113,20 +1018,20 @@ uninstall-am: uninstall-includeHEADERS uninstall-libLTLIBRARIES \
1113 1113
 
1114 1114
 .MAKE: all check install install-am install-strip
1115 1115
 
1116
-.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
1116
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
1117 1117
 	clean-libLTLIBRARIES clean-libtool clean-noinstLTLIBRARIES \
1118
-	cscopelist-am ctags ctags-am distclean distclean-compile \
1119
-	distclean-generic distclean-libtool distclean-tags distdir dvi \
1120
-	dvi-am html html-am info info-am install install-am \
1121
-	install-data install-data-am install-dvi install-dvi-am \
1122
-	install-exec install-exec-am install-html install-html-am \
1118
+	ctags distclean distclean-compile distclean-generic \
1119
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
1120
+	html-am info info-am install install-am install-data \
1121
+	install-data-am install-dvi install-dvi-am install-exec \
1122
+	install-exec-am install-html install-html-am \
1123 1123
 	install-includeHEADERS install-info install-info-am \
1124 1124
 	install-libLTLIBRARIES install-ltdlincludeHEADERS install-man \
1125 1125
 	install-pdf install-pdf-am install-ps install-ps-am \
1126 1126
 	install-strip installcheck installcheck-am installdirs \
1127 1127
 	maintainer-clean maintainer-clean-generic mostlyclean \
1128 1128
 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
1129
-	pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
1129
+	pdf pdf-am ps ps-am tags uninstall uninstall-am \
1130 1130
 	uninstall-includeHEADERS uninstall-libLTLIBRARIES \
1131 1131
 	uninstall-ltdlincludeHEADERS
1132 1132
 
... ...
@@ -1,8 +1,9 @@
1
-# Makefile.in generated by automake 1.14 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 \
... ...
@@ -185,19 +140,6 @@ sigtool_LDADD = $(LDADD)
185 185
 AM_V_lt = $(am__v_lt_@AM_V@)
186 186
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
187 187
 am__v_lt_0 = --silent
188
-am__v_lt_1 = 
189
-AM_V_P = $(am__v_P_@AM_V@)
190
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
191
-am__v_P_0 = false
192
-am__v_P_1 = :
193
-AM_V_GEN = $(am__v_GEN_@AM_V@)
194
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
195
-am__v_GEN_0 = @echo "  GEN     " $@;
196
-am__v_GEN_1 = 
197
-AM_V_at = $(am__v_at_@AM_V@)
198
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
199
-am__v_at_0 = @
200
-am__v_at_1 = 
201 188
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
202 189
 depcomp = $(SHELL) $(top_srcdir)/config/depcomp
203 190
 am__depfiles_maybe = depfiles
... ...
@@ -210,40 +152,22 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
210 210
 	$(AM_CFLAGS) $(CFLAGS)
211 211
 AM_V_CC = $(am__v_CC_@AM_V@)
212 212
 am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
213
-am__v_CC_0 = @echo "  CC      " $@;
214
-am__v_CC_1 = 
213
+am__v_CC_0 = @echo "  CC    " $@;
214
+AM_V_at = $(am__v_at_@AM_V@)
215
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
216
+am__v_at_0 = @
215 217
 CCLD = $(CC)
216 218
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
217 219
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
218 220
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
219 221
 AM_V_CCLD = $(am__v_CCLD_@AM_V@)
220 222
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
221
-am__v_CCLD_0 = @echo "  CCLD    " $@;
222
-am__v_CCLD_1 = 
223
+am__v_CCLD_0 = @echo "  CCLD  " $@;
224
+AM_V_GEN = $(am__v_GEN_@AM_V@)
225
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
226
+am__v_GEN_0 = @echo "  GEN   " $@;
223 227
 SOURCES = $(sigtool_SOURCES)
224 228
 DIST_SOURCES = $(sigtool_SOURCES)
225
-am__can_run_installinfo = \
226
-  case $$AM_UPDATE_INFO_DIR in \
227
-    n|no|NO) false;; \
228
-    *) (install-info --version) >/dev/null 2>&1;; \
229
-  esac
230
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
231
-# Read a list of newline-separated strings from the standard input,
232
-# and print each of them once, without duplicates.  Input order is
233
-# *not* preserved.
234
-am__uniquify_input = $(AWK) '\
235
-  BEGIN { nonempty = 0; } \
236
-  { items[$$0] = 1; nonempty = 1; } \
237
-  END { if (nonempty) { for (i in items) print i; }; } \
238
-'
239
-# Make sure the list of sources is unique.  This is necessary because,
240
-# e.g., the same source file might be shared among _SOURCES variables
241
-# for different programs/libraries.
242
-am__define_uniq_tagged_files = \
243
-  list='$(am__tagged_files)'; \
244
-  unique=`for i in $$list; do \
245
-    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
246
-  done | $(am__uniquify_input)`
247 229
 ETAGS = etags
248 230
 CTAGS = ctags
249 231
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
... ...
@@ -502,19 +426,14 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
502 502
 $(am__aclocal_m4_deps):
503 503
 install-binPROGRAMS: $(bin_PROGRAMS)
504 504
 	@$(NORMAL_INSTALL)
505
+	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
505 506
 	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
506
-	if test -n "$$list"; then \
507
-	  echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
508
-	  $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
509
-	fi; \
510 507
 	for p in $$list; do echo "$$p $$p"; done | \
511 508
 	sed 's/$(EXEEXT)$$//' | \
512
-	while read p p1; do if test -f $$p \
513
-	 || test -f $$p1 \
514
-	  ; then echo "$$p"; echo "$$p"; else :; fi; \
509
+	while read p p1; do if test -f $$p || test -f $$p1; \
510
+	  then echo "$$p"; echo "$$p"; else :; fi; \
515 511
 	done | \
516
-	sed -e 'p;s,.*/,,;n;h' \
517
-	    -e 's|.*|.|' \
512
+	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
518 513
 	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
519 514
 	sed 'N;N;N;s,\n, ,g' | \
520 515
 	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
... ...
@@ -535,8 +454,7 @@ uninstall-binPROGRAMS:
535 535
 	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
536 536
 	files=`for p in $$list; do echo "$$p"; done | \
537 537
 	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
538
-	      -e 's/$$/$(EXEEXT)/' \
539
-	`; \
538
+	      -e 's/$$/$(EXEEXT)/' `; \
540 539
 	test -n "$$list" || exit 0; \
541 540
 	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
542 541
 	cd "$(DESTDIR)$(bindir)" && rm -f $$files
... ...
@@ -565,7 +483,6 @@ installcheck-binPROGRAMS: $(bin_PROGRAMS)
565 565
 	    else echo "$$f does not support $$opt" 1>&2; bad=1; fi; \
566 566
 	  done; \
567 567
 	done; rm -f c$${pid}_.???; exit $$bad
568
-
569 568
 sigtool$(EXEEXT): $(sigtool_OBJECTS) $(sigtool_DEPENDENCIES) $(EXTRA_sigtool_DEPENDENCIES) 
570 569
 	@rm -f sigtool$(EXEEXT)
571 570
 	$(AM_V_CCLD)$(LINK) $(sigtool_OBJECTS) $(sigtool_LDADD) $(LIBS)
... ...
@@ -590,14 +507,14 @@ distclean-compile:
590 590
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
591 591
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
592 592
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
593
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
593
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
594 594
 
595 595
 .c.obj:
596 596
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
597 597
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
598 598
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
599 599
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
600
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
600
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
601 601
 
602 602
 .c.lo:
603 603
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
... ...
@@ -696,15 +613,26 @@ mostlyclean-libtool:
696 696
 clean-libtool:
697 697
 	-rm -rf .libs _libs
698 698
 
699
-ID: $(am__tagged_files)
700
-	$(am__define_uniq_tagged_files); mkid -fID $$unique
701
-tags: tags-am
702
-TAGS: tags
703
-
704
-tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
699
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
700
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
701
+	unique=`for i in $$list; do \
702
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
703
+	  done | \
704
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
705
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
706
+	mkid -fID $$unique
707
+tags: TAGS
708
+
709
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
710
+		$(TAGS_FILES) $(LISP)
705 711
 	set x; \
706 712
 	here=`pwd`; \
707
-	$(am__define_uniq_tagged_files); \
713
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
714
+	unique=`for i in $$list; do \
715
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
716
+	  done | \
717
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
718
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
708 719
 	shift; \
709 720
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
710 721
 	  test -n "$$unique" || unique=$$empty_fix; \
... ...
@@ -716,11 +644,15 @@ tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
716 716
 	      $$unique; \
717 717
 	  fi; \
718 718
 	fi
719
-ctags: ctags-am
720
-
721
-CTAGS: ctags
722
-ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
723
-	$(am__define_uniq_tagged_files); \
719
+ctags: CTAGS
720
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
721
+		$(TAGS_FILES) $(LISP)
722
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
723
+	unique=`for i in $$list; do \
724
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
725
+	  done | \
726
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
727
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
724 728
 	test -z "$(CTAGS_ARGS)$$unique" \
725 729
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
726 730
 	     $$unique
... ...
@@ -729,21 +661,6 @@ GTAGS:
729 729
 	here=`$(am__cd) $(top_builddir) && pwd` \
730 730
 	  && $(am__cd) $(top_srcdir) \
731 731
 	  && gtags -i $(GTAGS_ARGS) "$$here"
732
-cscopelist: cscopelist-am
733
-
734
-cscopelist-am: $(am__tagged_files)
735
-	list='$(am__tagged_files)'; \
736
-	case "$(srcdir)" in \
737
-	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
738
-	  *) sdir=$(subdir)/$(srcdir) ;; \
739
-	esac; \
740
-	for i in $$list; do \
741
-	  if test -f "$$i"; then \
742
-	    echo "$(subdir)/$$i"; \
743
-	  else \
744
-	    echo "$$sdir/$$i"; \
745
-	  fi; \
746
-	done >> $(top_builddir)/cscope.files
747 732
 
748 733
 distclean-tags:
749 734
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
... ...
@@ -888,20 +805,19 @@ uninstall-am: uninstall-binPROGRAMS
888 888
 
889 889
 .MAKE: install-am install-strip
890 890
 
891
-.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \
892
-	clean-binPROGRAMS clean-generic clean-libtool cscopelist-am \
893
-	ctags ctags-am distclean distclean-compile distclean-generic \
894
-	distclean-libtool distclean-tags distdir dvi dvi-am html \
895
-	html-am info info-am install install-am install-binPROGRAMS \
896
-	install-data install-data-am install-dvi install-dvi-am \
897
-	install-exec install-exec-am install-html install-html-am \
898
-	install-info install-info-am install-man install-pdf \
899
-	install-pdf-am install-ps install-ps-am install-strip \
900
-	installcheck installcheck-am installcheck-binPROGRAMS \
901
-	installdirs maintainer-clean maintainer-clean-generic \
902
-	mostlyclean mostlyclean-compile mostlyclean-generic \
903
-	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
904
-	uninstall-am uninstall-binPROGRAMS
891
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
892
+	clean-generic clean-libtool ctags distclean distclean-compile \
893
+	distclean-generic distclean-libtool distclean-tags distdir dvi \
894
+	dvi-am html html-am info info-am install install-am \
895
+	install-binPROGRAMS install-data install-data-am install-dvi \
896
+	install-dvi-am install-exec install-exec-am install-html \
897
+	install-html-am install-info install-info-am install-man \
898
+	install-pdf install-pdf-am install-ps install-ps-am \
899
+	install-strip installcheck installcheck-am \
900
+	installcheck-binPROGRAMS installdirs maintainer-clean \
901
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
902
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
903
+	tags uninstall uninstall-am uninstall-binPROGRAMS
905 904
 
906 905
 
907 906
 # 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 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 \
... ...
@@ -156,26 +112,14 @@ mkinstalldirs = $(install_sh) -d
156 156
 CONFIG_HEADER = $(top_builddir)/clamav-config.h
157 157
 CONFIG_CLEAN_FILES =
158 158
 CONFIG_CLEAN_VPATH_FILES =
159
-AM_V_P = $(am__v_P_@AM_V@)
160
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
161
-am__v_P_0 = false
162
-am__v_P_1 = :
163 159
 AM_V_GEN = $(am__v_GEN_@AM_V@)
164 160
 am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
165
-am__v_GEN_0 = @echo "  GEN     " $@;
166
-am__v_GEN_1 = 
161
+am__v_GEN_0 = @echo "  GEN   " $@;
167 162
 AM_V_at = $(am__v_at_@AM_V@)
168 163
 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
169 164
 am__v_at_0 = @
170
-am__v_at_1 = 
171 165
 SOURCES =
172 166
 DIST_SOURCES =
173
-am__can_run_installinfo = \
174
-  case $$AM_UPDATE_INFO_DIR in \
175
-    n|no|NO) false;; \
176
-    *) (install-info --version) >/dev/null 2>&1;; \
177
-  esac
178
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
179 167
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
180 168
 ACLOCAL = @ACLOCAL@
181 169
 AMTAR = @AMTAR@
... ...
@@ -431,11 +375,11 @@ mostlyclean-libtool:
431 431
 
432 432
 clean-libtool:
433 433
 	-rm -rf .libs _libs
434
-tags TAGS:
435
-
436
-ctags CTAGS:
434
+tags: TAGS
435
+TAGS:
437 436
 
438
-cscope cscopelist:
437
+ctags: CTAGS
438
+CTAGS:
439 439
 
440 440
 
441 441
 distdir: $(DISTFILES)
... ...
@@ -571,16 +515,16 @@ uninstall-am:
571 571
 .MAKE: install-am install-strip
572 572
 
573 573
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
574
-	clean-local cscopelist-am ctags-am distclean distclean-generic \
575
-	distclean-libtool distdir dvi dvi-am html html-am info info-am \
576
-	install install-am install-data install-data-am install-dvi \
574
+	clean-local distclean distclean-generic distclean-libtool \
575
+	distdir dvi dvi-am html html-am info info-am install \
576
+	install-am install-data install-data-am install-dvi \
577 577
 	install-dvi-am install-exec install-exec-am install-html \
578 578
 	install-html-am install-info install-info-am install-man \
579 579
 	install-pdf install-pdf-am install-ps install-ps-am \
580 580
 	install-strip installcheck installcheck-am installdirs \
581 581
 	maintainer-clean maintainer-clean-generic mostlyclean \
582 582
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
583
-	tags-am uninstall uninstall-am
583
+	uninstall uninstall-am
584 584
 
585 585
 
586 586
 all: $(FILES)
... ...
@@ -1,8 +1,9 @@
1
-# Makefile.in generated by automake 1.14 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 \
... ...
@@ -183,7 +138,6 @@ check_clamav_OBJECTS = $(am_check_clamav_OBJECTS)
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 186
 check_clamav_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
188 187
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(check_clamav_CFLAGS) \
189 188
 	$(CFLAGS) $(check_clamav_LDFLAGS) $(LDFLAGS) -o $@
... ...
@@ -200,18 +154,6 @@ am_check_fpu_endian_OBJECTS =  \
200 200
 check_fpu_endian_OBJECTS = $(am_check_fpu_endian_OBJECTS)
201 201
 check_fpu_endian_DEPENDENCIES =  \
202 202
 	$(top_builddir)/libclamav/libclamav.la
203
-AM_V_P = $(am__v_P_@AM_V@)
204
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
205
-am__v_P_0 = false
206
-am__v_P_1 = :
207
-AM_V_GEN = $(am__v_GEN_@AM_V@)
208
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
209
-am__v_GEN_0 = @echo "  GEN     " $@;
210
-am__v_GEN_1 = 
211
-AM_V_at = $(am__v_at_@AM_V@)
212
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
213
-am__v_at_0 = @
214
-am__v_at_1 = 
215 203
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
216 204
 depcomp = $(SHELL) $(top_srcdir)/config/depcomp
217 205
 am__depfiles_maybe = depfiles
... ...
@@ -224,65 +166,40 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
224 224
 	$(AM_CFLAGS) $(CFLAGS)
225 225
 AM_V_CC = $(am__v_CC_@AM_V@)
226 226
 am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
227
-am__v_CC_0 = @echo "  CC      " $@;
228
-am__v_CC_1 = 
227
+am__v_CC_0 = @echo "  CC    " $@;
228
+AM_V_at = $(am__v_at_@AM_V@)
229
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
230
+am__v_at_0 = @
229 231
 CCLD = $(CC)
230 232
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
231 233
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
232 234
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
233 235
 AM_V_CCLD = $(am__v_CCLD_@AM_V@)
234 236
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
235
-am__v_CCLD_0 = @echo "  CCLD    " $@;
236
-am__v_CCLD_1 = 
237
+am__v_CCLD_0 = @echo "  CCLD  " $@;
238
+AM_V_GEN = $(am__v_GEN_@AM_V@)
239
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
240
+am__v_GEN_0 = @echo "  GEN   " $@;
237 241
 SOURCES = $(check_clamav_SOURCES) $(check_clamd_SOURCES) \
238 242
 	$(check_fpu_endian_SOURCES)
239 243
 DIST_SOURCES = $(am__check_clamav_SOURCES_DIST) \
240 244
 	$(am__check_clamd_SOURCES_DIST) $(check_fpu_endian_SOURCES)
241
-am__can_run_installinfo = \
242
-  case $$AM_UPDATE_INFO_DIR in \
243
-    n|no|NO) false;; \
244
-    *) (install-info --version) >/dev/null 2>&1;; \
245
-  esac
246
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
247
-# Read a list of newline-separated strings from the standard input,
248
-# and print each of them once, without duplicates.  Input order is
249
-# *not* preserved.
250
-am__uniquify_input = $(AWK) '\
251
-  BEGIN { nonempty = 0; } \
252
-  { items[$$0] = 1; nonempty = 1; } \
253
-  END { if (nonempty) { for (i in items) print i; }; } \
254
-'
255
-# Make sure the list of sources is unique.  This is necessary because,
256
-# e.g., the same source file might be shared among _SOURCES variables
257
-# for different programs/libraries.
258
-am__define_uniq_tagged_files = \
259
-  list='$(am__tagged_files)'; \
260
-  unique=`for i in $$list; do \
261
-    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
262
-  done | $(am__uniquify_input)`
263 245
 ETAGS = etags
264 246
 CTAGS = ctags
265
-am__tty_colors_dummy = \
266
-  mgn= red= grn= lgn= blu= brg= std=; \
267
-  am__color_tests=no
268
-am__tty_colors = { \
269
-  $(am__tty_colors_dummy); \
270
-  if test "X$(AM_COLOR_TESTS)" = Xno; then \
271
-    am__color_tests=no; \
272
-  elif test "X$(AM_COLOR_TESTS)" = Xalways; then \
273
-    am__color_tests=yes; \
274
-  elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \
275
-    am__color_tests=yes; \
276
-  fi; \
277
-  if test $$am__color_tests = yes; then \
278
-    red=''; \
279
-    grn=''; \
280
-    lgn=''; \
281
-    blu=''; \
282
-    mgn=''; \
283
-    brg=''; \
284
-    std=''; \
285
-  fi; \
247
+# If stdout is a non-dumb tty, use colors.  If test -t is not supported,
248
+# then this fails; a conservative approach.  Of course do not redirect
249
+# stdout here, just stderr.
250
+am__tty_colors = \
251
+red=; grn=; lgn=; blu=; std=; \
252
+test "X$(AM_COLOR_TESTS)" != Xno \
253
+&& test "X$$TERM" != Xdumb \
254
+&& { test "X$(AM_COLOR_TESTS)" = Xalways || test -t 1 2>/dev/null; } \
255
+&& { \
256
+  red=''; \
257
+  grn=''; \
258
+  lgn=''; \
259
+  blu=''; \
260
+  std=''; \
286 261
 }
287 262
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
288 263
 am__vpath_adj = case $$p in \
... ...
@@ -311,161 +228,91 @@ am__uninstall_files_from_dir = { \
311 311
     || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
312 312
          $(am__cd) "$$dir" && rm -f $$files; }; \
313 313
   }
314
-am__recheck_rx = ^[ 	]*:recheck:[ 	]*
315
-am__global_test_result_rx = ^[ 	]*:global-test-result:[ 	]*
316
-am__copy_in_global_log_rx = ^[ 	]*:copy-in-global-log:[ 	]*
317
-# A command that, given a newline-separated list of test names on the
318
-# standard input, print the name of the tests that are to be re-run
319
-# upon "make recheck".
320
-am__list_recheck_tests = $(AWK) '{ \
321
-  recheck = 1; \
322
-  while ((rc = (getline line < ($$0 ".trs"))) != 0) \
323
-    { \
324
-      if (rc < 0) \
325
-        { \
326
-          if ((getline line2 < ($$0 ".log")) < 0) \
327
-	    recheck = 0; \
328
-          break; \
329
-        } \
330
-      else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \
331
-        { \
332
-          recheck = 0; \
333
-          break; \
334
-        } \
335
-      else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \
336
-        { \
337
-          break; \
338
-        } \
339
-    }; \
340
-  if (recheck) \
341
-    print $$0; \
342
-  close ($$0 ".trs"); \
343
-  close ($$0 ".log"); \
344
-}'
345
-# A command that, given a newline-separated list of test names on the
346
-# standard input, create the global log from their .trs and .log files.
347
-am__create_global_log = $(AWK) ' \
348
-function fatal(msg) \
349
-{ \
350
-  print "fatal: making $@: " msg | "cat >&2"; \
351
-  exit 1; \
352
-} \
353
-function rst_section(header) \
354
-{ \
355
-  print header; \
356
-  len = length(header); \
357
-  for (i = 1; i <= len; i = i + 1) \
358
-    printf "="; \
359
-  printf "\n\n"; \
360
-} \
361
-{ \
362
-  copy_in_global_log = 1; \
363
-  global_test_result = "RUN"; \
364
-  while ((rc = (getline line < ($$0 ".trs"))) != 0) \
365
-    { \
366
-      if (rc < 0) \
367
-         fatal("failed to read from " $$0 ".trs"); \
368
-      if (line ~ /$(am__global_test_result_rx)/) \
369
-        { \
370
-          sub("$(am__global_test_result_rx)", "", line); \
371
-          sub("[ 	]*$$", "", line); \
372
-          global_test_result = line; \
373
-        } \
374
-      else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \
375
-        copy_in_global_log = 0; \
376
-    }; \
377
-  if (copy_in_global_log) \
378
-    { \
379
-      rst_section(global_test_result ": " $$0); \
380
-      while ((rc = (getline line < ($$0 ".log"))) != 0) \
381
-      { \
382
-        if (rc < 0) \
383
-          fatal("failed to read from " $$0 ".log"); \
384
-        print line; \
385
-      }; \
386
-      printf "\n"; \
387
-    }; \
388
-  close ($$0 ".trs"); \
389
-  close ($$0 ".log"); \
314
+# Restructured Text title and section.
315
+am__rst_title = sed 's/.*/   &   /;h;s/./=/g;p;x;p;g;p;s/.*//'
316
+am__rst_section = sed 'p;s/./=/g;p;g'
317
+# Put stdin (possibly several lines separated by ".  ") in a box.
318
+# Prefix each line by 'col' and terminate each with 'std', for coloring.
319
+# Multi line coloring is problematic with "less -R", so we really need
320
+# to color each line individually.
321
+am__text_box = $(AWK) '{			\
322
+  n = split($$0, lines, "\\.  "); max = 0;	\
323
+  for (i = 1; i <= n; ++i)			\
324
+    if (max < length(lines[i]))			\
325
+      max = length(lines[i]);			\
326
+  for (i = 0; i < max; ++i)			\
327
+    line = line "=";				\
328
+  print col line std;				\
329
+  for (i = 1; i <= n; ++i)			\
330
+    if (lines[i])				\
331
+      print col lines[i] std;			\
332
+  print col line std;				\
390 333
 }'
391
-# Restructured Text title.
392
-am__rst_title = { sed 's/.*/   &   /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; }
393 334
 # Solaris 10 'make', and several other traditional 'make' implementations,
394 335
 # pass "-e" to $(SHELL), and POSIX 2008 even requires this.  Work around it
395 336
 # by disabling -e (using the XSI extension "set +e") if it's set.
396 337
 am__sh_e_setup = case $$- in *e*) set +e;; esac
397
-# Default flags passed to test drivers.
398
-am__common_driver_flags = \
399
-  --color-tests "$$am__color_tests" \
400
-  --enable-hard-errors "$$am__enable_hard_errors" \
401
-  --expect-failure "$$am__expect_failure"
402 338
 # To be inserted before the command running the test.  Creates the
403 339
 # directory for the log if needed.  Stores in $dir the directory
404
-# containing $f, in $tst the test, in $log the log.  Executes the
405
-# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and
406
-# passes TESTS_ENVIRONMENT.  Set up options for the wrapper that
407
-# will run the test scripts (or their associated LOG_COMPILER, if
408
-# thy have one).
340
+# containing $f, in $tst the test, in $log the log, and passes
341
+# TESTS_ENVIRONMENT.  Save and restore TERM around use of
342
+# TESTS_ENVIRONMENT, in case that unsets it.
409 343
 am__check_pre = \
410 344
 $(am__sh_e_setup);					\
411 345
 $(am__vpath_adj_setup) $(am__vpath_adj)			\
412
-$(am__tty_colors);					\
413 346
 srcdir=$(srcdir); export srcdir;			\
414
-case "$@" in						\
415
-  */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;;	\
416
-    *) am__odir=.;; 					\
417
-esac;							\
418
-test "x$$am__odir" = x"." || test -d "$$am__odir" 	\
419
-  || $(MKDIR_P) "$$am__odir" || exit $$?;		\
347
+rm -f $@-t;						\
348
+am__trap='rm -f '\''$(abs_builddir)/$@-t'\''; (exit $$st); exit $$st'; \
349
+trap "st=129; $$am__trap" 1; trap "st=130; $$am__trap" 2;	\
350
+trap "st=141; $$am__trap" 13; trap "st=143; $$am__trap" 15; \
351
+am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;		\
352
+test "x$$am__odir" = x. || $(MKDIR_P) "$$am__odir" || exit $$?;	\
420 353
 if test -f "./$$f"; then dir=./;			\
421 354
 elif test -f "$$f"; then dir=;				\
422 355
 else dir="$(srcdir)/"; fi;				\
423
-tst=$$dir$$f; log='$@'; 				\
424
-if test -n '$(DISABLE_HARD_ERRORS)'; then		\
425
-  am__enable_hard_errors=no; 				\
426
-else							\
427
-  am__enable_hard_errors=yes; 				\
428
-fi; 							\
356
+tst=$$dir$$f; log='$@'; __SAVED_TERM=$$TERM;		\
357
+$(TESTS_ENVIRONMENT)
358
+# To be appended to the command running the test.  Handle the stdout
359
+# and stderr redirection, and catch the exit status.
360
+am__check_post = \
361
+>$@-t 2>&1;						\
362
+estatus=$$?;						\
363
+if test -n '$(DISABLE_HARD_ERRORS)'			\
364
+   && test $$estatus -eq 99; then			\
365
+  estatus=1;						\
366
+fi;							\
367
+TERM=$$__SAVED_TERM; export TERM;			\
368
+$(am__tty_colors);					\
369
+xfailed=PASS;						\
429 370
 case " $(XFAIL_TESTS) " in				\
430 371
   *[\ \	]$$f[\ \	]* | *[\ \	]$$dir$$f[\ \	]*) \
431
-    am__expect_failure=yes;;				\
432
-  *)							\
433
-    am__expect_failure=no;;				\
434
-esac; 							\
435
-$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT)
436
-# A shell command to get the names of the tests scripts with any registered
437
-# extension removed (i.e., equivalently, the names of the test logs, with
438
-# the '.log' extension removed).  The result is saved in the shell variable
439
-# '$bases'.  This honors runtime overriding of TESTS and TEST_LOGS.  Sadly,
440
-# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)",
441
-# since that might cause problem with VPATH rewrites for suffix-less tests.
442
-# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'.
443
-am__set_TESTS_bases = \
444
-  bases='$(TEST_LOGS)'; \
445
-  bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \
446
-  bases=`echo $$bases`
372
+    xfailed=XFAIL;;					\
373
+esac;							\
374
+case $$estatus.$$xfailed in				\
375
+    0.XFAIL) col=$$red; res=XPASS;;			\
376
+    0.*)     col=$$grn; res=PASS ;;			\
377
+    77.*)    col=$$blu; res=SKIP ;;			\
378
+    99.*)    col=$$red; res=FAIL ;;			\
379
+    *.XFAIL) col=$$lgn; res=XFAIL;;			\
380
+    *.*)     col=$$red; res=FAIL ;;			\
381
+esac;							\
382
+echo "$${col}$$res$${std}: $$f";			\
383
+echo "$$res: $$f (exit: $$estatus)" |			\
384
+  $(am__rst_section) >$@;				\
385
+cat $@-t >>$@;						\
386
+rm -f $@-t
447 387
 RECHECK_LOGS = $(TEST_LOGS)
448
-AM_RECURSIVE_TARGETS = check recheck
388
+AM_RECURSIVE_TARGETS = check recheck check-html recheck-html
389
+TEST_SUITE_HTML = $(TEST_SUITE_LOG:.log=.html)
449 390
 TEST_SUITE_LOG = test-suite.log
450 391
 TEST_EXTENSIONS = @EXEEXT@ .test
451
-LOG_DRIVER = $(SHELL) $(top_srcdir)/config/test-driver
452 392
 LOG_COMPILE = $(LOG_COMPILER) $(AM_LOG_FLAGS) $(LOG_FLAGS)
453
-am__set_b = \
454
-  case '$@' in \
455
-    */*) \
456
-      case '$*' in \
457
-        */*) b='$*';; \
458
-          *) b=`echo '$@' | sed 's/\.log$$//'`; \
459
-       esac;; \
460
-    *) \
461
-      b='$*';; \
462
-  esac
463 393
 am__test_logs1 = $(TESTS:=.log)
464 394
 am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log)
465 395
 TEST_LOGS = $(am__test_logs2:.test.log=.log)
466
-TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/config/test-driver
467 396
 TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \
468 397
 	$(TEST_LOG_FLAGS)
398
+TEST_LOGS_TMP = $(TEST_LOGS:.log=.log-t)
469 399
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
470 400
 ACLOCAL = @ACLOCAL@
471 401
 AMTAR = @AMTAR@
... ...
@@ -705,7 +552,7 @@ EXTRA_DIST = .split $(srcdir)/*.ref input test-freshclam.conf valgrind.supp viru
705 705
 all: all-am
706 706
 
707 707
 .SUFFIXES:
708
-.SUFFIXES: .c .lo .log .o .obj .test .test$(EXEEXT) .trs
708
+.SUFFIXES: .c .html .lo .log .o .obj .test .test$(EXEEXT)
709 709
 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
710 710
 	@for dep in $?; do \
711 711
 	  case '$(am__configure_deps)' in \
... ...
@@ -745,15 +592,12 @@ clean-checkPROGRAMS:
745 745
 	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
746 746
 	echo " rm -f" $$list; \
747 747
 	rm -f $$list
748
-
749 748
 check_clamav$(EXEEXT): $(check_clamav_OBJECTS) $(check_clamav_DEPENDENCIES) $(EXTRA_check_clamav_DEPENDENCIES) 
750 749
 	@rm -f check_clamav$(EXEEXT)
751 750
 	$(AM_V_CCLD)$(check_clamav_LINK) $(check_clamav_OBJECTS) $(check_clamav_LDADD) $(LIBS)
752
-
753 751
 check_clamd$(EXEEXT): $(check_clamd_OBJECTS) $(check_clamd_DEPENDENCIES) $(EXTRA_check_clamd_DEPENDENCIES) 
754 752
 	@rm -f check_clamd$(EXEEXT)
755 753
 	$(AM_V_CCLD)$(LINK) $(check_clamd_OBJECTS) $(check_clamd_LDADD) $(LIBS)
756
-
757 754
 check_fpu_endian$(EXEEXT): $(check_fpu_endian_OBJECTS) $(check_fpu_endian_DEPENDENCIES) $(EXTRA_check_fpu_endian_DEPENDENCIES) 
758 755
 	@rm -f check_fpu_endian$(EXEEXT)
759 756
 	$(AM_V_CCLD)$(LINK) $(check_fpu_endian_OBJECTS) $(check_fpu_endian_LDADD) $(LIBS)
... ...
@@ -783,14 +627,14 @@ distclean-compile:
783 783
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
784 784
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
785 785
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
786
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
786
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
787 787
 
788 788
 .c.obj:
789 789
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
790 790
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
791 791
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
792 792
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
793
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
793
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
794 794
 
795 795
 .c.lo:
796 796
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
... ...
@@ -987,15 +831,26 @@ mostlyclean-libtool:
987 987
 clean-libtool:
988 988
 	-rm -rf .libs _libs
989 989
 
990
-ID: $(am__tagged_files)
991
-	$(am__define_uniq_tagged_files); mkid -fID $$unique
992
-tags: tags-am
993
-TAGS: tags
994
-
995
-tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
990
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
991
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
992
+	unique=`for i in $$list; do \
993
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
994
+	  done | \
995
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
996
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
997
+	mkid -fID $$unique
998
+tags: TAGS
999
+
1000
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
1001
+		$(TAGS_FILES) $(LISP)
996 1002
 	set x; \
997 1003
 	here=`pwd`; \
998
-	$(am__define_uniq_tagged_files); \
1004
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
1005
+	unique=`for i in $$list; do \
1006
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
1007
+	  done | \
1008
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
1009
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
999 1010
 	shift; \
1000 1011
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
1001 1012
 	  test -n "$$unique" || unique=$$empty_fix; \
... ...
@@ -1007,11 +862,15 @@ tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
1007 1007
 	      $$unique; \
1008 1008
 	  fi; \
1009 1009
 	fi
1010
-ctags: ctags-am
1011
-
1012
-CTAGS: ctags
1013
-ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
1014
-	$(am__define_uniq_tagged_files); \
1010
+ctags: CTAGS
1011
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
1012
+		$(TAGS_FILES) $(LISP)
1013
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
1014
+	unique=`for i in $$list; do \
1015
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
1016
+	  done | \
1017
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
1018
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
1015 1019
 	test -z "$(CTAGS_ARGS)$$unique" \
1016 1020
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
1017 1021
 	     $$unique
... ...
@@ -1020,271 +879,167 @@ GTAGS:
1020 1020
 	here=`$(am__cd) $(top_builddir) && pwd` \
1021 1021
 	  && $(am__cd) $(top_srcdir) \
1022 1022
 	  && gtags -i $(GTAGS_ARGS) "$$here"
1023
-cscopelist: cscopelist-am
1024
-
1025
-cscopelist-am: $(am__tagged_files)
1026
-	list='$(am__tagged_files)'; \
1027
-	case "$(srcdir)" in \
1028
-	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
1029
-	  *) sdir=$(subdir)/$(srcdir) ;; \
1030
-	esac; \
1031
-	for i in $$list; do \
1032
-	  if test -f "$$i"; then \
1033
-	    echo "$(subdir)/$$i"; \
1034
-	  else \
1035
-	    echo "$$sdir/$$i"; \
1036
-	  fi; \
1037
-	done >> $(top_builddir)/cscope.files
1038 1023
 
1039 1024
 distclean-tags:
1040 1025
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
1041 1026
 
1042
-# Recover from deleted '.trs' file; this should ensure that
1043
-# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create
1044
-# both 'foo.log' and 'foo.trs'.  Break the recipe in two subshells
1045
-# to avoid problems with "make -n".
1046
-.log.trs:
1047
-	rm -f $< $@
1048
-	$(MAKE) $(AM_MAKEFLAGS) $<
1049
-
1050
-# Leading 'am--fnord' is there to ensure the list of targets does not
1051
-# expand to empty, as could happen e.g. with make check TESTS=''.
1052
-am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck)
1053
-am--force-recheck:
1054
-	@:
1055
-
1056 1027
 $(TEST_SUITE_LOG): $(TEST_LOGS)
1057
-	@$(am__set_TESTS_bases); \
1058
-	am__f_ok () { test -f "$$1" && test -r "$$1"; }; \
1059
-	redo_bases=`for i in $$bases; do \
1060
-	              am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \
1061
-	            done`; \
1062
-	if test -n "$$redo_bases"; then \
1063
-	  redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \
1064
-	  redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \
1065
-	  if $(am__make_dryrun); then :; else \
1066
-	    rm -f $$redo_logs && rm -f $$redo_results || exit 1; \
1067
-	  fi; \
1068
-	fi; \
1069
-	if test -n "$$am__remaking_logs"; then \
1070
-	  echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \
1071
-	       "recursion detected" >&2; \
1072
-	else \
1073
-	  am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \
1074
-	fi; \
1075
-	if $(am__make_dryrun); then :; else \
1076
-	  st=0;  \
1077
-	  errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \
1078
-	  for i in $$redo_bases; do \
1079
-	    test -f $$i.trs && test -r $$i.trs \
1080
-	      || { echo "$$errmsg $$i.trs" >&2; st=1; }; \
1081
-	    test -f $$i.log && test -r $$i.log \
1082
-	      || { echo "$$errmsg $$i.log" >&2; st=1; }; \
1083
-	  done; \
1084
-	  test $$st -eq 0 || exit 1; \
1085
-	fi
1086
-	@$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \
1087
-	ws='[ 	]'; \
1088
-	results=`for b in $$bases; do echo $$b.trs; done`; \
1089
-	test -n "$$results" || results=/dev/null; \
1090
-	all=`  grep "^$$ws*:test-result:"           $$results | wc -l`; \
1091
-	pass=` grep "^$$ws*:test-result:$$ws*PASS"  $$results | wc -l`; \
1092
-	fail=` grep "^$$ws*:test-result:$$ws*FAIL"  $$results | wc -l`; \
1093
-	skip=` grep "^$$ws*:test-result:$$ws*SKIP"  $$results | wc -l`; \
1094
-	xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \
1095
-	xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \
1096
-	error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \
1097
-	if test `expr $$fail + $$xpass + $$error` -eq 0; then \
1098
-	  success=true; \
1099
-	else \
1100
-	  success=false; \
1101
-	fi; \
1102
-	br='==================='; br=$$br$$br$$br$$br; \
1103
-	result_count () \
1104
-	{ \
1105
-	    if test x"$$1" = x"--maybe-color"; then \
1106
-	      maybe_colorize=yes; \
1107
-	    elif test x"$$1" = x"--no-color"; then \
1108
-	      maybe_colorize=no; \
1109
-	    else \
1110
-	      echo "$@: invalid 'result_count' usage" >&2; exit 4; \
1111
-	    fi; \
1112
-	    shift; \
1113
-	    desc=$$1 count=$$2; \
1114
-	    if test $$maybe_colorize = yes && test $$count -gt 0; then \
1115
-	      color_start=$$3 color_end=$$std; \
1116
-	    else \
1117
-	      color_start= color_end=; \
1118
-	    fi; \
1119
-	    echo "$${color_start}# $$desc $$count$${color_end}"; \
1120
-	}; \
1121
-	create_testsuite_report () \
1122
-	{ \
1123
-	  result_count $$1 "TOTAL:" $$all   "$$brg"; \
1124
-	  result_count $$1 "PASS: " $$pass  "$$grn"; \
1125
-	  result_count $$1 "SKIP: " $$skip  "$$blu"; \
1126
-	  result_count $$1 "XFAIL:" $$xfail "$$lgn"; \
1127
-	  result_count $$1 "FAIL: " $$fail  "$$red"; \
1128
-	  result_count $$1 "XPASS:" $$xpass "$$red"; \
1129
-	  result_count $$1 "ERROR:" $$error "$$mgn"; \
1130
-	}; \
1028
+	@$(am__sh_e_setup);						\
1029
+	list='$(TEST_LOGS)';						\
1030
+	results=`for f in $$list; do					\
1031
+		   test -r $$f && read line < $$f && echo "$$line"	\
1032
+		     || echo FAIL;					\
1033
+		 done`;							\
1034
+	all=`echo "$$results" | sed '/^$$/d' | wc -l | sed -e 's/^[	 ]*//'`; \
1035
+	fail=`echo "$$results" | grep -c '^FAIL'`;			\
1036
+	pass=`echo "$$results" | grep -c '^PASS'`;			\
1037
+	skip=`echo "$$results" | grep -c '^SKIP'`;			\
1038
+	xfail=`echo "$$results" | grep -c '^XFAIL'`;			\
1039
+	xpass=`echo "$$results" | grep -c '^XPASS'`;			\
1040
+	failures=`expr $$fail + $$xpass`;				\
1041
+	all=`expr $$all - $$skip`;					\
1042
+	if test "$$all" -eq 1; then tests=test; All=;			\
1043
+	else tests=tests; All="All "; fi;				\
1044
+	case fail=$$fail:xpass=$$xpass:xfail=$$xfail in			\
1045
+	  fail=0:xpass=0:xfail=0)					\
1046
+	    msg="$$All$$all $$tests passed.  ";				\
1047
+	    exit=true;;							\
1048
+	  fail=0:xpass=0:xfail=*)					\
1049
+	    msg="$$All$$all $$tests behaved as expected";		\
1050
+	    if test "$$xfail" -eq 1; then xfailures=failure;		\
1051
+	    else xfailures=failures; fi;				\
1052
+	    msg="$$msg ($$xfail expected $$xfailures).  ";		\
1053
+	    exit=true;;							\
1054
+	  fail=*:xpass=0:xfail=*)					\
1055
+	    msg="$$fail of $$all $$tests failed.  ";			\
1056
+	    exit=false;;						\
1057
+	  fail=*:xpass=*:xfail=*)					\
1058
+	    msg="$$failures of $$all $$tests did not behave as expected"; \
1059
+	    if test "$$xpass" -eq 1; then xpasses=pass;			\
1060
+	    else xpasses=passes; fi;					\
1061
+	    msg="$$msg ($$xpass unexpected $$xpasses).  ";		\
1062
+	    exit=false;;						\
1063
+	  *)								\
1064
+	    echo >&2 "incorrect case"; exit 4;;				\
1065
+	esac;								\
1066
+	if test "$$skip" -ne 0; then					\
1067
+	  if test "$$skip" -eq 1; then					\
1068
+	    msg="$$msg($$skip test was not run).  ";			\
1069
+	  else								\
1070
+	    msg="$$msg($$skip tests were not run).  ";			\
1071
+	  fi;								\
1072
+	fi;								\
1131 1073
 	{								\
1132 1074
 	  echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" |	\
1133 1075
 	    $(am__rst_title);						\
1134
-	  create_testsuite_report --no-color;				\
1076
+	  echo "$$msg";							\
1135 1077
 	  echo;								\
1136 1078
 	  echo ".. contents:: :depth: 2";				\
1137 1079
 	  echo;								\
1138
-	  for b in $$bases; do echo $$b; done				\
1139
-	    | $(am__create_global_log);					\
1140
-	} >$(TEST_SUITE_LOG).tmp || exit 1;				\
1080
+	  for f in $$list; do						\
1081
+	    test -r $$f && read line < $$f || line=;			\
1082
+	    case $$line in						\
1083
+	      PASS:*|XFAIL:*);;						\
1084
+	      *) echo; cat $$f;;					\
1085
+	    esac;							\
1086
+	  done;								\
1087
+	} >$(TEST_SUITE_LOG).tmp;					\
1141 1088
 	mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG);			\
1142
-	if $$success; then						\
1089
+	if test "$$failures" -ne 0; then				\
1090
+	  msg="$${msg}See $(subdir)/$(TEST_SUITE_LOG).  ";		\
1091
+	  if test -n "$(PACKAGE_BUGREPORT)"; then			\
1092
+	    msg="$${msg}Please report to $(PACKAGE_BUGREPORT).  ";	\
1093
+	  fi;								\
1094
+	fi;								\
1095
+	test x"$$VERBOSE" = x || $$exit || cat $(TEST_SUITE_LOG);	\
1096
+	$(am__tty_colors);						\
1097
+	if $$exit; then							\
1143 1098
 	  col="$$grn";							\
1144 1099
 	 else								\
1145 1100
 	  col="$$red";							\
1146
-	  test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG);		\
1147 1101
 	fi;								\
1148
-	echo "$${col}$$br$${std}"; 					\
1149
-	echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}";	\
1150
-	echo "$${col}$$br$${std}"; 					\
1151
-	create_testsuite_report --maybe-color;				\
1152
-	echo "$$col$$br$$std";						\
1153
-	if $$success; then :; else					\
1154
-	  echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}";		\
1155
-	  if test -n "$(PACKAGE_BUGREPORT)"; then			\
1156
-	    echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}";	\
1157
-	  fi;								\
1158
-	  echo "$$col$$br$$std";					\
1159
-	fi;								\
1160
-	$$success || exit 1
1102
+	echo "$$msg" | $(am__text_box) "col=$$col" "std=$$std";		\
1103
+	$$exit || exit 1
1161 1104
 
1162
-check-TESTS:
1163
-	@list='$(RECHECK_LOGS)';           test -z "$$list" || rm -f $$list
1164
-	@list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list
1165
-	@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
1166
-	@set +e; $(am__set_TESTS_bases); \
1167
-	log_list=`for i in $$bases; do echo $$i.log; done`; \
1168
-	trs_list=`for i in $$bases; do echo $$i.trs; done`; \
1169
-	log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \
1170
-	$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \
1171
-	exit $$?;
1172
-recheck: all $(check_PROGRAMS) $(check_SCRIPTS)
1105
+check-TESTS recheck:
1106
+	@if test $@ != recheck; then \
1107
+	   list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list; \
1108
+	 fi
1173 1109
 	@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
1174
-	@set +e; $(am__set_TESTS_bases); \
1175
-	bases=`for i in $$bases; do echo $$i; done \
1176
-	         | $(am__list_recheck_tests)` || exit 1; \
1177
-	log_list=`for i in $$bases; do echo $$i.log; done`; \
1178
-	log_list=`echo $$log_list`; \
1179
-	$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \
1180
-	        am__force_recheck=am--force-recheck \
1181
-	        TEST_LOGS="$$log_list"; \
1182
-	exit $$?
1110
+	@list='' list2='$(TEST_LOGS)'; for f in $$list2; do \
1111
+	  test .log = $$f && continue; \
1112
+	  if test $@ = recheck; then \
1113
+	    test -f $$f || continue; \
1114
+	    if test -r $$f && read line < $$f; then \
1115
+	      case $$line in FAIL*|XPASS*) : ;; *) continue;; esac; \
1116
+	    fi; \
1117
+	  fi; \
1118
+	  if test -z "$$list"; then list=$$f; else list="$$list $$f"; fi; \
1119
+	done; \
1120
+	if test $@ = recheck && test -n "$$list"; then \
1121
+	  echo "am--clean: ; rm -f $$list" \
1122
+	    | $(MAKE) $(AM_MAKEFLAGS) -f - am--clean || exit 1; \
1123
+	fi; \
1124
+	$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$list"
1125
+recheck: $(check_PROGRAMS) $(check_SCRIPTS)
1126
+
1127
+am--mostlyclean-test-html:
1128
+	list='$(TEST_LOGS:.log=.html)'; test -z "$$list" || rm -f $$list
1129
+	rm -f $(TEST_SUITE_HTML)
1130
+
1131
+.log.html:
1132
+	@list='$(RST2HTML) $$RST2HTML rst2html rst2html.py';		\
1133
+	for r2h in $$list; do						\
1134
+	  if ($$r2h --version) >/dev/null 2>&1; then			\
1135
+	    R2H=$$r2h;							\
1136
+	  fi;								\
1137
+	done;								\
1138
+	if test -z "$$R2H"; then					\
1139
+	  echo >&2 "cannot find rst2html, cannot create $@";		\
1140
+	  exit 2;							\
1141
+	fi;								\
1142
+	$$R2H $< >$@.tmp
1143
+	@mv $@.tmp $@
1144
+
1145
+# Be sure to run check first, and then to convert the result.
1146
+# Beware of concurrent executions.  Run "check" not "check-TESTS", as
1147
+# check-SCRIPTS and other dependencies are rebuilt by the former only.
1148
+# And expect check to fail.
1149
+check-html recheck-html:
1150
+	@target=`echo $@ | sed 's/-html$$//'`; \
1151
+	rv=0; $(MAKE) $(AM_MAKEFLAGS) $$target || rv=$$?; \
1152
+	$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_HTML) TEST_LOGS= || exit 4; \
1153
+	exit $$rv
1183 1154
 check_clamav.log: check_clamav$(EXEEXT)
1184
-	@p='check_clamav$(EXEEXT)'; \
1185
-	b='check_clamav'; \
1186
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
1187
-	--log-file $$b.log --trs-file $$b.trs \
1188
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
1189
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
1155
+	@p='check_clamav$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
1190 1156
 check_freshclam.sh.log: check_freshclam.sh
1191
-	@p='check_freshclam.sh'; \
1192
-	b='check_freshclam.sh'; \
1193
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
1194
-	--log-file $$b.log --trs-file $$b.trs \
1195
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
1196
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
1157
+	@p='check_freshclam.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
1197 1158
 check_sigtool.sh.log: check_sigtool.sh
1198
-	@p='check_sigtool.sh'; \
1199
-	b='check_sigtool.sh'; \
1200
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
1201
-	--log-file $$b.log --trs-file $$b.trs \
1202
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
1203
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
1159
+	@p='check_sigtool.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
1204 1160
 check_unit_vg.sh.log: check_unit_vg.sh
1205
-	@p='check_unit_vg.sh'; \
1206
-	b='check_unit_vg.sh'; \
1207
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
1208
-	--log-file $$b.log --trs-file $$b.trs \
1209
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
1210
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
1161
+	@p='check_unit_vg.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
1211 1162
 check1_clamscan.sh.log: check1_clamscan.sh
1212
-	@p='check1_clamscan.sh'; \
1213
-	b='check1_clamscan.sh'; \
1214
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
1215
-	--log-file $$b.log --trs-file $$b.trs \
1216
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
1217
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
1163
+	@p='check1_clamscan.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
1218 1164
 check2_clamd.sh.log: check2_clamd.sh
1219
-	@p='check2_clamd.sh'; \
1220
-	b='check2_clamd.sh'; \
1221
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
1222
-	--log-file $$b.log --trs-file $$b.trs \
1223
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
1224
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
1165
+	@p='check2_clamd.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
1225 1166
 check3_clamd.sh.log: check3_clamd.sh
1226
-	@p='check3_clamd.sh'; \
1227
-	b='check3_clamd.sh'; \
1228
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
1229
-	--log-file $$b.log --trs-file $$b.trs \
1230
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
1231
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
1167
+	@p='check3_clamd.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
1232 1168
 check4_clamd.sh.log: check4_clamd.sh
1233
-	@p='check4_clamd.sh'; \
1234
-	b='check4_clamd.sh'; \
1235
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
1236
-	--log-file $$b.log --trs-file $$b.trs \
1237
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
1238
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
1169
+	@p='check4_clamd.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
1239 1170
 check5_clamd_vg.sh.log: check5_clamd_vg.sh
1240
-	@p='check5_clamd_vg.sh'; \
1241
-	b='check5_clamd_vg.sh'; \
1242
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
1243
-	--log-file $$b.log --trs-file $$b.trs \
1244
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
1245
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
1171
+	@p='check5_clamd_vg.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
1246 1172
 check6_clamd_vg.sh.log: check6_clamd_vg.sh
1247
-	@p='check6_clamd_vg.sh'; \
1248
-	b='check6_clamd_vg.sh'; \
1249
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
1250
-	--log-file $$b.log --trs-file $$b.trs \
1251
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
1252
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
1173
+	@p='check6_clamd_vg.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
1253 1174
 check7_clamd_hg.sh.log: check7_clamd_hg.sh
1254
-	@p='check7_clamd_hg.sh'; \
1255
-	b='check7_clamd_hg.sh'; \
1256
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
1257
-	--log-file $$b.log --trs-file $$b.trs \
1258
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
1259
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
1175
+	@p='check7_clamd_hg.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
1260 1176
 check8_clamd_hg.sh.log: check8_clamd_hg.sh
1261
-	@p='check8_clamd_hg.sh'; \
1262
-	b='check8_clamd_hg.sh'; \
1263
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
1264
-	--log-file $$b.log --trs-file $$b.trs \
1265
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
1266
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
1177
+	@p='check8_clamd_hg.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
1267 1178
 check9_clamscan_vg.sh.log: check9_clamscan_vg.sh
1268
-	@p='check9_clamscan_vg.sh'; \
1269
-	b='check9_clamscan_vg.sh'; \
1270
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
1271
-	--log-file $$b.log --trs-file $$b.trs \
1272
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
1273
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
1179
+	@p='check9_clamscan_vg.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
1274 1180
 .test.log:
1275
-	@p='$<'; \
1276
-	$(am__set_b); \
1277
-	$(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \
1278
-	--log-file $$b.log --trs-file $$b.trs \
1279
-	$(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
1280
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
1181
+	@p='$<'; $(am__check_pre) $(TEST_LOG_COMPILE) "$$tst" $(am__check_post)
1281 1182
 @am__EXEEXT_TRUE@.test$(EXEEXT).log:
1282
-@am__EXEEXT_TRUE@	@p='$<'; \
1283
-@am__EXEEXT_TRUE@	$(am__set_b); \
1284
-@am__EXEEXT_TRUE@	$(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \
1285
-@am__EXEEXT_TRUE@	--log-file $$b.log --trs-file $$b.trs \
1286
-@am__EXEEXT_TRUE@	$(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
1287
-@am__EXEEXT_TRUE@	"$$tst" $(AM_TESTS_FD_REDIRECT)
1183
+@am__EXEEXT_TRUE@	@p='$<'; $(am__check_pre) $(TEST_LOG_COMPILE) "$$tst" $(am__check_post)
1288 1184
 
1289 1185
 distdir: $(DISTFILES)
1290 1186
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
... ...
@@ -1343,7 +1098,7 @@ install-strip:
1343 1343
 	fi
1344 1344
 mostlyclean-generic:
1345 1345
 	-test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS)
1346
-	-test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs)
1346
+	-test -z "$(TEST_LOGS_TMP)" || rm -f $(TEST_LOGS_TMP)
1347 1347
 	-test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
1348 1348
 
1349 1349
 clean-generic:
... ...
@@ -1415,8 +1170,8 @@ maintainer-clean-am: distclean-am maintainer-clean-generic
1415 1415
 
1416 1416
 mostlyclean: mostlyclean-am
1417 1417
 
1418
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
1419
-	mostlyclean-libtool
1418
+mostlyclean-am: am--mostlyclean-test-html mostlyclean-compile \
1419
+	mostlyclean-generic mostlyclean-libtool
1420 1420
 
1421 1421
 pdf: pdf-am
1422 1422
 
... ...
@@ -1428,21 +1183,22 @@ ps-am:
1428 1428
 
1429 1429
 uninstall-am:
1430 1430
 
1431
-.MAKE: check-am install-am install-strip
1432
-
1433
-.PHONY: CTAGS GTAGS TAGS all all-am check check-TESTS check-am clean \
1434
-	clean-checkPROGRAMS clean-generic clean-libtool clean-local \
1435
-	cscopelist-am ctags ctags-am distclean distclean-compile \
1436
-	distclean-generic distclean-libtool distclean-tags distdir dvi \
1437
-	dvi-am html html-am info info-am install install-am \
1438
-	install-data install-data-am install-dvi install-dvi-am \
1439
-	install-exec install-exec-am install-html install-html-am \
1440
-	install-info install-info-am install-man install-pdf \
1441
-	install-pdf-am install-ps install-ps-am install-strip \
1442
-	installcheck installcheck-am installdirs maintainer-clean \
1443
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
1444
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
1445
-	recheck tags tags-am uninstall uninstall-am
1431
+.MAKE: check-am check-html install-am install-strip recheck-html
1432
+
1433
+.PHONY: CTAGS GTAGS all all-am am--mostlyclean-test-html check \
1434
+	check-TESTS check-am check-html clean clean-checkPROGRAMS \
1435
+	clean-generic clean-libtool clean-local ctags distclean \
1436
+	distclean-compile distclean-generic distclean-libtool \
1437
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
1438
+	install install-am install-data install-data-am install-dvi \
1439
+	install-dvi-am install-exec install-exec-am install-html \
1440
+	install-html-am install-info install-info-am install-man \
1441
+	install-pdf install-pdf-am install-ps install-ps-am \
1442
+	install-strip installcheck installcheck-am installdirs \
1443
+	maintainer-clean maintainer-clean-generic mostlyclean \
1444
+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
1445
+	pdf pdf-am ps ps-am recheck recheck-html tags uninstall \
1446
+	uninstall-am
1446 1447
 
1447 1448
 
1448 1449
 check_unit_vg.sh: $(FILES)