Browse code

support libjson-c 0.10, 1.11, and 1.12

Steven Morgan authored on 2014/05/23 22:46:06
Showing 36 changed files
... ...
@@ -1,4 +1,4 @@
1
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
1
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
2 2
 # @configure_input@
3 3
 
4 4
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
... ...
@@ -35,23 +35,6 @@
35 35
 
36 36
 
37 37
 VPATH = @srcdir@
38
-am__make_dryrun = \
39
-  { \
40
-    am__dry=no; \
41
-    case $$MAKEFLAGS in \
42
-      *\\[\ \	]*) \
43
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
44
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
45
-      *) \
46
-        for am__flg in $$MAKEFLAGS; do \
47
-          case $$am__flg in \
48
-            *=*|--*) ;; \
49
-            *n*) am__dry=yes; break;; \
50
-          esac; \
51
-        done;; \
52
-    esac; \
53
-    test $$am__dry = yes; \
54
-  }
55 38
 pkgdatadir = $(datadir)/@PACKAGE@
56 39
 pkgincludedir = $(includedir)/@PACKAGE@
57 40
 pkglibdir = $(libdir)/@PACKAGE@
... ...
@@ -217,11 +200,6 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
217 217
 	install-pdf-recursive install-ps-recursive install-recursive \
218 218
 	installcheck-recursive installdirs-recursive pdf-recursive \
219 219
 	ps-recursive uninstall-recursive
220
-am__can_run_installinfo = \
221
-  case $$AM_UPDATE_INFO_DIR in \
222
-    n|no|NO) false;; \
223
-    *) (install-info --version) >/dev/null 2>&1;; \
224
-  esac
225 220
 DATA = $(pkgconfig_DATA)
226 221
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
227 222
   distclean-recursive maintainer-clean-recursive
... ...
@@ -564,11 +542,8 @@ docs/man/clamsubmit.1: $(top_builddir)/config.status $(top_srcdir)/docs/man/clam
564 564
 	cd $(top_builddir) && $(SHELL) ./config.status $@
565 565
 install-binSCRIPTS: $(bin_SCRIPTS)
566 566
 	@$(NORMAL_INSTALL)
567
+	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
567 568
 	@list='$(bin_SCRIPTS)'; test -n "$(bindir)" || list=; \
568
-	if test -n "$$list"; then \
569
-	  echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
570
-	  $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
571
-	fi; \
572 569
 	for p in $$list; do \
573 570
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
574 571
 	  if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
... ...
@@ -623,11 +598,8 @@ distclean-libtool:
623 623
 	-rm -f libtool config.lt
624 624
 install-pkgconfigDATA: $(pkgconfig_DATA)
625 625
 	@$(NORMAL_INSTALL)
626
+	test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)"
626 627
 	@list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
627
-	if test -n "$$list"; then \
628
-	  echo " $(MKDIR_P) '$(DESTDIR)$(pkgconfigdir)'"; \
629
-	  $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" || exit 1; \
630
-	fi; \
631 628
 	for p in $$list; do \
632 629
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
633 630
 	  echo "$$d$$p"; \
... ...
@@ -812,10 +784,13 @@ distdir: $(DISTFILES)
812 812
 	done
813 813
 	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
814 814
 	  if test "$$subdir" = .; then :; else \
815
-	    $(am__make_dryrun) \
816
-	      || test -d "$(distdir)/$$subdir" \
817
-	      || $(MKDIR_P) "$(distdir)/$$subdir" \
818
-	      || exit 1; \
815
+	    test -d "$(distdir)/$$subdir" \
816
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
817
+	    || exit 1; \
818
+	  fi; \
819
+	done
820
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
821
+	  if test "$$subdir" = .; then :; else \
819 822
 	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
820 823
 	    $(am__relativize); \
821 824
 	    new_distdir=$$reldir; \
... ...
@@ -904,7 +879,7 @@ distcheck: dist
904 904
 	*.zip*) \
905 905
 	  unzip $(distdir).zip ;;\
906 906
 	esac
907
-	chmod -R a-w $(distdir); chmod u+w $(distdir)
907
+	chmod -R a-w $(distdir); chmod a+w $(distdir)
908 908
 	mkdir $(distdir)/_build
909 909
 	mkdir $(distdir)/_inst
910 910
 	chmod a-w $(distdir)
... ...
@@ -1,4 +1,4 @@
1
-# generated automatically by aclocal 1.11.6 -*- Autoconf -*-
1
+# generated automatically by aclocal 1.11.3 -*- Autoconf -*-
2 2
 
3 3
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
4 4
 # 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
... ...
@@ -14,8 +14,8 @@
14 14
 
15 15
 m4_ifndef([AC_AUTOCONF_VERSION],
16 16
   [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.
17
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],,
18
+[m4_warning([this file was generated for autoconf 2.68.
19 19
 You have another version of autoconf.  It may work, but is not guaranteed to.
20 20
 If you have problems, you may need to regenerate the build system entirely.
21 21
 To do so, use the procedure documented by the package, typically `autoreconf'.])])
... ...
@@ -38,7 +38,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
38 38
 [am__api_version='1.11'
39 39
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
40 40
 dnl require some minimum version.  Point them to the right macro.
41
-m4_if([$1], [1.11.6], [],
41
+m4_if([$1], [1.11.3], [],
42 42
       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
43 43
 ])
44 44
 
... ...
@@ -54,7 +54,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
54 54
 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
55 55
 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
56 56
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
57
-[AM_AUTOMAKE_VERSION([1.11.6])dnl
57
+[AM_AUTOMAKE_VERSION([1.11.3])dnl
58 58
 m4_ifndef([AC_AUTOCONF_VERSION],
59 59
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
60 60
 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
... ...
@@ -1,4 +1,4 @@
1
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
1
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
2 2
 # @configure_input@
3 3
 
4 4
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
... ...
@@ -34,23 +34,6 @@
34 34
 #  MA 02110-1301, USA.
35 35
 
36 36
 VPATH = @srcdir@
37
-am__make_dryrun = \
38
-  { \
39
-    am__dry=no; \
40
-    case $$MAKEFLAGS in \
41
-      *\\[\ \	]*) \
42
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
43
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
44
-      *) \
45
-        for am__flg in $$MAKEFLAGS; do \
46
-          case $$am__flg in \
47
-            *=*|--*) ;; \
48
-            *n*) am__dry=yes; break;; \
49
-          esac; \
50
-        done;; \
51
-    esac; \
52
-    test $$am__dry = yes; \
53
-  }
54 37
 pkgdatadir = $(datadir)/@PACKAGE@
55 38
 pkgincludedir = $(includedir)/@PACKAGE@
56 39
 pkglibdir = $(libdir)/@PACKAGE@
... ...
@@ -199,11 +182,6 @@ am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
199 199
 am__v_GEN_0 = @echo "  GEN   " $@;
200 200
 SOURCES = $(clamav_milter_SOURCES)
201 201
 DIST_SOURCES = $(am__clamav_milter_SOURCES_DIST)
202
-am__can_run_installinfo = \
203
-  case $$AM_UPDATE_INFO_DIR in \
204
-    n|no|NO) false;; \
205
-    *) (install-info --version) >/dev/null 2>&1;; \
206
-  esac
207 202
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
208 203
 am__vpath_adj = case $$p in \
209 204
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
... ...
@@ -488,11 +466,8 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
488 488
 $(am__aclocal_m4_deps):
489 489
 install-sbinPROGRAMS: $(sbin_PROGRAMS)
490 490
 	@$(NORMAL_INSTALL)
491
+	test -z "$(sbindir)" || $(MKDIR_P) "$(DESTDIR)$(sbindir)"
491 492
 	@list='$(sbin_PROGRAMS)'; test -n "$(sbindir)" || list=; \
492
-	if test -n "$$list"; then \
493
-	  echo " $(MKDIR_P) '$(DESTDIR)$(sbindir)'"; \
494
-	  $(MKDIR_P) "$(DESTDIR)$(sbindir)" || exit 1; \
495
-	fi; \
496 493
 	for p in $$list; do echo "$$p $$p"; done | \
497 494
 	sed 's/$(EXEEXT)$$//' | \
498 495
 	while read p p1; do if test -f $$p || test -f $$p1; \
... ...
@@ -652,18 +627,11 @@ clean-libtool:
652 652
 	-rm -rf .libs _libs
653 653
 install-man8: $(man_MANS)
654 654
 	@$(NORMAL_INSTALL)
655
-	@list1=''; \
656
-	list2='$(man_MANS)'; \
657
-	test -n "$(man8dir)" \
658
-	  && test -n "`echo $$list1$$list2`" \
659
-	  || exit 0; \
660
-	echo " $(MKDIR_P) '$(DESTDIR)$(man8dir)'"; \
661
-	$(MKDIR_P) "$(DESTDIR)$(man8dir)" || exit 1; \
662
-	{ for i in $$list1; do echo "$$i"; done;  \
663
-	if test -n "$$list2"; then \
664
-	  for i in $$list2; do echo "$$i"; done \
665
-	    | sed -n '/\.8[a-z]*$$/p'; \
666
-	fi; \
655
+	test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)"
656
+	@list=''; test -n "$(man8dir)" || exit 0; \
657
+	{ for i in $$list; do echo "$$i"; done; \
658
+	l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
659
+	  sed -n '/\.8[a-z]*$$/p'; \
667 660
 	} | while read p; do \
668 661
 	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
669 662
 	  echo "$$d$$p"; echo "$$p"; \
... ...
@@ -1,4 +1,4 @@
1
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
1
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
2 2
 # @configure_input@
3 3
 
4 4
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
... ...
@@ -16,23 +16,6 @@
16 16
 @SET_MAKE@
17 17
 
18 18
 VPATH = @srcdir@
19
-am__make_dryrun = \
20
-  { \
21
-    am__dry=no; \
22
-    case $$MAKEFLAGS in \
23
-      *\\[\ \	]*) \
24
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
25
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
26
-      *) \
27
-        for am__flg in $$MAKEFLAGS; do \
28
-          case $$am__flg in \
29
-            *=*|--*) ;; \
30
-            *n*) am__dry=yes; break;; \
31
-          esac; \
32
-        done;; \
33
-    esac; \
34
-    test $$am__dry = yes; \
35
-  }
36 19
 pkgdatadir = $(datadir)/@PACKAGE@
37 20
 pkgincludedir = $(includedir)/@PACKAGE@
38 21
 pkglibdir = $(libdir)/@PACKAGE@
... ...
@@ -165,11 +148,6 @@ am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
165 165
 am__v_GEN_0 = @echo "  GEN   " $@;
166 166
 SOURCES = $(clambc_SOURCES)
167 167
 DIST_SOURCES = $(clambc_SOURCES)
168
-am__can_run_installinfo = \
169
-  case $$AM_UPDATE_INFO_DIR in \
170
-    n|no|NO) false;; \
171
-    *) (install-info --version) >/dev/null 2>&1;; \
172
-  esac
173 168
 ETAGS = etags
174 169
 CTAGS = ctags
175 170
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
... ...
@@ -413,11 +391,8 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
413 413
 $(am__aclocal_m4_deps):
414 414
 install-binPROGRAMS: $(bin_PROGRAMS)
415 415
 	@$(NORMAL_INSTALL)
416
+	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
416 417
 	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
417
-	if test -n "$$list"; then \
418
-	  echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
419
-	  $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
420
-	fi; \
421 418
 	for p in $$list; do echo "$$p $$p"; done | \
422 419
 	sed 's/$(EXEEXT)$$//' | \
423 420
 	while read p p1; do if test -f $$p || test -f $$p1; \
... ...
@@ -1,4 +1,4 @@
1
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
1
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
2 2
 # @configure_input@
3 3
 
4 4
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
... ...
@@ -34,23 +34,6 @@
34 34
 #  MA 02110-1301, USA.
35 35
 
36 36
 VPATH = @srcdir@
37
-am__make_dryrun = \
38
-  { \
39
-    am__dry=no; \
40
-    case $$MAKEFLAGS in \
41
-      *\\[\ \	]*) \
42
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
43
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
44
-      *) \
45
-        for am__flg in $$MAKEFLAGS; do \
46
-          case $$am__flg in \
47
-            *=*|--*) ;; \
48
-            *n*) am__dry=yes; break;; \
49
-          esac; \
50
-        done;; \
51
-    esac; \
52
-    test $$am__dry = yes; \
53
-  }
54 37
 pkgdatadir = $(datadir)/@PACKAGE@
55 38
 pkgincludedir = $(includedir)/@PACKAGE@
56 39
 pkglibdir = $(libdir)/@PACKAGE@
... ...
@@ -183,11 +166,6 @@ am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
183 183
 am__v_GEN_0 = @echo "  GEN   " $@;
184 184
 SOURCES = $(clamconf_SOURCES)
185 185
 DIST_SOURCES = $(clamconf_SOURCES)
186
-am__can_run_installinfo = \
187
-  case $$AM_UPDATE_INFO_DIR in \
188
-    n|no|NO) false;; \
189
-    *) (install-info --version) >/dev/null 2>&1;; \
190
-  esac
191 186
 ETAGS = etags
192 187
 CTAGS = ctags
193 188
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
... ...
@@ -436,11 +414,8 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
436 436
 $(am__aclocal_m4_deps):
437 437
 install-binPROGRAMS: $(bin_PROGRAMS)
438 438
 	@$(NORMAL_INSTALL)
439
+	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
439 440
 	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
440
-	if test -n "$$list"; then \
441
-	  echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
442
-	  $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
443
-	fi; \
444 441
 	for p in $$list; do echo "$$p $$p"; done | \
445 442
 	sed 's/$(EXEEXT)$$//' | \
446 443
 	while read p p1; do if test -f $$p || test -f $$p1; \
... ...
@@ -1,4 +1,4 @@
1
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
1
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
2 2
 # @configure_input@
3 3
 
4 4
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
... ...
@@ -34,23 +34,6 @@
34 34
 #  MA 02110-1301, USA.
35 35
 
36 36
 VPATH = @srcdir@
37
-am__make_dryrun = \
38
-  { \
39
-    am__dry=no; \
40
-    case $$MAKEFLAGS in \
41
-      *\\[\ \	]*) \
42
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
43
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
44
-      *) \
45
-        for am__flg in $$MAKEFLAGS; do \
46
-          case $$am__flg in \
47
-            *=*|--*) ;; \
48
-            *n*) am__dry=yes; break;; \
49
-          esac; \
50
-        done;; \
51
-    esac; \
52
-    test $$am__dry = yes; \
53
-  }
54 37
 pkgdatadir = $(datadir)/@PACKAGE@
55 38
 pkgincludedir = $(includedir)/@PACKAGE@
56 39
 pkglibdir = $(libdir)/@PACKAGE@
... ...
@@ -196,11 +179,6 @@ am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
196 196
 am__v_GEN_0 = @echo "  GEN   " $@;
197 197
 SOURCES = $(clamd_SOURCES)
198 198
 DIST_SOURCES = $(am__clamd_SOURCES_DIST)
199
-am__can_run_installinfo = \
200
-  case $$AM_UPDATE_INFO_DIR in \
201
-    n|no|NO) false;; \
202
-    *) (install-info --version) >/dev/null 2>&1;; \
203
-  esac
204 199
 ETAGS = etags
205 200
 CTAGS = ctags
206 201
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
... ...
@@ -467,11 +445,8 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
467 467
 $(am__aclocal_m4_deps):
468 468
 install-sbinPROGRAMS: $(sbin_PROGRAMS)
469 469
 	@$(NORMAL_INSTALL)
470
+	test -z "$(sbindir)" || $(MKDIR_P) "$(DESTDIR)$(sbindir)"
470 471
 	@list='$(sbin_PROGRAMS)'; test -n "$(sbindir)" || list=; \
471
-	if test -n "$$list"; then \
472
-	  echo " $(MKDIR_P) '$(DESTDIR)$(sbindir)'"; \
473
-	  $(MKDIR_P) "$(DESTDIR)$(sbindir)" || exit 1; \
474
-	fi; \
475 472
 	for p in $$list; do echo "$$p $$p"; done | \
476 473
 	sed 's/$(EXEEXT)$$//' | \
477 474
 	while read p p1; do if test -f $$p || test -f $$p1; \
... ...
@@ -1,4 +1,4 @@
1
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
1
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
2 2
 # @configure_input@
3 3
 
4 4
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
... ...
@@ -34,23 +34,6 @@
34 34
 #  MA 02110-1301, USA.
35 35
 
36 36
 VPATH = @srcdir@
37
-am__make_dryrun = \
38
-  { \
39
-    am__dry=no; \
40
-    case $$MAKEFLAGS in \
41
-      *\\[\ \	]*) \
42
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
43
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
44
-      *) \
45
-        for am__flg in $$MAKEFLAGS; do \
46
-          case $$am__flg in \
47
-            *=*|--*) ;; \
48
-            *n*) am__dry=yes; break;; \
49
-          esac; \
50
-        done;; \
51
-    esac; \
52
-    test $$am__dry = yes; \
53
-  }
54 37
 pkgdatadir = $(datadir)/@PACKAGE@
55 38
 pkgincludedir = $(includedir)/@PACKAGE@
56 39
 pkglibdir = $(libdir)/@PACKAGE@
... ...
@@ -194,11 +177,6 @@ am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
194 194
 am__v_GEN_0 = @echo "  GEN   " $@;
195 195
 SOURCES = $(clamdscan_SOURCES)
196 196
 DIST_SOURCES = $(am__clamdscan_SOURCES_DIST)
197
-am__can_run_installinfo = \
198
-  case $$AM_UPDATE_INFO_DIR in \
199
-    n|no|NO) false;; \
200
-    *) (install-info --version) >/dev/null 2>&1;; \
201
-  esac
202 197
 ETAGS = etags
203 198
 CTAGS = ctags
204 199
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
... ...
@@ -453,11 +431,8 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
453 453
 $(am__aclocal_m4_deps):
454 454
 install-binPROGRAMS: $(bin_PROGRAMS)
455 455
 	@$(NORMAL_INSTALL)
456
+	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
456 457
 	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
457
-	if test -n "$$list"; then \
458
-	  echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
459
-	  $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
460
-	fi; \
461 458
 	for p in $$list; do echo "$$p $$p"; done | \
462 459
 	sed 's/$(EXEEXT)$$//' | \
463 460
 	while read p p1; do if test -f $$p || test -f $$p1; \
... ...
@@ -1,4 +1,4 @@
1
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
1
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
2 2
 # @configure_input@
3 3
 
4 4
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
... ...
@@ -16,23 +16,6 @@
16 16
 @SET_MAKE@
17 17
 
18 18
 VPATH = @srcdir@
19
-am__make_dryrun = \
20
-  { \
21
-    am__dry=no; \
22
-    case $$MAKEFLAGS in \
23
-      *\\[\ \	]*) \
24
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
25
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
26
-      *) \
27
-        for am__flg in $$MAKEFLAGS; do \
28
-          case $$am__flg in \
29
-            *=*|--*) ;; \
30
-            *n*) am__dry=yes; break;; \
31
-          esac; \
32
-        done;; \
33
-    esac; \
34
-    test $$am__dry = yes; \
35
-  }
36 19
 pkgdatadir = $(datadir)/@PACKAGE@
37 20
 pkgincludedir = $(includedir)/@PACKAGE@
38 21
 pkglibdir = $(libdir)/@PACKAGE@
... ...
@@ -170,11 +153,6 @@ am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
170 170
 am__v_GEN_0 = @echo "  GEN   " $@;
171 171
 SOURCES = $(clamdtop_SOURCES)
172 172
 DIST_SOURCES = $(am__clamdtop_SOURCES_DIST)
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 173
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
179 174
 am__vpath_adj = case $$p in \
180 175
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
... ...
@@ -450,11 +428,8 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
450 450
 $(am__aclocal_m4_deps):
451 451
 install-binPROGRAMS: $(bin_PROGRAMS)
452 452
 	@$(NORMAL_INSTALL)
453
+	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
453 454
 	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
454
-	if test -n "$$list"; then \
455
-	  echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
456
-	  $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
457
-	fi; \
458 455
 	for p in $$list; do echo "$$p $$p"; done | \
459 456
 	sed 's/$(EXEEXT)$$//' | \
460 457
 	while read p p1; do if test -f $$p || test -f $$p1; \
... ...
@@ -595,18 +570,11 @@ clean-libtool:
595 595
 	-rm -rf .libs _libs
596 596
 install-man1: $(man_MANS)
597 597
 	@$(NORMAL_INSTALL)
598
-	@list1=''; \
599
-	list2='$(man_MANS)'; \
600
-	test -n "$(man1dir)" \
601
-	  && test -n "`echo $$list1$$list2`" \
602
-	  || exit 0; \
603
-	echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \
604
-	$(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \
605
-	{ for i in $$list1; do echo "$$i"; done;  \
606
-	if test -n "$$list2"; then \
607
-	  for i in $$list2; do echo "$$i"; done \
608
-	    | sed -n '/\.1[a-z]*$$/p'; \
609
-	fi; \
598
+	test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
599
+	@list=''; test -n "$(man1dir)" || exit 0; \
600
+	{ for i in $$list; do echo "$$i"; done; \
601
+	l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
602
+	  sed -n '/\.1[a-z]*$$/p'; \
610 603
 	} | while read p; do \
611 604
 	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
612 605
 	  echo "$$d$$p"; echo "$$p"; \
... ...
@@ -1,4 +1,4 @@
1
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
1
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
2 2
 # @configure_input@
3 3
 
4 4
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
... ...
@@ -35,23 +35,6 @@
35 35
 #  MA 02110-1301, USA.
36 36
 
37 37
 VPATH = @srcdir@
38
-am__make_dryrun = \
39
-  { \
40
-    am__dry=no; \
41
-    case $$MAKEFLAGS in \
42
-      *\\[\ \	]*) \
43
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
44
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
45
-      *) \
46
-        for am__flg in $$MAKEFLAGS; do \
47
-          case $$am__flg in \
48
-            *=*|--*) ;; \
49
-            *n*) am__dry=yes; break;; \
50
-          esac; \
51
-        done;; \
52
-    esac; \
53
-    test $$am__dry = yes; \
54
-  }
55 38
 pkgdatadir = $(datadir)/@PACKAGE@
56 39
 pkgincludedir = $(includedir)/@PACKAGE@
57 40
 pkglibdir = $(libdir)/@PACKAGE@
... ...
@@ -185,11 +168,6 @@ am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
185 185
 am__v_GEN_0 = @echo "  GEN   " $@;
186 186
 SOURCES = $(clamscan_SOURCES)
187 187
 DIST_SOURCES = $(clamscan_SOURCES)
188
-am__can_run_installinfo = \
189
-  case $$AM_UPDATE_INFO_DIR in \
190
-    n|no|NO) false;; \
191
-    *) (install-info --version) >/dev/null 2>&1;; \
192
-  esac
193 188
 ETAGS = etags
194 189
 CTAGS = ctags
195 190
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
... ...
@@ -440,11 +418,8 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
440 440
 $(am__aclocal_m4_deps):
441 441
 install-binPROGRAMS: $(bin_PROGRAMS)
442 442
 	@$(NORMAL_INSTALL)
443
+	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
443 444
 	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
444
-	if test -n "$$list"; then \
445
-	  echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
446
-	  $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
447
-	fi; \
448 445
 	for p in $$list; do echo "$$p $$p"; done | \
449 446
 	sed 's/$(EXEEXT)$$//' | \
450 447
 	while read p p1; do if test -f $$p || test -f $$p1; \
... ...
@@ -1,4 +1,4 @@
1
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
1
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
2 2
 # @configure_input@
3 3
 
4 4
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
... ...
@@ -34,23 +34,6 @@
34 34
 #  MA 02110-1301, USA.
35 35
 
36 36
 VPATH = @srcdir@
37
-am__make_dryrun = \
38
-  { \
39
-    am__dry=no; \
40
-    case $$MAKEFLAGS in \
41
-      *\\[\ \	]*) \
42
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
43
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
44
-      *) \
45
-        for am__flg in $$MAKEFLAGS; do \
46
-          case $$am__flg in \
47
-            *=*|--*) ;; \
48
-            *n*) am__dry=yes; break;; \
49
-          esac; \
50
-        done;; \
51
-    esac; \
52
-    test $$am__dry = yes; \
53
-  }
54 37
 pkgdatadir = $(datadir)/@PACKAGE@
55 38
 pkgincludedir = $(includedir)/@PACKAGE@
56 39
 pkglibdir = $(libdir)/@PACKAGE@
... ...
@@ -183,11 +166,6 @@ am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
183 183
 am__v_GEN_0 = @echo "  GEN   " $@;
184 184
 SOURCES = $(clamsubmit_SOURCES)
185 185
 DIST_SOURCES = $(clamsubmit_SOURCES)
186
-am__can_run_installinfo = \
187
-  case $$AM_UPDATE_INFO_DIR in \
188
-    n|no|NO) false;; \
189
-    *) (install-info --version) >/dev/null 2>&1;; \
190
-  esac
191 186
 ETAGS = etags
192 187
 CTAGS = ctags
193 188
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
... ...
@@ -434,11 +412,8 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
434 434
 $(am__aclocal_m4_deps):
435 435
 install-binPROGRAMS: $(bin_PROGRAMS)
436 436
 	@$(NORMAL_INSTALL)
437
+	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
437 438
 	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
438
-	if test -n "$$list"; then \
439
-	  echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
440
-	  $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
441
-	fi; \
442 439
 	for p in $$list; do echo "$$p $$p"; done | \
443 440
 	sed 's/$(EXEEXT)$$//' | \
444 441
 	while read p p1; do if test -f $$p || test -f $$p1; \
... ...
@@ -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'"
... ...
@@ -1382,6 +1362,8 @@ target=$target_alias
1382 1382
 if test "x$host_alias" != x; then
1383 1383
   if test "x$build_alias" = x; then
1384 1384
     cross_compiling=maybe
1385
+    $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
1386
+    If a cross compiler is detected then cross compile mode will be used" >&2
1385 1387
   elif test "x$build_alias" != "x$host_alias"; then
1386 1388
     cross_compiling=yes
1387 1389
   fi
... ...
@@ -1703,9 +1685,9 @@ test -n "$ac_init_help" && exit $ac_status
1703 1703
 if $ac_init_version; then
1704 1704
   cat <<\_ACEOF
1705 1705
 ClamAV configure devel
1706
-generated by GNU Autoconf 2.69
1706
+generated by GNU Autoconf 2.68
1707 1707
 
1708
-Copyright (C) 2012 Free Software Foundation, Inc.
1708
+Copyright (C) 2010 Free Software Foundation, Inc.
1709 1709
 This configure script is free software; the Free Software Foundation
1710 1710
 gives unlimited permission to copy, distribute and modify it.
1711 1711
 _ACEOF
... ...
@@ -1781,7 +1763,7 @@ $as_echo "$ac_try_echo"; } >&5
1781 1781
 	 test ! -s conftest.err
1782 1782
        } && test -s conftest$ac_exeext && {
1783 1783
 	 test "$cross_compiling" = yes ||
1784
-	 test -x conftest$ac_exeext
1784
+	 $as_test_x conftest$ac_exeext
1785 1785
        }; then :
1786 1786
   ac_retval=0
1787 1787
 else
... ...
@@ -2172,7 +2154,7 @@ This file contains any messages produced by compilers while
2172 2172
 running configure, to aid debugging if configure makes a mistake.
2173 2173
 
2174 2174
 It was created by ClamAV $as_me devel, which was
2175
-generated by GNU Autoconf 2.69.  Invocation command line was
2175
+generated by GNU Autoconf 2.68.  Invocation command line was
2176 2176
 
2177 2177
   $ $0 $@
2178 2178
 
... ...
@@ -2893,7 +2875,7 @@ case $as_dir/ in #((
2893 2893
     # by default.
2894 2894
     for ac_prog in ginstall scoinst install; do
2895 2895
       for ac_exec_ext in '' $ac_executable_extensions; do
2896
-	if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
2896
+	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
2897 2897
 	  if test $ac_prog = install &&
2898 2898
 	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
2899 2899
 	    # AIX install.  It has an incompatible calling convention.
... ...
@@ -3062,7 +3044,7 @@ do
3062 3062
   IFS=$as_save_IFS
3063 3063
   test -z "$as_dir" && as_dir=.
3064 3064
     for ac_exec_ext in '' $ac_executable_extensions; do
3065
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
3065
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
3066 3066
     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
3067 3067
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
3068 3068
     break 2
... ...
@@ -3102,7 +3084,7 @@ do
3102 3102
   IFS=$as_save_IFS
3103 3103
   test -z "$as_dir" && as_dir=.
3104 3104
     for ac_exec_ext in '' $ac_executable_extensions; do
3105
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
3105
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
3106 3106
     ac_cv_prog_ac_ct_STRIP="strip"
3107 3107
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
3108 3108
     break 2
... ...
@@ -3153,7 +3135,7 @@ do
3153 3153
   test -z "$as_dir" && as_dir=.
3154 3154
     for ac_prog in mkdir gmkdir; do
3155 3155
 	 for ac_exec_ext in '' $ac_executable_extensions; do
3156
-	   as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue
3156
+	   { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
3157 3157
 	   case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
3158 3158
 	     'mkdir (GNU coreutils) '* | \
3159 3159
 	     'mkdir (coreutils) '* | \
... ...
@@ -3206,7 +3188,7 @@ do
3206 3206
   IFS=$as_save_IFS
3207 3207
   test -z "$as_dir" && as_dir=.
3208 3208
     for ac_exec_ext in '' $ac_executable_extensions; do
3209
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
3209
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
3210 3210
     ac_cv_prog_AWK="$ac_prog"
3211 3211
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
3212 3212
     break 2
... ...
@@ -3666,7 +3648,7 @@ do
3666 3666
   IFS=$as_save_IFS
3667 3667
   test -z "$as_dir" && as_dir=.
3668 3668
     for ac_exec_ext in '' $ac_executable_extensions; do
3669
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
3669
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
3670 3670
     ac_cv_prog_CC="${ac_tool_prefix}gcc"
3671 3671
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
3672 3672
     break 2
... ...
@@ -3706,7 +3688,7 @@ do
3706 3706
   IFS=$as_save_IFS
3707 3707
   test -z "$as_dir" && as_dir=.
3708 3708
     for ac_exec_ext in '' $ac_executable_extensions; do
3709
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
3709
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
3710 3710
     ac_cv_prog_ac_ct_CC="gcc"
3711 3711
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
3712 3712
     break 2
... ...
@@ -3759,7 +3741,7 @@ do
3759 3759
   IFS=$as_save_IFS
3760 3760
   test -z "$as_dir" && as_dir=.
3761 3761
     for ac_exec_ext in '' $ac_executable_extensions; do
3762
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
3762
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
3763 3763
     ac_cv_prog_CC="${ac_tool_prefix}cc"
3764 3764
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
3765 3765
     break 2
... ...
@@ -3800,7 +3782,7 @@ do
3800 3800
   IFS=$as_save_IFS
3801 3801
   test -z "$as_dir" && as_dir=.
3802 3802
     for ac_exec_ext in '' $ac_executable_extensions; do
3803
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
3803
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
3804 3804
     if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
3805 3805
        ac_prog_rejected=yes
3806 3806
        continue
... ...
@@ -3858,7 +3840,7 @@ do
3858 3858
   IFS=$as_save_IFS
3859 3859
   test -z "$as_dir" && as_dir=.
3860 3860
     for ac_exec_ext in '' $ac_executable_extensions; do
3861
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
3861
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
3862 3862
     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
3863 3863
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
3864 3864
     break 2
... ...
@@ -3902,7 +3884,7 @@ do
3902 3902
   IFS=$as_save_IFS
3903 3903
   test -z "$as_dir" && as_dir=.
3904 3904
     for ac_exec_ext in '' $ac_executable_extensions; do
3905
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
3905
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
3906 3906
     ac_cv_prog_ac_ct_CC="$ac_prog"
3907 3907
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
3908 3908
     break 2
... ...
@@ -4348,7 +4330,8 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
4348 4348
 /* end confdefs.h.  */
4349 4349
 #include <stdarg.h>
4350 4350
 #include <stdio.h>
4351
-struct stat;
4351
+#include <sys/types.h>
4352
+#include <sys/stat.h>
4352 4353
 /* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
4353 4354
 struct buf { int x; };
4354 4355
 FILE * (*rcsopen) (struct buf *, struct stat *, int);
... ...
@@ -4583,7 +4566,7 @@ do
4583 4583
     for ac_prog in sed gsed; do
4584 4584
     for ac_exec_ext in '' $ac_executable_extensions; do
4585 4585
       ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
4586
-      as_fn_executable_p "$ac_path_SED" || continue
4586
+      { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
4587 4587
 # Check for GNU ac_path_SED and select it if it is found.
4588 4588
   # Check for GNU $ac_path_SED
4589 4589
 case `"$ac_path_SED" --version 2>&1` in
... ...
@@ -4659,7 +4642,7 @@ do
4659 4659
     for ac_prog in grep ggrep; do
4660 4660
     for ac_exec_ext in '' $ac_executable_extensions; do
4661 4661
       ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
4662
-      as_fn_executable_p "$ac_path_GREP" || continue
4662
+      { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
4663 4663
 # Check for GNU ac_path_GREP and select it if it is found.
4664 4664
   # Check for GNU $ac_path_GREP
4665 4665
 case `"$ac_path_GREP" --version 2>&1` in
... ...
@@ -4725,7 +4708,7 @@ do
4725 4725
     for ac_prog in egrep; do
4726 4726
     for ac_exec_ext in '' $ac_executable_extensions; do
4727 4727
       ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
4728
-      as_fn_executable_p "$ac_path_EGREP" || continue
4728
+      { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
4729 4729
 # Check for GNU ac_path_EGREP and select it if it is found.
4730 4730
   # Check for GNU $ac_path_EGREP
4731 4731
 case `"$ac_path_EGREP" --version 2>&1` in
... ...
@@ -4792,7 +4775,7 @@ do
4792 4792
     for ac_prog in fgrep; do
4793 4793
     for ac_exec_ext in '' $ac_executable_extensions; do
4794 4794
       ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
4795
-      as_fn_executable_p "$ac_path_FGREP" || continue
4795
+      { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue
4796 4796
 # Check for GNU ac_path_FGREP and select it if it is found.
4797 4797
   # Check for GNU $ac_path_FGREP
4798 4798
 case `"$ac_path_FGREP" --version 2>&1` in
... ...
@@ -5048,7 +5031,7 @@ do
5048 5048
   IFS=$as_save_IFS
5049 5049
   test -z "$as_dir" && as_dir=.
5050 5050
     for ac_exec_ext in '' $ac_executable_extensions; do
5051
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
5051
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
5052 5052
     ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog"
5053 5053
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
5054 5054
     break 2
... ...
@@ -5092,7 +5075,7 @@ do
5092 5092
   IFS=$as_save_IFS
5093 5093
   test -z "$as_dir" && as_dir=.
5094 5094
     for ac_exec_ext in '' $ac_executable_extensions; do
5095
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
5095
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
5096 5096
     ac_cv_prog_ac_ct_DUMPBIN="$ac_prog"
5097 5097
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
5098 5098
     break 2
... ...
@@ -5517,7 +5500,7 @@ do
5517 5517
   IFS=$as_save_IFS
5518 5518
   test -z "$as_dir" && as_dir=.
5519 5519
     for ac_exec_ext in '' $ac_executable_extensions; do
5520
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
5520
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
5521 5521
     ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
5522 5522
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
5523 5523
     break 2
... ...
@@ -5557,7 +5540,7 @@ do
5557 5557
   IFS=$as_save_IFS
5558 5558
   test -z "$as_dir" && as_dir=.
5559 5559
     for ac_exec_ext in '' $ac_executable_extensions; do
5560
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
5560
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
5561 5561
     ac_cv_prog_ac_ct_OBJDUMP="objdump"
5562 5562
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
5563 5563
     break 2
... ...
@@ -5859,7 +5842,7 @@ do
5859 5859
   IFS=$as_save_IFS
5860 5860
   test -z "$as_dir" && as_dir=.
5861 5861
     for ac_exec_ext in '' $ac_executable_extensions; do
5862
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
5862
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
5863 5863
     ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
5864 5864
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
5865 5865
     break 2
... ...
@@ -5899,7 +5882,7 @@ do
5899 5899
   IFS=$as_save_IFS
5900 5900
   test -z "$as_dir" && as_dir=.
5901 5901
     for ac_exec_ext in '' $ac_executable_extensions; do
5902
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
5902
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
5903 5903
     ac_cv_prog_ac_ct_DLLTOOL="dlltool"
5904 5904
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
5905 5905
     break 2
... ...
@@ -6003,7 +5986,7 @@ do
6003 6003
   IFS=$as_save_IFS
6004 6004
   test -z "$as_dir" && as_dir=.
6005 6005
     for ac_exec_ext in '' $ac_executable_extensions; do
6006
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
6006
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
6007 6007
     ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
6008 6008
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
6009 6009
     break 2
... ...
@@ -6047,7 +6030,7 @@ do
6047 6047
   IFS=$as_save_IFS
6048 6048
   test -z "$as_dir" && as_dir=.
6049 6049
     for ac_exec_ext in '' $ac_executable_extensions; do
6050
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
6050
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
6051 6051
     ac_cv_prog_ac_ct_AR="$ac_prog"
6052 6052
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
6053 6053
     break 2
... ...
@@ -6172,7 +6155,7 @@ do
6172 6172
   IFS=$as_save_IFS
6173 6173
   test -z "$as_dir" && as_dir=.
6174 6174
     for ac_exec_ext in '' $ac_executable_extensions; do
6175
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
6175
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
6176 6176
     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
6177 6177
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
6178 6178
     break 2
... ...
@@ -6212,7 +6195,7 @@ do
6212 6212
   IFS=$as_save_IFS
6213 6213
   test -z "$as_dir" && as_dir=.
6214 6214
     for ac_exec_ext in '' $ac_executable_extensions; do
6215
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
6215
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
6216 6216
     ac_cv_prog_ac_ct_STRIP="strip"
6217 6217
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
6218 6218
     break 2
... ...
@@ -6271,7 +6254,7 @@ do
6271 6271
   IFS=$as_save_IFS
6272 6272
   test -z "$as_dir" && as_dir=.
6273 6273
     for ac_exec_ext in '' $ac_executable_extensions; do
6274
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
6274
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
6275 6275
     ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
6276 6276
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
6277 6277
     break 2
... ...
@@ -6311,7 +6294,7 @@ do
6311 6311
   IFS=$as_save_IFS
6312 6312
   test -z "$as_dir" && as_dir=.
6313 6313
     for ac_exec_ext in '' $ac_executable_extensions; do
6314
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
6314
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
6315 6315
     ac_cv_prog_ac_ct_RANLIB="ranlib"
6316 6316
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
6317 6317
     break 2
... ...
@@ -6973,7 +6956,7 @@ do
6973 6973
   IFS=$as_save_IFS
6974 6974
   test -z "$as_dir" && as_dir=.
6975 6975
     for ac_exec_ext in '' $ac_executable_extensions; do
6976
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
6976
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
6977 6977
     ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
6978 6978
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
6979 6979
     break 2
... ...
@@ -7013,7 +6996,7 @@ do
7013 7013
   IFS=$as_save_IFS
7014 7014
   test -z "$as_dir" && as_dir=.
7015 7015
     for ac_exec_ext in '' $ac_executable_extensions; do
7016
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
7016
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7017 7017
     ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
7018 7018
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7019 7019
     break 2
... ...
@@ -7093,7 +7076,7 @@ do
7093 7093
   IFS=$as_save_IFS
7094 7094
   test -z "$as_dir" && as_dir=.
7095 7095
     for ac_exec_ext in '' $ac_executable_extensions; do
7096
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
7096
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7097 7097
     ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
7098 7098
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7099 7099
     break 2
... ...
@@ -7133,7 +7116,7 @@ do
7133 7133
   IFS=$as_save_IFS
7134 7134
   test -z "$as_dir" && as_dir=.
7135 7135
     for ac_exec_ext in '' $ac_executable_extensions; do
7136
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
7136
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7137 7137
     ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
7138 7138
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7139 7139
     break 2
... ...
@@ -7185,7 +7168,7 @@ do
7185 7185
   IFS=$as_save_IFS
7186 7186
   test -z "$as_dir" && as_dir=.
7187 7187
     for ac_exec_ext in '' $ac_executable_extensions; do
7188
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
7188
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7189 7189
     ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
7190 7190
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7191 7191
     break 2
... ...
@@ -7225,7 +7208,7 @@ do
7225 7225
   IFS=$as_save_IFS
7226 7226
   test -z "$as_dir" && as_dir=.
7227 7227
     for ac_exec_ext in '' $ac_executable_extensions; do
7228
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
7228
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7229 7229
     ac_cv_prog_ac_ct_NMEDIT="nmedit"
7230 7230
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7231 7231
     break 2
... ...
@@ -7277,7 +7260,7 @@ do
7277 7277
   IFS=$as_save_IFS
7278 7278
   test -z "$as_dir" && as_dir=.
7279 7279
     for ac_exec_ext in '' $ac_executable_extensions; do
7280
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
7280
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7281 7281
     ac_cv_prog_LIPO="${ac_tool_prefix}lipo"
7282 7282
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7283 7283
     break 2
... ...
@@ -7317,7 +7300,7 @@ do
7317 7317
   IFS=$as_save_IFS
7318 7318
   test -z "$as_dir" && as_dir=.
7319 7319
     for ac_exec_ext in '' $ac_executable_extensions; do
7320
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
7320
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7321 7321
     ac_cv_prog_ac_ct_LIPO="lipo"
7322 7322
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7323 7323
     break 2
... ...
@@ -7369,7 +7352,7 @@ do
7369 7369
   IFS=$as_save_IFS
7370 7370
   test -z "$as_dir" && as_dir=.
7371 7371
     for ac_exec_ext in '' $ac_executable_extensions; do
7372
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
7372
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7373 7373
     ac_cv_prog_OTOOL="${ac_tool_prefix}otool"
7374 7374
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7375 7375
     break 2
... ...
@@ -7409,7 +7392,7 @@ do
7409 7409
   IFS=$as_save_IFS
7410 7410
   test -z "$as_dir" && as_dir=.
7411 7411
     for ac_exec_ext in '' $ac_executable_extensions; do
7412
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
7412
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7413 7413
     ac_cv_prog_ac_ct_OTOOL="otool"
7414 7414
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7415 7415
     break 2
... ...
@@ -7461,7 +7444,7 @@ do
7461 7461
   IFS=$as_save_IFS
7462 7462
   test -z "$as_dir" && as_dir=.
7463 7463
     for ac_exec_ext in '' $ac_executable_extensions; do
7464
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
7464
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7465 7465
     ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64"
7466 7466
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7467 7467
     break 2
... ...
@@ -7501,7 +7484,7 @@ do
7501 7501
   IFS=$as_save_IFS
7502 7502
   test -z "$as_dir" && as_dir=.
7503 7503
     for ac_exec_ext in '' $ac_executable_extensions; do
7504
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
7504
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7505 7505
     ac_cv_prog_ac_ct_OTOOL64="otool64"
7506 7506
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7507 7507
     break 2
... ...
@@ -13084,7 +13067,7 @@ do
13084 13084
   IFS=$as_save_IFS
13085 13085
   test -z "$as_dir" && as_dir=.
13086 13086
     for ac_exec_ext in '' $ac_executable_extensions; do
13087
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
13087
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
13088 13088
     ac_cv_prog_CC="${ac_tool_prefix}gcc"
13089 13089
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
13090 13090
     break 2
... ...
@@ -13124,7 +13107,7 @@ do
13124 13124
   IFS=$as_save_IFS
13125 13125
   test -z "$as_dir" && as_dir=.
13126 13126
     for ac_exec_ext in '' $ac_executable_extensions; do
13127
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
13127
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
13128 13128
     ac_cv_prog_ac_ct_CC="gcc"
13129 13129
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
13130 13130
     break 2
... ...
@@ -13177,7 +13160,7 @@ do
13177 13177
   IFS=$as_save_IFS
13178 13178
   test -z "$as_dir" && as_dir=.
13179 13179
     for ac_exec_ext in '' $ac_executable_extensions; do
13180
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
13180
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
13181 13181
     ac_cv_prog_CC="${ac_tool_prefix}cc"
13182 13182
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
13183 13183
     break 2
... ...
@@ -13218,7 +13201,7 @@ do
13218 13218
   IFS=$as_save_IFS
13219 13219
   test -z "$as_dir" && as_dir=.
13220 13220
     for ac_exec_ext in '' $ac_executable_extensions; do
13221
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
13221
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
13222 13222
     if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
13223 13223
        ac_prog_rejected=yes
13224 13224
        continue
... ...
@@ -13276,7 +13259,7 @@ do
13276 13276
   IFS=$as_save_IFS
13277 13277
   test -z "$as_dir" && as_dir=.
13278 13278
     for ac_exec_ext in '' $ac_executable_extensions; do
13279
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
13279
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
13280 13280
     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
13281 13281
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
13282 13282
     break 2
... ...
@@ -13320,7 +13303,7 @@ do
13320 13320
   IFS=$as_save_IFS
13321 13321
   test -z "$as_dir" && as_dir=.
13322 13322
     for ac_exec_ext in '' $ac_executable_extensions; do
13323
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
13323
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
13324 13324
     ac_cv_prog_ac_ct_CC="$ac_prog"
13325 13325
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
13326 13326
     break 2
... ...
@@ -13516,7 +13499,8 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
13516 13516
 /* end confdefs.h.  */
13517 13517
 #include <stdarg.h>
13518 13518
 #include <stdio.h>
13519
-struct stat;
13519
+#include <sys/types.h>
13520
+#include <sys/stat.h>
13520 13521
 /* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
13521 13522
 struct buf { int x; };
13522 13523
 FILE * (*rcsopen) (struct buf *, struct stat *, int);
... ...
@@ -14046,11 +14030,11 @@ else
14046 14046
 int
14047 14047
 main ()
14048 14048
 {
14049
-
14049
+/* FIXME: Include the comments suggested by Paul. */
14050 14050
 #ifndef __cplusplus
14051
-  /* Ultrix mips cc rejects this sort of thing.  */
14051
+  /* Ultrix mips cc rejects this.  */
14052 14052
   typedef int charset[2];
14053
-  const charset cs = { 0, 0 };
14053
+  const charset cs;
14054 14054
   /* SunOS 4.1.1 cc rejects this.  */
14055 14055
   char const *const *pcpcc;
14056 14056
   char **ppc;
... ...
@@ -14067,9 +14051,8 @@ main ()
14067 14067
   ++pcpcc;
14068 14068
   ppc = (char**) pcpcc;
14069 14069
   pcpcc = (char const *const *) ppc;
14070
-  { /* SCO 3.2v4 cc rejects this sort of thing.  */
14071
-    char tx;
14072
-    char *t = &tx;
14070
+  { /* SCO 3.2v4 cc rejects this.  */
14071
+    char *t;
14073 14072
     char const *s = 0 ? (char *) 0 : (char const *) 0;
14074 14073
 
14075 14074
     *t++ = 0;
... ...
@@ -14085,10 +14068,10 @@ main ()
14085 14085
     iptr p = 0;
14086 14086
     ++p;
14087 14087
   }
14088
-  { /* AIX XL C 1.02.0.0 rejects this sort of thing, saying
14088
+  { /* AIX XL C 1.02.0.0 rejects this saying
14089 14089
        "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
14090
-    struct s { int j; const int *ap[3]; } bx;
14091
-    struct s *b = &bx; b->j = 5;
14090
+    struct s { int j; const int *ap[3]; };
14091
+    struct s *b; b->j = 5;
14092 14092
   }
14093 14093
   { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
14094 14094
     const int foo = 10;
... ...
@@ -16317,7 +16300,7 @@ do
16317 16317
   IFS=$as_save_IFS
16318 16318
   test -z "$as_dir" && as_dir=.
16319 16319
     for ac_exec_ext in '' $ac_executable_extensions; do
16320
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
16320
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
16321 16321
     ac_cv_prog_GCOV="$ac_prog"
16322 16322
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
16323 16323
     break 2
... ...
@@ -16360,7 +16343,7 @@ do
16360 16360
   IFS=$as_save_IFS
16361 16361
   test -z "$as_dir" && as_dir=.
16362 16362
     for ac_exec_ext in '' $ac_executable_extensions; do
16363
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
16363
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
16364 16364
     ac_cv_prog_LCOV="$ac_prog"
16365 16365
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
16366 16366
     break 2
... ...
@@ -16403,7 +16386,7 @@ do
16403 16403
   IFS=$as_save_IFS
16404 16404
   test -z "$as_dir" && as_dir=.
16405 16405
     for ac_exec_ext in '' $ac_executable_extensions; do
16406
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
16406
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
16407 16407
     ac_cv_prog_GENHTML="$ac_prog"
16408 16408
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
16409 16409
     break 2
... ...
@@ -16745,41 +16728,114 @@ $as_echo_n "checking for libjson installation... " >&6; }
16745 16745
 # Check whether --with-libjson was given.
16746 16746
 if test "${with_libjson+set}" = set; then :
16747 16747
   withval=$with_libjson;
16748
-if test "$withval"; then
16748
+if test "X$withval" != "Xno"
16749
+then
16750
+  if test ! -n "$withval"
16751
+  then
16749 16752
     LIBJSON_HOME="$withval"
16753
+    have_json="yes"
16754
+  else
16755
+    LIBJSON_HOME=/usr/local
16756
+    if test -d "$LIBJSON_HOME/include/json" -o -d "$LIBJSON_HOME/include/json-c"
16757
+    then
16758
+      have_json="yes"
16759
+    else
16760
+      LIBJSON_HOME=/usr
16761
+      if test -d "$LIBJSON_HOME/include/json" -o -d "$LIBJSON_HOME/include/json-c"
16762
+      then
16763
+        have_json="yes"
16764
+      else
16765
+        have_json="no"
16766
+      fi
16767
+    fi
16768
+  fi
16750 16769
 fi
16751 16770
 
16752
-else
16753
-
16754
-LIBJSON_HOME=/usr/local
16755
-if test ! -f "$LIBJSON_HOME/include/json/json.h"
16756
-then
16757
-    LIBJSON_HOME=/usr
16758
-fi
16759 16771
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBJSON_HOME" >&5
16760 16772
 $as_echo "$LIBJSON_HOME" >&6; }
16761 16773
 
16762
-fi
16763
-
16774
+else
16764 16775
 
16765 16776
 have_json="no"
16766 16777
 
16767
-if test ! -f "$LIBJSON_HOME/include/json/json.h"
16778
+fi
16779
+
16780
+
16781
+if test "X$have_json" = "Xyes"
16768 16782
 then
16769
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: json not found." >&5
16783
+  if test -d "$LIBJSON_HOME/include/json"
16784
+  then
16785
+    JSON_INCLUDE="include/json"
16786
+  fi
16787
+  if test -d "$LIBJSON_HOME/include/json-c"
16788
+  then
16789
+    JSON_INCLUDE="include/json-c"
16790
+  fi
16791
+
16792
+  if test ! -f "$LIBJSON_HOME/$JSON_INCLUDE/json.h"
16793
+  then
16794
+      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: json not found." >&5
16770 16795
 $as_echo "$as_me: WARNING: json not found." >&2;}
16771
-else
16772
-JSON_LDFLAGS="-L$LIBJSON_HOME/lib"
16773
-JSON_LIBS="-ljson"
16774
-JSON_CPPFLAGS="-I$LIBJSON_HOME/include"
16796
+  else
16797
+    JSON_LDFLAGS="-L$LIBJSON_HOME/lib"
16798
+    JSON_LIBS="-ljson-c"
16799
+    JSON_CPPFLAGS="-I$LIBJSON_HOME/$JSON_INCLUDE"
16775 16800
 
16776
-save_LDFLAGS="$LDFLAGS"
16777
-LDFLAGS="-L$LIBJSON_HOME/lib $JSON_LIBS"
16801
+    { $as_echo "$as_me:${as_lineno-$LINENO}: JSON_CPPFLAGS is $JSON_CPPFLAGS" >&5
16802
+$as_echo "$as_me: JSON_CPPFLAGS is $JSON_CPPFLAGS" >&6;}
16778 16803
 
16779
-save_CFLAGS="$CFLAGS"
16780
-CFLAGS="$JSON_CPPFLAGS"
16804
+    save_LDFLAGS="$LDFLAGS"
16805
+    LDFLAGS="-L$LIBJSON_HOME/lib $JSON_LIBS"
16806
+
16807
+    save_CFLAGS="$CFLAGS"
16808
+    CFLAGS="$JSON_CPPFLAGS"
16809
+
16810
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for json_object_new_object in -ljson-c" >&5
16811
+$as_echo_n "checking for json_object_new_object in -ljson-c... " >&6; }
16812
+if ${ac_cv_lib_json_c_json_object_new_object+:} false; then :
16813
+  $as_echo_n "(cached) " >&6
16814
+else
16815
+  ac_check_lib_save_LIBS=$LIBS
16816
+LIBS="-ljson-c  $LIBS"
16817
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
16818
+/* end confdefs.h.  */
16781 16819
 
16782
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for json_object_new_object in -ljson" >&5
16820
+/* Override any GCC internal prototype to avoid an error.
16821
+   Use char because int might match the return type of a GCC
16822
+   builtin and then its argument prototype would still apply.  */
16823
+#ifdef __cplusplus
16824
+extern "C"
16825
+#endif
16826
+char json_object_new_object ();
16827
+int
16828
+main ()
16829
+{
16830
+return json_object_new_object ();
16831
+  ;
16832
+  return 0;
16833
+}
16834
+_ACEOF
16835
+if ac_fn_c_try_link "$LINENO"; then :
16836
+  ac_cv_lib_json_c_json_object_new_object=yes
16837
+else
16838
+  ac_cv_lib_json_c_json_object_new_object=no
16839
+fi
16840
+rm -f core conftest.err conftest.$ac_objext \
16841
+    conftest$ac_exeext conftest.$ac_ext
16842
+LIBS=$ac_check_lib_save_LIBS
16843
+fi
16844
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_json_c_json_object_new_object" >&5
16845
+$as_echo "$ac_cv_lib_json_c_json_object_new_object" >&6; }
16846
+if test "x$ac_cv_lib_json_c_json_object_new_object" = xyes; then :
16847
+  have_json="yes"
16848
+else
16849
+  have_json="no"
16850
+fi
16851
+
16852
+    if test "X$have_json" = "Xno"
16853
+    then
16854
+      JSON_LIBS="-ljson"
16855
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for json_object_new_object in -ljson" >&5
16783 16856
 $as_echo_n "checking for json_object_new_object in -ljson... " >&6; }
16784 16857
 if ${ac_cv_lib_json_json_object_new_object+:} false; then :
16785 16858
   $as_echo_n "(cached) " >&6
... ...
@@ -16818,15 +16874,18 @@ $as_echo "$ac_cv_lib_json_json_object_new_object" >&6; }
16818 16818
 if test "x$ac_cv_lib_json_json_object_new_object" = xyes; then :
16819 16819
   have_json="yes"
16820 16820
 else
16821
-  as_fn_error $? "Your libjson installation is misconfigured or missing" "$LINENO" 5
16821
+  have_json="no"
16822 16822
 fi
16823 16823
 
16824
+    fi
16824 16825
 
16825
-LDFLAGS="$save_LDFLAGS"
16826
-CFLAGS="$save_CFLAGS"
16826
+    LDFLAGS="$save_LDFLAGS"
16827
+    CFLAGS="$save_CFLAGS"
16828
+
16829
+  fi
16827 16830
 fi
16828 16831
 
16829
-if test "$have_json" = "yes"; then
16832
+if test "X$have_json" = "Xyes"; then
16830 16833
 
16831 16834
 $as_echo "#define HAVE_JSON 1" >>confdefs.h
16832 16835
 
... ...
@@ -19306,7 +19365,7 @@ do
19306 19306
   IFS=$as_save_IFS
19307 19307
   test -z "$as_dir" && as_dir=.
19308 19308
     for ac_exec_ext in '' $ac_executable_extensions; do
19309
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
19309
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
19310 19310
     ac_cv_path_GETENT="$as_dir/$ac_word$ac_exec_ext"
19311 19311
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
19312 19312
     break 2
... ...
@@ -22569,16 +22628,16 @@ if (echo >conf$$.file) 2>/dev/null; then
22569 22569
     # ... but there are two gotchas:
22570 22570
     # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
22571 22571
     # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
22572
-    # In both cases, we have to default to `cp -pR'.
22572
+    # In both cases, we have to default to `cp -p'.
22573 22573
     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
22574
-      as_ln_s='cp -pR'
22574
+      as_ln_s='cp -p'
22575 22575
   elif ln conf$$.file conf$$ 2>/dev/null; then
22576 22576
     as_ln_s=ln
22577 22577
   else
22578
-    as_ln_s='cp -pR'
22578
+    as_ln_s='cp -p'
22579 22579
   fi
22580 22580
 else
22581
-  as_ln_s='cp -pR'
22581
+  as_ln_s='cp -p'
22582 22582
 fi
22583 22583
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
22584 22584
 rmdir conf$$.dir 2>/dev/null
... ...
@@ -22638,16 +22697,28 @@ else
22638 22638
   as_mkdir_p=false
22639 22639
 fi
22640 22640
 
22641
-
22642
-# as_fn_executable_p FILE
22643
-# -----------------------
22644
-# Test if FILE is an executable regular file.
22645
-as_fn_executable_p ()
22646
-{
22647
-  test -f "$1" && test -x "$1"
22648
-} # as_fn_executable_p
22649
-as_test_x='test -x'
22650
-as_executable_p=as_fn_executable_p
22641
+if test -x / >/dev/null 2>&1; then
22642
+  as_test_x='test -x'
22643
+else
22644
+  if ls -dL / >/dev/null 2>&1; then
22645
+    as_ls_L_option=L
22646
+  else
22647
+    as_ls_L_option=
22648
+  fi
22649
+  as_test_x='
22650
+    eval sh -c '\''
22651
+      if test -d "$1"; then
22652
+	test -d "$1/.";
22653
+      else
22654
+	case $1 in #(
22655
+	-*)set "./$1";;
22656
+	esac;
22657
+	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
22658
+	???[sx]*):;;*)false;;esac;fi
22659
+    '\'' sh
22660
+  '
22661
+fi
22662
+as_executable_p=$as_test_x
22651 22663
 
22652 22664
 # Sed expression to map a string onto a valid CPP name.
22653 22665
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
... ...
@@ -22669,7 +22740,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
22669 22669
 # values after options handling.
22670 22670
 ac_log="
22671 22671
 This file was extended by ClamAV $as_me devel, which was
22672
-generated by GNU Autoconf 2.69.  Invocation command line was
22672
+generated by GNU Autoconf 2.68.  Invocation command line was
22673 22673
 
22674 22674
   CONFIG_FILES    = $CONFIG_FILES
22675 22675
   CONFIG_HEADERS  = $CONFIG_HEADERS
... ...
@@ -22736,10 +22807,10 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
22736 22736
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
22737 22737
 ac_cs_version="\\
22738 22738
 ClamAV config.status devel
22739
-configured by $0, generated by GNU Autoconf 2.69,
22739
+configured by $0, generated by GNU Autoconf 2.68,
22740 22740
   with options \\"\$ac_cs_config\\"
22741 22741
 
22742
-Copyright (C) 2012 Free Software Foundation, Inc.
22742
+Copyright (C) 2010 Free Software Foundation, Inc.
22743 22743
 This config.status script is free software; the Free Software Foundation
22744 22744
 gives unlimited permission to copy, distribute and modify it."
22745 22745
 
... ...
@@ -22830,7 +22901,7 @@ fi
22830 22830
 _ACEOF
22831 22831
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
22832 22832
 if \$ac_cs_recheck; then
22833
-  set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
22833
+  set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
22834 22834
   shift
22835 22835
   \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
22836 22836
   CONFIG_SHELL='$SHELL'
... ...
@@ -25203,16 +25274,16 @@ if (echo >conf$$.file) 2>/dev/null; then
25203 25203
     # ... but there are two gotchas:
25204 25204
     # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
25205 25205
     # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
25206
-    # In both cases, we have to default to `cp -pR'.
25206
+    # In both cases, we have to default to `cp -p'.
25207 25207
     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
25208
-      as_ln_s='cp -pR'
25208
+      as_ln_s='cp -p'
25209 25209
   elif ln conf$$.file conf$$ 2>/dev/null; then
25210 25210
     as_ln_s=ln
25211 25211
   else
25212
-    as_ln_s='cp -pR'
25212
+    as_ln_s='cp -p'
25213 25213
   fi
25214 25214
 else
25215
-  as_ln_s='cp -pR'
25215
+  as_ln_s='cp -p'
25216 25216
 fi
25217 25217
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
25218 25218
 rmdir conf$$.dir 2>/dev/null
... ...
@@ -25272,16 +25343,28 @@ else
25272 25272
   as_mkdir_p=false
25273 25273
 fi
25274 25274
 
25275
-
25276
-# as_fn_executable_p FILE
25277
-# -----------------------
25278
-# Test if FILE is an executable regular file.
25279
-as_fn_executable_p ()
25280
-{
25281
-  test -f "$1" && test -x "$1"
25282
-} # as_fn_executable_p
25283
-as_test_x='test -x'
25284
-as_executable_p=as_fn_executable_p
25275
+if test -x / >/dev/null 2>&1; then
25276
+  as_test_x='test -x'
25277
+else
25278
+  if ls -dL / >/dev/null 2>&1; then
25279
+    as_ls_L_option=L
25280
+  else
25281
+    as_ls_L_option=
25282
+  fi
25283
+  as_test_x='
25284
+    eval sh -c '\''
25285
+      if test -d "$1"; then
25286
+	test -d "$1/.";
25287
+      else
25288
+	case $1 in #(
25289
+	-*)set "./$1";;
25290
+	esac;
25291
+	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
25292
+	???[sx]*):;;*)false;;esac;fi
25293
+    '\'' sh
25294
+  '
25295
+fi
25296
+as_executable_p=$as_test_x
25285 25297
 
25286 25298
 # Sed expression to map a string onto a valid CPP name.
25287 25299
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
... ...
@@ -25303,7 +25386,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
25303 25303
 # values after options handling.
25304 25304
 ac_log="
25305 25305
 This file was extended by ClamAV $as_me devel, which was
25306
-generated by GNU Autoconf 2.69.  Invocation command line was
25306
+generated by GNU Autoconf 2.68.  Invocation command line was
25307 25307
 
25308 25308
   CONFIG_FILES    = $CONFIG_FILES
25309 25309
   CONFIG_HEADERS  = $CONFIG_HEADERS
... ...
@@ -25370,10 +25453,10 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
25370 25370
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
25371 25371
 ac_cs_version="\\
25372 25372
 ClamAV config.status devel
25373
-configured by $0, generated by GNU Autoconf 2.69,
25373
+configured by $0, generated by GNU Autoconf 2.68,
25374 25374
   with options \\"\$ac_cs_config\\"
25375 25375
 
25376
-Copyright (C) 2012 Free Software Foundation, Inc.
25376
+Copyright (C) 2010 Free Software Foundation, Inc.
25377 25377
 This config.status script is free software; the Free Software Foundation
25378 25378
 gives unlimited permission to copy, distribute and modify it."
25379 25379
 
... ...
@@ -25464,7 +25547,7 @@ fi
25464 25464
 _ACEOF
25465 25465
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
25466 25466
 if \$ac_cs_recheck; then
25467
-  set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
25467
+  set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
25468 25468
   shift
25469 25469
   \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
25470 25470
   CONFIG_SHELL='$SHELL'
... ...
@@ -1,4 +1,4 @@
1
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
1
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
2 2
 # @configure_input@
3 3
 
4 4
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
... ...
@@ -34,23 +34,6 @@
34 34
 #  along with this program; if not, write to the Free Software
35 35
 #  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
36 36
 VPATH = @srcdir@
37
-am__make_dryrun = \
38
-  { \
39
-    am__dry=no; \
40
-    case $$MAKEFLAGS in \
41
-      *\\[\ \	]*) \
42
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
43
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
44
-      *) \
45
-        for am__flg in $$MAKEFLAGS; do \
46
-          case $$am__flg in \
47
-            *=*|--*) ;; \
48
-            *n*) am__dry=yes; break;; \
49
-          esac; \
50
-        done;; \
51
-    esac; \
52
-    test $$am__dry = yes; \
53
-  }
54 37
 pkgdatadir = $(datadir)/@PACKAGE@
55 38
 pkgincludedir = $(includedir)/@PACKAGE@
56 39
 pkglibdir = $(libdir)/@PACKAGE@
... ...
@@ -153,11 +136,6 @@ am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
153 153
 am__v_at_0 = @
154 154
 SOURCES =
155 155
 DIST_SOURCES =
156
-am__can_run_installinfo = \
157
-  case $$AM_UPDATE_INFO_DIR in \
158
-    n|no|NO) false;; \
159
-    *) (install-info --version) >/dev/null 2>&1;; \
160
-  esac
161 156
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
162 157
 ACLOCAL = @ACLOCAL@
163 158
 AMTAR = @AMTAR@
... ...
@@ -1,4 +1,4 @@
1
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
1
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
2 2
 # @configure_input@
3 3
 
4 4
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
... ...
@@ -33,23 +33,6 @@
33 33
 #  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
34 34
 #  MA 02110-1301, USA.
35 35
 VPATH = @srcdir@
36
-am__make_dryrun = \
37
-  { \
38
-    am__dry=no; \
39
-    case $$MAKEFLAGS in \
40
-      *\\[\ \	]*) \
41
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
42
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
43
-      *) \
44
-        for am__flg in $$MAKEFLAGS; do \
45
-          case $$am__flg in \
46
-            *=*|--*) ;; \
47
-            *n*) am__dry=yes; break;; \
48
-          esac; \
49
-        done;; \
50
-    esac; \
51
-    test $$am__dry = yes; \
52
-  }
53 36
 pkgdatadir = $(datadir)/@PACKAGE@
54 37
 pkgincludedir = $(includedir)/@PACKAGE@
55 38
 pkglibdir = $(libdir)/@PACKAGE@
... ...
@@ -152,11 +135,6 @@ am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
152 152
 am__v_at_0 = @
153 153
 SOURCES =
154 154
 DIST_SOURCES =
155
-am__can_run_installinfo = \
156
-  case $$AM_UPDATE_INFO_DIR in \
157
-    n|no|NO) false;; \
158
-    *) (install-info --version) >/dev/null 2>&1;; \
159
-  esac
160 155
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
161 156
 am__vpath_adj = case $$p in \
162 157
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
... ...
@@ -427,18 +405,11 @@ clean-libtool:
427 427
 	-rm -rf .libs _libs
428 428
 install-man1: $(man_MANS)
429 429
 	@$(NORMAL_INSTALL)
430
-	@list1=''; \
431
-	list2='$(man_MANS)'; \
432
-	test -n "$(man1dir)" \
433
-	  && test -n "`echo $$list1$$list2`" \
434
-	  || exit 0; \
435
-	echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \
436
-	$(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \
437
-	{ for i in $$list1; do echo "$$i"; done;  \
438
-	if test -n "$$list2"; then \
439
-	  for i in $$list2; do echo "$$i"; done \
440
-	    | sed -n '/\.1[a-z]*$$/p'; \
441
-	fi; \
430
+	test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
431
+	@list=''; test -n "$(man1dir)" || exit 0; \
432
+	{ for i in $$list; do echo "$$i"; done; \
433
+	l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
434
+	  sed -n '/\.1[a-z]*$$/p'; \
442 435
 	} | while read p; do \
443 436
 	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
444 437
 	  echo "$$d$$p"; echo "$$p"; \
... ...
@@ -470,18 +441,11 @@ uninstall-man1:
470 470
 	dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
471 471
 install-man5: $(man_MANS)
472 472
 	@$(NORMAL_INSTALL)
473
-	@list1=''; \
474
-	list2='$(man_MANS)'; \
475
-	test -n "$(man5dir)" \
476
-	  && test -n "`echo $$list1$$list2`" \
477
-	  || exit 0; \
478
-	echo " $(MKDIR_P) '$(DESTDIR)$(man5dir)'"; \
479
-	$(MKDIR_P) "$(DESTDIR)$(man5dir)" || exit 1; \
480
-	{ for i in $$list1; do echo "$$i"; done;  \
481
-	if test -n "$$list2"; then \
482
-	  for i in $$list2; do echo "$$i"; done \
483
-	    | sed -n '/\.5[a-z]*$$/p'; \
484
-	fi; \
473
+	test -z "$(man5dir)" || $(MKDIR_P) "$(DESTDIR)$(man5dir)"
474
+	@list=''; test -n "$(man5dir)" || exit 0; \
475
+	{ for i in $$list; do echo "$$i"; done; \
476
+	l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
477
+	  sed -n '/\.5[a-z]*$$/p'; \
485 478
 	} | while read p; do \
486 479
 	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
487 480
 	  echo "$$d$$p"; echo "$$p"; \
... ...
@@ -513,18 +477,11 @@ uninstall-man5:
513 513
 	dir='$(DESTDIR)$(man5dir)'; $(am__uninstall_files_from_dir)
514 514
 install-man8: $(man_MANS)
515 515
 	@$(NORMAL_INSTALL)
516
-	@list1=''; \
517
-	list2='$(man_MANS)'; \
518
-	test -n "$(man8dir)" \
519
-	  && test -n "`echo $$list1$$list2`" \
520
-	  || exit 0; \
521
-	echo " $(MKDIR_P) '$(DESTDIR)$(man8dir)'"; \
522
-	$(MKDIR_P) "$(DESTDIR)$(man8dir)" || exit 1; \
523
-	{ for i in $$list1; do echo "$$i"; done;  \
524
-	if test -n "$$list2"; then \
525
-	  for i in $$list2; do echo "$$i"; done \
526
-	    | sed -n '/\.8[a-z]*$$/p'; \
527
-	fi; \
516
+	test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)"
517
+	@list=''; test -n "$(man8dir)" || exit 0; \
518
+	{ for i in $$list; do echo "$$i"; done; \
519
+	l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
520
+	  sed -n '/\.8[a-z]*$$/p'; \
528 521
 	} | while read p; do \
529 522
 	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
530 523
 	  echo "$$d$$p"; echo "$$p"; \
... ...
@@ -1,4 +1,4 @@
1
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
1
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
2 2
 # @configure_input@
3 3
 
4 4
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
... ...
@@ -34,23 +34,6 @@
34 34
 #  MA 02110-1301, USA.
35 35
 
36 36
 VPATH = @srcdir@
37
-am__make_dryrun = \
38
-  { \
39
-    am__dry=no; \
40
-    case $$MAKEFLAGS in \
41
-      *\\[\ \	]*) \
42
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
43
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
44
-      *) \
45
-        for am__flg in $$MAKEFLAGS; do \
46
-          case $$am__flg in \
47
-            *=*|--*) ;; \
48
-            *n*) am__dry=yes; break;; \
49
-          esac; \
50
-        done;; \
51
-    esac; \
52
-    test $$am__dry = yes; \
53
-  }
54 37
 pkgdatadir = $(datadir)/@PACKAGE@
55 38
 pkgincludedir = $(includedir)/@PACKAGE@
56 39
 pkglibdir = $(libdir)/@PACKAGE@
... ...
@@ -154,11 +137,6 @@ am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
154 154
 am__v_at_0 = @
155 155
 SOURCES =
156 156
 DIST_SOURCES =
157
-am__can_run_installinfo = \
158
-  case $$AM_UPDATE_INFO_DIR in \
159
-    n|no|NO) false;; \
160
-    *) (install-info --version) >/dev/null 2>&1;; \
161
-  esac
162 157
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
163 158
 am__vpath_adj = case $$p in \
164 159
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
... ...
@@ -425,11 +403,8 @@ clean-libtool:
425 425
 	-rm -rf .libs _libs
426 426
 install-sysconfDATA: $(sysconf_DATA)
427 427
 	@$(NORMAL_INSTALL)
428
+	test -z "$(sysconfdir)" || $(MKDIR_P) "$(DESTDIR)$(sysconfdir)"
428 429
 	@list='$(sysconf_DATA)'; test -n "$(sysconfdir)" || list=; \
429
-	if test -n "$$list"; then \
430
-	  echo " $(MKDIR_P) '$(DESTDIR)$(sysconfdir)'"; \
431
-	  $(MKDIR_P) "$(DESTDIR)$(sysconfdir)" || exit 1; \
432
-	fi; \
433 430
 	for p in $$list; do \
434 431
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
435 432
 	  echo "$$d$$p"; \
... ...
@@ -1,4 +1,4 @@
1
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
1
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
2 2
 # @configure_input@
3 3
 
4 4
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
... ...
@@ -35,23 +35,6 @@
35 35
 #  MA 02110-1301, USA.
36 36
 
37 37
 VPATH = @srcdir@
38
-am__make_dryrun = \
39
-  { \
40
-    am__dry=no; \
41
-    case $$MAKEFLAGS in \
42
-      *\\[\ \	]*) \
43
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
44
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
45
-      *) \
46
-        for am__flg in $$MAKEFLAGS; do \
47
-          case $$am__flg in \
48
-            *=*|--*) ;; \
49
-            *n*) am__dry=yes; break;; \
50
-          esac; \
51
-        done;; \
52
-    esac; \
53
-    test $$am__dry = yes; \
54
-  }
55 38
 pkgdatadir = $(datadir)/@PACKAGE@
56 39
 pkgincludedir = $(includedir)/@PACKAGE@
57 40
 pkglibdir = $(libdir)/@PACKAGE@
... ...
@@ -187,11 +170,6 @@ am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
187 187
 am__v_GEN_0 = @echo "  GEN   " $@;
188 188
 SOURCES = $(freshclam_SOURCES)
189 189
 DIST_SOURCES = $(freshclam_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 190
 ETAGS = etags
196 191
 CTAGS = ctags
197 192
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
... ...
@@ -457,11 +435,8 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
457 457
 $(am__aclocal_m4_deps):
458 458
 install-binPROGRAMS: $(bin_PROGRAMS)
459 459
 	@$(NORMAL_INSTALL)
460
+	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
460 461
 	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
461
-	if test -n "$$list"; then \
462
-	  echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
463
-	  $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
464
-	fi; \
465 462
 	for p in $$list; do echo "$$p $$p"; done | \
466 463
 	sed 's/$(EXEEXT)$$//' | \
467 464
 	while read p p1; do if test -f $$p || test -f $$p1; \
... ...
@@ -142,7 +142,7 @@ libclamav_nocxx_la_CFLAGS=$(AM_CFLAGS) @SSL_CPPFLAGS@ @JSON_CPPFLAGS@
142 142
 
143 143
 libclamav_la_LIBADD = @SSL_LIBS@ @JSON_LIBS@ @LIBCLAMAV_LIBS@ @LIBLTDL@ $(IFACELIBADD) $(LLVMLIBADD) libclamav_internal_utils.la @THREAD_LIBS@ @LIBM@
144 144
 libclamav_la_DEPENDENCIES =  @LTDLDEPS@ $(IFACEDEP) $(LLVMDEP) libclamav_internal_utils.la
145
-libclamav_la_CFLAGS =$(AM_CFLAGS) $(XML_CPPFLAGS) -DSEARCH_LIBDIR=\"$(libdir)\" @LIBCLAMAV_CPPFLAGS@
145
+libclamav_la_CFLAGS =$(AM_CFLAGS) $(XML_CPPFLAGS) -DSEARCH_LIBDIR=\"$(libdir)\" @LIBCLAMAV_CPPFLAGS@ @JSON_CPPFLAGS@
146 146
 libclamav_la_LDFLAGS = @SSL_LDFLAGS@ @TH_SAFE@ @JSON_LDFLAGS@ $(XML_LIBS) -version-info @LIBCLAMAV_VERSION@ -no-undefined
147 147
 
148 148
 if VERSIONSCRIPT
... ...
@@ -435,8 +435,8 @@ libclamav_la_SOURCES = \
435 435
 	stats.h \
436 436
 	www.c \
437 437
 	www.h \
438
-	json.c \
439
-	json.h \
438
+	stats_json.c \
439
+	stats_json.h \
440 440
 	hostid.c \
441 441
 	hostid.h \
442 442
 	openioc.c \
... ...
@@ -1,4 +1,4 @@
1
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
1
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
2 2
 # @configure_input@
3 3
 
4 4
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
... ...
@@ -36,23 +36,6 @@
36 36
 
37 37
 
38 38
 VPATH = @srcdir@
39
-am__make_dryrun = \
40
-  { \
41
-    am__dry=no; \
42
-    case $$MAKEFLAGS in \
43
-      *\\[\ \	]*) \
44
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
45
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
46
-      *) \
47
-        for am__flg in $$MAKEFLAGS; do \
48
-          case $$am__flg in \
49
-            *=*|--*) ;; \
50
-            *n*) am__dry=yes; break;; \
51
-          esac; \
52
-        done;; \
53
-    esac; \
54
-    test $$am__dry = yes; \
55
-  }
56 39
 pkgdatadir = $(datadir)/@PACKAGE@
57 40
 pkgincludedir = $(includedir)/@PACKAGE@
58 41
 pkglibdir = $(libdir)/@PACKAGE@
... ...
@@ -252,7 +235,7 @@ am_libclamav_la_OBJECTS = libclamav_la-matcher-ac.lo \
252 252
 	libclamav_la-iso9660.lo libclamav_la-arc4.lo \
253 253
 	libclamav_la-rijndael.lo libclamav_la-crtmgr.lo \
254 254
 	libclamav_la-asn1.lo libclamav_la-fpu.lo libclamav_la-stats.lo \
255
-	libclamav_la-www.lo libclamav_la-json.lo \
255
+	libclamav_la-www.lo libclamav_la-stats_json.lo \
256 256
 	libclamav_la-hostid.lo libclamav_la-openioc.lo \
257 257
 	libclamav_la-fp_add.lo libclamav_la-fp_add_d.lo \
258 258
 	libclamav_la-fp_addmod.lo libclamav_la-fp_cmp.lo \
... ...
@@ -433,11 +416,6 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
433 433
 	install-pdf-recursive install-ps-recursive install-recursive \
434 434
 	installcheck-recursive installdirs-recursive pdf-recursive \
435 435
 	ps-recursive uninstall-recursive
436
-am__can_run_installinfo = \
437
-  case $$AM_UPDATE_INFO_DIR in \
438
-    n|no|NO) false;; \
439
-    *) (install-info --version) >/dev/null 2>&1;; \
440
-  esac
441 436
 HEADERS = $(include_HEADERS)
442 437
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
443 438
   distclean-recursive maintainer-clean-recursive
... ...
@@ -768,7 +746,7 @@ libclamav_nocxx_la_SOURCES = bytecode_nojit.c
768 768
 libclamav_nocxx_la_CFLAGS = $(AM_CFLAGS) @SSL_CPPFLAGS@ @JSON_CPPFLAGS@
769 769
 libclamav_la_LIBADD = @SSL_LIBS@ @JSON_LIBS@ @LIBCLAMAV_LIBS@ @LIBLTDL@ $(IFACELIBADD) $(LLVMLIBADD) libclamav_internal_utils.la @THREAD_LIBS@ @LIBM@
770 770
 libclamav_la_DEPENDENCIES = @LTDLDEPS@ $(IFACEDEP) $(LLVMDEP) libclamav_internal_utils.la
771
-libclamav_la_CFLAGS = $(AM_CFLAGS) $(XML_CPPFLAGS) -DSEARCH_LIBDIR=\"$(libdir)\" @LIBCLAMAV_CPPFLAGS@
771
+libclamav_la_CFLAGS = $(AM_CFLAGS) $(XML_CPPFLAGS) -DSEARCH_LIBDIR=\"$(libdir)\" @LIBCLAMAV_CPPFLAGS@ @JSON_CPPFLAGS@
772 772
 libclamav_la_LDFLAGS = @SSL_LDFLAGS@ @TH_SAFE@ @JSON_LDFLAGS@ \
773 773
 	$(XML_LIBS) -version-info @LIBCLAMAV_VERSION@ -no-undefined \
774 774
 	$(am__append_6)
... ...
@@ -824,11 +802,11 @@ libclamav_la_SOURCES = matcher-ac.c matcher-ac.h matcher-bm.c \
824 824
 	sf_base64decode.c sf_base64decode.h hfsplus.c hfsplus.h swf.c \
825 825
 	swf.h jpeg.c jpeg.h png.c png.h iso9660.c iso9660.h arc4.c \
826 826
 	arc4.h rijndael.c rijndael.h crtmgr.c crtmgr.h asn1.c asn1.h \
827
-	fpu.c fpu.h stats.c stats.h www.c www.h json.c json.h hostid.c \
828
-	hostid.h openioc.c openioc.h bignum.h bignum_fast.h \
829
-	tomsfastmath/addsub/fp_add.c tomsfastmath/addsub/fp_add_d.c \
830
-	tomsfastmath/addsub/fp_addmod.c tomsfastmath/addsub/fp_cmp.c \
831
-	tomsfastmath/addsub/fp_cmp_d.c \
827
+	fpu.c fpu.h stats.c stats.h www.c www.h stats_json.c \
828
+	stats_json.h hostid.c hostid.h openioc.c openioc.h bignum.h \
829
+	bignum_fast.h tomsfastmath/addsub/fp_add.c \
830
+	tomsfastmath/addsub/fp_add_d.c tomsfastmath/addsub/fp_addmod.c \
831
+	tomsfastmath/addsub/fp_cmp.c tomsfastmath/addsub/fp_cmp_d.c \
832 832
 	tomsfastmath/addsub/fp_cmp_mag.c tomsfastmath/addsub/fp_sub.c \
833 833
 	tomsfastmath/addsub/fp_sub_d.c tomsfastmath/addsub/fp_submod.c \
834 834
 	tomsfastmath/addsub/s_fp_add.c tomsfastmath/addsub/s_fp_sub.c \
... ...
@@ -932,6 +910,7 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
932 932
 $(am__aclocal_m4_deps):
933 933
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
934 934
 	@$(NORMAL_INSTALL)
935
+	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
935 936
 	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
936 937
 	list2=; for p in $$list; do \
937 938
 	  if test -f $$p; then \
... ...
@@ -939,8 +918,6 @@ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
939 939
 	  else :; fi; \
940 940
 	done; \
941 941
 	test -z "$$list2" || { \
942
-	  echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \
943
-	  $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \
944 942
 	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \
945 943
 	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \
946 944
 	}
... ...
@@ -1161,7 +1138,6 @@ distclean-compile:
1161 1161
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_la-iso9660.Plo@am__quote@
1162 1162
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_la-jpeg.Plo@am__quote@
1163 1163
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_la-js-norm.Plo@am__quote@
1164
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_la-json.Plo@am__quote@
1165 1164
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_la-json_api.Plo@am__quote@
1166 1165
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_la-line.Plo@am__quote@
1167 1166
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_la-lzma_iface.Plo@am__quote@
... ...
@@ -1207,6 +1183,7 @@ distclean-compile:
1207 1207
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_la-special.Plo@am__quote@
1208 1208
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_la-spin.Plo@am__quote@
1209 1209
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_la-stats.Plo@am__quote@
1210
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_la-stats_json.Plo@am__quote@
1210 1211
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_la-swf.Plo@am__quote@
1211 1212
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_la-table.Plo@am__quote@
1212 1213
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_la-text.Plo@am__quote@
... ...
@@ -2184,12 +2161,12 @@ libclamav_la-www.lo: www.c
2184 2184
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
2185 2185
 @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-www.lo `test -f 'www.c' || echo '$(srcdir)/'`www.c
2186 2186
 
2187
-libclamav_la-json.lo: json.c
2188
-@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-json.lo -MD -MP -MF $(DEPDIR)/libclamav_la-json.Tpo -c -o libclamav_la-json.lo `test -f 'json.c' || echo '$(srcdir)/'`json.c
2189
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libclamav_la-json.Tpo $(DEPDIR)/libclamav_la-json.Plo
2190
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='json.c' object='libclamav_la-json.lo' libtool=yes @AMDEPBACKSLASH@
2187
+libclamav_la-stats_json.lo: stats_json.c
2188
+@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-stats_json.lo -MD -MP -MF $(DEPDIR)/libclamav_la-stats_json.Tpo -c -o libclamav_la-stats_json.lo `test -f 'stats_json.c' || echo '$(srcdir)/'`stats_json.c
2189
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libclamav_la-stats_json.Tpo $(DEPDIR)/libclamav_la-stats_json.Plo
2190
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='stats_json.c' object='libclamav_la-stats_json.lo' libtool=yes @AMDEPBACKSLASH@
2191 2191
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
2192
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_la_CFLAGS) $(CFLAGS) -c -o libclamav_la-json.lo `test -f 'json.c' || echo '$(srcdir)/'`json.c
2192
+@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-stats_json.lo `test -f 'stats_json.c' || echo '$(srcdir)/'`stats_json.c
2193 2193
 
2194 2194
 libclamav_la-hostid.lo: hostid.c
2195 2195
 @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-hostid.lo -MD -MP -MF $(DEPDIR)/libclamav_la-hostid.Tpo -c -o libclamav_la-hostid.lo `test -f 'hostid.c' || echo '$(srcdir)/'`hostid.c
... ...
@@ -3003,11 +2980,8 @@ clean-libtool:
3003 3003
 	-rm -rf .libs _libs
3004 3004
 install-includeHEADERS: $(include_HEADERS)
3005 3005
 	@$(NORMAL_INSTALL)
3006
+	test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)"
3006 3007
 	@list='$(include_HEADERS)'; test -n "$(includedir)" || list=; \
3007
-	if test -n "$$list"; then \
3008
-	  echo " $(MKDIR_P) '$(DESTDIR)$(includedir)'"; \
3009
-	  $(MKDIR_P) "$(DESTDIR)$(includedir)" || exit 1; \
3010
-	fi; \
3011 3008
 	for p in $$list; do \
3012 3009
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
3013 3010
 	  echo "$$d$$p"; \
... ...
@@ -3190,10 +3164,13 @@ distdir: $(DISTFILES)
3190 3190
 	done
3191 3191
 	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
3192 3192
 	  if test "$$subdir" = .; then :; else \
3193
-	    $(am__make_dryrun) \
3194
-	      || test -d "$(distdir)/$$subdir" \
3195
-	      || $(MKDIR_P) "$(distdir)/$$subdir" \
3196
-	      || exit 1; \
3193
+	    test -d "$(distdir)/$$subdir" \
3194
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
3195
+	    || exit 1; \
3196
+	  fi; \
3197
+	done
3198
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
3199
+	  if test "$$subdir" = .; then :; else \
3197 3200
 	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
3198 3201
 	    $(am__relativize); \
3199 3202
 	    new_distdir=$$reldir; \
... ...
@@ -1,4 +1,4 @@
1
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
1
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
2 2
 # @configure_input@
3 3
 
4 4
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
... ...
@@ -32,23 +32,6 @@
32 32
 
33 33
 
34 34
 VPATH = @srcdir@
35
-am__make_dryrun = \
36
-  { \
37
-    am__dry=no; \
38
-    case $$MAKEFLAGS in \
39
-      *\\[\ \	]*) \
40
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
41
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
42
-      *) \
43
-        for am__flg in $$MAKEFLAGS; do \
44
-          case $$am__flg in \
45
-            *=*|--*) ;; \
46
-            *n*) am__dry=yes; break;; \
47
-          esac; \
48
-        done;; \
49
-    esac; \
50
-    test $$am__dry = yes; \
51
-  }
52 35
 pkgdatadir = $(datadir)/@PACKAGE@
53 36
 pkgincludedir = $(includedir)/@PACKAGE@
54 37
 pkglibdir = $(libdir)/@PACKAGE@
... ...
@@ -832,11 +815,6 @@ DIST_SOURCES = $(am__libclamavcxx_la_SOURCES_DIST) \
832 832
 	$(am__libllvmsystem_la_SOURCES_DIST) \
833 833
 	$(am__libllvmx86codegen_la_SOURCES_DIST) \
834 834
 	$(am__tblgen_SOURCES_DIST)
835
-am__can_run_installinfo = \
836
-  case $$AM_UPDATE_INFO_DIR in \
837
-    n|no|NO) false;; \
838
-    *) (install-info --version) >/dev/null 2>&1;; \
839
-  esac
840 835
 ETAGS = etags
841 836
 CTAGS = ctags
842 837
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
... ...
@@ -5565,7 +5543,7 @@ distcheck: dist
5565 5565
 	*.zip*) \
5566 5566
 	  unzip $(distdir).zip ;;\
5567 5567
 	esac
5568
-	chmod -R a-w $(distdir); chmod u+w $(distdir)
5568
+	chmod -R a-w $(distdir); chmod a+w $(distdir)
5569 5569
 	mkdir $(distdir)/_build
5570 5570
 	mkdir $(distdir)/_inst
5571 5571
 	chmod a-w $(distdir)
... ...
@@ -1,4 +1,4 @@
1
-# generated automatically by aclocal 1.11.6 -*- Autoconf -*-
1
+# generated automatically by aclocal 1.11.3 -*- Autoconf -*-
2 2
 
3 3
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
4 4
 # 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
... ...
@@ -14,8 +14,8 @@
14 14
 
15 15
 m4_ifndef([AC_AUTOCONF_VERSION],
16 16
   [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.
17
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],,
18
+[m4_warning([this file was generated for autoconf 2.68.
19 19
 You have another version of autoconf.  It may work, but is not guaranteed to.
20 20
 If you have problems, you may need to regenerate the build system entirely.
21 21
 To do so, use the procedure documented by the package, typically `autoreconf'.])])
... ...
@@ -38,7 +38,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
38 38
 [am__api_version='1.11'
39 39
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
40 40
 dnl require some minimum version.  Point them to the right macro.
41
-m4_if([$1], [1.11.6], [],
41
+m4_if([$1], [1.11.3], [],
42 42
       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
43 43
 ])
44 44
 
... ...
@@ -54,7 +54,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
54 54
 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
55 55
 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
56 56
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
57
-[AM_AUTOMAKE_VERSION([1.11.6])dnl
57
+[AM_AUTOMAKE_VERSION([1.11.3])dnl
58 58
 m4_ifndef([AC_AUTOCONF_VERSION],
59 59
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
60 60
 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
... ...
@@ -1,11 +1,13 @@
1 1
 #! /bin/sh
2 2
 # Guess values for system-dependent variables and create Makefiles.
3
-# Generated by GNU Autoconf 2.69 for libclamavc++ devel.
3
+# Generated by GNU Autoconf 2.68 for libclamavc++ devel.
4 4
 #
5 5
 # Report bugs to <http://bugs.clamav.net>.
6 6
 #
7 7
 #
8
-# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
8
+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
9
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
10
+# Foundation, Inc.
9 11
 #
10 12
 #
11 13
 # This configure script is free software; the Free Software Foundation
... ...
@@ -134,31 +136,6 @@ export LANGUAGE
134 134
 # CDPATH.
135 135
 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
136 136
 
137
-# Use a proper internal environment variable to ensure we don't fall
138
-  # into an infinite loop, continuously re-executing ourselves.
139
-  if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
140
-    _as_can_reexec=no; export _as_can_reexec;
141
-    # We cannot yet assume a decent shell, so we have to provide a
142
-# neutralization value for shells without unset; and this also
143
-# works around shells that cannot unset nonexistent variables.
144
-# Preserve -v and -x to the replacement shell.
145
-BASH_ENV=/dev/null
146
-ENV=/dev/null
147
-(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
148
-case $- in # ((((
149
-  *v*x* | *x*v* ) as_opts=-vx ;;
150
-  *v* ) as_opts=-v ;;
151
-  *x* ) as_opts=-x ;;
152
-  * ) as_opts= ;;
153
-esac
154
-exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
155
-# Admittedly, this is quite paranoid, since all the known shells bail
156
-# out after a failed `exec'.
157
-$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
158
-as_fn_exit 255
159
-  fi
160
-  # We don't want this to propagate to other subprocesses.
161
-          { _as_can_reexec=; unset _as_can_reexec;}
162 137
 if test "x$CONFIG_SHELL" = x; then
163 138
   as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
164 139
   emulate sh
... ...
@@ -192,8 +169,7 @@ if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
192 192
 else
193 193
   exitcode=1; echo positional parameters were not saved.
194 194
 fi
195
-test x\$exitcode = x0 || exit 1
196
-test -x / || exit 1"
195
+test x\$exitcode = x0 || exit 1"
197 196
   as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
198 197
   as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
199 198
   eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
... ...
@@ -246,25 +222,21 @@ IFS=$as_save_IFS
246 246
 
247 247
 
248 248
       if test "x$CONFIG_SHELL" != x; then :
249
-  export CONFIG_SHELL
250
-             # We cannot yet assume a decent shell, so we have to provide a
251
-# neutralization value for shells without unset; and this also
252
-# works around shells that cannot unset nonexistent variables.
253
-# Preserve -v and -x to the replacement shell.
254
-BASH_ENV=/dev/null
255
-ENV=/dev/null
256
-(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
257
-case $- in # ((((
258
-  *v*x* | *x*v* ) as_opts=-vx ;;
259
-  *v* ) as_opts=-v ;;
260
-  *x* ) as_opts=-x ;;
261
-  * ) as_opts= ;;
262
-esac
263
-exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
264
-# Admittedly, this is quite paranoid, since all the known shells bail
265
-# out after a failed `exec'.
266
-$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
267
-exit 255
249
+  # We cannot yet assume a decent shell, so we have to provide a
250
+	# neutralization value for shells without unset; and this also
251
+	# works around shells that cannot unset nonexistent variables.
252
+	# Preserve -v and -x to the replacement shell.
253
+	BASH_ENV=/dev/null
254
+	ENV=/dev/null
255
+	(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
256
+	export CONFIG_SHELL
257
+	case $- in # ((((
258
+	  *v*x* | *x*v* ) as_opts=-vx ;;
259
+	  *v* ) as_opts=-v ;;
260
+	  *x* ) as_opts=-x ;;
261
+	  * ) as_opts= ;;
262
+	esac
263
+	exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
268 264
 fi
269 265
 
270 266
     if test x$as_have_required = xno; then :
... ...
@@ -367,14 +339,6 @@ $as_echo X"$as_dir" |
367 367
 
368 368
 
369 369
 } # as_fn_mkdir_p
370
-
371
-# as_fn_executable_p FILE
372
-# -----------------------
373
-# Test if FILE is an executable regular file.
374
-as_fn_executable_p ()
375
-{
376
-  test -f "$1" && test -x "$1"
377
-} # as_fn_executable_p
378 370
 # as_fn_append VAR VALUE
379 371
 # ----------------------
380 372
 # Append the text in VALUE to the end of the definition contained in VAR. Take
... ...
@@ -496,10 +460,6 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits
496 496
   chmod +x "$as_me.lineno" ||
497 497
     { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
498 498
 
499
-  # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
500
-  # already done that, so ensure we don't try to do so again and fall
501
-  # in an infinite loop.  This has already happened in practice.
502
-  _as_can_reexec=no; export _as_can_reexec
503 499
   # Don't try to exec as it changes $[0], causing all sort of problems
504 500
   # (the dirname of $[0] is not the place where we might find the
505 501
   # original and so on.  Autoconf is especially sensitive to this).
... ...
@@ -534,16 +494,16 @@ if (echo >conf$$.file) 2>/dev/null; then
534 534
     # ... but there are two gotchas:
535 535
     # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
536 536
     # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
537
-    # In both cases, we have to default to `cp -pR'.
537
+    # In both cases, we have to default to `cp -p'.
538 538
     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
539
-      as_ln_s='cp -pR'
539
+      as_ln_s='cp -p'
540 540
   elif ln conf$$.file conf$$ 2>/dev/null; then
541 541
     as_ln_s=ln
542 542
   else
543
-    as_ln_s='cp -pR'
543
+    as_ln_s='cp -p'
544 544
   fi
545 545
 else
546
-  as_ln_s='cp -pR'
546
+  as_ln_s='cp -p'
547 547
 fi
548 548
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
549 549
 rmdir conf$$.dir 2>/dev/null
... ...
@@ -555,8 +515,28 @@ else
555 555
   as_mkdir_p=false
556 556
 fi
557 557
 
558
-as_test_x='test -x'
559
-as_executable_p=as_fn_executable_p
558
+if test -x / >/dev/null 2>&1; then
559
+  as_test_x='test -x'
560
+else
561
+  if ls -dL / >/dev/null 2>&1; then
562
+    as_ls_L_option=L
563
+  else
564
+    as_ls_L_option=
565
+  fi
566
+  as_test_x='
567
+    eval sh -c '\''
568
+      if test -d "$1"; then
569
+	test -d "$1/.";
570
+      else
571
+	case $1 in #(
572
+	-*)set "./$1";;
573
+	esac;
574
+	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
575
+	???[sx]*):;;*)false;;esac;fi
576
+    '\'' sh
577
+  '
578
+fi
579
+as_executable_p=$as_test_x
560 580
 
561 581
 # Sed expression to map a string onto a valid CPP name.
562 582
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
... ...
@@ -1269,6 +1249,8 @@ target=$target_alias
1269 1269
 if test "x$host_alias" != x; then
1270 1270
   if test "x$build_alias" = x; then
1271 1271
     cross_compiling=maybe
1272
+    $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
1273
+    If a cross compiler is detected then cross compile mode will be used" >&2
1272 1274
   elif test "x$build_alias" != "x$host_alias"; then
1273 1275
     cross_compiling=yes
1274 1276
   fi
... ...
@@ -1540,9 +1522,9 @@ test -n "$ac_init_help" && exit $ac_status
1540 1540
 if $ac_init_version; then
1541 1541
   cat <<\_ACEOF
1542 1542
 libclamavc++ configure devel
1543
-generated by GNU Autoconf 2.69
1543
+generated by GNU Autoconf 2.68
1544 1544
 
1545
-Copyright (C) 2012 Free Software Foundation, Inc.
1545
+Copyright (C) 2010 Free Software Foundation, Inc.
1546 1546
 This configure script is free software; the Free Software Foundation
1547 1547
 gives unlimited permission to copy, distribute and modify it.
1548 1548
 _ACEOF
... ...
@@ -1766,7 +1748,7 @@ $as_echo "$ac_try_echo"; } >&5
1766 1766
 	 test ! -s conftest.err
1767 1767
        } && test -s conftest$ac_exeext && {
1768 1768
 	 test "$cross_compiling" = yes ||
1769
-	 test -x conftest$ac_exeext
1769
+	 $as_test_x conftest$ac_exeext
1770 1770
        }; then :
1771 1771
   ac_retval=0
1772 1772
 else
... ...
@@ -1916,7 +1898,7 @@ $as_echo "$ac_try_echo"; } >&5
1916 1916
 	 test ! -s conftest.err
1917 1917
        } && test -s conftest$ac_exeext && {
1918 1918
 	 test "$cross_compiling" = yes ||
1919
-	 test -x conftest$ac_exeext
1919
+	 $as_test_x conftest$ac_exeext
1920 1920
        }; then :
1921 1921
   ac_retval=0
1922 1922
 else
... ...
@@ -1981,7 +1963,7 @@ This file contains any messages produced by compilers while
1981 1981
 running configure, to aid debugging if configure makes a mistake.
1982 1982
 
1983 1983
 It was created by libclamavc++ $as_me devel, which was
1984
-generated by GNU Autoconf 2.69.  Invocation command line was
1984
+generated by GNU Autoconf 2.68.  Invocation command line was
1985 1985
 
1986 1986
   $ $0 $@
1987 1987
 
... ...
@@ -2510,7 +2492,7 @@ case $as_dir/ in #((
2510 2510
     # by default.
2511 2511
     for ac_prog in ginstall scoinst install; do
2512 2512
       for ac_exec_ext in '' $ac_executable_extensions; do
2513
-	if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
2513
+	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
2514 2514
 	  if test $ac_prog = install &&
2515 2515
 	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
2516 2516
 	    # AIX install.  It has an incompatible calling convention.
... ...
@@ -2679,7 +2661,7 @@ do
2679 2679
   IFS=$as_save_IFS
2680 2680
   test -z "$as_dir" && as_dir=.
2681 2681
     for ac_exec_ext in '' $ac_executable_extensions; do
2682
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
2682
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
2683 2683
     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
2684 2684
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
2685 2685
     break 2
... ...
@@ -2719,7 +2701,7 @@ do
2719 2719
   IFS=$as_save_IFS
2720 2720
   test -z "$as_dir" && as_dir=.
2721 2721
     for ac_exec_ext in '' $ac_executable_extensions; do
2722
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
2722
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
2723 2723
     ac_cv_prog_ac_ct_STRIP="strip"
2724 2724
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
2725 2725
     break 2
... ...
@@ -2770,7 +2752,7 @@ do
2770 2770
   test -z "$as_dir" && as_dir=.
2771 2771
     for ac_prog in mkdir gmkdir; do
2772 2772
 	 for ac_exec_ext in '' $ac_executable_extensions; do
2773
-	   as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue
2773
+	   { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
2774 2774
 	   case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
2775 2775
 	     'mkdir (GNU coreutils) '* | \
2776 2776
 	     'mkdir (coreutils) '* | \
... ...
@@ -2823,7 +2805,7 @@ do
2823 2823
   IFS=$as_save_IFS
2824 2824
   test -z "$as_dir" && as_dir=.
2825 2825
     for ac_exec_ext in '' $ac_executable_extensions; do
2826
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
2826
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
2827 2827
     ac_cv_prog_AWK="$ac_prog"
2828 2828
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
2829 2829
     break 2
... ...
@@ -3090,7 +3072,7 @@ do
3090 3090
   IFS=$as_save_IFS
3091 3091
   test -z "$as_dir" && as_dir=.
3092 3092
     for ac_exec_ext in '' $ac_executable_extensions; do
3093
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
3093
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
3094 3094
     ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
3095 3095
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
3096 3096
     break 2
... ...
@@ -3134,7 +3116,7 @@ do
3134 3134
   IFS=$as_save_IFS
3135 3135
   test -z "$as_dir" && as_dir=.
3136 3136
     for ac_exec_ext in '' $ac_executable_extensions; do
3137
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
3137
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
3138 3138
     ac_cv_prog_ac_ct_CXX="$ac_prog"
3139 3139
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
3140 3140
     break 2
... ...
@@ -3782,7 +3764,7 @@ do
3782 3782
   IFS=$as_save_IFS
3783 3783
   test -z "$as_dir" && as_dir=.
3784 3784
     for ac_exec_ext in '' $ac_executable_extensions; do
3785
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
3785
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
3786 3786
     ac_cv_prog_CC="${ac_tool_prefix}gcc"
3787 3787
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
3788 3788
     break 2
... ...
@@ -3822,7 +3804,7 @@ do
3822 3822
   IFS=$as_save_IFS
3823 3823
   test -z "$as_dir" && as_dir=.
3824 3824
     for ac_exec_ext in '' $ac_executable_extensions; do
3825
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
3825
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
3826 3826
     ac_cv_prog_ac_ct_CC="gcc"
3827 3827
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
3828 3828
     break 2
... ...
@@ -3875,7 +3857,7 @@ do
3875 3875
   IFS=$as_save_IFS
3876 3876
   test -z "$as_dir" && as_dir=.
3877 3877
     for ac_exec_ext in '' $ac_executable_extensions; do
3878
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
3878
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
3879 3879
     ac_cv_prog_CC="${ac_tool_prefix}cc"
3880 3880
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
3881 3881
     break 2
... ...
@@ -3916,7 +3898,7 @@ do
3916 3916
   IFS=$as_save_IFS
3917 3917
   test -z "$as_dir" && as_dir=.
3918 3918
     for ac_exec_ext in '' $ac_executable_extensions; do
3919
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
3919
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
3920 3920
     if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
3921 3921
        ac_prog_rejected=yes
3922 3922
        continue
... ...
@@ -3974,7 +3956,7 @@ do
3974 3974
   IFS=$as_save_IFS
3975 3975
   test -z "$as_dir" && as_dir=.
3976 3976
     for ac_exec_ext in '' $ac_executable_extensions; do
3977
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
3977
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
3978 3978
     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
3979 3979
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
3980 3980
     break 2
... ...
@@ -4018,7 +4000,7 @@ do
4018 4018
   IFS=$as_save_IFS
4019 4019
   test -z "$as_dir" && as_dir=.
4020 4020
     for ac_exec_ext in '' $ac_executable_extensions; do
4021
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
4021
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
4022 4022
     ac_cv_prog_ac_ct_CC="$ac_prog"
4023 4023
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4024 4024
     break 2
... ...
@@ -4214,7 +4196,8 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
4214 4214
 /* end confdefs.h.  */
4215 4215
 #include <stdarg.h>
4216 4216
 #include <stdio.h>
4217
-struct stat;
4217
+#include <sys/types.h>
4218
+#include <sys/stat.h>
4218 4219
 /* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
4219 4220
 struct buf { int x; };
4220 4221
 FILE * (*rcsopen) (struct buf *, struct stat *, int);
... ...
@@ -4582,7 +4565,7 @@ do
4582 4582
     for ac_prog in grep ggrep; do
4583 4583
     for ac_exec_ext in '' $ac_executable_extensions; do
4584 4584
       ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
4585
-      as_fn_executable_p "$ac_path_GREP" || continue
4585
+      { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
4586 4586
 # Check for GNU ac_path_GREP and select it if it is found.
4587 4587
   # Check for GNU $ac_path_GREP
4588 4588
 case `"$ac_path_GREP" --version 2>&1` in
... ...
@@ -4648,7 +4631,7 @@ do
4648 4648
     for ac_prog in egrep; do
4649 4649
     for ac_exec_ext in '' $ac_executable_extensions; do
4650 4650
       ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
4651
-      as_fn_executable_p "$ac_path_EGREP" || continue
4651
+      { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
4652 4652
 # Check for GNU ac_path_EGREP and select it if it is found.
4653 4653
   # Check for GNU $ac_path_EGREP
4654 4654
 case `"$ac_path_EGREP" --version 2>&1` in
... ...
@@ -5201,7 +5184,7 @@ do
5201 5201
     for ac_prog in sed gsed; do
5202 5202
     for ac_exec_ext in '' $ac_executable_extensions; do
5203 5203
       ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
5204
-      as_fn_executable_p "$ac_path_SED" || continue
5204
+      { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
5205 5205
 # Check for GNU ac_path_SED and select it if it is found.
5206 5206
   # Check for GNU $ac_path_SED
5207 5207
 case `"$ac_path_SED" --version 2>&1` in
... ...
@@ -5280,7 +5263,7 @@ do
5280 5280
     for ac_prog in fgrep; do
5281 5281
     for ac_exec_ext in '' $ac_executable_extensions; do
5282 5282
       ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
5283
-      as_fn_executable_p "$ac_path_FGREP" || continue
5283
+      { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue
5284 5284
 # Check for GNU ac_path_FGREP and select it if it is found.
5285 5285
   # Check for GNU $ac_path_FGREP
5286 5286
 case `"$ac_path_FGREP" --version 2>&1` in
... ...
@@ -5536,7 +5519,7 @@ do
5536 5536
   IFS=$as_save_IFS
5537 5537
   test -z "$as_dir" && as_dir=.
5538 5538
     for ac_exec_ext in '' $ac_executable_extensions; do
5539
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
5539
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
5540 5540
     ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog"
5541 5541
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
5542 5542
     break 2
... ...
@@ -5580,7 +5563,7 @@ do
5580 5580
   IFS=$as_save_IFS
5581 5581
   test -z "$as_dir" && as_dir=.
5582 5582
     for ac_exec_ext in '' $ac_executable_extensions; do
5583
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
5583
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
5584 5584
     ac_cv_prog_ac_ct_DUMPBIN="$ac_prog"
5585 5585
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
5586 5586
     break 2
... ...
@@ -6005,7 +5988,7 @@ do
6005 6005
   IFS=$as_save_IFS
6006 6006
   test -z "$as_dir" && as_dir=.
6007 6007
     for ac_exec_ext in '' $ac_executable_extensions; do
6008
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
6008
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
6009 6009
     ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
6010 6010
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
6011 6011
     break 2
... ...
@@ -6045,7 +6028,7 @@ do
6045 6045
   IFS=$as_save_IFS
6046 6046
   test -z "$as_dir" && as_dir=.
6047 6047
     for ac_exec_ext in '' $ac_executable_extensions; do
6048
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
6048
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
6049 6049
     ac_cv_prog_ac_ct_OBJDUMP="objdump"
6050 6050
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
6051 6051
     break 2
... ...
@@ -6347,7 +6330,7 @@ do
6347 6347
   IFS=$as_save_IFS
6348 6348
   test -z "$as_dir" && as_dir=.
6349 6349
     for ac_exec_ext in '' $ac_executable_extensions; do
6350
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
6350
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
6351 6351
     ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
6352 6352
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
6353 6353
     break 2
... ...
@@ -6387,7 +6370,7 @@ do
6387 6387
   IFS=$as_save_IFS
6388 6388
   test -z "$as_dir" && as_dir=.
6389 6389
     for ac_exec_ext in '' $ac_executable_extensions; do
6390
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
6390
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
6391 6391
     ac_cv_prog_ac_ct_DLLTOOL="dlltool"
6392 6392
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
6393 6393
     break 2
... ...
@@ -6490,7 +6473,7 @@ do
6490 6490
   IFS=$as_save_IFS
6491 6491
   test -z "$as_dir" && as_dir=.
6492 6492
     for ac_exec_ext in '' $ac_executable_extensions; do
6493
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
6493
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
6494 6494
     ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
6495 6495
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
6496 6496
     break 2
... ...
@@ -6534,7 +6517,7 @@ do
6534 6534
   IFS=$as_save_IFS
6535 6535
   test -z "$as_dir" && as_dir=.
6536 6536
     for ac_exec_ext in '' $ac_executable_extensions; do
6537
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
6537
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
6538 6538
     ac_cv_prog_ac_ct_AR="$ac_prog"
6539 6539
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
6540 6540
     break 2
... ...
@@ -6659,7 +6642,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_STRIP="${ac_tool_prefix}strip"
6664 6664
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
6665 6665
     break 2
... ...
@@ -6699,7 +6682,7 @@ do
6699 6699
   IFS=$as_save_IFS
6700 6700
   test -z "$as_dir" && as_dir=.
6701 6701
     for ac_exec_ext in '' $ac_executable_extensions; do
6702
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
6702
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
6703 6703
     ac_cv_prog_ac_ct_STRIP="strip"
6704 6704
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
6705 6705
     break 2
... ...
@@ -6758,7 +6741,7 @@ do
6758 6758
   IFS=$as_save_IFS
6759 6759
   test -z "$as_dir" && as_dir=.
6760 6760
     for ac_exec_ext in '' $ac_executable_extensions; do
6761
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
6761
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
6762 6762
     ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
6763 6763
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
6764 6764
     break 2
... ...
@@ -6798,7 +6781,7 @@ do
6798 6798
   IFS=$as_save_IFS
6799 6799
   test -z "$as_dir" && as_dir=.
6800 6800
     for ac_exec_ext in '' $ac_executable_extensions; do
6801
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
6801
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
6802 6802
     ac_cv_prog_ac_ct_RANLIB="ranlib"
6803 6803
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
6804 6804
     break 2
... ...
@@ -7460,7 +7443,7 @@ do
7460 7460
   IFS=$as_save_IFS
7461 7461
   test -z "$as_dir" && as_dir=.
7462 7462
     for ac_exec_ext in '' $ac_executable_extensions; do
7463
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
7463
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7464 7464
     ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
7465 7465
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7466 7466
     break 2
... ...
@@ -7500,7 +7483,7 @@ do
7500 7500
   IFS=$as_save_IFS
7501 7501
   test -z "$as_dir" && as_dir=.
7502 7502
     for ac_exec_ext in '' $ac_executable_extensions; do
7503
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
7503
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7504 7504
     ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
7505 7505
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7506 7506
     break 2
... ...
@@ -7580,7 +7563,7 @@ do
7580 7580
   IFS=$as_save_IFS
7581 7581
   test -z "$as_dir" && as_dir=.
7582 7582
     for ac_exec_ext in '' $ac_executable_extensions; do
7583
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
7583
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7584 7584
     ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
7585 7585
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7586 7586
     break 2
... ...
@@ -7620,7 +7603,7 @@ do
7620 7620
   IFS=$as_save_IFS
7621 7621
   test -z "$as_dir" && as_dir=.
7622 7622
     for ac_exec_ext in '' $ac_executable_extensions; do
7623
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
7623
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7624 7624
     ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
7625 7625
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7626 7626
     break 2
... ...
@@ -7672,7 +7655,7 @@ do
7672 7672
   IFS=$as_save_IFS
7673 7673
   test -z "$as_dir" && as_dir=.
7674 7674
     for ac_exec_ext in '' $ac_executable_extensions; do
7675
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
7675
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7676 7676
     ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
7677 7677
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7678 7678
     break 2
... ...
@@ -7712,7 +7695,7 @@ do
7712 7712
   IFS=$as_save_IFS
7713 7713
   test -z "$as_dir" && as_dir=.
7714 7714
     for ac_exec_ext in '' $ac_executable_extensions; do
7715
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
7715
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7716 7716
     ac_cv_prog_ac_ct_NMEDIT="nmedit"
7717 7717
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7718 7718
     break 2
... ...
@@ -7764,7 +7747,7 @@ do
7764 7764
   IFS=$as_save_IFS
7765 7765
   test -z "$as_dir" && as_dir=.
7766 7766
     for ac_exec_ext in '' $ac_executable_extensions; do
7767
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
7767
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7768 7768
     ac_cv_prog_LIPO="${ac_tool_prefix}lipo"
7769 7769
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7770 7770
     break 2
... ...
@@ -7804,7 +7787,7 @@ do
7804 7804
   IFS=$as_save_IFS
7805 7805
   test -z "$as_dir" && as_dir=.
7806 7806
     for ac_exec_ext in '' $ac_executable_extensions; do
7807
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
7807
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7808 7808
     ac_cv_prog_ac_ct_LIPO="lipo"
7809 7809
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7810 7810
     break 2
... ...
@@ -7856,7 +7839,7 @@ do
7856 7856
   IFS=$as_save_IFS
7857 7857
   test -z "$as_dir" && as_dir=.
7858 7858
     for ac_exec_ext in '' $ac_executable_extensions; do
7859
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
7859
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7860 7860
     ac_cv_prog_OTOOL="${ac_tool_prefix}otool"
7861 7861
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7862 7862
     break 2
... ...
@@ -7896,7 +7879,7 @@ do
7896 7896
   IFS=$as_save_IFS
7897 7897
   test -z "$as_dir" && as_dir=.
7898 7898
     for ac_exec_ext in '' $ac_executable_extensions; do
7899
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
7899
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7900 7900
     ac_cv_prog_ac_ct_OTOOL="otool"
7901 7901
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7902 7902
     break 2
... ...
@@ -7948,7 +7931,7 @@ do
7948 7948
   IFS=$as_save_IFS
7949 7949
   test -z "$as_dir" && as_dir=.
7950 7950
     for ac_exec_ext in '' $ac_executable_extensions; do
7951
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
7951
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7952 7952
     ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64"
7953 7953
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7954 7954
     break 2
... ...
@@ -7988,7 +7971,7 @@ do
7988 7988
   IFS=$as_save_IFS
7989 7989
   test -z "$as_dir" && as_dir=.
7990 7990
     for ac_exec_ext in '' $ac_executable_extensions; do
7991
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
7991
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7992 7992
     ac_cv_prog_ac_ct_OTOOL64="otool64"
7993 7993
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7994 7994
     break 2
... ...
@@ -16180,16 +16163,16 @@ if (echo >conf$$.file) 2>/dev/null; then
16180 16180
     # ... but there are two gotchas:
16181 16181
     # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
16182 16182
     # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
16183
-    # In both cases, we have to default to `cp -pR'.
16183
+    # In both cases, we have to default to `cp -p'.
16184 16184
     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
16185
-      as_ln_s='cp -pR'
16185
+      as_ln_s='cp -p'
16186 16186
   elif ln conf$$.file conf$$ 2>/dev/null; then
16187 16187
     as_ln_s=ln
16188 16188
   else
16189
-    as_ln_s='cp -pR'
16189
+    as_ln_s='cp -p'
16190 16190
   fi
16191 16191
 else
16192
-  as_ln_s='cp -pR'
16192
+  as_ln_s='cp -p'
16193 16193
 fi
16194 16194
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
16195 16195
 rmdir conf$$.dir 2>/dev/null
... ...
@@ -16249,16 +16232,28 @@ else
16249 16249
   as_mkdir_p=false
16250 16250
 fi
16251 16251
 
16252
-
16253
-# as_fn_executable_p FILE
16254
-# -----------------------
16255
-# Test if FILE is an executable regular file.
16256
-as_fn_executable_p ()
16257
-{
16258
-  test -f "$1" && test -x "$1"
16259
-} # as_fn_executable_p
16260
-as_test_x='test -x'
16261
-as_executable_p=as_fn_executable_p
16252
+if test -x / >/dev/null 2>&1; then
16253
+  as_test_x='test -x'
16254
+else
16255
+  if ls -dL / >/dev/null 2>&1; then
16256
+    as_ls_L_option=L
16257
+  else
16258
+    as_ls_L_option=
16259
+  fi
16260
+  as_test_x='
16261
+    eval sh -c '\''
16262
+      if test -d "$1"; then
16263
+	test -d "$1/.";
16264
+      else
16265
+	case $1 in #(
16266
+	-*)set "./$1";;
16267
+	esac;
16268
+	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
16269
+	???[sx]*):;;*)false;;esac;fi
16270
+    '\'' sh
16271
+  '
16272
+fi
16273
+as_executable_p=$as_test_x
16262 16274
 
16263 16275
 # Sed expression to map a string onto a valid CPP name.
16264 16276
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
... ...
@@ -16280,7 +16275,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
16280 16280
 # values after options handling.
16281 16281
 ac_log="
16282 16282
 This file was extended by libclamavc++ $as_me devel, which was
16283
-generated by GNU Autoconf 2.69.  Invocation command line was
16283
+generated by GNU Autoconf 2.68.  Invocation command line was
16284 16284
 
16285 16285
   CONFIG_FILES    = $CONFIG_FILES
16286 16286
   CONFIG_HEADERS  = $CONFIG_HEADERS
... ...
@@ -16346,10 +16341,10 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
16346 16346
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
16347 16347
 ac_cs_version="\\
16348 16348
 libclamavc++ config.status devel
16349
-configured by $0, generated by GNU Autoconf 2.69,
16349
+configured by $0, generated by GNU Autoconf 2.68,
16350 16350
   with options \\"\$ac_cs_config\\"
16351 16351
 
16352
-Copyright (C) 2012 Free Software Foundation, Inc.
16352
+Copyright (C) 2010 Free Software Foundation, Inc.
16353 16353
 This config.status script is free software; the Free Software Foundation
16354 16354
 gives unlimited permission to copy, distribute and modify it."
16355 16355
 
... ...
@@ -16440,7 +16435,7 @@ fi
16440 16440
 _ACEOF
16441 16441
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
16442 16442
 if \$ac_cs_recheck; then
16443
-  set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
16443
+  set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
16444 16444
   shift
16445 16445
   \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
16446 16446
   CONFIG_SHELL='$SHELL'
16447 16447
deleted file mode 100644
... ...
@@ -1,225 +0,0 @@
1
-/*
2
- *  Copyright (C) 2014 Cisco and/or its affiliates. All rights reserved.
3
- *
4
- *  Author: Shawn Webb
5
- *
6
- *  This program is free software; you can redistribute it and/or modify
7
- *  it under the terms of the GNU General Public License version 2 as
8
- *  published by the Free Software Foundation.
9
- *
10
- *  This program is distributed in the hope that it will be useful,
11
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
12
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
13
- *  GNU General Public License for more details.
14
- *
15
- *  You should have received a copy of the GNU General Public License
16
- *  along with this program; if not, write to the Free Software
17
- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
18
- *  MA 02110-1301, USA.
19
- */
20
-
21
-#include <stdio.h>
22
-#include <stdlib.h>
23
-#include <string.h>
24
-
25
-#if HAVE_UNISTD_H
26
-#include <unistd.h>
27
-#endif
28
-
29
-#include <sys/types.h>
30
-#include <errno.h>
31
-
32
-#if defined(_WIN32)
33
-#include <WinSock2.h>
34
-#include <Windows.h>
35
-#endif
36
-
37
-#include <openssl/ssl.h>
38
-#include <openssl/err.h>
39
-#include "libclamav/crypto.h"
40
-
41
-#include "libclamav/others.h"
42
-#include "libclamav/clamav.h"
43
-
44
-#define JSON_BUFSZ 512
45
-#define SAMPLE_PREFIX "sample_"
46
-
47
-char *hex_encode(char *buf, char *data, size_t len)
48
-{
49
-    size_t i;
50
-    char *p;
51
-
52
-    p = (buf != NULL) ? buf : calloc(1, (len*2)+1);
53
-    if (!(p))
54
-        return NULL;
55
-
56
-    for (i=0; i<len; i++)
57
-        sprintf(p+(i*2), "%02x", *(int *)(data+i) & 0xff);
58
-
59
-    return p;
60
-}
61
-
62
-char *ensure_bufsize(char *buf, size_t *oldsize, size_t used, size_t additional)
63
-{
64
-    char *p=buf;
65
-
66
-    if (*oldsize - used < additional) {
67
-        p = realloc(buf, *oldsize + JSON_BUFSZ);
68
-        if (!(p)) {
69
-            cli_errmsg("ensure_bufsize: Could not allocate more memory: %s (errno: %d)\n", strerror(errno), errno);
70
-            free(buf);
71
-            return NULL;
72
-        }
73
-
74
-        *oldsize += JSON_BUFSZ;
75
-    }
76
-
77
-    return p;
78
-}
79
-
80
-char *export_stats_to_json(struct cl_engine *engine, cli_intel_t *intel)
81
-{
82
-    char *buf=NULL, *p, *hostid, md5[33];
83
-    cli_flagged_sample_t *sample;
84
-    size_t bufsz, curused, i, j;
85
-
86
-    if (!(intel->hostid))
87
-        if ((engine->cb_stats_get_hostid))
88
-            intel->hostid = engine->cb_stats_get_hostid(engine->stats_data);
89
-
90
-    hostid = (intel->hostid != NULL) ? intel->hostid : STATS_ANON_UUID;
91
-
92
-    buf = calloc(1, JSON_BUFSZ);
93
-    if (!(buf))
94
-        return NULL;
95
-
96
-    bufsz = JSON_BUFSZ;
97
-    sprintf(buf, "{\n\t\"hostid\": \"%s\",\n", hostid);
98
-    if (intel->host_info)
99
-        sprintf(buf+strlen(buf), "\t\"host_info\": \"%s\",\n", intel->host_info);
100
-
101
-    sprintf(buf+strlen(buf), "\t\"samples\": [\n");
102
-    curused = strlen(buf);
103
-
104
-    for (sample = intel->samples; sample != NULL; sample = sample->next) {
105
-        if (sample->hits == 0)
106
-            continue;
107
-
108
-        memset(md5, 0x00, sizeof(md5));
109
-        hex_encode(md5, sample->md5, sizeof(sample->md5));
110
-
111
-        buf = ensure_bufsize(buf, &bufsz, curused, strlen(md5) + sizeof(SAMPLE_PREFIX) + 45);
112
-        if (!(buf))
113
-            return NULL;
114
-
115
-        snprintf(buf+curused, bufsz-curused, "\t\t\t{\n");
116
-        curused += strlen(buf+curused);
117
-
118
-        buf = ensure_bufsize(buf, &bufsz, curused, sizeof("\t\t\t\"hash\": \"\",\n") + strlen(md5) + 1);
119
-        if (!(buf))
120
-            return NULL;
121
-
122
-        snprintf(buf+curused, bufsz-curused, "\t\t\t\"hash\": \"%s\",\n", md5);
123
-        curused += strlen(buf+curused);
124
-
125
-        /* Reuse the md5 variable for serializing the number of hits */
126
-        snprintf(md5, sizeof(md5), "%u", sample->hits);
127
-
128
-        buf = ensure_bufsize(buf, &bufsz, curused, strlen(md5) + 20);
129
-        if (!(buf))
130
-            return NULL;
131
-
132
-        snprintf(buf+curused, bufsz-curused, "\t\t\t\"hits\": %s,\n", md5);
133
-        curused += strlen(buf+curused);
134
-
135
-        snprintf(md5, sizeof(md5), "%zu", sample->size);
136
-
137
-        buf = ensure_bufsize(buf, &bufsz, curused, strlen(md5) + 20);
138
-        if (!(buf))
139
-            return NULL;
140
-
141
-        snprintf(buf+curused, bufsz-curused, "\t\t\t\"size\": %s,\n", md5);
142
-        curused += strlen(buf+curused);
143
-
144
-        buf = ensure_bufsize(buf, &bufsz, curused, 30);
145
-        if (!(buf))
146
-            return NULL;
147
-
148
-        if ((sample->sections) && (sample->sections->nsections)) {
149
-            buf = ensure_bufsize(buf, &bufsz, curused, 30);
150
-            if (!(buf))
151
-                return NULL;
152
-
153
-            snprintf(buf+curused, bufsz-curused, "\t\t\t\"sections\": [\n");
154
-            curused += strlen(buf+curused);
155
-
156
-            for (i=0; i < sample->sections->nsections; i++) {
157
-                buf = ensure_bufsize(buf, &bufsz, curused, 30);
158
-                if (!(buf))
159
-                    return NULL;
160
-
161
-                snprintf(buf+curused, bufsz-curused, "\t\t\t\t%s{\n", (i > 0) ? "," : "");
162
-                curused += strlen(buf+curused);
163
-
164
-                buf = ensure_bufsize(buf, &bufsz, curused, 65);
165
-                if (!(buf))
166
-                    return NULL;
167
-
168
-                memset(md5, 0x00, sizeof(md5));
169
-                for (j=0; j < 16; j++)
170
-                    sprintf(md5+(j*2), "%02x", sample->sections->sections[i].md5[j]);
171
-
172
-                snprintf(buf+curused, bufsz-curused, "\t\t\t\t\t\"hash\": \"%s\",\n", md5);
173
-                curused += strlen(buf+curused);
174
-
175
-                buf = ensure_bufsize(buf, &bufsz, curused, 65);
176
-                if (!(buf))
177
-                    return NULL;
178
-
179
-                snprintf(buf+curused, bufsz-curused, "\t\t\t\t\t\"size\": %zu\n", sample->sections->sections[i].len);
180
-                curused += strlen(buf+curused);
181
-
182
-                buf = ensure_bufsize(buf, &bufsz, curused, 30);
183
-                if (!(buf))
184
-                    return NULL;
185
-
186
-                snprintf(buf+curused, bufsz-curused, "\t\t\t\t}\n");
187
-                curused += strlen(buf+curused);
188
-            }
189
-
190
-            buf = ensure_bufsize(buf, &bufsz, curused, 20);
191
-            if (!(buf))
192
-                return NULL;
193
-
194
-            snprintf(buf+curused, bufsz-curused, "\t\t\t],\n");
195
-            curused += strlen(buf+curused);
196
-        }
197
-
198
-        snprintf(buf+curused, bufsz-curused, "\t\t\t\"virus_names\": [ ");
199
-        curused += strlen(buf+curused);
200
-
201
-        for (i=0; sample->virus_name[i] != NULL; i++) {
202
-            buf = ensure_bufsize(buf, &bufsz, curused, strlen(sample->virus_name[i]) + 5);
203
-            if (!(buf))
204
-                return NULL;
205
-
206
-            snprintf(buf+curused, bufsz-curused, "%s\"%s\"", (i > 0) ? ", " : "", sample->virus_name[i]);
207
-            curused += strlen(buf+curused);
208
-        }
209
-
210
-        buf = ensure_bufsize(buf, &bufsz, curused, 10);
211
-        if (!(buf))
212
-            return NULL;
213
-
214
-        snprintf(buf+curused, bufsz-curused, " ]\n\t\t}%s\n", (sample->next != NULL) ? "," : "");
215
-        curused += strlen(buf+curused);
216
-    }
217
-
218
-    buf = ensure_bufsize(buf, &bufsz, curused, 15);
219
-    if (!(buf))
220
-        return NULL;
221
-
222
-    snprintf(buf+curused, bufsz-curused, "\t]\n}\n");
223
-
224
-    return buf;
225
-}
226 1
deleted file mode 100644
... ...
@@ -1,26 +0,0 @@
1
-/*
2
- *  Copyright (C) 2014 Cisco and/or its affiliates. All rights reserved.
3
- *
4
- *  Author: Shawn Webb
5
- *
6
- *  This program is free software; you can redistribute it and/or modify
7
- *  it under the terms of the GNU General Public License version 2 as
8
- *  published by the Free Software Foundation.
9
- *
10
- *  This program is distributed in the hope that it will be useful,
11
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
12
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
13
- *  GNU General Public License for more details.
14
- *
15
- *  You should have received a copy of the GNU General Public License
16
- *  along with this program; if not, write to the Free Software
17
- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
18
- *  MA 02110-1301, USA.
19
- */
20
-
21
-#if !defined(_LIBCLAMAV_JSON_H)
22
-#define _LIBCLAMAV_JSON_H
23
-
24
-char *export_stats_to_json(struct cl_engine *engine, cli_intel_t *intel);
25
-
26
-#endif
... ...
@@ -27,7 +27,7 @@
27 27
 #endif
28 28
 
29 29
 #if HAVE_JSON
30
-#include "json/json.h"
30
+#include "json.h"
31 31
 #endif
32 32
 
33 33
 #include "cltypes.h"
... ...
@@ -51,7 +51,7 @@
51 51
 #include "events.h"
52 52
 #include "crtmgr.h"
53 53
 #ifdef HAVE_JSON
54
-#include "json/json.h"
54
+#include "json.h"
55 55
 #endif
56 56
 
57 57
 /*
... ...
@@ -55,7 +55,7 @@
55 55
 #include "libclamav/others.h"
56 56
 #include "libclamav/clamav.h"
57 57
 #include "libclamav/dconf.h"
58
-#include "libclamav/json.h"
58
+#include "libclamav/stats_json.h"
59 59
 #include "libclamav/stats.h"
60 60
 #include "libclamav/hostid.h"
61 61
 #include "libclamav/www.h"
62 62
new file mode 100644
... ...
@@ -0,0 +1,225 @@
0
+/*
1
+ *  Copyright (C) 2014 Cisco and/or its affiliates. All rights reserved.
2
+ *
3
+ *  Author: Shawn Webb
4
+ *
5
+ *  This program is free software; you can redistribute it and/or modify
6
+ *  it under the terms of the GNU General Public License version 2 as
7
+ *  published by the Free Software Foundation.
8
+ *
9
+ *  This program is distributed in the hope that it will be useful,
10
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
11
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
12
+ *  GNU General Public License for more details.
13
+ *
14
+ *  You should have received a copy of the GNU General Public License
15
+ *  along with this program; if not, write to the Free Software
16
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
17
+ *  MA 02110-1301, USA.
18
+ */
19
+
20
+#include <stdio.h>
21
+#include <stdlib.h>
22
+#include <string.h>
23
+
24
+#if HAVE_UNISTD_H
25
+#include <unistd.h>
26
+#endif
27
+
28
+#include <sys/types.h>
29
+#include <errno.h>
30
+
31
+#if defined(_WIN32)
32
+#include <WinSock2.h>
33
+#include <Windows.h>
34
+#endif
35
+
36
+#include <openssl/ssl.h>
37
+#include <openssl/err.h>
38
+#include "libclamav/crypto.h"
39
+
40
+#include "libclamav/others.h"
41
+#include "libclamav/clamav.h"
42
+
43
+#define JSON_BUFSZ 512
44
+#define SAMPLE_PREFIX "sample_"
45
+
46
+char *hex_encode(char *buf, char *data, size_t len)
47
+{
48
+    size_t i;
49
+    char *p;
50
+
51
+    p = (buf != NULL) ? buf : calloc(1, (len*2)+1);
52
+    if (!(p))
53
+        return NULL;
54
+
55
+    for (i=0; i<len; i++)
56
+        sprintf(p+(i*2), "%02x", *(int *)(data+i) & 0xff);
57
+
58
+    return p;
59
+}
60
+
61
+char *ensure_bufsize(char *buf, size_t *oldsize, size_t used, size_t additional)
62
+{
63
+    char *p=buf;
64
+
65
+    if (*oldsize - used < additional) {
66
+        p = realloc(buf, *oldsize + JSON_BUFSZ);
67
+        if (!(p)) {
68
+            cli_errmsg("ensure_bufsize: Could not allocate more memory: %s (errno: %d)\n", strerror(errno), errno);
69
+            free(buf);
70
+            return NULL;
71
+        }
72
+
73
+        *oldsize += JSON_BUFSZ;
74
+    }
75
+
76
+    return p;
77
+}
78
+
79
+char *export_stats_to_json(struct cl_engine *engine, cli_intel_t *intel)
80
+{
81
+    char *buf=NULL, *p, *hostid, md5[33];
82
+    cli_flagged_sample_t *sample;
83
+    size_t bufsz, curused, i, j;
84
+
85
+    if (!(intel->hostid))
86
+        if ((engine->cb_stats_get_hostid))
87
+            intel->hostid = engine->cb_stats_get_hostid(engine->stats_data);
88
+
89
+    hostid = (intel->hostid != NULL) ? intel->hostid : STATS_ANON_UUID;
90
+
91
+    buf = calloc(1, JSON_BUFSZ);
92
+    if (!(buf))
93
+        return NULL;
94
+
95
+    bufsz = JSON_BUFSZ;
96
+    sprintf(buf, "{\n\t\"hostid\": \"%s\",\n", hostid);
97
+    if (intel->host_info)
98
+        sprintf(buf+strlen(buf), "\t\"host_info\": \"%s\",\n", intel->host_info);
99
+
100
+    sprintf(buf+strlen(buf), "\t\"samples\": [\n");
101
+    curused = strlen(buf);
102
+
103
+    for (sample = intel->samples; sample != NULL; sample = sample->next) {
104
+        if (sample->hits == 0)
105
+            continue;
106
+
107
+        memset(md5, 0x00, sizeof(md5));
108
+        hex_encode(md5, sample->md5, sizeof(sample->md5));
109
+
110
+        buf = ensure_bufsize(buf, &bufsz, curused, strlen(md5) + sizeof(SAMPLE_PREFIX) + 45);
111
+        if (!(buf))
112
+            return NULL;
113
+
114
+        snprintf(buf+curused, bufsz-curused, "\t\t\t{\n");
115
+        curused += strlen(buf+curused);
116
+
117
+        buf = ensure_bufsize(buf, &bufsz, curused, sizeof("\t\t\t\"hash\": \"\",\n") + strlen(md5) + 1);
118
+        if (!(buf))
119
+            return NULL;
120
+
121
+        snprintf(buf+curused, bufsz-curused, "\t\t\t\"hash\": \"%s\",\n", md5);
122
+        curused += strlen(buf+curused);
123
+
124
+        /* Reuse the md5 variable for serializing the number of hits */
125
+        snprintf(md5, sizeof(md5), "%u", sample->hits);
126
+
127
+        buf = ensure_bufsize(buf, &bufsz, curused, strlen(md5) + 20);
128
+        if (!(buf))
129
+            return NULL;
130
+
131
+        snprintf(buf+curused, bufsz-curused, "\t\t\t\"hits\": %s,\n", md5);
132
+        curused += strlen(buf+curused);
133
+
134
+        snprintf(md5, sizeof(md5), "%zu", sample->size);
135
+
136
+        buf = ensure_bufsize(buf, &bufsz, curused, strlen(md5) + 20);
137
+        if (!(buf))
138
+            return NULL;
139
+
140
+        snprintf(buf+curused, bufsz-curused, "\t\t\t\"size\": %s,\n", md5);
141
+        curused += strlen(buf+curused);
142
+
143
+        buf = ensure_bufsize(buf, &bufsz, curused, 30);
144
+        if (!(buf))
145
+            return NULL;
146
+
147
+        if ((sample->sections) && (sample->sections->nsections)) {
148
+            buf = ensure_bufsize(buf, &bufsz, curused, 30);
149
+            if (!(buf))
150
+                return NULL;
151
+
152
+            snprintf(buf+curused, bufsz-curused, "\t\t\t\"sections\": [\n");
153
+            curused += strlen(buf+curused);
154
+
155
+            for (i=0; i < sample->sections->nsections; i++) {
156
+                buf = ensure_bufsize(buf, &bufsz, curused, 30);
157
+                if (!(buf))
158
+                    return NULL;
159
+
160
+                snprintf(buf+curused, bufsz-curused, "\t\t\t\t%s{\n", (i > 0) ? "," : "");
161
+                curused += strlen(buf+curused);
162
+
163
+                buf = ensure_bufsize(buf, &bufsz, curused, 65);
164
+                if (!(buf))
165
+                    return NULL;
166
+
167
+                memset(md5, 0x00, sizeof(md5));
168
+                for (j=0; j < 16; j++)
169
+                    sprintf(md5+(j*2), "%02x", sample->sections->sections[i].md5[j]);
170
+
171
+                snprintf(buf+curused, bufsz-curused, "\t\t\t\t\t\"hash\": \"%s\",\n", md5);
172
+                curused += strlen(buf+curused);
173
+
174
+                buf = ensure_bufsize(buf, &bufsz, curused, 65);
175
+                if (!(buf))
176
+                    return NULL;
177
+
178
+                snprintf(buf+curused, bufsz-curused, "\t\t\t\t\t\"size\": %zu\n", sample->sections->sections[i].len);
179
+                curused += strlen(buf+curused);
180
+
181
+                buf = ensure_bufsize(buf, &bufsz, curused, 30);
182
+                if (!(buf))
183
+                    return NULL;
184
+
185
+                snprintf(buf+curused, bufsz-curused, "\t\t\t\t}\n");
186
+                curused += strlen(buf+curused);
187
+            }
188
+
189
+            buf = ensure_bufsize(buf, &bufsz, curused, 20);
190
+            if (!(buf))
191
+                return NULL;
192
+
193
+            snprintf(buf+curused, bufsz-curused, "\t\t\t],\n");
194
+            curused += strlen(buf+curused);
195
+        }
196
+
197
+        snprintf(buf+curused, bufsz-curused, "\t\t\t\"virus_names\": [ ");
198
+        curused += strlen(buf+curused);
199
+
200
+        for (i=0; sample->virus_name[i] != NULL; i++) {
201
+            buf = ensure_bufsize(buf, &bufsz, curused, strlen(sample->virus_name[i]) + 5);
202
+            if (!(buf))
203
+                return NULL;
204
+
205
+            snprintf(buf+curused, bufsz-curused, "%s\"%s\"", (i > 0) ? ", " : "", sample->virus_name[i]);
206
+            curused += strlen(buf+curused);
207
+        }
208
+
209
+        buf = ensure_bufsize(buf, &bufsz, curused, 10);
210
+        if (!(buf))
211
+            return NULL;
212
+
213
+        snprintf(buf+curused, bufsz-curused, " ]\n\t\t}%s\n", (sample->next != NULL) ? "," : "");
214
+        curused += strlen(buf+curused);
215
+    }
216
+
217
+    buf = ensure_bufsize(buf, &bufsz, curused, 15);
218
+    if (!(buf))
219
+        return NULL;
220
+
221
+    snprintf(buf+curused, bufsz-curused, "\t]\n}\n");
222
+
223
+    return buf;
224
+}
0 225
new file mode 100644
... ...
@@ -0,0 +1,26 @@
0
+/*
1
+ *  Copyright (C) 2014 Cisco and/or its affiliates. All rights reserved.
2
+ *
3
+ *  Author: Shawn Webb
4
+ *
5
+ *  This program is free software; you can redistribute it and/or modify
6
+ *  it under the terms of the GNU General Public License version 2 as
7
+ *  published by the Free Software Foundation.
8
+ *
9
+ *  This program is distributed in the hope that it will be useful,
10
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
11
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
12
+ *  GNU General Public License for more details.
13
+ *
14
+ *  You should have received a copy of the GNU General Public License
15
+ *  along with this program; if not, write to the Free Software
16
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
17
+ *  MA 02110-1301, USA.
18
+ */
19
+
20
+#if !defined(_LIBCLAMAV_JSON_H)
21
+#define _LIBCLAMAV_JSON_H
22
+
23
+char *export_stats_to_json(struct cl_engine *engine, cli_intel_t *intel);
24
+
25
+#endif
... ...
@@ -48,7 +48,7 @@
48 48
 #endif
49 49
 #include "blob.h"
50 50
 #ifdef HAVE_JSON
51
-#include "json/json.h"
51
+#include "json.h"
52 52
 #endif
53 53
 
54 54
 #define PPT_LZW_BUFFSIZE 8192
... ...
@@ -1,4 +1,4 @@
1
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
1
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
2 2
 # @configure_input@
3 3
 
4 4
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
... ...
@@ -19,23 +19,6 @@
19 19
 
20 20
 
21 21
 VPATH = @srcdir@
22
-am__make_dryrun = \
23
-  { \
24
-    am__dry=no; \
25
-    case $$MAKEFLAGS in \
26
-      *\\[\ \	]*) \
27
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
28
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
29
-      *) \
30
-        for am__flg in $$MAKEFLAGS; do \
31
-          case $$am__flg in \
32
-            *=*|--*) ;; \
33
-            *n*) am__dry=yes; break;; \
34
-          esac; \
35
-        done;; \
36
-    esac; \
37
-    test $$am__dry = yes; \
38
-  }
39 22
 pkgdatadir = $(datadir)/@PACKAGE@
40 23
 pkgincludedir = $(includedir)/@PACKAGE@
41 24
 pkglibdir = $(libdir)/@PACKAGE@
... ...
@@ -259,11 +242,6 @@ DIST_SOURCES = $(dld_link_la_SOURCES) $(dlopen_la_SOURCES) \
259 259
 	$(dyld_la_SOURCES) $(libltdl_la_SOURCES) \
260 260
 	$(libltdlc_la_SOURCES) $(load_add_on_la_SOURCES) \
261 261
 	$(loadlibrary_la_SOURCES) $(shl_load_la_SOURCES)
262
-am__can_run_installinfo = \
263
-  case $$AM_UPDATE_INFO_DIR in \
264
-    n|no|NO) false;; \
265
-    *) (install-info --version) >/dev/null 2>&1;; \
266
-  esac
267 262
 am__include_HEADERS_DIST = ltdl.h
268 263
 am__ltdlinclude_HEADERS_DIST = libltdl/lt_system.h libltdl/lt_error.h \
269 264
 	libltdl/lt_dlloader.h
... ...
@@ -565,6 +543,7 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
565 565
 $(am__aclocal_m4_deps):
566 566
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
567 567
 	@$(NORMAL_INSTALL)
568
+	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
568 569
 	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
569 570
 	list2=; for p in $$list; do \
570 571
 	  if test -f $$p; then \
... ...
@@ -572,8 +551,6 @@ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
572 572
 	  else :; fi; \
573 573
 	done; \
574 574
 	test -z "$$list2" || { \
575
-	  echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \
576
-	  $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \
577 575
 	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \
578 576
 	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \
579 577
 	}
... ...
@@ -800,11 +777,8 @@ clean-libtool:
800 800
 	-rm -rf .libs _libs
801 801
 install-includeHEADERS: $(include_HEADERS)
802 802
 	@$(NORMAL_INSTALL)
803
+	test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)"
803 804
 	@list='$(include_HEADERS)'; test -n "$(includedir)" || list=; \
804
-	if test -n "$$list"; then \
805
-	  echo " $(MKDIR_P) '$(DESTDIR)$(includedir)'"; \
806
-	  $(MKDIR_P) "$(DESTDIR)$(includedir)" || exit 1; \
807
-	fi; \
808 805
 	for p in $$list; do \
809 806
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
810 807
 	  echo "$$d$$p"; \
... ...
@@ -821,11 +795,8 @@ uninstall-includeHEADERS:
821 821
 	dir='$(DESTDIR)$(includedir)'; $(am__uninstall_files_from_dir)
822 822
 install-ltdlincludeHEADERS: $(ltdlinclude_HEADERS)
823 823
 	@$(NORMAL_INSTALL)
824
+	test -z "$(ltdlincludedir)" || $(MKDIR_P) "$(DESTDIR)$(ltdlincludedir)"
824 825
 	@list='$(ltdlinclude_HEADERS)'; test -n "$(ltdlincludedir)" || list=; \
825
-	if test -n "$$list"; then \
826
-	  echo " $(MKDIR_P) '$(DESTDIR)$(ltdlincludedir)'"; \
827
-	  $(MKDIR_P) "$(DESTDIR)$(ltdlincludedir)" || exit 1; \
828
-	fi; \
829 826
 	for p in $$list; do \
830 827
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
831 828
 	  echo "$$d$$p"; \
... ...
@@ -5,41 +5,76 @@ AC_ARG_WITH([libjson],
5 5
 [  --with-libjson=DIR   path to directory containing libjson (default=
6 6
     /usr/local or /usr if not found in /usr/local)],
7 7
 [
8
-if test "$withval"; then
9
-    LIBJSON_HOME="$withval"
10
-fi
11
-], [
12
-LIBJSON_HOME=/usr/local
13
-if test ! -f "$LIBJSON_HOME/include/json/json.h"
8
+if test "X$withval" != "Xno"
14 9
 then
15
-    LIBJSON_HOME=/usr
10
+  if test ! -n "$withval"
11
+  then
12
+    LIBJSON_HOME="$withval"
13
+    have_json="yes"
14
+  else
15
+    LIBJSON_HOME=/usr/local
16
+    if test -d "$LIBJSON_HOME/include/json" -o -d "$LIBJSON_HOME/include/json-c"
17
+    then
18
+      have_json="yes"
19
+    else
20
+      LIBJSON_HOME=/usr
21
+      if test -d "$LIBJSON_HOME/include/json" -o -d "$LIBJSON_HOME/include/json-c"
22
+      then
23
+        have_json="yes"
24
+      else
25
+        have_json="no"
26
+      fi
27
+    fi
28
+  fi
16 29
 fi
17
-AC_MSG_RESULT([$LIBJSON_HOME])
18
-])
19 30
 
31
+AC_MSG_RESULT([$LIBJSON_HOME])
32
+],
33
+[
20 34
 have_json="no"
35
+])
21 36
 
22
-if test ! -f "$LIBJSON_HOME/include/json/json.h"
37
+if test "X$have_json" = "Xyes"
23 38
 then
24
-    AC_MSG_WARN([json not found.])
25
-else
26
-JSON_LDFLAGS="-L$LIBJSON_HOME/lib"
27
-JSON_LIBS="-ljson"
28
-JSON_CPPFLAGS="-I$LIBJSON_HOME/include"
39
+  if test -d "$LIBJSON_HOME/include/json"
40
+  then
41
+    JSON_INCLUDE="include/json"
42
+  fi
43
+  if test -d "$LIBJSON_HOME/include/json-c"
44
+  then
45
+    JSON_INCLUDE="include/json-c"
46
+  fi
47
+
48
+  if test ! -f "$LIBJSON_HOME/$JSON_INCLUDE/json.h"
49
+  then
50
+      AC_MSG_WARN([json not found.])
51
+  else
52
+    JSON_LDFLAGS="-L$LIBJSON_HOME/lib"
53
+    JSON_LIBS="-ljson-c"
54
+    JSON_CPPFLAGS="-I$LIBJSON_HOME/$JSON_INCLUDE"
55
+
56
+    AC_MSG_NOTICE([JSON_CPPFLAGS is $JSON_CPPFLAGS])
57
+
58
+    save_LDFLAGS="$LDFLAGS"
59
+    LDFLAGS="-L$LIBJSON_HOME/lib $JSON_LIBS"
29 60
 
30
-save_LDFLAGS="$LDFLAGS"
31
-LDFLAGS="-L$LIBJSON_HOME/lib $JSON_LIBS"
61
+    save_CFLAGS="$CFLAGS"
62
+    CFLAGS="$JSON_CPPFLAGS"
32 63
 
33
-save_CFLAGS="$CFLAGS"
34
-CFLAGS="$JSON_CPPFLAGS"
64
+    AC_CHECK_LIB([json-c], [json_object_new_object], [have_json="yes"], [have_json="no"])
65
+    if test "X$have_json" = "Xno"
66
+    then 
67
+      JSON_LIBS="-ljson"
68
+      AC_CHECK_LIB([json], [json_object_new_object], [have_json="yes"], [have_json="no"])
69
+    fi
35 70
 
36
-AC_CHECK_LIB([json], [json_object_new_object], [have_json="yes"], [AC_MSG_ERROR([Your libjson installation is misconfigured or missing])])
71
+    LDFLAGS="$save_LDFLAGS"
72
+    CFLAGS="$save_CFLAGS"
37 73
 
38
-LDFLAGS="$save_LDFLAGS"
39
-CFLAGS="$save_CFLAGS"
74
+  fi
40 75
 fi
41 76
 
42
-if test "$have_json" = "yes"; then
77
+if test "X$have_json" = "Xyes"; then
43 78
 AC_DEFINE([HAVE_JSON],1,[Define to 1 if you have the 'libjson' library (-ljson).])
44 79
 fi
45 80
 
... ...
@@ -1,4 +1,4 @@
1
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
1
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
2 2
 # @configure_input@
3 3
 
4 4
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
... ...
@@ -34,23 +34,6 @@
34 34
 #  MA 02110-1301, USA.
35 35
 
36 36
 VPATH = @srcdir@
37
-am__make_dryrun = \
38
-  { \
39
-    am__dry=no; \
40
-    case $$MAKEFLAGS in \
41
-      *\\[\ \	]*) \
42
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
43
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
44
-      *) \
45
-        for am__flg in $$MAKEFLAGS; do \
46
-          case $$am__flg in \
47
-            *=*|--*) ;; \
48
-            *n*) am__dry=yes; break;; \
49
-          esac; \
50
-        done;; \
51
-    esac; \
52
-    test $$am__dry = yes; \
53
-  }
54 37
 pkgdatadir = $(datadir)/@PACKAGE@
55 38
 pkgincludedir = $(includedir)/@PACKAGE@
56 39
 pkglibdir = $(libdir)/@PACKAGE@
... ...
@@ -184,11 +167,6 @@ am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
184 184
 am__v_GEN_0 = @echo "  GEN   " $@;
185 185
 SOURCES = $(sigtool_SOURCES)
186 186
 DIST_SOURCES = $(sigtool_SOURCES)
187
-am__can_run_installinfo = \
188
-  case $$AM_UPDATE_INFO_DIR in \
189
-    n|no|NO) false;; \
190
-    *) (install-info --version) >/dev/null 2>&1;; \
191
-  esac
192 187
 ETAGS = etags
193 188
 CTAGS = ctags
194 189
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
... ...
@@ -440,11 +418,8 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
440 440
 $(am__aclocal_m4_deps):
441 441
 install-binPROGRAMS: $(bin_PROGRAMS)
442 442
 	@$(NORMAL_INSTALL)
443
+	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
443 444
 	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
444
-	if test -n "$$list"; then \
445
-	  echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
446
-	  $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
447
-	fi; \
448 445
 	for p in $$list; do echo "$$p $$p"; done | \
449 446
 	sed 's/$(EXEEXT)$$//' | \
450 447
 	while read p p1; do if test -f $$p || test -f $$p1; \
... ...
@@ -1,4 +1,4 @@
1
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
1
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
2 2
 # @configure_input@
3 3
 
4 4
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
... ...
@@ -15,23 +15,6 @@
15 15
 
16 16
 @SET_MAKE@
17 17
 VPATH = @srcdir@
18
-am__make_dryrun = \
19
-  { \
20
-    am__dry=no; \
21
-    case $$MAKEFLAGS in \
22
-      *\\[\ \	]*) \
23
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
24
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
25
-      *) \
26
-        for am__flg in $$MAKEFLAGS; do \
27
-          case $$am__flg in \
28
-            *=*|--*) ;; \
29
-            *n*) am__dry=yes; break;; \
30
-          esac; \
31
-        done;; \
32
-    esac; \
33
-    test $$am__dry = yes; \
34
-  }
35 18
 pkgdatadir = $(datadir)/@PACKAGE@
36 19
 pkgincludedir = $(includedir)/@PACKAGE@
37 20
 pkglibdir = $(libdir)/@PACKAGE@
... ...
@@ -136,11 +119,6 @@ am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
136 136
 am__v_at_0 = @
137 137
 SOURCES =
138 138
 DIST_SOURCES =
139
-am__can_run_installinfo = \
140
-  case $$AM_UPDATE_INFO_DIR in \
141
-    n|no|NO) false;; \
142
-    *) (install-info --version) >/dev/null 2>&1;; \
143
-  esac
144 139
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
145 140
 ACLOCAL = @ACLOCAL@
146 141
 AMTAR = @AMTAR@
... ...
@@ -35,10 +35,10 @@ check_clamav_SOURCES = check_clamav.c checks.h checks_common.h $(top_builddir)/l
35 35
 		       check_jsnorm.c check_str.c check_regex.c\
36 36
 		       check_disasm.c check_uniq.c check_matchers.c\
37 37
 		       check_htmlnorm.c check_bytecode.c
38
-check_clamav_CPPFLAGS = -I$(top_srcdir) @CHECK_CPPFLAGS@ -DSRCDIR=\"$(abs_srcdir)\" -DOBJDIR=\"$(abs_builddir)\"
38
+check_clamav_CPPFLAGS = -I$(top_srcdir) @CHECK_CPPFLAGS@ @JSON_CPPFLAGS@ -DSRCDIR=\"$(abs_srcdir)\" -DOBJDIR=\"$(abs_builddir)\"
39 39
 check_clamav_LDADD = $(top_builddir)/libclamav/libclamav.la @THREAD_LIBS@ @CHECK_LIBS@
40 40
 check_clamd_SOURCES = check_clamd.c checks_common.h
41
-check_clamd_CPPFLAGS = -I$(top_srcdir) @CHECK_CPPFLAGS@ -DSRCDIR=\"$(abs_srcdir)\" -DBUILDDIR=\"$(abs_builddir)\"
41
+check_clamd_CPPFLAGS = -I$(top_srcdir) @CHECK_CPPFLAGS@ @JSON_CPPFLAGS@ -DSRCDIR=\"$(abs_srcdir)\" -DBUILDDIR=\"$(abs_builddir)\"
42 42
 check_clamd_LDADD = @CHECK_LIBS@ @CLAMD_LIBS@
43 43
 else
44 44
 check_clamd_SOURCES = check_clamav_skip.c
... ...
@@ -46,7 +46,7 @@ check_clamav_SOURCES = check_clamav_skip.c
46 46
 endif
47 47
 
48 48
 check_fpu_endian_SOURCES = check_fpu_endian.c
49
-check_fpu_endian_CPPFLAGS = -I$(top_srcdir) @CHECK_CPPFLAGS@ -DSRCDIR=\"$(abs_srcdir)\" -DOBJDIR=\"$(abs_builddir)\"
49
+check_fpu_endian_CPPFLAGS = -I$(top_srcdir) @CHECK_CPPFLAGS@ @JSON_CPPFLAGS@ -DSRCDIR=\"$(abs_srcdir)\" -DOBJDIR=\"$(abs_builddir)\"
50 50
 check_fpu_endian_LDADD = $(top_builddir)/libclamav/libclamav.la
51 51
 
52 52
 check_clamav.c: $(top_builddir)/test/clam.exe clamav.hdb
... ...
@@ -1,4 +1,4 @@
1
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
1
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
2 2
 # @configure_input@
3 3
 
4 4
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
... ...
@@ -15,23 +15,6 @@
15 15
 
16 16
 @SET_MAKE@
17 17
 VPATH = @srcdir@
18
-am__make_dryrun = \
19
-  { \
20
-    am__dry=no; \
21
-    case $$MAKEFLAGS in \
22
-      *\\[\ \	]*) \
23
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
24
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
25
-      *) \
26
-        for am__flg in $$MAKEFLAGS; do \
27
-          case $$am__flg in \
28
-            *=*|--*) ;; \
29
-            *n*) am__dry=yes; break;; \
30
-          esac; \
31
-        done;; \
32
-    esac; \
33
-    test $$am__dry = yes; \
34
-  }
35 18
 pkgdatadir = $(datadir)/@PACKAGE@
36 19
 pkgincludedir = $(includedir)/@PACKAGE@
37 20
 pkglibdir = $(libdir)/@PACKAGE@
... ...
@@ -197,11 +180,6 @@ SOURCES = $(check_clamav_SOURCES) $(check_clamd_SOURCES) \
197 197
 	$(check_fpu_endian_SOURCES)
198 198
 DIST_SOURCES = $(am__check_clamav_SOURCES_DIST) \
199 199
 	$(am__check_clamd_SOURCES_DIST) $(check_fpu_endian_SOURCES)
200
-am__can_run_installinfo = \
201
-  case $$AM_UPDATE_INFO_DIR in \
202
-    n|no|NO) false;; \
203
-    *) (install-info --version) >/dev/null 2>&1;; \
204
-  esac
205 200
 ETAGS = etags
206 201
 CTAGS = ctags
207 202
 # If stdout is a non-dumb tty, use colors.  If test -t is not supported,
... ...
@@ -541,14 +519,14 @@ AM_CFLAGS = @WERR_CFLAGS@
541 541
 @HAVE_LIBCHECK_TRUE@		       check_disasm.c check_uniq.c check_matchers.c\
542 542
 @HAVE_LIBCHECK_TRUE@		       check_htmlnorm.c check_bytecode.c
543 543
 
544
-@HAVE_LIBCHECK_TRUE@check_clamav_CPPFLAGS = -I$(top_srcdir) @CHECK_CPPFLAGS@ -DSRCDIR=\"$(abs_srcdir)\" -DOBJDIR=\"$(abs_builddir)\"
544
+@HAVE_LIBCHECK_TRUE@check_clamav_CPPFLAGS = -I$(top_srcdir) @CHECK_CPPFLAGS@ @JSON_CPPFLAGS@ -DSRCDIR=\"$(abs_srcdir)\" -DOBJDIR=\"$(abs_builddir)\"
545 545
 @HAVE_LIBCHECK_TRUE@check_clamav_LDADD = $(top_builddir)/libclamav/libclamav.la @THREAD_LIBS@ @CHECK_LIBS@
546 546
 @HAVE_LIBCHECK_FALSE@check_clamd_SOURCES = check_clamav_skip.c
547 547
 @HAVE_LIBCHECK_TRUE@check_clamd_SOURCES = check_clamd.c checks_common.h
548
-@HAVE_LIBCHECK_TRUE@check_clamd_CPPFLAGS = -I$(top_srcdir) @CHECK_CPPFLAGS@ -DSRCDIR=\"$(abs_srcdir)\" -DBUILDDIR=\"$(abs_builddir)\"
548
+@HAVE_LIBCHECK_TRUE@check_clamd_CPPFLAGS = -I$(top_srcdir) @CHECK_CPPFLAGS@ @JSON_CPPFLAGS@ -DSRCDIR=\"$(abs_srcdir)\" -DBUILDDIR=\"$(abs_builddir)\"
549 549
 @HAVE_LIBCHECK_TRUE@check_clamd_LDADD = @CHECK_LIBS@ @CLAMD_LIBS@
550 550
 check_fpu_endian_SOURCES = check_fpu_endian.c
551
-check_fpu_endian_CPPFLAGS = -I$(top_srcdir) @CHECK_CPPFLAGS@ -DSRCDIR=\"$(abs_srcdir)\" -DOBJDIR=\"$(abs_builddir)\"
551
+check_fpu_endian_CPPFLAGS = -I$(top_srcdir) @CHECK_CPPFLAGS@ @JSON_CPPFLAGS@ -DSRCDIR=\"$(abs_srcdir)\" -DOBJDIR=\"$(abs_builddir)\"
552 552
 check_fpu_endian_LDADD = $(top_builddir)/libclamav/libclamav.la
553 553
 CLEANFILES = lcov.out *.gcno *.gcda *.log $(FILES) test-stderr.log clamscan.log accdenied clamav.hdb $(utils)
554 554
 EXTRA_DIST = .split $(srcdir)/*.ref input test-freshclam.conf valgrind.supp virusaction-test.sh $(scripts) preload_run.sh check_common.sh
... ...
@@ -986,7 +964,8 @@ check-TESTS recheck:
986 986
 	  if test -z "$$list"; then list=$$f; else list="$$list $$f"; fi; \
987 987
 	done; \
988 988
 	if test $@ = recheck && test -n "$$list"; then \
989
-	  $(am__make_dryrun) || rm -f $$list || exit 1; \
989
+	  echo "am--clean: ; rm -f $$list" \
990
+	    | $(MAKE) $(AM_MAKEFLAGS) -f - am--clean || exit 1; \
990 991
 	fi; \
991 992
 	$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$list"
992 993
 recheck: $(check_PROGRAMS) $(check_SCRIPTS)
... ...
@@ -181,7 +181,7 @@
181 181
     <ClCompile Include="..\libclamav\crypto.c" />
182 182
     <ClCompile Include="..\libclamav\fpu.c" />
183 183
     <ClCompile Include="..\libclamav\hostid.c" />
184
-    <ClCompile Include="..\libclamav\json.c" />
184
+    <ClCompile Include="..\libclamav\stats_json.c" />
185 185
     <ClCompile Include="..\libclamav\openioc.c" />
186 186
     <ClCompile Include="..\libclamav\sf_base64decode.c" />
187 187
     <ClCompile Include="..\libclamav\stats.c" />
... ...
@@ -507,7 +507,7 @@
507 507
     <ClInclude Include="..\libclamav\conv.h" />
508 508
     <ClInclude Include="..\libclamav\crypto.h" />
509 509
     <ClInclude Include="..\libclamav\hostid.h" />
510
-    <ClInclude Include="..\libclamav\json.h" />
510
+    <ClInclude Include="..\libclamav\stats_json.h" />
511 511
     <ClInclude Include="..\libclamav\stats.h" />
512 512
     <ClInclude Include="..\libclamav\www.h" />
513 513
   </ItemGroup>
... ...
@@ -885,7 +885,7 @@
885 885
     <ClCompile Include="..\libclamav\hostid.c">
886 886
       <Filter>Source Files</Filter>
887 887
     </ClCompile>
888
-    <ClCompile Include="..\libclamav\json.c">
888
+    <ClCompile Include="..\libclamav\stats_json.c">
889 889
       <Filter>Source Files</Filter>
890 890
     </ClCompile>
891 891
     <ClCompile Include="..\libclamav\stats.c">
... ...
@@ -911,7 +911,7 @@
911 911
     <ClInclude Include="..\libclamav\hostid.h">
912 912
       <Filter>Source Files</Filter>
913 913
     </ClInclude>
914
-    <ClInclude Include="..\libclamav\json.h">
914
+    <ClInclude Include="..\libclamav\stats_json.h">
915 915
       <Filter>Source Files</Filter>
916 916
     </ClInclude>
917 917
     <ClInclude Include="..\libclamav\stats.h">