... | ... |
@@ -1,4 +1,4 @@ |
1 |
-# Makefile.in generated by automake 1.11.3 from Makefile.am. |
|
1 |
+# Makefile.in generated by automake 1.11.6 from Makefile.am. |
|
2 | 2 |
# @configure_input@ |
3 | 3 |
|
4 | 4 |
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, |
... | ... |
@@ -35,6 +35,23 @@ |
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 |
+ } |
|
38 | 55 |
pkgdatadir = $(datadir)/@PACKAGE@ |
39 | 56 |
pkgincludedir = $(includedir)/@PACKAGE@ |
40 | 57 |
pkglibdir = $(libdir)/@PACKAGE@ |
... | ... |
@@ -200,6 +217,11 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ |
200 | 200 |
install-pdf-recursive install-ps-recursive install-recursive \ |
201 | 201 |
installcheck-recursive installdirs-recursive pdf-recursive \ |
202 | 202 |
ps-recursive uninstall-recursive |
203 |
+am__can_run_installinfo = \ |
|
204 |
+ case $$AM_UPDATE_INFO_DIR in \ |
|
205 |
+ n|no|NO) false;; \ |
|
206 |
+ *) (install-info --version) >/dev/null 2>&1;; \ |
|
207 |
+ esac |
|
203 | 208 |
DATA = $(pkgconfig_DATA) |
204 | 209 |
RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ |
205 | 210 |
distclean-recursive maintainer-clean-recursive |
... | ... |
@@ -542,8 +564,11 @@ docs/man/clamsubmit.1: $(top_builddir)/config.status $(top_srcdir)/docs/man/clam |
542 | 542 |
cd $(top_builddir) && $(SHELL) ./config.status $@ |
543 | 543 |
install-binSCRIPTS: $(bin_SCRIPTS) |
544 | 544 |
@$(NORMAL_INSTALL) |
545 |
- test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" |
|
546 | 545 |
@list='$(bin_SCRIPTS)'; test -n "$(bindir)" || list=; \ |
546 |
+ if test -n "$$list"; then \ |
|
547 |
+ echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \ |
|
548 |
+ $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \ |
|
549 |
+ fi; \ |
|
547 | 550 |
for p in $$list; do \ |
548 | 551 |
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ |
549 | 552 |
if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \ |
... | ... |
@@ -598,8 +623,11 @@ distclean-libtool: |
598 | 598 |
-rm -f libtool config.lt |
599 | 599 |
install-pkgconfigDATA: $(pkgconfig_DATA) |
600 | 600 |
@$(NORMAL_INSTALL) |
601 |
- test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" |
|
602 | 601 |
@list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ |
602 |
+ if test -n "$$list"; then \ |
|
603 |
+ echo " $(MKDIR_P) '$(DESTDIR)$(pkgconfigdir)'"; \ |
|
604 |
+ $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" || exit 1; \ |
|
605 |
+ fi; \ |
|
603 | 606 |
for p in $$list; do \ |
604 | 607 |
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ |
605 | 608 |
echo "$$d$$p"; \ |
... | ... |
@@ -784,13 +812,10 @@ distdir: $(DISTFILES) |
784 | 784 |
done |
785 | 785 |
@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ |
786 | 786 |
if test "$$subdir" = .; then :; else \ |
787 |
- test -d "$(distdir)/$$subdir" \ |
|
788 |
- || $(MKDIR_P) "$(distdir)/$$subdir" \ |
|
789 |
- || exit 1; \ |
|
790 |
- fi; \ |
|
791 |
- done |
|
792 |
- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ |
|
793 |
- if test "$$subdir" = .; then :; else \ |
|
787 |
+ $(am__make_dryrun) \ |
|
788 |
+ || test -d "$(distdir)/$$subdir" \ |
|
789 |
+ || $(MKDIR_P) "$(distdir)/$$subdir" \ |
|
790 |
+ || exit 1; \ |
|
794 | 791 |
dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ |
795 | 792 |
$(am__relativize); \ |
796 | 793 |
new_distdir=$$reldir; \ |
... | ... |
@@ -879,7 +904,7 @@ distcheck: dist |
879 | 879 |
*.zip*) \ |
880 | 880 |
unzip $(distdir).zip ;;\ |
881 | 881 |
esac |
882 |
- chmod -R a-w $(distdir); chmod a+w $(distdir) |
|
882 |
+ chmod -R a-w $(distdir); chmod u+w $(distdir) |
|
883 | 883 |
mkdir $(distdir)/_build |
884 | 884 |
mkdir $(distdir)/_inst |
885 | 885 |
chmod a-w $(distdir) |
... | ... |
@@ -1,4 +1,4 @@ |
1 |
-# generated automatically by aclocal 1.11.3 -*- Autoconf -*- |
|
1 |
+# generated automatically by aclocal 1.11.6 -*- 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.68],, |
|
18 |
-[m4_warning([this file was generated for autoconf 2.68. |
|
17 |
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],, |
|
18 |
+[m4_warning([this file was generated for autoconf 2.69. |
|
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.3], [], |
|
41 |
+m4_if([$1], [1.11.6], [], |
|
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.3])dnl |
|
57 |
+[AM_AUTOMAKE_VERSION([1.11.6])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.3 from Makefile.am. |
|
1 |
+# Makefile.in generated by automake 1.11.6 from Makefile.am. |
|
2 | 2 |
# @configure_input@ |
3 | 3 |
|
4 | 4 |
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, |
... | ... |
@@ -34,6 +34,23 @@ |
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 |
+ } |
|
37 | 54 |
pkgdatadir = $(datadir)/@PACKAGE@ |
38 | 55 |
pkgincludedir = $(includedir)/@PACKAGE@ |
39 | 56 |
pkglibdir = $(libdir)/@PACKAGE@ |
... | ... |
@@ -182,6 +199,11 @@ am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) |
182 | 182 |
am__v_GEN_0 = @echo " GEN " $@; |
183 | 183 |
SOURCES = $(clamav_milter_SOURCES) |
184 | 184 |
DIST_SOURCES = $(am__clamav_milter_SOURCES_DIST) |
185 |
+am__can_run_installinfo = \ |
|
186 |
+ case $$AM_UPDATE_INFO_DIR in \ |
|
187 |
+ n|no|NO) false;; \ |
|
188 |
+ *) (install-info --version) >/dev/null 2>&1;; \ |
|
189 |
+ esac |
|
185 | 190 |
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; |
186 | 191 |
am__vpath_adj = case $$p in \ |
187 | 192 |
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ |
... | ... |
@@ -466,8 +488,11 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) |
466 | 466 |
$(am__aclocal_m4_deps): |
467 | 467 |
install-sbinPROGRAMS: $(sbin_PROGRAMS) |
468 | 468 |
@$(NORMAL_INSTALL) |
469 |
- test -z "$(sbindir)" || $(MKDIR_P) "$(DESTDIR)$(sbindir)" |
|
470 | 469 |
@list='$(sbin_PROGRAMS)'; test -n "$(sbindir)" || list=; \ |
470 |
+ if test -n "$$list"; then \ |
|
471 |
+ echo " $(MKDIR_P) '$(DESTDIR)$(sbindir)'"; \ |
|
472 |
+ $(MKDIR_P) "$(DESTDIR)$(sbindir)" || exit 1; \ |
|
473 |
+ fi; \ |
|
471 | 474 |
for p in $$list; do echo "$$p $$p"; done | \ |
472 | 475 |
sed 's/$(EXEEXT)$$//' | \ |
473 | 476 |
while read p p1; do if test -f $$p || test -f $$p1; \ |
... | ... |
@@ -627,11 +652,18 @@ clean-libtool: |
627 | 627 |
-rm -rf .libs _libs |
628 | 628 |
install-man8: $(man_MANS) |
629 | 629 |
@$(NORMAL_INSTALL) |
630 |
- test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)" |
|
631 |
- @list=''; test -n "$(man8dir)" || exit 0; \ |
|
632 |
- { for i in $$list; do echo "$$i"; done; \ |
|
633 |
- l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \ |
|
634 |
- sed -n '/\.8[a-z]*$$/p'; \ |
|
630 |
+ @list1=''; \ |
|
631 |
+ list2='$(man_MANS)'; \ |
|
632 |
+ test -n "$(man8dir)" \ |
|
633 |
+ && test -n "`echo $$list1$$list2`" \ |
|
634 |
+ || exit 0; \ |
|
635 |
+ echo " $(MKDIR_P) '$(DESTDIR)$(man8dir)'"; \ |
|
636 |
+ $(MKDIR_P) "$(DESTDIR)$(man8dir)" || exit 1; \ |
|
637 |
+ { for i in $$list1; do echo "$$i"; done; \ |
|
638 |
+ if test -n "$$list2"; then \ |
|
639 |
+ for i in $$list2; do echo "$$i"; done \ |
|
640 |
+ | sed -n '/\.8[a-z]*$$/p'; \ |
|
641 |
+ fi; \ |
|
635 | 642 |
} | while read p; do \ |
636 | 643 |
if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ |
637 | 644 |
echo "$$d$$p"; echo "$$p"; \ |
... | ... |
@@ -1,4 +1,4 @@ |
1 |
-# Makefile.in generated by automake 1.11.3 from Makefile.am. |
|
1 |
+# Makefile.in generated by automake 1.11.6 from Makefile.am. |
|
2 | 2 |
# @configure_input@ |
3 | 3 |
|
4 | 4 |
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, |
... | ... |
@@ -16,6 +16,23 @@ |
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 |
+ } |
|
19 | 36 |
pkgdatadir = $(datadir)/@PACKAGE@ |
20 | 37 |
pkgincludedir = $(includedir)/@PACKAGE@ |
21 | 38 |
pkglibdir = $(libdir)/@PACKAGE@ |
... | ... |
@@ -148,6 +165,11 @@ am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) |
148 | 148 |
am__v_GEN_0 = @echo " GEN " $@; |
149 | 149 |
SOURCES = $(clambc_SOURCES) |
150 | 150 |
DIST_SOURCES = $(clambc_SOURCES) |
151 |
+am__can_run_installinfo = \ |
|
152 |
+ case $$AM_UPDATE_INFO_DIR in \ |
|
153 |
+ n|no|NO) false;; \ |
|
154 |
+ *) (install-info --version) >/dev/null 2>&1;; \ |
|
155 |
+ esac |
|
151 | 156 |
ETAGS = etags |
152 | 157 |
CTAGS = ctags |
153 | 158 |
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) |
... | ... |
@@ -391,8 +413,11 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) |
391 | 391 |
$(am__aclocal_m4_deps): |
392 | 392 |
install-binPROGRAMS: $(bin_PROGRAMS) |
393 | 393 |
@$(NORMAL_INSTALL) |
394 |
- test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" |
|
395 | 394 |
@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ |
395 |
+ if test -n "$$list"; then \ |
|
396 |
+ echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \ |
|
397 |
+ $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \ |
|
398 |
+ fi; \ |
|
396 | 399 |
for p in $$list; do echo "$$p $$p"; done | \ |
397 | 400 |
sed 's/$(EXEEXT)$$//' | \ |
398 | 401 |
while read p p1; do if test -f $$p || test -f $$p1; \ |
... | ... |
@@ -1,4 +1,4 @@ |
1 |
-# Makefile.in generated by automake 1.11.3 from Makefile.am. |
|
1 |
+# Makefile.in generated by automake 1.11.6 from Makefile.am. |
|
2 | 2 |
# @configure_input@ |
3 | 3 |
|
4 | 4 |
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, |
... | ... |
@@ -34,6 +34,23 @@ |
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 |
+ } |
|
37 | 54 |
pkgdatadir = $(datadir)/@PACKAGE@ |
38 | 55 |
pkgincludedir = $(includedir)/@PACKAGE@ |
39 | 56 |
pkglibdir = $(libdir)/@PACKAGE@ |
... | ... |
@@ -166,6 +183,11 @@ am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) |
166 | 166 |
am__v_GEN_0 = @echo " GEN " $@; |
167 | 167 |
SOURCES = $(clamconf_SOURCES) |
168 | 168 |
DIST_SOURCES = $(clamconf_SOURCES) |
169 |
+am__can_run_installinfo = \ |
|
170 |
+ case $$AM_UPDATE_INFO_DIR in \ |
|
171 |
+ n|no|NO) false;; \ |
|
172 |
+ *) (install-info --version) >/dev/null 2>&1;; \ |
|
173 |
+ esac |
|
169 | 174 |
ETAGS = etags |
170 | 175 |
CTAGS = ctags |
171 | 176 |
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) |
... | ... |
@@ -414,8 +436,11 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) |
414 | 414 |
$(am__aclocal_m4_deps): |
415 | 415 |
install-binPROGRAMS: $(bin_PROGRAMS) |
416 | 416 |
@$(NORMAL_INSTALL) |
417 |
- test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" |
|
418 | 417 |
@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ |
418 |
+ if test -n "$$list"; then \ |
|
419 |
+ echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \ |
|
420 |
+ $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \ |
|
421 |
+ fi; \ |
|
419 | 422 |
for p in $$list; do echo "$$p $$p"; done | \ |
420 | 423 |
sed 's/$(EXEEXT)$$//' | \ |
421 | 424 |
while read p p1; do if test -f $$p || test -f $$p1; \ |
... | ... |
@@ -1,4 +1,4 @@ |
1 |
-# Makefile.in generated by automake 1.11.3 from Makefile.am. |
|
1 |
+# Makefile.in generated by automake 1.11.6 from Makefile.am. |
|
2 | 2 |
# @configure_input@ |
3 | 3 |
|
4 | 4 |
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, |
... | ... |
@@ -34,6 +34,23 @@ |
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 |
+ } |
|
37 | 54 |
pkgdatadir = $(datadir)/@PACKAGE@ |
38 | 55 |
pkgincludedir = $(includedir)/@PACKAGE@ |
39 | 56 |
pkglibdir = $(libdir)/@PACKAGE@ |
... | ... |
@@ -179,6 +196,11 @@ am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) |
179 | 179 |
am__v_GEN_0 = @echo " GEN " $@; |
180 | 180 |
SOURCES = $(clamd_SOURCES) |
181 | 181 |
DIST_SOURCES = $(am__clamd_SOURCES_DIST) |
182 |
+am__can_run_installinfo = \ |
|
183 |
+ case $$AM_UPDATE_INFO_DIR in \ |
|
184 |
+ n|no|NO) false;; \ |
|
185 |
+ *) (install-info --version) >/dev/null 2>&1;; \ |
|
186 |
+ esac |
|
182 | 187 |
ETAGS = etags |
183 | 188 |
CTAGS = ctags |
184 | 189 |
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) |
... | ... |
@@ -445,8 +467,11 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) |
445 | 445 |
$(am__aclocal_m4_deps): |
446 | 446 |
install-sbinPROGRAMS: $(sbin_PROGRAMS) |
447 | 447 |
@$(NORMAL_INSTALL) |
448 |
- test -z "$(sbindir)" || $(MKDIR_P) "$(DESTDIR)$(sbindir)" |
|
449 | 448 |
@list='$(sbin_PROGRAMS)'; test -n "$(sbindir)" || list=; \ |
449 |
+ if test -n "$$list"; then \ |
|
450 |
+ echo " $(MKDIR_P) '$(DESTDIR)$(sbindir)'"; \ |
|
451 |
+ $(MKDIR_P) "$(DESTDIR)$(sbindir)" || exit 1; \ |
|
452 |
+ fi; \ |
|
450 | 453 |
for p in $$list; do echo "$$p $$p"; done | \ |
451 | 454 |
sed 's/$(EXEEXT)$$//' | \ |
452 | 455 |
while read p p1; do if test -f $$p || test -f $$p1; \ |
... | ... |
@@ -1,4 +1,4 @@ |
1 |
-# Makefile.in generated by automake 1.11.3 from Makefile.am. |
|
1 |
+# Makefile.in generated by automake 1.11.6 from Makefile.am. |
|
2 | 2 |
# @configure_input@ |
3 | 3 |
|
4 | 4 |
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, |
... | ... |
@@ -34,6 +34,23 @@ |
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 |
+ } |
|
37 | 54 |
pkgdatadir = $(datadir)/@PACKAGE@ |
38 | 55 |
pkgincludedir = $(includedir)/@PACKAGE@ |
39 | 56 |
pkglibdir = $(libdir)/@PACKAGE@ |
... | ... |
@@ -177,6 +194,11 @@ am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) |
177 | 177 |
am__v_GEN_0 = @echo " GEN " $@; |
178 | 178 |
SOURCES = $(clamdscan_SOURCES) |
179 | 179 |
DIST_SOURCES = $(am__clamdscan_SOURCES_DIST) |
180 |
+am__can_run_installinfo = \ |
|
181 |
+ case $$AM_UPDATE_INFO_DIR in \ |
|
182 |
+ n|no|NO) false;; \ |
|
183 |
+ *) (install-info --version) >/dev/null 2>&1;; \ |
|
184 |
+ esac |
|
180 | 185 |
ETAGS = etags |
181 | 186 |
CTAGS = ctags |
182 | 187 |
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) |
... | ... |
@@ -431,8 +453,11 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) |
431 | 431 |
$(am__aclocal_m4_deps): |
432 | 432 |
install-binPROGRAMS: $(bin_PROGRAMS) |
433 | 433 |
@$(NORMAL_INSTALL) |
434 |
- test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" |
|
435 | 434 |
@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ |
435 |
+ if test -n "$$list"; then \ |
|
436 |
+ echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \ |
|
437 |
+ $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \ |
|
438 |
+ fi; \ |
|
436 | 439 |
for p in $$list; do echo "$$p $$p"; done | \ |
437 | 440 |
sed 's/$(EXEEXT)$$//' | \ |
438 | 441 |
while read p p1; do if test -f $$p || test -f $$p1; \ |
... | ... |
@@ -1,4 +1,4 @@ |
1 |
-# Makefile.in generated by automake 1.11.3 from Makefile.am. |
|
1 |
+# Makefile.in generated by automake 1.11.6 from Makefile.am. |
|
2 | 2 |
# @configure_input@ |
3 | 3 |
|
4 | 4 |
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, |
... | ... |
@@ -16,6 +16,23 @@ |
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 |
+ } |
|
19 | 36 |
pkgdatadir = $(datadir)/@PACKAGE@ |
20 | 37 |
pkgincludedir = $(includedir)/@PACKAGE@ |
21 | 38 |
pkglibdir = $(libdir)/@PACKAGE@ |
... | ... |
@@ -153,6 +170,11 @@ am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) |
153 | 153 |
am__v_GEN_0 = @echo " GEN " $@; |
154 | 154 |
SOURCES = $(clamdtop_SOURCES) |
155 | 155 |
DIST_SOURCES = $(am__clamdtop_SOURCES_DIST) |
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 |
|
156 | 161 |
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; |
157 | 162 |
am__vpath_adj = case $$p in \ |
158 | 163 |
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ |
... | ... |
@@ -428,8 +450,11 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) |
428 | 428 |
$(am__aclocal_m4_deps): |
429 | 429 |
install-binPROGRAMS: $(bin_PROGRAMS) |
430 | 430 |
@$(NORMAL_INSTALL) |
431 |
- test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" |
|
432 | 431 |
@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ |
432 |
+ if test -n "$$list"; then \ |
|
433 |
+ echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \ |
|
434 |
+ $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \ |
|
435 |
+ fi; \ |
|
433 | 436 |
for p in $$list; do echo "$$p $$p"; done | \ |
434 | 437 |
sed 's/$(EXEEXT)$$//' | \ |
435 | 438 |
while read p p1; do if test -f $$p || test -f $$p1; \ |
... | ... |
@@ -570,11 +595,18 @@ clean-libtool: |
570 | 570 |
-rm -rf .libs _libs |
571 | 571 |
install-man1: $(man_MANS) |
572 | 572 |
@$(NORMAL_INSTALL) |
573 |
- test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)" |
|
574 |
- @list=''; test -n "$(man1dir)" || exit 0; \ |
|
575 |
- { for i in $$list; do echo "$$i"; done; \ |
|
576 |
- l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \ |
|
577 |
- sed -n '/\.1[a-z]*$$/p'; \ |
|
573 |
+ @list1=''; \ |
|
574 |
+ list2='$(man_MANS)'; \ |
|
575 |
+ test -n "$(man1dir)" \ |
|
576 |
+ && test -n "`echo $$list1$$list2`" \ |
|
577 |
+ || exit 0; \ |
|
578 |
+ echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \ |
|
579 |
+ $(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \ |
|
580 |
+ { for i in $$list1; do echo "$$i"; done; \ |
|
581 |
+ if test -n "$$list2"; then \ |
|
582 |
+ for i in $$list2; do echo "$$i"; done \ |
|
583 |
+ | sed -n '/\.1[a-z]*$$/p'; \ |
|
584 |
+ fi; \ |
|
578 | 585 |
} | while read p; do \ |
579 | 586 |
if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ |
580 | 587 |
echo "$$d$$p"; echo "$$p"; \ |
... | ... |
@@ -1,4 +1,4 @@ |
1 |
-# Makefile.in generated by automake 1.11.3 from Makefile.am. |
|
1 |
+# Makefile.in generated by automake 1.11.6 from Makefile.am. |
|
2 | 2 |
# @configure_input@ |
3 | 3 |
|
4 | 4 |
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, |
... | ... |
@@ -35,6 +35,23 @@ |
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 |
+ } |
|
38 | 55 |
pkgdatadir = $(datadir)/@PACKAGE@ |
39 | 56 |
pkgincludedir = $(includedir)/@PACKAGE@ |
40 | 57 |
pkglibdir = $(libdir)/@PACKAGE@ |
... | ... |
@@ -168,6 +185,11 @@ am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) |
168 | 168 |
am__v_GEN_0 = @echo " GEN " $@; |
169 | 169 |
SOURCES = $(clamscan_SOURCES) |
170 | 170 |
DIST_SOURCES = $(clamscan_SOURCES) |
171 |
+am__can_run_installinfo = \ |
|
172 |
+ case $$AM_UPDATE_INFO_DIR in \ |
|
173 |
+ n|no|NO) false;; \ |
|
174 |
+ *) (install-info --version) >/dev/null 2>&1;; \ |
|
175 |
+ esac |
|
171 | 176 |
ETAGS = etags |
172 | 177 |
CTAGS = ctags |
173 | 178 |
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) |
... | ... |
@@ -418,8 +440,11 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) |
418 | 418 |
$(am__aclocal_m4_deps): |
419 | 419 |
install-binPROGRAMS: $(bin_PROGRAMS) |
420 | 420 |
@$(NORMAL_INSTALL) |
421 |
- test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" |
|
422 | 421 |
@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ |
422 |
+ if test -n "$$list"; then \ |
|
423 |
+ echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \ |
|
424 |
+ $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \ |
|
425 |
+ fi; \ |
|
423 | 426 |
for p in $$list; do echo "$$p $$p"; done | \ |
424 | 427 |
sed 's/$(EXEEXT)$$//' | \ |
425 | 428 |
while read p p1; do if test -f $$p || test -f $$p1; \ |
... | ... |
@@ -1,4 +1,4 @@ |
1 |
-# Makefile.in generated by automake 1.11.3 from Makefile.am. |
|
1 |
+# Makefile.in generated by automake 1.11.6 from Makefile.am. |
|
2 | 2 |
# @configure_input@ |
3 | 3 |
|
4 | 4 |
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, |
... | ... |
@@ -34,6 +34,23 @@ |
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 |
+ } |
|
37 | 54 |
pkgdatadir = $(datadir)/@PACKAGE@ |
38 | 55 |
pkgincludedir = $(includedir)/@PACKAGE@ |
39 | 56 |
pkglibdir = $(libdir)/@PACKAGE@ |
... | ... |
@@ -166,6 +183,11 @@ am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) |
166 | 166 |
am__v_GEN_0 = @echo " GEN " $@; |
167 | 167 |
SOURCES = $(clamsubmit_SOURCES) |
168 | 168 |
DIST_SOURCES = $(clamsubmit_SOURCES) |
169 |
+am__can_run_installinfo = \ |
|
170 |
+ case $$AM_UPDATE_INFO_DIR in \ |
|
171 |
+ n|no|NO) false;; \ |
|
172 |
+ *) (install-info --version) >/dev/null 2>&1;; \ |
|
173 |
+ esac |
|
169 | 174 |
ETAGS = etags |
170 | 175 |
CTAGS = ctags |
171 | 176 |
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) |
... | ... |
@@ -412,8 +434,11 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) |
412 | 412 |
$(am__aclocal_m4_deps): |
413 | 413 |
install-binPROGRAMS: $(bin_PROGRAMS) |
414 | 414 |
@$(NORMAL_INSTALL) |
415 |
- test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" |
|
416 | 415 |
@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ |
416 |
+ if test -n "$$list"; then \ |
|
417 |
+ echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \ |
|
418 |
+ $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \ |
|
419 |
+ fi; \ |
|
417 | 420 |
for p in $$list; do echo "$$p $$p"; done | \ |
418 | 421 |
sed 's/$(EXEEXT)$$//' | \ |
419 | 422 |
while read p p1; do if test -f $$p || test -f $$p1; \ |
... | ... |
@@ -1,13 +1,11 @@ |
1 | 1 |
#! /bin/sh |
2 | 2 |
# Guess values for system-dependent variables and create Makefiles. |
3 |
-# Generated by GNU Autoconf 2.68 for ClamAV devel. |
|
3 |
+# Generated by GNU Autoconf 2.69 for ClamAV devel. |
|
4 | 4 |
# |
5 | 5 |
# Report bugs to <http://bugs.clamav.net/>. |
6 | 6 |
# |
7 | 7 |
# |
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. |
|
8 |
+# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. |
|
11 | 9 |
# |
12 | 10 |
# |
13 | 11 |
# This configure script is free software; the Free Software Foundation |
... | ... |
@@ -136,6 +134,31 @@ export LANGUAGE |
136 | 136 |
# CDPATH. |
137 | 137 |
(unset CDPATH) >/dev/null 2>&1 && unset CDPATH |
138 | 138 |
|
139 |
+# Use a proper internal environment variable to ensure we don't fall |
|
140 |
+ # into an infinite loop, continuously re-executing ourselves. |
|
141 |
+ if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then |
|
142 |
+ _as_can_reexec=no; export _as_can_reexec; |
|
143 |
+ # We cannot yet assume a decent shell, so we have to provide a |
|
144 |
+# neutralization value for shells without unset; and this also |
|
145 |
+# works around shells that cannot unset nonexistent variables. |
|
146 |
+# Preserve -v and -x to the replacement shell. |
|
147 |
+BASH_ENV=/dev/null |
|
148 |
+ENV=/dev/null |
|
149 |
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV |
|
150 |
+case $- in # (((( |
|
151 |
+ *v*x* | *x*v* ) as_opts=-vx ;; |
|
152 |
+ *v* ) as_opts=-v ;; |
|
153 |
+ *x* ) as_opts=-x ;; |
|
154 |
+ * ) as_opts= ;; |
|
155 |
+esac |
|
156 |
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} |
|
157 |
+# Admittedly, this is quite paranoid, since all the known shells bail |
|
158 |
+# out after a failed `exec'. |
|
159 |
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 |
|
160 |
+as_fn_exit 255 |
|
161 |
+ fi |
|
162 |
+ # We don't want this to propagate to other subprocesses. |
|
163 |
+ { _as_can_reexec=; unset _as_can_reexec;} |
|
139 | 164 |
if test "x$CONFIG_SHELL" = x; then |
140 | 165 |
as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : |
141 | 166 |
emulate sh |
... | ... |
@@ -169,7 +192,8 @@ if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then : |
169 | 169 |
else |
170 | 170 |
exitcode=1; echo positional parameters were not saved. |
171 | 171 |
fi |
172 |
-test x\$exitcode = x0 || exit 1" |
|
172 |
+test x\$exitcode = x0 || exit 1 |
|
173 |
+test -x / || exit 1" |
|
173 | 174 |
as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO |
174 | 175 |
as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO |
175 | 176 |
eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && |
... | ... |
@@ -222,21 +246,25 @@ IFS=$as_save_IFS |
222 | 222 |
|
223 | 223 |
|
224 | 224 |
if test "x$CONFIG_SHELL" != x; then : |
225 |
- # We cannot yet assume a decent shell, so we have to provide a |
|
226 |
- # neutralization value for shells without unset; and this also |
|
227 |
- # works around shells that cannot unset nonexistent variables. |
|
228 |
- # Preserve -v and -x to the replacement shell. |
|
229 |
- BASH_ENV=/dev/null |
|
230 |
- ENV=/dev/null |
|
231 |
- (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV |
|
232 |
- export CONFIG_SHELL |
|
233 |
- case $- in # (((( |
|
234 |
- *v*x* | *x*v* ) as_opts=-vx ;; |
|
235 |
- *v* ) as_opts=-v ;; |
|
236 |
- *x* ) as_opts=-x ;; |
|
237 |
- * ) as_opts= ;; |
|
238 |
- esac |
|
239 |
- exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"} |
|
225 |
+ export CONFIG_SHELL |
|
226 |
+ # We cannot yet assume a decent shell, so we have to provide a |
|
227 |
+# neutralization value for shells without unset; and this also |
|
228 |
+# works around shells that cannot unset nonexistent variables. |
|
229 |
+# Preserve -v and -x to the replacement shell. |
|
230 |
+BASH_ENV=/dev/null |
|
231 |
+ENV=/dev/null |
|
232 |
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV |
|
233 |
+case $- in # (((( |
|
234 |
+ *v*x* | *x*v* ) as_opts=-vx ;; |
|
235 |
+ *v* ) as_opts=-v ;; |
|
236 |
+ *x* ) as_opts=-x ;; |
|
237 |
+ * ) as_opts= ;; |
|
238 |
+esac |
|
239 |
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} |
|
240 |
+# Admittedly, this is quite paranoid, since all the known shells bail |
|
241 |
+# out after a failed `exec'. |
|
242 |
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 |
|
243 |
+exit 255 |
|
240 | 244 |
fi |
241 | 245 |
|
242 | 246 |
if test x$as_have_required = xno; then : |
... | ... |
@@ -339,6 +367,14 @@ $as_echo X"$as_dir" | |
339 | 339 |
|
340 | 340 |
|
341 | 341 |
} # as_fn_mkdir_p |
342 |
+ |
|
343 |
+# as_fn_executable_p FILE |
|
344 |
+# ----------------------- |
|
345 |
+# Test if FILE is an executable regular file. |
|
346 |
+as_fn_executable_p () |
|
347 |
+{ |
|
348 |
+ test -f "$1" && test -x "$1" |
|
349 |
+} # as_fn_executable_p |
|
342 | 350 |
# as_fn_append VAR VALUE |
343 | 351 |
# ---------------------- |
344 | 352 |
# Append the text in VALUE to the end of the definition contained in VAR. Take |
... | ... |
@@ -460,6 +496,10 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits |
460 | 460 |
chmod +x "$as_me.lineno" || |
461 | 461 |
{ $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } |
462 | 462 |
|
463 |
+ # If we had to re-execute with $CONFIG_SHELL, we're ensured to have |
|
464 |
+ # already done that, so ensure we don't try to do so again and fall |
|
465 |
+ # in an infinite loop. This has already happened in practice. |
|
466 |
+ _as_can_reexec=no; export _as_can_reexec |
|
463 | 467 |
# Don't try to exec as it changes $[0], causing all sort of problems |
464 | 468 |
# (the dirname of $[0] is not the place where we might find the |
465 | 469 |
# original and so on. Autoconf is especially sensitive to this). |
... | ... |
@@ -494,16 +534,16 @@ if (echo >conf$$.file) 2>/dev/null; then |
494 | 494 |
# ... but there are two gotchas: |
495 | 495 |
# 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. |
496 | 496 |
# 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. |
497 |
- # In both cases, we have to default to `cp -p'. |
|
497 |
+ # In both cases, we have to default to `cp -pR'. |
|
498 | 498 |
ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || |
499 |
- as_ln_s='cp -p' |
|
499 |
+ as_ln_s='cp -pR' |
|
500 | 500 |
elif ln conf$$.file conf$$ 2>/dev/null; then |
501 | 501 |
as_ln_s=ln |
502 | 502 |
else |
503 |
- as_ln_s='cp -p' |
|
503 |
+ as_ln_s='cp -pR' |
|
504 | 504 |
fi |
505 | 505 |
else |
506 |
- as_ln_s='cp -p' |
|
506 |
+ as_ln_s='cp -pR' |
|
507 | 507 |
fi |
508 | 508 |
rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file |
509 | 509 |
rmdir conf$$.dir 2>/dev/null |
... | ... |
@@ -515,28 +555,8 @@ else |
515 | 515 |
as_mkdir_p=false |
516 | 516 |
fi |
517 | 517 |
|
518 |
-if test -x / >/dev/null 2>&1; then |
|
519 |
- as_test_x='test -x' |
|
520 |
-else |
|
521 |
- if ls -dL / >/dev/null 2>&1; then |
|
522 |
- as_ls_L_option=L |
|
523 |
- else |
|
524 |
- as_ls_L_option= |
|
525 |
- fi |
|
526 |
- as_test_x=' |
|
527 |
- eval sh -c '\'' |
|
528 |
- if test -d "$1"; then |
|
529 |
- test -d "$1/."; |
|
530 |
- else |
|
531 |
- case $1 in #( |
|
532 |
- -*)set "./$1";; |
|
533 |
- esac; |
|
534 |
- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( |
|
535 |
- ???[sx]*):;;*)false;;esac;fi |
|
536 |
- '\'' sh |
|
537 |
- ' |
|
538 |
-fi |
|
539 |
-as_executable_p=$as_test_x |
|
518 |
+as_test_x='test -x' |
|
519 |
+as_executable_p=as_fn_executable_p |
|
540 | 520 |
|
541 | 521 |
# Sed expression to map a string onto a valid CPP name. |
542 | 522 |
as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" |
... | ... |
@@ -1362,8 +1382,6 @@ target=$target_alias |
1362 | 1362 |
if test "x$host_alias" != x; then |
1363 | 1363 |
if test "x$build_alias" = x; then |
1364 | 1364 |
cross_compiling=maybe |
1365 |
- $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. |
|
1366 |
- If a cross compiler is detected then cross compile mode will be used" >&2 |
|
1367 | 1365 |
elif test "x$build_alias" != "x$host_alias"; then |
1368 | 1366 |
cross_compiling=yes |
1369 | 1367 |
fi |
... | ... |
@@ -1685,9 +1703,9 @@ test -n "$ac_init_help" && exit $ac_status |
1685 | 1685 |
if $ac_init_version; then |
1686 | 1686 |
cat <<\_ACEOF |
1687 | 1687 |
ClamAV configure devel |
1688 |
-generated by GNU Autoconf 2.68 |
|
1688 |
+generated by GNU Autoconf 2.69 |
|
1689 | 1689 |
|
1690 |
-Copyright (C) 2010 Free Software Foundation, Inc. |
|
1690 |
+Copyright (C) 2012 Free Software Foundation, Inc. |
|
1691 | 1691 |
This configure script is free software; the Free Software Foundation |
1692 | 1692 |
gives unlimited permission to copy, distribute and modify it. |
1693 | 1693 |
_ACEOF |
... | ... |
@@ -1763,7 +1781,7 @@ $as_echo "$ac_try_echo"; } >&5 |
1763 | 1763 |
test ! -s conftest.err |
1764 | 1764 |
} && test -s conftest$ac_exeext && { |
1765 | 1765 |
test "$cross_compiling" = yes || |
1766 |
- $as_test_x conftest$ac_exeext |
|
1766 |
+ test -x conftest$ac_exeext |
|
1767 | 1767 |
}; then : |
1768 | 1768 |
ac_retval=0 |
1769 | 1769 |
else |
... | ... |
@@ -2154,7 +2172,7 @@ This file contains any messages produced by compilers while |
2154 | 2154 |
running configure, to aid debugging if configure makes a mistake. |
2155 | 2155 |
|
2156 | 2156 |
It was created by ClamAV $as_me devel, which was |
2157 |
-generated by GNU Autoconf 2.68. Invocation command line was |
|
2157 |
+generated by GNU Autoconf 2.69. Invocation command line was |
|
2158 | 2158 |
|
2159 | 2159 |
$ $0 $@ |
2160 | 2160 |
|
... | ... |
@@ -2875,7 +2893,7 @@ case $as_dir/ in #(( |
2875 | 2875 |
# by default. |
2876 | 2876 |
for ac_prog in ginstall scoinst install; do |
2877 | 2877 |
for ac_exec_ext in '' $ac_executable_extensions; do |
2878 |
- if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then |
|
2878 |
+ if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then |
|
2879 | 2879 |
if test $ac_prog = install && |
2880 | 2880 |
grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then |
2881 | 2881 |
# AIX install. It has an incompatible calling convention. |
... | ... |
@@ -3044,7 +3062,7 @@ do |
3044 | 3044 |
IFS=$as_save_IFS |
3045 | 3045 |
test -z "$as_dir" && as_dir=. |
3046 | 3046 |
for ac_exec_ext in '' $ac_executable_extensions; do |
3047 |
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
|
3047 |
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
|
3048 | 3048 |
ac_cv_prog_STRIP="${ac_tool_prefix}strip" |
3049 | 3049 |
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
3050 | 3050 |
break 2 |
... | ... |
@@ -3084,7 +3102,7 @@ do |
3084 | 3084 |
IFS=$as_save_IFS |
3085 | 3085 |
test -z "$as_dir" && as_dir=. |
3086 | 3086 |
for ac_exec_ext in '' $ac_executable_extensions; do |
3087 |
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
|
3087 |
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
|
3088 | 3088 |
ac_cv_prog_ac_ct_STRIP="strip" |
3089 | 3089 |
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
3090 | 3090 |
break 2 |
... | ... |
@@ -3135,7 +3153,7 @@ do |
3135 | 3135 |
test -z "$as_dir" && as_dir=. |
3136 | 3136 |
for ac_prog in mkdir gmkdir; do |
3137 | 3137 |
for ac_exec_ext in '' $ac_executable_extensions; do |
3138 |
- { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue |
|
3138 |
+ as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue |
|
3139 | 3139 |
case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( |
3140 | 3140 |
'mkdir (GNU coreutils) '* | \ |
3141 | 3141 |
'mkdir (coreutils) '* | \ |
... | ... |
@@ -3188,7 +3206,7 @@ do |
3188 | 3188 |
IFS=$as_save_IFS |
3189 | 3189 |
test -z "$as_dir" && as_dir=. |
3190 | 3190 |
for ac_exec_ext in '' $ac_executable_extensions; do |
3191 |
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
|
3191 |
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
|
3192 | 3192 |
ac_cv_prog_AWK="$ac_prog" |
3193 | 3193 |
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
3194 | 3194 |
break 2 |
... | ... |
@@ -3648,7 +3666,7 @@ do |
3648 | 3648 |
IFS=$as_save_IFS |
3649 | 3649 |
test -z "$as_dir" && as_dir=. |
3650 | 3650 |
for ac_exec_ext in '' $ac_executable_extensions; do |
3651 |
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
|
3651 |
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
|
3652 | 3652 |
ac_cv_prog_CC="${ac_tool_prefix}gcc" |
3653 | 3653 |
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
3654 | 3654 |
break 2 |
... | ... |
@@ -3688,7 +3706,7 @@ do |
3688 | 3688 |
IFS=$as_save_IFS |
3689 | 3689 |
test -z "$as_dir" && as_dir=. |
3690 | 3690 |
for ac_exec_ext in '' $ac_executable_extensions; do |
3691 |
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
|
3691 |
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
|
3692 | 3692 |
ac_cv_prog_ac_ct_CC="gcc" |
3693 | 3693 |
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
3694 | 3694 |
break 2 |
... | ... |
@@ -3741,7 +3759,7 @@ do |
3741 | 3741 |
IFS=$as_save_IFS |
3742 | 3742 |
test -z "$as_dir" && as_dir=. |
3743 | 3743 |
for ac_exec_ext in '' $ac_executable_extensions; do |
3744 |
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
|
3744 |
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
|
3745 | 3745 |
ac_cv_prog_CC="${ac_tool_prefix}cc" |
3746 | 3746 |
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
3747 | 3747 |
break 2 |
... | ... |
@@ -3782,7 +3800,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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
|
3785 |
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
|
3786 | 3786 |
if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then |
3787 | 3787 |
ac_prog_rejected=yes |
3788 | 3788 |
continue |
... | ... |
@@ -3840,7 +3858,7 @@ do |
3840 | 3840 |
IFS=$as_save_IFS |
3841 | 3841 |
test -z "$as_dir" && as_dir=. |
3842 | 3842 |
for ac_exec_ext in '' $ac_executable_extensions; do |
3843 |
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
|
3843 |
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
|
3844 | 3844 |
ac_cv_prog_CC="$ac_tool_prefix$ac_prog" |
3845 | 3845 |
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
3846 | 3846 |
break 2 |
... | ... |
@@ -3884,7 +3902,7 @@ do |
3884 | 3884 |
IFS=$as_save_IFS |
3885 | 3885 |
test -z "$as_dir" && as_dir=. |
3886 | 3886 |
for ac_exec_ext in '' $ac_executable_extensions; do |
3887 |
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
|
3887 |
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
|
3888 | 3888 |
ac_cv_prog_ac_ct_CC="$ac_prog" |
3889 | 3889 |
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
3890 | 3890 |
break 2 |
... | ... |
@@ -4330,8 +4348,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
4330 | 4330 |
/* end confdefs.h. */ |
4331 | 4331 |
#include <stdarg.h> |
4332 | 4332 |
#include <stdio.h> |
4333 |
-#include <sys/types.h> |
|
4334 |
-#include <sys/stat.h> |
|
4333 |
+struct stat; |
|
4335 | 4334 |
/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ |
4336 | 4335 |
struct buf { int x; }; |
4337 | 4336 |
FILE * (*rcsopen) (struct buf *, struct stat *, int); |
... | ... |
@@ -4566,7 +4583,7 @@ do |
4566 | 4566 |
for ac_prog in sed gsed; do |
4567 | 4567 |
for ac_exec_ext in '' $ac_executable_extensions; do |
4568 | 4568 |
ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" |
4569 |
- { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue |
|
4569 |
+ as_fn_executable_p "$ac_path_SED" || continue |
|
4570 | 4570 |
# Check for GNU ac_path_SED and select it if it is found. |
4571 | 4571 |
# Check for GNU $ac_path_SED |
4572 | 4572 |
case `"$ac_path_SED" --version 2>&1` in |
... | ... |
@@ -4642,7 +4659,7 @@ do |
4642 | 4642 |
for ac_prog in grep ggrep; do |
4643 | 4643 |
for ac_exec_ext in '' $ac_executable_extensions; do |
4644 | 4644 |
ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" |
4645 |
- { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue |
|
4645 |
+ as_fn_executable_p "$ac_path_GREP" || continue |
|
4646 | 4646 |
# Check for GNU ac_path_GREP and select it if it is found. |
4647 | 4647 |
# Check for GNU $ac_path_GREP |
4648 | 4648 |
case `"$ac_path_GREP" --version 2>&1` in |
... | ... |
@@ -4708,7 +4725,7 @@ do |
4708 | 4708 |
for ac_prog in egrep; do |
4709 | 4709 |
for ac_exec_ext in '' $ac_executable_extensions; do |
4710 | 4710 |
ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" |
4711 |
- { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue |
|
4711 |
+ as_fn_executable_p "$ac_path_EGREP" || continue |
|
4712 | 4712 |
# Check for GNU ac_path_EGREP and select it if it is found. |
4713 | 4713 |
# Check for GNU $ac_path_EGREP |
4714 | 4714 |
case `"$ac_path_EGREP" --version 2>&1` in |
... | ... |
@@ -4775,7 +4792,7 @@ do |
4775 | 4775 |
for ac_prog in fgrep; do |
4776 | 4776 |
for ac_exec_ext in '' $ac_executable_extensions; do |
4777 | 4777 |
ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext" |
4778 |
- { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue |
|
4778 |
+ as_fn_executable_p "$ac_path_FGREP" || continue |
|
4779 | 4779 |
# Check for GNU ac_path_FGREP and select it if it is found. |
4780 | 4780 |
# Check for GNU $ac_path_FGREP |
4781 | 4781 |
case `"$ac_path_FGREP" --version 2>&1` in |
... | ... |
@@ -5031,7 +5048,7 @@ do |
5031 | 5031 |
IFS=$as_save_IFS |
5032 | 5032 |
test -z "$as_dir" && as_dir=. |
5033 | 5033 |
for ac_exec_ext in '' $ac_executable_extensions; do |
5034 |
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
|
5034 |
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
|
5035 | 5035 |
ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog" |
5036 | 5036 |
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
5037 | 5037 |
break 2 |
... | ... |
@@ -5075,7 +5092,7 @@ do |
5075 | 5075 |
IFS=$as_save_IFS |
5076 | 5076 |
test -z "$as_dir" && as_dir=. |
5077 | 5077 |
for ac_exec_ext in '' $ac_executable_extensions; do |
5078 |
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
|
5078 |
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
|
5079 | 5079 |
ac_cv_prog_ac_ct_DUMPBIN="$ac_prog" |
5080 | 5080 |
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
5081 | 5081 |
break 2 |
... | ... |
@@ -5500,7 +5517,7 @@ do |
5500 | 5500 |
IFS=$as_save_IFS |
5501 | 5501 |
test -z "$as_dir" && as_dir=. |
5502 | 5502 |
for ac_exec_ext in '' $ac_executable_extensions; do |
5503 |
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
|
5503 |
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
|
5504 | 5504 |
ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump" |
5505 | 5505 |
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
5506 | 5506 |
break 2 |
... | ... |
@@ -5540,7 +5557,7 @@ do |
5540 | 5540 |
IFS=$as_save_IFS |
5541 | 5541 |
test -z "$as_dir" && as_dir=. |
5542 | 5542 |
for ac_exec_ext in '' $ac_executable_extensions; do |
5543 |
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
|
5543 |
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
|
5544 | 5544 |
ac_cv_prog_ac_ct_OBJDUMP="objdump" |
5545 | 5545 |
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
5546 | 5546 |
break 2 |
... | ... |
@@ -5842,7 +5859,7 @@ do |
5842 | 5842 |
IFS=$as_save_IFS |
5843 | 5843 |
test -z "$as_dir" && as_dir=. |
5844 | 5844 |
for ac_exec_ext in '' $ac_executable_extensions; do |
5845 |
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
|
5845 |
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
|
5846 | 5846 |
ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" |
5847 | 5847 |
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
5848 | 5848 |
break 2 |
... | ... |
@@ -5882,7 +5899,7 @@ do |
5882 | 5882 |
IFS=$as_save_IFS |
5883 | 5883 |
test -z "$as_dir" && as_dir=. |
5884 | 5884 |
for ac_exec_ext in '' $ac_executable_extensions; do |
5885 |
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
|
5885 |
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
|
5886 | 5886 |
ac_cv_prog_ac_ct_DLLTOOL="dlltool" |
5887 | 5887 |
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
5888 | 5888 |
break 2 |
... | ... |
@@ -5986,7 +6003,7 @@ do |
5986 | 5986 |
IFS=$as_save_IFS |
5987 | 5987 |
test -z "$as_dir" && as_dir=. |
5988 | 5988 |
for ac_exec_ext in '' $ac_executable_extensions; do |
5989 |
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
|
5989 |
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
|
5990 | 5990 |
ac_cv_prog_AR="$ac_tool_prefix$ac_prog" |
5991 | 5991 |
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
5992 | 5992 |
break 2 |
... | ... |
@@ -6030,7 +6047,7 @@ do |
6030 | 6030 |
IFS=$as_save_IFS |
6031 | 6031 |
test -z "$as_dir" && as_dir=. |
6032 | 6032 |
for ac_exec_ext in '' $ac_executable_extensions; do |
6033 |
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
|
6033 |
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
|
6034 | 6034 |
ac_cv_prog_ac_ct_AR="$ac_prog" |
6035 | 6035 |
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
6036 | 6036 |
break 2 |
... | ... |
@@ -6155,7 +6172,7 @@ do |
6155 | 6155 |
IFS=$as_save_IFS |
6156 | 6156 |
test -z "$as_dir" && as_dir=. |
6157 | 6157 |
for ac_exec_ext in '' $ac_executable_extensions; do |
6158 |
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
|
6158 |
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
|
6159 | 6159 |
ac_cv_prog_STRIP="${ac_tool_prefix}strip" |
6160 | 6160 |
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
6161 | 6161 |
break 2 |
... | ... |
@@ -6195,7 +6212,7 @@ do |
6195 | 6195 |
IFS=$as_save_IFS |
6196 | 6196 |
test -z "$as_dir" && as_dir=. |
6197 | 6197 |
for ac_exec_ext in '' $ac_executable_extensions; do |
6198 |
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
|
6198 |
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
|
6199 | 6199 |
ac_cv_prog_ac_ct_STRIP="strip" |
6200 | 6200 |
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
6201 | 6201 |
break 2 |
... | ... |
@@ -6254,7 +6271,7 @@ do |
6254 | 6254 |
IFS=$as_save_IFS |
6255 | 6255 |
test -z "$as_dir" && as_dir=. |
6256 | 6256 |
for ac_exec_ext in '' $ac_executable_extensions; do |
6257 |
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
|
6257 |
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
|
6258 | 6258 |
ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" |
6259 | 6259 |
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
6260 | 6260 |
break 2 |
... | ... |
@@ -6294,7 +6311,7 @@ do |
6294 | 6294 |
IFS=$as_save_IFS |
6295 | 6295 |
test -z "$as_dir" && as_dir=. |
6296 | 6296 |
for ac_exec_ext in '' $ac_executable_extensions; do |
6297 |
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
|
6297 |
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
|
6298 | 6298 |
ac_cv_prog_ac_ct_RANLIB="ranlib" |
6299 | 6299 |
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
6300 | 6300 |
break 2 |
... | ... |
@@ -6956,7 +6973,7 @@ do |
6956 | 6956 |
IFS=$as_save_IFS |
6957 | 6957 |
test -z "$as_dir" && as_dir=. |
6958 | 6958 |
for ac_exec_ext in '' $ac_executable_extensions; do |
6959 |
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
|
6959 |
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
|
6960 | 6960 |
ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" |
6961 | 6961 |
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
6962 | 6962 |
break 2 |
... | ... |
@@ -6996,7 +7013,7 @@ do |
6996 | 6996 |
IFS=$as_save_IFS |
6997 | 6997 |
test -z "$as_dir" && as_dir=. |
6998 | 6998 |
for ac_exec_ext in '' $ac_executable_extensions; do |
6999 |
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
|
6999 |
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
|
7000 | 7000 |
ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" |
7001 | 7001 |
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
7002 | 7002 |
break 2 |
... | ... |
@@ -7076,7 +7093,7 @@ do |
7076 | 7076 |
IFS=$as_save_IFS |
7077 | 7077 |
test -z "$as_dir" && as_dir=. |
7078 | 7078 |
for ac_exec_ext in '' $ac_executable_extensions; do |
7079 |
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
|
7079 |
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
|
7080 | 7080 |
ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil" |
7081 | 7081 |
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
7082 | 7082 |
break 2 |
... | ... |
@@ -7116,7 +7133,7 @@ do |
7116 | 7116 |
IFS=$as_save_IFS |
7117 | 7117 |
test -z "$as_dir" && as_dir=. |
7118 | 7118 |
for ac_exec_ext in '' $ac_executable_extensions; do |
7119 |
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
|
7119 |
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
|
7120 | 7120 |
ac_cv_prog_ac_ct_DSYMUTIL="dsymutil" |
7121 | 7121 |
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
7122 | 7122 |
break 2 |
... | ... |
@@ -7168,7 +7185,7 @@ do |
7168 | 7168 |
IFS=$as_save_IFS |
7169 | 7169 |
test -z "$as_dir" && as_dir=. |
7170 | 7170 |
for ac_exec_ext in '' $ac_executable_extensions; do |
7171 |
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
|
7171 |
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
|
7172 | 7172 |
ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit" |
7173 | 7173 |
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
7174 | 7174 |
break 2 |
... | ... |
@@ -7208,7 +7225,7 @@ do |
7208 | 7208 |
IFS=$as_save_IFS |
7209 | 7209 |
test -z "$as_dir" && as_dir=. |
7210 | 7210 |
for ac_exec_ext in '' $ac_executable_extensions; do |
7211 |
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
|
7211 |
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
|
7212 | 7212 |
ac_cv_prog_ac_ct_NMEDIT="nmedit" |
7213 | 7213 |
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
7214 | 7214 |
break 2 |
... | ... |
@@ -7260,7 +7277,7 @@ do |
7260 | 7260 |
IFS=$as_save_IFS |
7261 | 7261 |
test -z "$as_dir" && as_dir=. |
7262 | 7262 |
for ac_exec_ext in '' $ac_executable_extensions; do |
7263 |
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
|
7263 |
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
|
7264 | 7264 |
ac_cv_prog_LIPO="${ac_tool_prefix}lipo" |
7265 | 7265 |
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
7266 | 7266 |
break 2 |
... | ... |
@@ -7300,7 +7317,7 @@ do |
7300 | 7300 |
IFS=$as_save_IFS |
7301 | 7301 |
test -z "$as_dir" && as_dir=. |
7302 | 7302 |
for ac_exec_ext in '' $ac_executable_extensions; do |
7303 |
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
|
7303 |
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
|
7304 | 7304 |
ac_cv_prog_ac_ct_LIPO="lipo" |
7305 | 7305 |
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
7306 | 7306 |
break 2 |
... | ... |
@@ -7352,7 +7369,7 @@ do |
7352 | 7352 |
IFS=$as_save_IFS |
7353 | 7353 |
test -z "$as_dir" && as_dir=. |
7354 | 7354 |
for ac_exec_ext in '' $ac_executable_extensions; do |
7355 |
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
|
7355 |
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
|
7356 | 7356 |
ac_cv_prog_OTOOL="${ac_tool_prefix}otool" |
7357 | 7357 |
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
7358 | 7358 |
break 2 |
... | ... |
@@ -7392,7 +7409,7 @@ do |
7392 | 7392 |
IFS=$as_save_IFS |
7393 | 7393 |
test -z "$as_dir" && as_dir=. |
7394 | 7394 |
for ac_exec_ext in '' $ac_executable_extensions; do |
7395 |
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
|
7395 |
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
|
7396 | 7396 |
ac_cv_prog_ac_ct_OTOOL="otool" |
7397 | 7397 |
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
7398 | 7398 |
break 2 |
... | ... |
@@ -7444,7 +7461,7 @@ do |
7444 | 7444 |
IFS=$as_save_IFS |
7445 | 7445 |
test -z "$as_dir" && as_dir=. |
7446 | 7446 |
for ac_exec_ext in '' $ac_executable_extensions; do |
7447 |
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
|
7447 |
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
|
7448 | 7448 |
ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64" |
7449 | 7449 |
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
7450 | 7450 |
break 2 |
... | ... |
@@ -7484,7 +7501,7 @@ do |
7484 | 7484 |
IFS=$as_save_IFS |
7485 | 7485 |
test -z "$as_dir" && as_dir=. |
7486 | 7486 |
for ac_exec_ext in '' $ac_executable_extensions; do |
7487 |
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
|
7487 |
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
|
7488 | 7488 |
ac_cv_prog_ac_ct_OTOOL64="otool64" |
7489 | 7489 |
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
7490 | 7490 |
break 2 |
... | ... |
@@ -13067,7 +13084,7 @@ do |
13067 | 13067 |
IFS=$as_save_IFS |
13068 | 13068 |
test -z "$as_dir" && as_dir=. |
13069 | 13069 |
for ac_exec_ext in '' $ac_executable_extensions; do |
13070 |
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
|
13070 |
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
|
13071 | 13071 |
ac_cv_prog_CC="${ac_tool_prefix}gcc" |
13072 | 13072 |
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
13073 | 13073 |
break 2 |
... | ... |
@@ -13107,7 +13124,7 @@ do |
13107 | 13107 |
IFS=$as_save_IFS |
13108 | 13108 |
test -z "$as_dir" && as_dir=. |
13109 | 13109 |
for ac_exec_ext in '' $ac_executable_extensions; do |
13110 |
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
|
13110 |
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
|
13111 | 13111 |
ac_cv_prog_ac_ct_CC="gcc" |
13112 | 13112 |
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
13113 | 13113 |
break 2 |
... | ... |
@@ -13160,7 +13177,7 @@ do |
13160 | 13160 |
IFS=$as_save_IFS |
13161 | 13161 |
test -z "$as_dir" && as_dir=. |
13162 | 13162 |
for ac_exec_ext in '' $ac_executable_extensions; do |
13163 |
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
|
13163 |
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
|
13164 | 13164 |
ac_cv_prog_CC="${ac_tool_prefix}cc" |
13165 | 13165 |
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
13166 | 13166 |
break 2 |
... | ... |
@@ -13201,7 +13218,7 @@ do |
13201 | 13201 |
IFS=$as_save_IFS |
13202 | 13202 |
test -z "$as_dir" && as_dir=. |
13203 | 13203 |
for ac_exec_ext in '' $ac_executable_extensions; do |
13204 |
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
|
13204 |
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
|
13205 | 13205 |
if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then |
13206 | 13206 |
ac_prog_rejected=yes |
13207 | 13207 |
continue |
... | ... |
@@ -13259,7 +13276,7 @@ do |
13259 | 13259 |
IFS=$as_save_IFS |
13260 | 13260 |
test -z "$as_dir" && as_dir=. |
13261 | 13261 |
for ac_exec_ext in '' $ac_executable_extensions; do |
13262 |
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
|
13262 |
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
|
13263 | 13263 |
ac_cv_prog_CC="$ac_tool_prefix$ac_prog" |
13264 | 13264 |
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
13265 | 13265 |
break 2 |
... | ... |
@@ -13303,7 +13320,7 @@ do |
13303 | 13303 |
IFS=$as_save_IFS |
13304 | 13304 |
test -z "$as_dir" && as_dir=. |
13305 | 13305 |
for ac_exec_ext in '' $ac_executable_extensions; do |
13306 |
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
|
13306 |
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
|
13307 | 13307 |
ac_cv_prog_ac_ct_CC="$ac_prog" |
13308 | 13308 |
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
13309 | 13309 |
break 2 |
... | ... |
@@ -13499,8 +13516,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
13499 | 13499 |
/* end confdefs.h. */ |
13500 | 13500 |
#include <stdarg.h> |
13501 | 13501 |
#include <stdio.h> |
13502 |
-#include <sys/types.h> |
|
13503 |
-#include <sys/stat.h> |
|
13502 |
+struct stat; |
|
13504 | 13503 |
/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ |
13505 | 13504 |
struct buf { int x; }; |
13506 | 13505 |
FILE * (*rcsopen) (struct buf *, struct stat *, int); |
... | ... |
@@ -14030,11 +14046,11 @@ else |
14030 | 14030 |
int |
14031 | 14031 |
main () |
14032 | 14032 |
{ |
14033 |
-/* FIXME: Include the comments suggested by Paul. */ |
|
14033 |
+ |
|
14034 | 14034 |
#ifndef __cplusplus |
14035 |
- /* Ultrix mips cc rejects this. */ |
|
14035 |
+ /* Ultrix mips cc rejects this sort of thing. */ |
|
14036 | 14036 |
typedef int charset[2]; |
14037 |
- const charset cs; |
|
14037 |
+ const charset cs = { 0, 0 }; |
|
14038 | 14038 |
/* SunOS 4.1.1 cc rejects this. */ |
14039 | 14039 |
char const *const *pcpcc; |
14040 | 14040 |
char **ppc; |
... | ... |
@@ -14051,8 +14067,9 @@ main () |
14051 | 14051 |
++pcpcc; |
14052 | 14052 |
ppc = (char**) pcpcc; |
14053 | 14053 |
pcpcc = (char const *const *) ppc; |
14054 |
- { /* SCO 3.2v4 cc rejects this. */ |
|
14055 |
- char *t; |
|
14054 |
+ { /* SCO 3.2v4 cc rejects this sort of thing. */ |
|
14055 |
+ char tx; |
|
14056 |
+ char *t = &tx; |
|
14056 | 14057 |
char const *s = 0 ? (char *) 0 : (char const *) 0; |
14057 | 14058 |
|
14058 | 14059 |
*t++ = 0; |
... | ... |
@@ -14068,10 +14085,10 @@ main () |
14068 | 14068 |
iptr p = 0; |
14069 | 14069 |
++p; |
14070 | 14070 |
} |
14071 |
- { /* AIX XL C 1.02.0.0 rejects this saying |
|
14071 |
+ { /* AIX XL C 1.02.0.0 rejects this sort of thing, saying |
|
14072 | 14072 |
"k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */ |
14073 |
- struct s { int j; const int *ap[3]; }; |
|
14074 |
- struct s *b; b->j = 5; |
|
14073 |
+ struct s { int j; const int *ap[3]; } bx; |
|
14074 |
+ struct s *b = &bx; b->j = 5; |
|
14075 | 14075 |
} |
14076 | 14076 |
{ /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */ |
14077 | 14077 |
const int foo = 10; |
... | ... |
@@ -16300,7 +16317,7 @@ do |
16300 | 16300 |
IFS=$as_save_IFS |
16301 | 16301 |
test -z "$as_dir" && as_dir=. |
16302 | 16302 |
for ac_exec_ext in '' $ac_executable_extensions; do |
16303 |
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
|
16303 |
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
|
16304 | 16304 |
ac_cv_prog_GCOV="$ac_prog" |
16305 | 16305 |
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
16306 | 16306 |
break 2 |
... | ... |
@@ -16343,7 +16360,7 @@ do |
16343 | 16343 |
IFS=$as_save_IFS |
16344 | 16344 |
test -z "$as_dir" && as_dir=. |
16345 | 16345 |
for ac_exec_ext in '' $ac_executable_extensions; do |
16346 |
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
|
16346 |
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
|
16347 | 16347 |
ac_cv_prog_LCOV="$ac_prog" |
16348 | 16348 |
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
16349 | 16349 |
break 2 |
... | ... |
@@ -16386,7 +16403,7 @@ do |
16386 | 16386 |
IFS=$as_save_IFS |
16387 | 16387 |
test -z "$as_dir" && as_dir=. |
16388 | 16388 |
for ac_exec_ext in '' $ac_executable_extensions; do |
16389 |
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
|
16389 |
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
|
16390 | 16390 |
ac_cv_prog_GENHTML="$ac_prog" |
16391 | 16391 |
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
16392 | 16392 |
break 2 |
... | ... |
@@ -19289,7 +19306,7 @@ do |
19289 | 19289 |
IFS=$as_save_IFS |
19290 | 19290 |
test -z "$as_dir" && as_dir=. |
19291 | 19291 |
for ac_exec_ext in '' $ac_executable_extensions; do |
19292 |
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
|
19292 |
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
|
19293 | 19293 |
ac_cv_path_GETENT="$as_dir/$ac_word$ac_exec_ext" |
19294 | 19294 |
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
19295 | 19295 |
break 2 |
... | ... |
@@ -22552,16 +22569,16 @@ if (echo >conf$$.file) 2>/dev/null; then |
22552 | 22552 |
# ... but there are two gotchas: |
22553 | 22553 |
# 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. |
22554 | 22554 |
# 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. |
22555 |
- # In both cases, we have to default to `cp -p'. |
|
22555 |
+ # In both cases, we have to default to `cp -pR'. |
|
22556 | 22556 |
ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || |
22557 |
- as_ln_s='cp -p' |
|
22557 |
+ as_ln_s='cp -pR' |
|
22558 | 22558 |
elif ln conf$$.file conf$$ 2>/dev/null; then |
22559 | 22559 |
as_ln_s=ln |
22560 | 22560 |
else |
22561 |
- as_ln_s='cp -p' |
|
22561 |
+ as_ln_s='cp -pR' |
|
22562 | 22562 |
fi |
22563 | 22563 |
else |
22564 |
- as_ln_s='cp -p' |
|
22564 |
+ as_ln_s='cp -pR' |
|
22565 | 22565 |
fi |
22566 | 22566 |
rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file |
22567 | 22567 |
rmdir conf$$.dir 2>/dev/null |
... | ... |
@@ -22621,28 +22638,16 @@ else |
22621 | 22621 |
as_mkdir_p=false |
22622 | 22622 |
fi |
22623 | 22623 |
|
22624 |
-if test -x / >/dev/null 2>&1; then |
|
22625 |
- as_test_x='test -x' |
|
22626 |
-else |
|
22627 |
- if ls -dL / >/dev/null 2>&1; then |
|
22628 |
- as_ls_L_option=L |
|
22629 |
- else |
|
22630 |
- as_ls_L_option= |
|
22631 |
- fi |
|
22632 |
- as_test_x=' |
|
22633 |
- eval sh -c '\'' |
|
22634 |
- if test -d "$1"; then |
|
22635 |
- test -d "$1/."; |
|
22636 |
- else |
|
22637 |
- case $1 in #( |
|
22638 |
- -*)set "./$1";; |
|
22639 |
- esac; |
|
22640 |
- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( |
|
22641 |
- ???[sx]*):;;*)false;;esac;fi |
|
22642 |
- '\'' sh |
|
22643 |
- ' |
|
22644 |
-fi |
|
22645 |
-as_executable_p=$as_test_x |
|
22624 |
+ |
|
22625 |
+# as_fn_executable_p FILE |
|
22626 |
+# ----------------------- |
|
22627 |
+# Test if FILE is an executable regular file. |
|
22628 |
+as_fn_executable_p () |
|
22629 |
+{ |
|
22630 |
+ test -f "$1" && test -x "$1" |
|
22631 |
+} # as_fn_executable_p |
|
22632 |
+as_test_x='test -x' |
|
22633 |
+as_executable_p=as_fn_executable_p |
|
22646 | 22634 |
|
22647 | 22635 |
# Sed expression to map a string onto a valid CPP name. |
22648 | 22636 |
as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" |
... | ... |
@@ -22664,7 +22669,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 |
22664 | 22664 |
# values after options handling. |
22665 | 22665 |
ac_log=" |
22666 | 22666 |
This file was extended by ClamAV $as_me devel, which was |
22667 |
-generated by GNU Autoconf 2.68. Invocation command line was |
|
22667 |
+generated by GNU Autoconf 2.69. Invocation command line was |
|
22668 | 22668 |
|
22669 | 22669 |
CONFIG_FILES = $CONFIG_FILES |
22670 | 22670 |
CONFIG_HEADERS = $CONFIG_HEADERS |
... | ... |
@@ -22731,10 +22736,10 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 |
22731 | 22731 |
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" |
22732 | 22732 |
ac_cs_version="\\ |
22733 | 22733 |
ClamAV config.status devel |
22734 |
-configured by $0, generated by GNU Autoconf 2.68, |
|
22734 |
+configured by $0, generated by GNU Autoconf 2.69, |
|
22735 | 22735 |
with options \\"\$ac_cs_config\\" |
22736 | 22736 |
|
22737 |
-Copyright (C) 2010 Free Software Foundation, Inc. |
|
22737 |
+Copyright (C) 2012 Free Software Foundation, Inc. |
|
22738 | 22738 |
This config.status script is free software; the Free Software Foundation |
22739 | 22739 |
gives unlimited permission to copy, distribute and modify it." |
22740 | 22740 |
|
... | ... |
@@ -22825,7 +22830,7 @@ fi |
22825 | 22825 |
_ACEOF |
22826 | 22826 |
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 |
22827 | 22827 |
if \$ac_cs_recheck; then |
22828 |
- set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion |
|
22828 |
+ set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion |
|
22829 | 22829 |
shift |
22830 | 22830 |
\$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 |
22831 | 22831 |
CONFIG_SHELL='$SHELL' |
... | ... |
@@ -25198,16 +25203,16 @@ if (echo >conf$$.file) 2>/dev/null; then |
25198 | 25198 |
# ... but there are two gotchas: |
25199 | 25199 |
# 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. |
25200 | 25200 |
# 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. |
25201 |
- # In both cases, we have to default to `cp -p'. |
|
25201 |
+ # In both cases, we have to default to `cp -pR'. |
|
25202 | 25202 |
ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || |
25203 |
- as_ln_s='cp -p' |
|
25203 |
+ as_ln_s='cp -pR' |
|
25204 | 25204 |
elif ln conf$$.file conf$$ 2>/dev/null; then |
25205 | 25205 |
as_ln_s=ln |
25206 | 25206 |
else |
25207 |
- as_ln_s='cp -p' |
|
25207 |
+ as_ln_s='cp -pR' |
|
25208 | 25208 |
fi |
25209 | 25209 |
else |
25210 |
- as_ln_s='cp -p' |
|
25210 |
+ as_ln_s='cp -pR' |
|
25211 | 25211 |
fi |
25212 | 25212 |
rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file |
25213 | 25213 |
rmdir conf$$.dir 2>/dev/null |
... | ... |
@@ -25267,28 +25272,16 @@ else |
25267 | 25267 |
as_mkdir_p=false |
25268 | 25268 |
fi |
25269 | 25269 |
|
25270 |
-if test -x / >/dev/null 2>&1; then |
|
25271 |
- as_test_x='test -x' |
|
25272 |
-else |
|
25273 |
- if ls -dL / >/dev/null 2>&1; then |
|
25274 |
- as_ls_L_option=L |
|
25275 |
- else |
|
25276 |
- as_ls_L_option= |
|
25277 |
- fi |
|
25278 |
- as_test_x=' |
|
25279 |
- eval sh -c '\'' |
|
25280 |
- if test -d "$1"; then |
|
25281 |
- test -d "$1/."; |
|
25282 |
- else |
|
25283 |
- case $1 in #( |
|
25284 |
- -*)set "./$1";; |
|
25285 |
- esac; |
|
25286 |
- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( |
|
25287 |
- ???[sx]*):;;*)false;;esac;fi |
|
25288 |
- '\'' sh |
|
25289 |
- ' |
|
25290 |
-fi |
|
25291 |
-as_executable_p=$as_test_x |
|
25270 |
+ |
|
25271 |
+# as_fn_executable_p FILE |
|
25272 |
+# ----------------------- |
|
25273 |
+# Test if FILE is an executable regular file. |
|
25274 |
+as_fn_executable_p () |
|
25275 |
+{ |
|
25276 |
+ test -f "$1" && test -x "$1" |
|
25277 |
+} # as_fn_executable_p |
|
25278 |
+as_test_x='test -x' |
|
25279 |
+as_executable_p=as_fn_executable_p |
|
25292 | 25280 |
|
25293 | 25281 |
# Sed expression to map a string onto a valid CPP name. |
25294 | 25282 |
as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" |
... | ... |
@@ -25310,7 +25303,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 |
25310 | 25310 |
# values after options handling. |
25311 | 25311 |
ac_log=" |
25312 | 25312 |
This file was extended by ClamAV $as_me devel, which was |
25313 |
-generated by GNU Autoconf 2.68. Invocation command line was |
|
25313 |
+generated by GNU Autoconf 2.69. Invocation command line was |
|
25314 | 25314 |
|
25315 | 25315 |
CONFIG_FILES = $CONFIG_FILES |
25316 | 25316 |
CONFIG_HEADERS = $CONFIG_HEADERS |
... | ... |
@@ -25377,10 +25370,10 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 |
25377 | 25377 |
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" |
25378 | 25378 |
ac_cs_version="\\ |
25379 | 25379 |
ClamAV config.status devel |
25380 |
-configured by $0, generated by GNU Autoconf 2.68, |
|
25380 |
+configured by $0, generated by GNU Autoconf 2.69, |
|
25381 | 25381 |
with options \\"\$ac_cs_config\\" |
25382 | 25382 |
|
25383 |
-Copyright (C) 2010 Free Software Foundation, Inc. |
|
25383 |
+Copyright (C) 2012 Free Software Foundation, Inc. |
|
25384 | 25384 |
This config.status script is free software; the Free Software Foundation |
25385 | 25385 |
gives unlimited permission to copy, distribute and modify it." |
25386 | 25386 |
|
... | ... |
@@ -25471,7 +25464,7 @@ fi |
25471 | 25471 |
_ACEOF |
25472 | 25472 |
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 |
25473 | 25473 |
if \$ac_cs_recheck; then |
25474 |
- set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion |
|
25474 |
+ set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion |
|
25475 | 25475 |
shift |
25476 | 25476 |
\$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 |
25477 | 25477 |
CONFIG_SHELL='$SHELL' |
... | ... |
@@ -1,4 +1,4 @@ |
1 |
-# Makefile.in generated by automake 1.11.3 from Makefile.am. |
|
1 |
+# Makefile.in generated by automake 1.11.6 from Makefile.am. |
|
2 | 2 |
# @configure_input@ |
3 | 3 |
|
4 | 4 |
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, |
... | ... |
@@ -34,6 +34,23 @@ |
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 |
+ } |
|
37 | 54 |
pkgdatadir = $(datadir)/@PACKAGE@ |
38 | 55 |
pkgincludedir = $(includedir)/@PACKAGE@ |
39 | 56 |
pkglibdir = $(libdir)/@PACKAGE@ |
... | ... |
@@ -136,6 +153,11 @@ 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 |
|
139 | 144 |
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) |
140 | 145 |
ACLOCAL = @ACLOCAL@ |
141 | 146 |
AMTAR = @AMTAR@ |
... | ... |
@@ -1,4 +1,4 @@ |
1 |
-# Makefile.in generated by automake 1.11.3 from Makefile.am. |
|
1 |
+# Makefile.in generated by automake 1.11.6 from Makefile.am. |
|
2 | 2 |
# @configure_input@ |
3 | 3 |
|
4 | 4 |
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, |
... | ... |
@@ -33,6 +33,23 @@ |
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 |
+ } |
|
36 | 53 |
pkgdatadir = $(datadir)/@PACKAGE@ |
37 | 54 |
pkgincludedir = $(includedir)/@PACKAGE@ |
38 | 55 |
pkglibdir = $(libdir)/@PACKAGE@ |
... | ... |
@@ -135,6 +152,11 @@ am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) |
135 | 135 |
am__v_at_0 = @ |
136 | 136 |
SOURCES = |
137 | 137 |
DIST_SOURCES = |
138 |
+am__can_run_installinfo = \ |
|
139 |
+ case $$AM_UPDATE_INFO_DIR in \ |
|
140 |
+ n|no|NO) false;; \ |
|
141 |
+ *) (install-info --version) >/dev/null 2>&1;; \ |
|
142 |
+ esac |
|
138 | 143 |
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; |
139 | 144 |
am__vpath_adj = case $$p in \ |
140 | 145 |
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ |
... | ... |
@@ -405,11 +427,18 @@ clean-libtool: |
405 | 405 |
-rm -rf .libs _libs |
406 | 406 |
install-man1: $(man_MANS) |
407 | 407 |
@$(NORMAL_INSTALL) |
408 |
- test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)" |
|
409 |
- @list=''; test -n "$(man1dir)" || exit 0; \ |
|
410 |
- { for i in $$list; do echo "$$i"; done; \ |
|
411 |
- l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \ |
|
412 |
- sed -n '/\.1[a-z]*$$/p'; \ |
|
408 |
+ @list1=''; \ |
|
409 |
+ list2='$(man_MANS)'; \ |
|
410 |
+ test -n "$(man1dir)" \ |
|
411 |
+ && test -n "`echo $$list1$$list2`" \ |
|
412 |
+ || exit 0; \ |
|
413 |
+ echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \ |
|
414 |
+ $(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \ |
|
415 |
+ { for i in $$list1; do echo "$$i"; done; \ |
|
416 |
+ if test -n "$$list2"; then \ |
|
417 |
+ for i in $$list2; do echo "$$i"; done \ |
|
418 |
+ | sed -n '/\.1[a-z]*$$/p'; \ |
|
419 |
+ fi; \ |
|
413 | 420 |
} | while read p; do \ |
414 | 421 |
if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ |
415 | 422 |
echo "$$d$$p"; echo "$$p"; \ |
... | ... |
@@ -441,11 +470,18 @@ uninstall-man1: |
441 | 441 |
dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir) |
442 | 442 |
install-man5: $(man_MANS) |
443 | 443 |
@$(NORMAL_INSTALL) |
444 |
- test -z "$(man5dir)" || $(MKDIR_P) "$(DESTDIR)$(man5dir)" |
|
445 |
- @list=''; test -n "$(man5dir)" || exit 0; \ |
|
446 |
- { for i in $$list; do echo "$$i"; done; \ |
|
447 |
- l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \ |
|
448 |
- sed -n '/\.5[a-z]*$$/p'; \ |
|
444 |
+ @list1=''; \ |
|
445 |
+ list2='$(man_MANS)'; \ |
|
446 |
+ test -n "$(man5dir)" \ |
|
447 |
+ && test -n "`echo $$list1$$list2`" \ |
|
448 |
+ || exit 0; \ |
|
449 |
+ echo " $(MKDIR_P) '$(DESTDIR)$(man5dir)'"; \ |
|
450 |
+ $(MKDIR_P) "$(DESTDIR)$(man5dir)" || exit 1; \ |
|
451 |
+ { for i in $$list1; do echo "$$i"; done; \ |
|
452 |
+ if test -n "$$list2"; then \ |
|
453 |
+ for i in $$list2; do echo "$$i"; done \ |
|
454 |
+ | sed -n '/\.5[a-z]*$$/p'; \ |
|
455 |
+ fi; \ |
|
449 | 456 |
} | while read p; do \ |
450 | 457 |
if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ |
451 | 458 |
echo "$$d$$p"; echo "$$p"; \ |
... | ... |
@@ -477,11 +513,18 @@ uninstall-man5: |
477 | 477 |
dir='$(DESTDIR)$(man5dir)'; $(am__uninstall_files_from_dir) |
478 | 478 |
install-man8: $(man_MANS) |
479 | 479 |
@$(NORMAL_INSTALL) |
480 |
- test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)" |
|
481 |
- @list=''; test -n "$(man8dir)" || exit 0; \ |
|
482 |
- { for i in $$list; do echo "$$i"; done; \ |
|
483 |
- l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \ |
|
484 |
- sed -n '/\.8[a-z]*$$/p'; \ |
|
480 |
+ @list1=''; \ |
|
481 |
+ list2='$(man_MANS)'; \ |
|
482 |
+ test -n "$(man8dir)" \ |
|
483 |
+ && test -n "`echo $$list1$$list2`" \ |
|
484 |
+ || exit 0; \ |
|
485 |
+ echo " $(MKDIR_P) '$(DESTDIR)$(man8dir)'"; \ |
|
486 |
+ $(MKDIR_P) "$(DESTDIR)$(man8dir)" || exit 1; \ |
|
487 |
+ { for i in $$list1; do echo "$$i"; done; \ |
|
488 |
+ if test -n "$$list2"; then \ |
|
489 |
+ for i in $$list2; do echo "$$i"; done \ |
|
490 |
+ | sed -n '/\.8[a-z]*$$/p'; \ |
|
491 |
+ fi; \ |
|
485 | 492 |
} | while read p; do \ |
486 | 493 |
if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ |
487 | 494 |
echo "$$d$$p"; echo "$$p"; \ |
... | ... |
@@ -1,4 +1,4 @@ |
1 |
-# Makefile.in generated by automake 1.11.3 from Makefile.am. |
|
1 |
+# Makefile.in generated by automake 1.11.6 from Makefile.am. |
|
2 | 2 |
# @configure_input@ |
3 | 3 |
|
4 | 4 |
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, |
... | ... |
@@ -34,6 +34,23 @@ |
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 |
+ } |
|
37 | 54 |
pkgdatadir = $(datadir)/@PACKAGE@ |
38 | 55 |
pkgincludedir = $(includedir)/@PACKAGE@ |
39 | 56 |
pkglibdir = $(libdir)/@PACKAGE@ |
... | ... |
@@ -137,6 +154,11 @@ am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) |
137 | 137 |
am__v_at_0 = @ |
138 | 138 |
SOURCES = |
139 | 139 |
DIST_SOURCES = |
140 |
+am__can_run_installinfo = \ |
|
141 |
+ case $$AM_UPDATE_INFO_DIR in \ |
|
142 |
+ n|no|NO) false;; \ |
|
143 |
+ *) (install-info --version) >/dev/null 2>&1;; \ |
|
144 |
+ esac |
|
140 | 145 |
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; |
141 | 146 |
am__vpath_adj = case $$p in \ |
142 | 147 |
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ |
... | ... |
@@ -403,8 +425,11 @@ clean-libtool: |
403 | 403 |
-rm -rf .libs _libs |
404 | 404 |
install-sysconfDATA: $(sysconf_DATA) |
405 | 405 |
@$(NORMAL_INSTALL) |
406 |
- test -z "$(sysconfdir)" || $(MKDIR_P) "$(DESTDIR)$(sysconfdir)" |
|
407 | 406 |
@list='$(sysconf_DATA)'; test -n "$(sysconfdir)" || list=; \ |
407 |
+ if test -n "$$list"; then \ |
|
408 |
+ echo " $(MKDIR_P) '$(DESTDIR)$(sysconfdir)'"; \ |
|
409 |
+ $(MKDIR_P) "$(DESTDIR)$(sysconfdir)" || exit 1; \ |
|
410 |
+ fi; \ |
|
408 | 411 |
for p in $$list; do \ |
409 | 412 |
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ |
410 | 413 |
echo "$$d$$p"; \ |
... | ... |
@@ -1,4 +1,4 @@ |
1 |
-# Makefile.in generated by automake 1.11.3 from Makefile.am. |
|
1 |
+# Makefile.in generated by automake 1.11.6 from Makefile.am. |
|
2 | 2 |
# @configure_input@ |
3 | 3 |
|
4 | 4 |
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, |
... | ... |
@@ -35,6 +35,23 @@ |
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 |
+ } |
|
38 | 55 |
pkgdatadir = $(datadir)/@PACKAGE@ |
39 | 56 |
pkgincludedir = $(includedir)/@PACKAGE@ |
40 | 57 |
pkglibdir = $(libdir)/@PACKAGE@ |
... | ... |
@@ -170,6 +187,11 @@ am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) |
170 | 170 |
am__v_GEN_0 = @echo " GEN " $@; |
171 | 171 |
SOURCES = $(freshclam_SOURCES) |
172 | 172 |
DIST_SOURCES = $(freshclam_SOURCES) |
173 |
+am__can_run_installinfo = \ |
|
174 |
+ case $$AM_UPDATE_INFO_DIR in \ |
|
175 |
+ n|no|NO) false;; \ |
|
176 |
+ *) (install-info --version) >/dev/null 2>&1;; \ |
|
177 |
+ esac |
|
173 | 178 |
ETAGS = etags |
174 | 179 |
CTAGS = ctags |
175 | 180 |
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) |
... | ... |
@@ -435,8 +457,11 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) |
435 | 435 |
$(am__aclocal_m4_deps): |
436 | 436 |
install-binPROGRAMS: $(bin_PROGRAMS) |
437 | 437 |
@$(NORMAL_INSTALL) |
438 |
- test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" |
|
439 | 438 |
@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ |
439 |
+ if test -n "$$list"; then \ |
|
440 |
+ echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \ |
|
441 |
+ $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \ |
|
442 |
+ fi; \ |
|
440 | 443 |
for p in $$list; do echo "$$p $$p"; done | \ |
441 | 444 |
sed 's/$(EXEEXT)$$//' | \ |
442 | 445 |
while read p p1; do if test -f $$p || test -f $$p1; \ |
... | ... |
@@ -396,13 +396,15 @@ libclamav_la_SOURCES = \ |
396 | 396 |
xar.c \ |
397 | 397 |
xar.h \ |
398 | 398 |
mbr.c \ |
399 |
- mbr.h \ |
|
399 |
+ mbr.h \ |
|
400 | 400 |
gpt.c \ |
401 | 401 |
gpt.h \ |
402 | 402 |
apm.c \ |
403 | 403 |
apm.h \ |
404 | 404 |
prtn_intxn.c \ |
405 | 405 |
prtn_intxn.h \ |
406 |
+ json_api.c\ |
|
407 |
+ json_api.h\ |
|
406 | 408 |
xz_iface.c \ |
407 | 409 |
xz_iface.h \ |
408 | 410 |
sf_base64decode.c \ |
... | ... |
@@ -1,4 +1,4 @@ |
1 |
-# Makefile.in generated by automake 1.11.3 from Makefile.am. |
|
1 |
+# Makefile.in generated by automake 1.11.6 from Makefile.am. |
|
2 | 2 |
# @configure_input@ |
3 | 3 |
|
4 | 4 |
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, |
... | ... |
@@ -36,6 +36,23 @@ |
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 |
+ } |
|
39 | 56 |
pkgdatadir = $(datadir)/@PACKAGE@ |
40 | 57 |
pkgincludedir = $(includedir)/@PACKAGE@ |
41 | 58 |
pkglibdir = $(libdir)/@PACKAGE@ |
... | ... |
@@ -228,9 +245,10 @@ am_libclamav_la_OBJECTS = libclamav_la-matcher-ac.lo \ |
228 | 228 |
libclamav_la-bytecode_detect.lo libclamav_la-events.lo \ |
229 | 229 |
libclamav_la-adc.lo libclamav_la-dmg.lo libclamav_la-xar.lo \ |
230 | 230 |
libclamav_la-mbr.lo libclamav_la-gpt.lo libclamav_la-apm.lo \ |
231 |
- libclamav_la-prtn_intxn.lo libclamav_la-xz_iface.lo \ |
|
232 |
- libclamav_la-sf_base64decode.lo libclamav_la-hfsplus.lo \ |
|
233 |
- libclamav_la-swf.lo libclamav_la-jpeg.lo libclamav_la-png.lo \ |
|
231 |
+ libclamav_la-prtn_intxn.lo libclamav_la-json_api.lo \ |
|
232 |
+ libclamav_la-xz_iface.lo libclamav_la-sf_base64decode.lo \ |
|
233 |
+ libclamav_la-hfsplus.lo libclamav_la-swf.lo \ |
|
234 |
+ libclamav_la-jpeg.lo libclamav_la-png.lo \ |
|
234 | 235 |
libclamav_la-iso9660.lo libclamav_la-arc4.lo \ |
235 | 236 |
libclamav_la-rijndael.lo libclamav_la-crtmgr.lo \ |
236 | 237 |
libclamav_la-asn1.lo libclamav_la-fpu.lo libclamav_la-stats.lo \ |
... | ... |
@@ -415,6 +433,11 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ |
415 | 415 |
install-pdf-recursive install-ps-recursive install-recursive \ |
416 | 416 |
installcheck-recursive installdirs-recursive pdf-recursive \ |
417 | 417 |
ps-recursive uninstall-recursive |
418 |
+am__can_run_installinfo = \ |
|
419 |
+ case $$AM_UPDATE_INFO_DIR in \ |
|
420 |
+ n|no|NO) false;; \ |
|
421 |
+ *) (install-info --version) >/dev/null 2>&1;; \ |
|
422 |
+ esac |
|
418 | 423 |
HEADERS = $(include_HEADERS) |
419 | 424 |
RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ |
420 | 425 |
distclean-recursive maintainer-clean-recursive |
... | ... |
@@ -797,14 +820,15 @@ libclamav_la_SOURCES = matcher-ac.c matcher-ac.h matcher-bm.c \ |
797 | 797 |
bytecode_detect.c bytecode_detect.h builtin_bytecodes.h \ |
798 | 798 |
events.c events.h adc.c adc.h dmg.c dmg.h xar.c xar.h mbr.c \ |
799 | 799 |
mbr.h gpt.c gpt.h apm.c apm.h prtn_intxn.c prtn_intxn.h \ |
800 |
- xz_iface.c xz_iface.h sf_base64decode.c sf_base64decode.h \ |
|
801 |
- hfsplus.c hfsplus.h swf.c swf.h jpeg.c jpeg.h png.c png.h \ |
|
802 |
- iso9660.c iso9660.h arc4.c arc4.h rijndael.c rijndael.h \ |
|
803 |
- crtmgr.c crtmgr.h asn1.c asn1.h fpu.c fpu.h stats.c stats.h \ |
|
804 |
- www.c www.h json.c json.h hostid.c hostid.h openioc.c \ |
|
805 |
- openioc.h bignum.h bignum_fast.h tomsfastmath/addsub/fp_add.c \ |
|
806 |
- tomsfastmath/addsub/fp_add_d.c tomsfastmath/addsub/fp_addmod.c \ |
|
807 |
- tomsfastmath/addsub/fp_cmp.c tomsfastmath/addsub/fp_cmp_d.c \ |
|
800 |
+ json_api.c json_api.h xz_iface.c xz_iface.h sf_base64decode.c \ |
|
801 |
+ sf_base64decode.h hfsplus.c hfsplus.h swf.c swf.h jpeg.c \ |
|
802 |
+ jpeg.h png.c png.h iso9660.c iso9660.h arc4.c arc4.h \ |
|
803 |
+ rijndael.c rijndael.h crtmgr.c crtmgr.h asn1.c asn1.h fpu.c \ |
|
804 |
+ fpu.h stats.c stats.h www.c www.h json.c json.h hostid.c \ |
|
805 |
+ hostid.h openioc.c openioc.h bignum.h bignum_fast.h \ |
|
806 |
+ tomsfastmath/addsub/fp_add.c tomsfastmath/addsub/fp_add_d.c \ |
|
807 |
+ tomsfastmath/addsub/fp_addmod.c tomsfastmath/addsub/fp_cmp.c \ |
|
808 |
+ tomsfastmath/addsub/fp_cmp_d.c \ |
|
808 | 809 |
tomsfastmath/addsub/fp_cmp_mag.c tomsfastmath/addsub/fp_sub.c \ |
809 | 810 |
tomsfastmath/addsub/fp_sub_d.c tomsfastmath/addsub/fp_submod.c \ |
810 | 811 |
tomsfastmath/addsub/s_fp_add.c tomsfastmath/addsub/s_fp_sub.c \ |
... | ... |
@@ -908,7 +932,6 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) |
908 | 908 |
$(am__aclocal_m4_deps): |
909 | 909 |
install-libLTLIBRARIES: $(lib_LTLIBRARIES) |
910 | 910 |
@$(NORMAL_INSTALL) |
911 |
- test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)" |
|
912 | 911 |
@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ |
913 | 912 |
list2=; for p in $$list; do \ |
914 | 913 |
if test -f $$p; then \ |
... | ... |
@@ -916,6 +939,8 @@ install-libLTLIBRARIES: $(lib_LTLIBRARIES) |
916 | 916 |
else :; fi; \ |
917 | 917 |
done; \ |
918 | 918 |
test -z "$$list2" || { \ |
919 |
+ echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \ |
|
920 |
+ $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \ |
|
919 | 921 |
echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \ |
920 | 922 |
$(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \ |
921 | 923 |
} |
... | ... |
@@ -1137,6 +1162,7 @@ distclean-compile: |
1137 | 1137 |
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_la-jpeg.Plo@am__quote@ |
1138 | 1138 |
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_la-js-norm.Plo@am__quote@ |
1139 | 1139 |
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_la-json.Plo@am__quote@ |
1140 |
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_la-json_api.Plo@am__quote@ |
|
1140 | 1141 |
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_la-line.Plo@am__quote@ |
1141 | 1142 |
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_la-lzma_iface.Plo@am__quote@ |
1142 | 1143 |
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_la-macho.Plo@am__quote@ |
... | ... |
@@ -2045,6 +2071,13 @@ libclamav_la-prtn_intxn.lo: prtn_intxn.c |
2045 | 2045 |
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ |
2046 | 2046 |
@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-prtn_intxn.lo `test -f 'prtn_intxn.c' || echo '$(srcdir)/'`prtn_intxn.c |
2047 | 2047 |
|
2048 |
+libclamav_la-json_api.lo: json_api.c |
|
2049 |
+@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_api.lo -MD -MP -MF $(DEPDIR)/libclamav_la-json_api.Tpo -c -o libclamav_la-json_api.lo `test -f 'json_api.c' || echo '$(srcdir)/'`json_api.c |
|
2050 |
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libclamav_la-json_api.Tpo $(DEPDIR)/libclamav_la-json_api.Plo |
|
2051 |
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='json_api.c' object='libclamav_la-json_api.lo' libtool=yes @AMDEPBACKSLASH@ |
|
2052 |
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ |
|
2053 |
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_la_CFLAGS) $(CFLAGS) -c -o libclamav_la-json_api.lo `test -f 'json_api.c' || echo '$(srcdir)/'`json_api.c |
|
2054 |
+ |
|
2048 | 2055 |
libclamav_la-xz_iface.lo: xz_iface.c |
2049 | 2056 |
@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_la_CFLAGS) $(CFLAGS) -MT libclamav_la-xz_iface.lo -MD -MP -MF $(DEPDIR)/libclamav_la-xz_iface.Tpo -c -o libclamav_la-xz_iface.lo `test -f 'xz_iface.c' || echo '$(srcdir)/'`xz_iface.c |
2050 | 2057 |
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libclamav_la-xz_iface.Tpo $(DEPDIR)/libclamav_la-xz_iface.Plo |
... | ... |
@@ -2962,8 +2995,11 @@ clean-libtool: |
2962 | 2962 |
-rm -rf .libs _libs |
2963 | 2963 |
install-includeHEADERS: $(include_HEADERS) |
2964 | 2964 |
@$(NORMAL_INSTALL) |
2965 |
- test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)" |
|
2966 | 2965 |
@list='$(include_HEADERS)'; test -n "$(includedir)" || list=; \ |
2966 |
+ if test -n "$$list"; then \ |
|
2967 |
+ echo " $(MKDIR_P) '$(DESTDIR)$(includedir)'"; \ |
|
2968 |
+ $(MKDIR_P) "$(DESTDIR)$(includedir)" || exit 1; \ |
|
2969 |
+ fi; \ |
|
2967 | 2970 |
for p in $$list; do \ |
2968 | 2971 |
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ |
2969 | 2972 |
echo "$$d$$p"; \ |
... | ... |
@@ -3146,13 +3182,10 @@ distdir: $(DISTFILES) |
3146 | 3146 |
done |
3147 | 3147 |
@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ |
3148 | 3148 |
if test "$$subdir" = .; then :; else \ |
3149 |
- test -d "$(distdir)/$$subdir" \ |
|
3150 |
- || $(MKDIR_P) "$(distdir)/$$subdir" \ |
|
3151 |
- || exit 1; \ |
|
3152 |
- fi; \ |
|
3153 |
- done |
|
3154 |
- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ |
|
3155 |
- if test "$$subdir" = .; then :; else \ |
|
3149 |
+ $(am__make_dryrun) \ |
|
3150 |
+ || test -d "$(distdir)/$$subdir" \ |
|
3151 |
+ || $(MKDIR_P) "$(distdir)/$$subdir" \ |
|
3152 |
+ || exit 1; \ |
|
3156 | 3153 |
dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ |
3157 | 3154 |
$(am__relativize); \ |
3158 | 3155 |
new_distdir=$$reldir; \ |
... | ... |
@@ -1,4 +1,4 @@ |
1 |
-# Makefile.in generated by automake 1.11.3 from Makefile.am. |
|
1 |
+# Makefile.in generated by automake 1.11.6 from Makefile.am. |
|
2 | 2 |
# @configure_input@ |
3 | 3 |
|
4 | 4 |
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, |
... | ... |
@@ -32,6 +32,23 @@ |
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 |
+ } |
|
35 | 52 |
pkgdatadir = $(datadir)/@PACKAGE@ |
36 | 53 |
pkgincludedir = $(includedir)/@PACKAGE@ |
37 | 54 |
pkglibdir = $(libdir)/@PACKAGE@ |
... | ... |
@@ -815,6 +832,11 @@ DIST_SOURCES = $(am__libclamavcxx_la_SOURCES_DIST) \ |
815 | 815 |
$(am__libllvmsystem_la_SOURCES_DIST) \ |
816 | 816 |
$(am__libllvmx86codegen_la_SOURCES_DIST) \ |
817 | 817 |
$(am__tblgen_SOURCES_DIST) |
818 |
+am__can_run_installinfo = \ |
|
819 |
+ case $$AM_UPDATE_INFO_DIR in \ |
|
820 |
+ n|no|NO) false;; \ |
|
821 |
+ *) (install-info --version) >/dev/null 2>&1;; \ |
|
822 |
+ esac |
|
818 | 823 |
ETAGS = etags |
819 | 824 |
CTAGS = ctags |
820 | 825 |
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) |
... | ... |
@@ -5543,7 +5565,7 @@ distcheck: dist |
5543 | 5543 |
*.zip*) \ |
5544 | 5544 |
unzip $(distdir).zip ;;\ |
5545 | 5545 |
esac |
5546 |
- chmod -R a-w $(distdir); chmod a+w $(distdir) |
|
5546 |
+ chmod -R a-w $(distdir); chmod u+w $(distdir) |
|
5547 | 5547 |
mkdir $(distdir)/_build |
5548 | 5548 |
mkdir $(distdir)/_inst |
5549 | 5549 |
chmod a-w $(distdir) |
... | ... |
@@ -1,4 +1,4 @@ |
1 |
-# generated automatically by aclocal 1.11.3 -*- Autoconf -*- |
|
1 |
+# generated automatically by aclocal 1.11.6 -*- 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.68],, |
|
18 |
-[m4_warning([this file was generated for autoconf 2.68. |
|
17 |
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],, |
|
18 |
+[m4_warning([this file was generated for autoconf 2.69. |
|
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.3], [], |
|
41 |
+m4_if([$1], [1.11.6], [], |
|
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.3])dnl |
|
57 |
+[AM_AUTOMAKE_VERSION([1.11.6])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,13 +1,11 @@ |
1 | 1 |
#! /bin/sh |
2 | 2 |
# Guess values for system-dependent variables and create Makefiles. |
3 |
-# Generated by GNU Autoconf 2.68 for libclamavc++ devel. |
|
3 |
+# Generated by GNU Autoconf 2.69 for libclamavc++ devel. |
|
4 | 4 |
# |
5 | 5 |
# Report bugs to <http://bugs.clamav.net>. |
6 | 6 |
# |
7 | 7 |
# |
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. |
|
8 |
+# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. |
|
11 | 9 |
# |
12 | 10 |
# |
13 | 11 |
# This configure script is free software; the Free Software Foundation |
... | ... |
@@ -136,6 +134,31 @@ export LANGUAGE |
136 | 136 |
# CDPATH. |
137 | 137 |
(unset CDPATH) >/dev/null 2>&1 && unset CDPATH |
138 | 138 |
|
139 |
+# Use a proper internal environment variable to ensure we don't fall |
|
140 |
+ # into an infinite loop, continuously re-executing ourselves. |
|
141 |
+ if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then |
|
142 |
+ _as_can_reexec=no; export _as_can_reexec; |
|
143 |
+ # We cannot yet assume a decent shell, so we have to provide a |
|
144 |
+# neutralization value for shells without unset; and this also |
|
145 |
+# works around shells that cannot unset nonexistent variables. |
|
146 |
+# Preserve -v and -x to the replacement shell. |
|
147 |
+BASH_ENV=/dev/null |
|
148 |
+ENV=/dev/null |
|
149 |
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV |
|
150 |
+case $- in # (((( |
|
151 |
+ *v*x* | *x*v* ) as_opts=-vx ;; |
|
152 |
+ *v* ) as_opts=-v ;; |
|
153 |
+ *x* ) as_opts=-x ;; |
|
154 |
+ * ) as_opts= ;; |
|
155 |
+esac |
|
156 |
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} |
|
157 |
+# Admittedly, this is quite paranoid, since all the known shells bail |
|
158 |
+# out after a failed `exec'. |
|
159 |
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 |
|
160 |
+as_fn_exit 255 |
|
161 |
+ fi |
|
162 |
+ # We don't want this to propagate to other subprocesses. |
|
163 |
+ { _as_can_reexec=; unset _as_can_reexec;} |
|
139 | 164 |
if test "x$CONFIG_SHELL" = x; then |
140 | 165 |
as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : |
141 | 166 |
emulate sh |
... | ... |
@@ -169,7 +192,8 @@ if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then : |
169 | 169 |
else |
170 | 170 |
exitcode=1; echo positional parameters were not saved. |
171 | 171 |
fi |
172 |
-test x\$exitcode = x0 || exit 1" |
|
172 |
+test x\$exitcode = x0 || exit 1 |
|
173 |
+test -x / || exit 1" |
|
173 | 174 |
as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO |
174 | 175 |
as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO |
175 | 176 |
eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && |
... | ... |
@@ -222,21 +246,25 @@ IFS=$as_save_IFS |
222 | 222 |
|
223 | 223 |
|
224 | 224 |
if test "x$CONFIG_SHELL" != x; then : |
225 |
- # We cannot yet assume a decent shell, so we have to provide a |
|
226 |
- # neutralization value for shells without unset; and this also |
|
227 |
- # works around shells that cannot unset nonexistent variables. |
|
228 |
- # Preserve -v and -x to the replacement shell. |
|
229 |
- BASH_ENV=/dev/null |
|
230 |
- ENV=/dev/null |
|
231 |
- (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV |
|
232 |
- export CONFIG_SHELL |
|
233 |
- case $- in # (((( |
|
234 |
- *v*x* | *x*v* ) as_opts=-vx ;; |
|
235 |
- *v* ) as_opts=-v ;; |
|
236 |
- *x* ) as_opts=-x ;; |
|
237 |
- * ) as_opts= ;; |
|
238 |
- esac |
|
239 |
- exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"} |
|
225 |
+ export CONFIG_SHELL |
|
226 |
+ # We cannot yet assume a decent shell, so we have to provide a |
|
227 |
+# neutralization value for shells without unset; and this also |
|
228 |
+# works around shells that cannot unset nonexistent variables. |
|
229 |
+# Preserve -v and -x to the replacement shell. |
|
230 |
+BASH_ENV=/dev/null |
|
231 |
+ENV=/dev/null |
|
232 |
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV |
|
233 |
+case $- in # (((( |
|
234 |
+ *v*x* | *x*v* ) as_opts=-vx ;; |
|
235 |
+ *v* ) as_opts=-v ;; |
|
236 |
+ *x* ) as_opts=-x ;; |
|
237 |
+ * ) as_opts= ;; |
|
238 |
+esac |
|
239 |
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} |
|
240 |
+# Admittedly, this is quite paranoid, since all the known shells bail |
|
241 |
+# out after a failed `exec'. |
|
242 |
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 |
|
243 |
+exit 255 |
|
240 | 244 |
fi |
241 | 245 |
|
242 | 246 |
if test x$as_have_required = xno; then : |
... | ... |
@@ -339,6 +367,14 @@ $as_echo X"$as_dir" | |
339 | 339 |
|
340 | 340 |
|
341 | 341 |
} # as_fn_mkdir_p |
342 |
+ |
|
343 |
+# as_fn_executable_p FILE |
|
344 |
+# ----------------------- |
|
345 |
+# Test if FILE is an executable regular file. |
|
346 |
+as_fn_executable_p () |
|
347 |
+{ |
|
348 |
+ test -f "$1" && test -x "$1" |
|
349 |
+} # as_fn_executable_p |
|
342 | 350 |
# as_fn_append VAR VALUE |
343 | 351 |
# ---------------------- |
344 | 352 |
# Append the text in VALUE to the end of the definition contained in VAR. Take |
... | ... |
@@ -460,6 +496,10 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits |
460 | 460 |
chmod +x "$as_me.lineno" || |
461 | 461 |
{ $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } |
462 | 462 |
|
463 |
+ # If we had to re-execute with $CONFIG_SHELL, we're ensured to have |
|
464 |
+ # already done that, so ensure we don't try to do so again and fall |
|
465 |
+ # in an infinite loop. This has already happened in practice. |
|
466 |
+ _as_can_reexec=no; export _as_can_reexec |
|
463 | 467 |
# Don't try to exec as it changes $[0], causing all sort of problems |
464 | 468 |
# (the dirname of $[0] is not the place where we might find the |
465 | 469 |
# original and so on. Autoconf is especially sensitive to this). |
... | ... |
@@ -494,16 +534,16 @@ if (echo >conf$$.file) 2>/dev/null; then |
494 | 494 |
# ... but there are two gotchas: |
495 | 495 |
# 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. |
496 | 496 |
# 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. |
497 |
- # In both cases, we have to default to `cp -p'. |
|
497 |
+ # In both cases, we have to default to `cp -pR'. |
|
498 | 498 |
ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || |
499 |
- as_ln_s='cp -p' |
|
499 |
+ as_ln_s='cp -pR' |
|
500 | 500 |
elif ln conf$$.file conf$$ 2>/dev/null; then |
501 | 501 |
as_ln_s=ln |
502 | 502 |
else |
503 |
- as_ln_s='cp -p' |
|
503 |
+ as_ln_s='cp -pR' |
|
504 | 504 |
fi |
505 | 505 |
else |
506 |
- as_ln_s='cp -p' |
|
506 |
+ as_ln_s='cp -pR' |
|
507 | 507 |
fi |
508 | 508 |
rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file |
509 | 509 |
rmdir conf$$.dir 2>/dev/null |
... | ... |
@@ -515,28 +555,8 @@ else |
515 | 515 |
as_mkdir_p=false |
516 | 516 |
fi |
517 | 517 |
|
518 |
-if test -x / >/dev/null 2>&1; then |
|
519 |
- as_test_x='test -x' |
|
520 |
-else |
|
521 |
- if ls -dL / >/dev/null 2>&1; then |
|
522 |
- as_ls_L_option=L |
|
523 |
- else |
|
524 |
- as_ls_L_option= |
|
525 |
- fi |
|
526 |
- as_test_x=' |
|
527 |
- eval sh -c '\'' |
|
528 |
- if test -d "$1"; then |
|
529 |
- test -d "$1/."; |
|
530 |
- else |
|
531 |
- case $1 in #( |
|
532 |
- -*)set "./$1";; |
|
533 |
- esac; |
|
534 |
- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( |
|
535 |
- ???[sx]*):;;*)false;;esac;fi |
|
536 |
- '\'' sh |
|
537 |
- ' |
|
538 |
-fi |
|
539 |
-as_executable_p=$as_test_x |
|
518 |
+as_test_x='test -x' |
|
519 |
+as_executable_p=as_fn_executable_p |
|
540 | 520 |
|
541 | 521 |
# Sed expression to map a string onto a valid CPP name. |
542 | 522 |
as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" |
... | ... |
@@ -1249,8 +1269,6 @@ target=$target_alias |
1249 | 1249 |
if test "x$host_alias" != x; then |
1250 | 1250 |
if test "x$build_alias" = x; then |
1251 | 1251 |
cross_compiling=maybe |
1252 |
- $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. |
|
1253 |
- If a cross compiler is detected then cross compile mode will be used" >&2 |
|
1254 | 1252 |
elif test "x$build_alias" != "x$host_alias"; then |
1255 | 1253 |
cross_compiling=yes |
1256 | 1254 |
fi |
... | ... |
@@ -1522,9 +1540,9 @@ test -n "$ac_init_help" && exit $ac_status |
1522 | 1522 |
if $ac_init_version; then |
1523 | 1523 |
cat <<\_ACEOF |
1524 | 1524 |
libclamavc++ configure devel |
1525 |
-generated by GNU Autoconf 2.68 |
|
1525 |
+generated by GNU Autoconf 2.69 |
|
1526 | 1526 |
|
1527 |
-Copyright (C) 2010 Free Software Foundation, Inc. |
|
1527 |
+Copyright (C) 2012 Free Software Foundation, Inc. |
|
1528 | 1528 |
This configure script is free software; the Free Software Foundation |
1529 | 1529 |
gives unlimited permission to copy, distribute and modify it. |
1530 | 1530 |
_ACEOF |
... | ... |
@@ -1748,7 +1766,7 @@ $as_echo "$ac_try_echo"; } >&5 |
1748 | 1748 |
test ! -s conftest.err |
1749 | 1749 |
} && test -s conftest$ac_exeext && { |
1750 | 1750 |
test "$cross_compiling" = yes || |
1751 |
- $as_test_x conftest$ac_exeext |
|
1751 |
+ test -x conftest$ac_exeext |
|
1752 | 1752 |
}; then : |
1753 | 1753 |
ac_retval=0 |
1754 | 1754 |
else |
... | ... |
@@ -1898,7 +1916,7 @@ $as_echo "$ac_try_echo"; } >&5 |
1898 | 1898 |
test ! -s conftest.err |
1899 | 1899 |
} && test -s conftest$ac_exeext && { |
1900 | 1900 |
test "$cross_compiling" = yes || |
1901 |
- $as_test_x conftest$ac_exeext |
|
1901 |
+ test -x conftest$ac_exeext |
|
1902 | 1902 |
}; then : |
1903 | 1903 |
ac_retval=0 |
1904 | 1904 |
else |
... | ... |
@@ -1963,7 +1981,7 @@ This file contains any messages produced by compilers while |
1963 | 1963 |
running configure, to aid debugging if configure makes a mistake. |
1964 | 1964 |
|
1965 | 1965 |
It was created by libclamavc++ $as_me devel, which was |
1966 |
-generated by GNU Autoconf 2.68. Invocation command line was |
|
1966 |
+generated by GNU Autoconf 2.69. Invocation command line was |
|
1967 | 1967 |
|
1968 | 1968 |
$ $0 $@ |
1969 | 1969 |
|
... | ... |
@@ -2492,7 +2510,7 @@ case $as_dir/ in #(( |
2492 | 2492 |
# by default. |
2493 | 2493 |
for ac_prog in ginstall scoinst install; do |
2494 | 2494 |
for ac_exec_ext in '' $ac_executable_extensions; do |
2495 |
- if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then |
|
2495 |
+ if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then |
|
2496 | 2496 |
if test $ac_prog = install && |
2497 | 2497 |
grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then |
2498 | 2498 |
# AIX install. It has an incompatible calling convention. |
... | ... |
@@ -2661,7 +2679,7 @@ do |
2661 | 2661 |
IFS=$as_save_IFS |
2662 | 2662 |
test -z "$as_dir" && as_dir=. |
2663 | 2663 |
for ac_exec_ext in '' $ac_executable_extensions; do |
2664 |
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
|
2664 |
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
|
2665 | 2665 |
ac_cv_prog_STRIP="${ac_tool_prefix}strip" |
2666 | 2666 |
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
2667 | 2667 |
break 2 |
... | ... |
@@ -2701,7 +2719,7 @@ do |
2701 | 2701 |
IFS=$as_save_IFS |
2702 | 2702 |
test -z "$as_dir" && as_dir=. |
2703 | 2703 |
for ac_exec_ext in '' $ac_executable_extensions; do |
2704 |
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
|
2704 |
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
|
2705 | 2705 |
ac_cv_prog_ac_ct_STRIP="strip" |
2706 | 2706 |
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
2707 | 2707 |
break 2 |
... | ... |
@@ -2752,7 +2770,7 @@ do |
2752 | 2752 |
test -z "$as_dir" && as_dir=. |
2753 | 2753 |
for ac_prog in mkdir gmkdir; do |
2754 | 2754 |
for ac_exec_ext in '' $ac_executable_extensions; do |
2755 |
- { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue |
|
2755 |
+ as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue |
|
2756 | 2756 |
case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( |
2757 | 2757 |
'mkdir (GNU coreutils) '* | \ |
2758 | 2758 |
'mkdir (coreutils) '* | \ |
... | ... |
@@ -2805,7 +2823,7 @@ do |
2805 | 2805 |
IFS=$as_save_IFS |
2806 | 2806 |
test -z "$as_dir" && as_dir=. |
2807 | 2807 |
for ac_exec_ext in '' $ac_executable_extensions; do |
2808 |
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
|
2808 |
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
|
2809 | 2809 |
ac_cv_prog_AWK="$ac_prog" |
2810 | 2810 |
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
2811 | 2811 |
break 2 |
... | ... |
@@ -3072,7 +3090,7 @@ do |
3072 | 3072 |
IFS=$as_save_IFS |
3073 | 3073 |
test -z "$as_dir" && as_dir=. |
3074 | 3074 |
for ac_exec_ext in '' $ac_executable_extensions; do |
3075 |
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
|
3075 |
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
|
3076 | 3076 |
ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" |
3077 | 3077 |
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
3078 | 3078 |
break 2 |
... | ... |
@@ -3116,7 +3134,7 @@ do |
3116 | 3116 |
IFS=$as_save_IFS |
3117 | 3117 |
test -z "$as_dir" && as_dir=. |
3118 | 3118 |
for ac_exec_ext in '' $ac_executable_extensions; do |
3119 |
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
|
3119 |
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
|
3120 | 3120 |
ac_cv_prog_ac_ct_CXX="$ac_prog" |
3121 | 3121 |
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
3122 | 3122 |
break 2 |
... | ... |
@@ -3764,7 +3782,7 @@ do |
3764 | 3764 |
IFS=$as_save_IFS |
3765 | 3765 |
test -z "$as_dir" && as_dir=. |
3766 | 3766 |
for ac_exec_ext in '' $ac_executable_extensions; do |
3767 |
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
|
3767 |
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
|
3768 | 3768 |
ac_cv_prog_CC="${ac_tool_prefix}gcc" |
3769 | 3769 |
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
3770 | 3770 |
break 2 |
... | ... |
@@ -3804,7 +3822,7 @@ do |
3804 | 3804 |
IFS=$as_save_IFS |
3805 | 3805 |
test -z "$as_dir" && as_dir=. |
3806 | 3806 |
for ac_exec_ext in '' $ac_executable_extensions; do |
3807 |
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
|
3807 |
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
|
3808 | 3808 |
ac_cv_prog_ac_ct_CC="gcc" |
3809 | 3809 |
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
3810 | 3810 |
break 2 |
... | ... |
@@ -3857,7 +3875,7 @@ do |
3857 | 3857 |
IFS=$as_save_IFS |
3858 | 3858 |
test -z "$as_dir" && as_dir=. |
3859 | 3859 |
for ac_exec_ext in '' $ac_executable_extensions; do |
3860 |
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
|
3860 |
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
|
3861 | 3861 |
ac_cv_prog_CC="${ac_tool_prefix}cc" |
3862 | 3862 |
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
3863 | 3863 |
break 2 |
... | ... |
@@ -3898,7 +3916,7 @@ do |
3898 | 3898 |
IFS=$as_save_IFS |
3899 | 3899 |
test -z "$as_dir" && as_dir=. |
3900 | 3900 |
for ac_exec_ext in '' $ac_executable_extensions; do |
3901 |
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
|
3901 |
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
|
3902 | 3902 |
if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then |
3903 | 3903 |
ac_prog_rejected=yes |
3904 | 3904 |
continue |
... | ... |
@@ -3956,7 +3974,7 @@ do |
3956 | 3956 |
IFS=$as_save_IFS |
3957 | 3957 |
test -z "$as_dir" && as_dir=. |
3958 | 3958 |
for ac_exec_ext in '' $ac_executable_extensions; do |
3959 |
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
|
3959 |
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
|
3960 | 3960 |
ac_cv_prog_CC="$ac_tool_prefix$ac_prog" |
3961 | 3961 |
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
3962 | 3962 |
break 2 |
... | ... |
@@ -4000,7 +4018,7 @@ do |
4000 | 4000 |
IFS=$as_save_IFS |
4001 | 4001 |
test -z "$as_dir" && as_dir=. |
4002 | 4002 |
for ac_exec_ext in '' $ac_executable_extensions; do |
4003 |
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
|
4003 |
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
|
4004 | 4004 |
ac_cv_prog_ac_ct_CC="$ac_prog" |
4005 | 4005 |
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
4006 | 4006 |
break 2 |
... | ... |
@@ -4196,8 +4214,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
4196 | 4196 |
/* end confdefs.h. */ |
4197 | 4197 |
#include <stdarg.h> |
4198 | 4198 |
#include <stdio.h> |
4199 |
-#include <sys/types.h> |
|
4200 |
-#include <sys/stat.h> |
|
4199 |
+struct stat; |
|
4201 | 4200 |
/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ |
4202 | 4201 |
struct buf { int x; }; |
4203 | 4202 |
FILE * (*rcsopen) (struct buf *, struct stat *, int); |
... | ... |
@@ -4565,7 +4582,7 @@ do |
4565 | 4565 |
for ac_prog in grep ggrep; do |
4566 | 4566 |
for ac_exec_ext in '' $ac_executable_extensions; do |
4567 | 4567 |
ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" |
4568 |
- { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue |
|
4568 |
+ as_fn_executable_p "$ac_path_GREP" || continue |
|
4569 | 4569 |
# Check for GNU ac_path_GREP and select it if it is found. |
4570 | 4570 |
# Check for GNU $ac_path_GREP |
4571 | 4571 |
case `"$ac_path_GREP" --version 2>&1` in |
... | ... |
@@ -4631,7 +4648,7 @@ do |
4631 | 4631 |
for ac_prog in egrep; do |
4632 | 4632 |
for ac_exec_ext in '' $ac_executable_extensions; do |
4633 | 4633 |
ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" |
4634 |
- { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue |
|
4634 |
+ as_fn_executable_p "$ac_path_EGREP" || continue |
|
4635 | 4635 |
# Check for GNU ac_path_EGREP and select it if it is found. |
4636 | 4636 |
# Check for GNU $ac_path_EGREP |
4637 | 4637 |
case `"$ac_path_EGREP" --version 2>&1` in |
... | ... |
@@ -5184,7 +5201,7 @@ do |
5184 | 5184 |
for ac_prog in sed gsed; do |
5185 | 5185 |
for ac_exec_ext in '' $ac_executable_extensions; do |
5186 | 5186 |
ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" |
5187 |
- { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue |
|
5187 |
+ as_fn_executable_p "$ac_path_SED" || continue |
|
5188 | 5188 |
# Check for GNU ac_path_SED and select it if it is found. |
5189 | 5189 |
# Check for GNU $ac_path_SED |
5190 | 5190 |
case `"$ac_path_SED" --version 2>&1` in |
... | ... |
@@ -5263,7 +5280,7 @@ do |
5263 | 5263 |
for ac_prog in fgrep; do |
5264 | 5264 |
for ac_exec_ext in '' $ac_executable_extensions; do |
5265 | 5265 |
ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext" |
5266 |
- { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue |
|
5266 |
+ as_fn_executable_p "$ac_path_FGREP" || continue |
|
5267 | 5267 |
# Check for GNU ac_path_FGREP and select it if it is found. |
5268 | 5268 |
# Check for GNU $ac_path_FGREP |
5269 | 5269 |
case `"$ac_path_FGREP" --version 2>&1` in |
... | ... |
@@ -5519,7 +5536,7 @@ do |
5519 | 5519 |
IFS=$as_save_IFS |
5520 | 5520 |
test -z "$as_dir" && as_dir=. |
5521 | 5521 |
for ac_exec_ext in '' $ac_executable_extensions; do |
5522 |
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
|
5522 |
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
|
5523 | 5523 |
ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog" |
5524 | 5524 |
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
5525 | 5525 |
break 2 |
... | ... |
@@ -5563,7 +5580,7 @@ do |
5563 | 5563 |
IFS=$as_save_IFS |
5564 | 5564 |
test -z "$as_dir" && as_dir=. |
5565 | 5565 |
for ac_exec_ext in '' $ac_executable_extensions; do |
5566 |
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
|
5566 |
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
|
5567 | 5567 |
ac_cv_prog_ac_ct_DUMPBIN="$ac_prog" |
5568 | 5568 |
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
5569 | 5569 |
break 2 |
... | ... |
@@ -5988,7 +6005,7 @@ do |
5988 | 5988 |
IFS=$as_save_IFS |
5989 | 5989 |
test -z "$as_dir" && as_dir=. |
5990 | 5990 |
for ac_exec_ext in '' $ac_executable_extensions; do |
5991 |
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
|
5991 |
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
|
5992 | 5992 |
ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump" |
5993 | 5993 |
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
5994 | 5994 |
break 2 |
... | ... |
@@ -6028,7 +6045,7 @@ do |
6028 | 6028 |
IFS=$as_save_IFS |
6029 | 6029 |
test -z "$as_dir" && as_dir=. |
6030 | 6030 |
for ac_exec_ext in '' $ac_executable_extensions; do |
6031 |
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
|
6031 |
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
|
6032 | 6032 |
ac_cv_prog_ac_ct_OBJDUMP="objdump" |
6033 | 6033 |
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
6034 | 6034 |
break 2 |
... | ... |
@@ -6330,7 +6347,7 @@ do |
6330 | 6330 |
IFS=$as_save_IFS |
6331 | 6331 |
test -z "$as_dir" && as_dir=. |
6332 | 6332 |
for ac_exec_ext in '' $ac_executable_extensions; do |
6333 |
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
|
6333 |
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
|
6334 | 6334 |
ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" |
6335 | 6335 |
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
6336 | 6336 |
break 2 |
... | ... |
@@ -6370,7 +6387,7 @@ do |
6370 | 6370 |
IFS=$as_save_IFS |
6371 | 6371 |
test -z "$as_dir" && as_dir=. |
6372 | 6372 |
for ac_exec_ext in '' $ac_executable_extensions; do |
6373 |
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
|
6373 |
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
|
6374 | 6374 |
ac_cv_prog_ac_ct_DLLTOOL="dlltool" |
6375 | 6375 |
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
6376 | 6376 |
break 2 |
... | ... |
@@ -6473,7 +6490,7 @@ do |
6473 | 6473 |
IFS=$as_save_IFS |
6474 | 6474 |
test -z "$as_dir" && as_dir=. |
6475 | 6475 |
for ac_exec_ext in '' $ac_executable_extensions; do |
6476 |
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
|
6476 |
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
|
6477 | 6477 |
ac_cv_prog_AR="$ac_tool_prefix$ac_prog" |
6478 | 6478 |
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
6479 | 6479 |
break 2 |
... | ... |
@@ -6517,7 +6534,7 @@ do |
6517 | 6517 |
IFS=$as_save_IFS |
6518 | 6518 |
test -z "$as_dir" && as_dir=. |
6519 | 6519 |
for ac_exec_ext in '' $ac_executable_extensions; do |
6520 |
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
|
6520 |
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
|
6521 | 6521 |
ac_cv_prog_ac_ct_AR="$ac_prog" |
6522 | 6522 |
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
6523 | 6523 |
break 2 |
... | ... |
@@ -6642,7 +6659,7 @@ do |
6642 | 6642 |
IFS=$as_save_IFS |
6643 | 6643 |
test -z "$as_dir" && as_dir=. |
6644 | 6644 |
for ac_exec_ext in '' $ac_executable_extensions; do |
6645 |
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
|
6645 |
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
|
6646 | 6646 |
ac_cv_prog_STRIP="${ac_tool_prefix}strip" |
6647 | 6647 |
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
6648 | 6648 |
break 2 |
... | ... |
@@ -6682,7 +6699,7 @@ do |
6682 | 6682 |
IFS=$as_save_IFS |
6683 | 6683 |
test -z "$as_dir" && as_dir=. |
6684 | 6684 |
for ac_exec_ext in '' $ac_executable_extensions; do |
6685 |
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
|
6685 |
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
|
6686 | 6686 |
ac_cv_prog_ac_ct_STRIP="strip" |
6687 | 6687 |
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
6688 | 6688 |
break 2 |
... | ... |
@@ -6741,7 +6758,7 @@ do |
6741 | 6741 |
IFS=$as_save_IFS |
6742 | 6742 |
test -z "$as_dir" && as_dir=. |
6743 | 6743 |
for ac_exec_ext in '' $ac_executable_extensions; do |
6744 |
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
|
6744 |
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
|
6745 | 6745 |
ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" |
6746 | 6746 |
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
6747 | 6747 |
break 2 |
... | ... |
@@ -6781,7 +6798,7 @@ do |
6781 | 6781 |
IFS=$as_save_IFS |
6782 | 6782 |
test -z "$as_dir" && as_dir=. |
6783 | 6783 |
for ac_exec_ext in '' $ac_executable_extensions; do |
6784 |
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
|
6784 |
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
|
6785 | 6785 |
ac_cv_prog_ac_ct_RANLIB="ranlib" |
6786 | 6786 |
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
6787 | 6787 |
break 2 |
... | ... |
@@ -7443,7 +7460,7 @@ do |
7443 | 7443 |
IFS=$as_save_IFS |
7444 | 7444 |
test -z "$as_dir" && as_dir=. |
7445 | 7445 |
for ac_exec_ext in '' $ac_executable_extensions; do |
7446 |
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
|
7446 |
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
|
7447 | 7447 |
ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" |
7448 | 7448 |
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
7449 | 7449 |
break 2 |
... | ... |
@@ -7483,7 +7500,7 @@ do |
7483 | 7483 |
IFS=$as_save_IFS |
7484 | 7484 |
test -z "$as_dir" && as_dir=. |
7485 | 7485 |
for ac_exec_ext in '' $ac_executable_extensions; do |
7486 |
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
|
7486 |
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
|
7487 | 7487 |
ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" |
7488 | 7488 |
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
7489 | 7489 |
break 2 |
... | ... |
@@ -7563,7 +7580,7 @@ do |
7563 | 7563 |
IFS=$as_save_IFS |
7564 | 7564 |
test -z "$as_dir" && as_dir=. |
7565 | 7565 |
for ac_exec_ext in '' $ac_executable_extensions; do |
7566 |
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
|
7566 |
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
|
7567 | 7567 |
ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil" |
7568 | 7568 |
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
7569 | 7569 |
break 2 |
... | ... |
@@ -7603,7 +7620,7 @@ do |
7603 | 7603 |
IFS=$as_save_IFS |
7604 | 7604 |
test -z "$as_dir" && as_dir=. |
7605 | 7605 |
for ac_exec_ext in '' $ac_executable_extensions; do |
7606 |
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
|
7606 |
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
|
7607 | 7607 |
ac_cv_prog_ac_ct_DSYMUTIL="dsymutil" |
7608 | 7608 |
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
7609 | 7609 |
break 2 |
... | ... |
@@ -7655,7 +7672,7 @@ do |
7655 | 7655 |
IFS=$as_save_IFS |
7656 | 7656 |
test -z "$as_dir" && as_dir=. |
7657 | 7657 |
for ac_exec_ext in '' $ac_executable_extensions; do |
7658 |
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
|
7658 |
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
|
7659 | 7659 |
ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit" |
7660 | 7660 |
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
7661 | 7661 |
break 2 |
... | ... |
@@ -7695,7 +7712,7 @@ do |
7695 | 7695 |
IFS=$as_save_IFS |
7696 | 7696 |
test -z "$as_dir" && as_dir=. |
7697 | 7697 |
for ac_exec_ext in '' $ac_executable_extensions; do |
7698 |
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
|
7698 |
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
|
7699 | 7699 |
ac_cv_prog_ac_ct_NMEDIT="nmedit" |
7700 | 7700 |
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
7701 | 7701 |
break 2 |
... | ... |
@@ -7747,7 +7764,7 @@ do |
7747 | 7747 |
IFS=$as_save_IFS |
7748 | 7748 |
test -z "$as_dir" && as_dir=. |
7749 | 7749 |
for ac_exec_ext in '' $ac_executable_extensions; do |
7750 |
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
|
7750 |
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
|
7751 | 7751 |
ac_cv_prog_LIPO="${ac_tool_prefix}lipo" |
7752 | 7752 |
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
7753 | 7753 |
break 2 |
... | ... |
@@ -7787,7 +7804,7 @@ do |
7787 | 7787 |
IFS=$as_save_IFS |
7788 | 7788 |
test -z "$as_dir" && as_dir=. |
7789 | 7789 |
for ac_exec_ext in '' $ac_executable_extensions; do |
7790 |
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
|
7790 |
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
|
7791 | 7791 |
ac_cv_prog_ac_ct_LIPO="lipo" |
7792 | 7792 |
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
7793 | 7793 |
break 2 |
... | ... |
@@ -7839,7 +7856,7 @@ do |
7839 | 7839 |
IFS=$as_save_IFS |
7840 | 7840 |
test -z "$as_dir" && as_dir=. |
7841 | 7841 |
for ac_exec_ext in '' $ac_executable_extensions; do |
7842 |
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
|
7842 |
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
|
7843 | 7843 |
ac_cv_prog_OTOOL="${ac_tool_prefix}otool" |
7844 | 7844 |
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
7845 | 7845 |
break 2 |
... | ... |
@@ -7879,7 +7896,7 @@ do |
7879 | 7879 |
IFS=$as_save_IFS |
7880 | 7880 |
test -z "$as_dir" && as_dir=. |
7881 | 7881 |
for ac_exec_ext in '' $ac_executable_extensions; do |
7882 |
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
|
7882 |
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
|
7883 | 7883 |
ac_cv_prog_ac_ct_OTOOL="otool" |
7884 | 7884 |
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
7885 | 7885 |
break 2 |
... | ... |
@@ -7931,7 +7948,7 @@ do |
7931 | 7931 |
IFS=$as_save_IFS |
7932 | 7932 |
test -z "$as_dir" && as_dir=. |
7933 | 7933 |
for ac_exec_ext in '' $ac_executable_extensions; do |
7934 |
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
|
7934 |
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
|
7935 | 7935 |
ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64" |
7936 | 7936 |
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
7937 | 7937 |
break 2 |
... | ... |
@@ -7971,7 +7988,7 @@ do |
7971 | 7971 |
IFS=$as_save_IFS |
7972 | 7972 |
test -z "$as_dir" && as_dir=. |
7973 | 7973 |
for ac_exec_ext in '' $ac_executable_extensions; do |
7974 |
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
|
7974 |
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
|
7975 | 7975 |
ac_cv_prog_ac_ct_OTOOL64="otool64" |
7976 | 7976 |
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
7977 | 7977 |
break 2 |
... | ... |
@@ -16163,16 +16180,16 @@ if (echo >conf$$.file) 2>/dev/null; then |
16163 | 16163 |
# ... but there are two gotchas: |
16164 | 16164 |
# 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. |
16165 | 16165 |
# 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. |
16166 |
- # In both cases, we have to default to `cp -p'. |
|
16166 |
+ # In both cases, we have to default to `cp -pR'. |
|
16167 | 16167 |
ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || |
16168 |
- as_ln_s='cp -p' |
|
16168 |
+ as_ln_s='cp -pR' |
|
16169 | 16169 |
elif ln conf$$.file conf$$ 2>/dev/null; then |
16170 | 16170 |
as_ln_s=ln |
16171 | 16171 |
else |
16172 |
- as_ln_s='cp -p' |
|
16172 |
+ as_ln_s='cp -pR' |
|
16173 | 16173 |
fi |
16174 | 16174 |
else |
16175 |
- as_ln_s='cp -p' |
|
16175 |
+ as_ln_s='cp -pR' |
|
16176 | 16176 |
fi |
16177 | 16177 |
rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file |
16178 | 16178 |
rmdir conf$$.dir 2>/dev/null |
... | ... |
@@ -16232,28 +16249,16 @@ else |
16232 | 16232 |
as_mkdir_p=false |
16233 | 16233 |
fi |
16234 | 16234 |
|
16235 |
-if test -x / >/dev/null 2>&1; then |
|
16236 |
- as_test_x='test -x' |
|
16237 |
-else |
|
16238 |
- if ls -dL / >/dev/null 2>&1; then |
|
16239 |
- as_ls_L_option=L |
|
16240 |
- else |
|
16241 |
- as_ls_L_option= |
|
16242 |
- fi |
|
16243 |
- as_test_x=' |
|
16244 |
- eval sh -c '\'' |
|
16245 |
- if test -d "$1"; then |
|
16246 |
- test -d "$1/."; |
|
16247 |
- else |
|
16248 |
- case $1 in #( |
|
16249 |
- -*)set "./$1";; |
|
16250 |
- esac; |
|
16251 |
- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( |
|
16252 |
- ???[sx]*):;;*)false;;esac;fi |
|
16253 |
- '\'' sh |
|
16254 |
- ' |
|
16255 |
-fi |
|
16256 |
-as_executable_p=$as_test_x |
|
16235 |
+ |
|
16236 |
+# as_fn_executable_p FILE |
|
16237 |
+# ----------------------- |
|
16238 |
+# Test if FILE is an executable regular file. |
|
16239 |
+as_fn_executable_p () |
|
16240 |
+{ |
|
16241 |
+ test -f "$1" && test -x "$1" |
|
16242 |
+} # as_fn_executable_p |
|
16243 |
+as_test_x='test -x' |
|
16244 |
+as_executable_p=as_fn_executable_p |
|
16257 | 16245 |
|
16258 | 16246 |
# Sed expression to map a string onto a valid CPP name. |
16259 | 16247 |
as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" |
... | ... |
@@ -16275,7 +16280,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 |
16275 | 16275 |
# values after options handling. |
16276 | 16276 |
ac_log=" |
16277 | 16277 |
This file was extended by libclamavc++ $as_me devel, which was |
16278 |
-generated by GNU Autoconf 2.68. Invocation command line was |
|
16278 |
+generated by GNU Autoconf 2.69. Invocation command line was |
|
16279 | 16279 |
|
16280 | 16280 |
CONFIG_FILES = $CONFIG_FILES |
16281 | 16281 |
CONFIG_HEADERS = $CONFIG_HEADERS |
... | ... |
@@ -16341,10 +16346,10 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 |
16341 | 16341 |
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" |
16342 | 16342 |
ac_cs_version="\\ |
16343 | 16343 |
libclamavc++ config.status devel |
16344 |
-configured by $0, generated by GNU Autoconf 2.68, |
|
16344 |
+configured by $0, generated by GNU Autoconf 2.69, |
|
16345 | 16345 |
with options \\"\$ac_cs_config\\" |
16346 | 16346 |
|
16347 |
-Copyright (C) 2010 Free Software Foundation, Inc. |
|
16347 |
+Copyright (C) 2012 Free Software Foundation, Inc. |
|
16348 | 16348 |
This config.status script is free software; the Free Software Foundation |
16349 | 16349 |
gives unlimited permission to copy, distribute and modify it." |
16350 | 16350 |
|
... | ... |
@@ -16435,7 +16440,7 @@ fi |
16435 | 16435 |
_ACEOF |
16436 | 16436 |
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 |
16437 | 16437 |
if \$ac_cs_recheck; then |
16438 |
- set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion |
|
16438 |
+ set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion |
|
16439 | 16439 |
shift |
16440 | 16440 |
\$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 |
16441 | 16441 |
CONFIG_SHELL='$SHELL' |
16442 | 16442 |
new file mode 100644 |
... | ... |
@@ -0,0 +1,134 @@ |
0 |
+/* |
|
1 |
+ * JSON Object API |
|
2 |
+ * |
|
3 |
+ * Copyright (C) 2014 Cisco Systems, Inc. |
|
4 |
+ * |
|
5 |
+ * Authors: Kevin Lin |
|
6 |
+ * |
|
7 |
+ * This program is free software; you can redistribute it and/or modify it under |
|
8 |
+ * the terms of the GNU General Public License version 2 as published by the |
|
9 |
+ * Free Software Foundation. |
|
10 |
+ * |
|
11 |
+ * This program is distributed in the hope that it will be useful, but WITHOUT |
|
12 |
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
|
13 |
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for |
|
14 |
+ * more details. |
|
15 |
+ * |
|
16 |
+ * You should have received a copy of the GNU General Public License along with |
|
17 |
+ * this program; if not, write to the Free Software Foundation, Inc., 51 |
|
18 |
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. |
|
19 |
+ */ |
|
20 |
+ |
|
21 |
+#if HAVE_CONFIG_H |
|
22 |
+#include "clamav-config.h" |
|
23 |
+#endif |
|
24 |
+ |
|
25 |
+#include <openssl/ssl.h> |
|
26 |
+#include <openssl/err.h> |
|
27 |
+#include "libclamav/crypto.h" |
|
28 |
+ |
|
29 |
+#include "cltypes.h" |
|
30 |
+#include "others.h" |
|
31 |
+#include "json_api.h" |
|
32 |
+ |
|
33 |
+#ifdef HAVE_JSON |
|
34 |
+int cli_jsonnull(json_object *obj, const char* key) |
|
35 |
+{ |
|
36 |
+ json_object *fpobj = json_object_new_object(); |
|
37 |
+ if (NULL == fpobj) { |
|
38 |
+ cli_errmsg("json: no memory for json string object.\n"); |
|
39 |
+ return CL_EMEM; |
|
40 |
+ } |
|
41 |
+ json_object_object_add(obj, key, fpobj); |
|
42 |
+ return CL_SUCCESS; |
|
43 |
+} |
|
44 |
+ |
|
45 |
+int cli_jsonstr(json_object *obj, const char* key, const char* s) |
|
46 |
+{ |
|
47 |
+ json_object *fpobj = json_object_new_string(s); |
|
48 |
+ if (NULL == fpobj) { |
|
49 |
+ cli_errmsg("json: no memory for json string object.\n"); |
|
50 |
+ return CL_EMEM; |
|
51 |
+ } |
|
52 |
+ json_object_object_add(obj, key, fpobj); |
|
53 |
+ return CL_SUCCESS; |
|
54 |
+} |
|
55 |
+ |
|
56 |
+int cli_jsonint(json_object *obj, const char* key, int32_t val) |
|
57 |
+{ |
|
58 |
+ json_object *fpobj = json_object_new_int(val); |
|
59 |
+ if (NULL == fpobj) { |
|
60 |
+ cli_errmsg("json: no memory for json int object.\n"); |
|
61 |
+ return CL_EMEM; |
|
62 |
+ } |
|
63 |
+ json_object_object_add(obj, key, fpobj); |
|
64 |
+ return CL_SUCCESS; |
|
65 |
+} |
|
66 |
+ |
|
67 |
+#ifdef JSON10 |
|
68 |
+int cli_jsonint64(json_object *obj, const char* key, int64_t i) |
|
69 |
+{ |
|
70 |
+ json_object *fpobj = json_object_new_int64(i); |
|
71 |
+ if (NULL == fpobj) { |
|
72 |
+ cli_errmsg("json: no memory for json int object.\n"); |
|
73 |
+ return CL_EMEM; |
|
74 |
+ } |
|
75 |
+ json_object_object_add(obj, key, fpobj); |
|
76 |
+ return CL_SUCCESS; |
|
77 |
+} |
|
78 |
+#else |
|
79 |
+int cli_jsonint64(json_object *obj, const char* key, int64_t i) |
|
80 |
+{ |
|
81 |
+ int32_t li, hi; |
|
82 |
+ json_object *fpobj0, *fpobj1; |
|
83 |
+ json_object *fparr = json_object_new_array(); |
|
84 |
+ if (NULL == fparr) { |
|
85 |
+ cli_errmsg("json: no memory for json array object.\n"); |
|
86 |
+ return CL_EMEM; |
|
87 |
+ } |
|
88 |
+ |
|
89 |
+ hi = (uint32_t)((i & 0xFFFFFFFF00000000) >> 32); |
|
90 |
+ li = (uint32_t)(i & 0xFFFFFFFF); |
|
91 |
+ |
|
92 |
+ fpobj0 = json_object_new_int(li); |
|
93 |
+ if (NULL == fpobj0) { |
|
94 |
+ cli_errmsg("json: no memory for json int object.\n"); |
|
95 |
+ return CL_EMEM; |
|
96 |
+ } |
|
97 |
+ fpobj1 = json_object_new_int(hi); |
|
98 |
+ if (NULL == fpobj1) { |
|
99 |
+ cli_errmsg("json: no memory for json int object.\n"); |
|
100 |
+ return CL_EMEM; |
|
101 |
+ } |
|
102 |
+ |
|
103 |
+ /* little-endian array */ |
|
104 |
+ json_object_array_add(fparr, fpobj0); |
|
105 |
+ json_object_array_add(fparr, fpobj1); |
|
106 |
+ json_object_object_add(obj, key, fparr); |
|
107 |
+} |
|
108 |
+//#define cli_jsonint64(o,n,i) cli_dbgmsg("%s: %lld [%llx]\n", n, i, i) |
|
109 |
+#endif |
|
110 |
+ |
|
111 |
+int cli_jsonbool(json_object *obj, const char* key, int i) |
|
112 |
+{ |
|
113 |
+ json_object *fpobj = json_object_new_boolean(i); |
|
114 |
+ if (NULL == fpobj) { |
|
115 |
+ cli_errmsg("json: no memory for json boolean object.\n"); |
|
116 |
+ return CL_EMEM; |
|
117 |
+ } |
|
118 |
+ json_object_object_add(obj, key, fpobj); |
|
119 |
+ return CL_SUCCESS; |
|
120 |
+} |
|
121 |
+ |
|
122 |
+int cli_jsondouble(json_object *obj, const char* key, double d) |
|
123 |
+{ |
|
124 |
+ json_object *fpobj = json_object_new_double(d); |
|
125 |
+ if (NULL == fpobj) { |
|
126 |
+ cli_errmsg("json: no memory for json int object.\n"); |
|
127 |
+ return CL_EMEM; |
|
128 |
+ } |
|
129 |
+ json_object_object_add(obj, key, fpobj); |
|
130 |
+ return CL_SUCCESS; |
|
131 |
+} |
|
132 |
+#else |
|
133 |
+#endif |
0 | 134 |
new file mode 100644 |
... | ... |
@@ -0,0 +1,48 @@ |
0 |
+/* |
|
1 |
+ * JSON Object API |
|
2 |
+ * |
|
3 |
+ * Copyright (C) 2014 Cisco Systems, Inc. |
|
4 |
+ * |
|
5 |
+ * Authors: Kevin Lin |
|
6 |
+ * |
|
7 |
+ * This program is free software; you can redistribute it and/or modify it under |
|
8 |
+ * the terms of the GNU General Public License version 2 as published by the |
|
9 |
+ * Free Software Foundation. |
|
10 |
+ * |
|
11 |
+ * This program is distributed in the hope that it will be useful, but WITHOUT |
|
12 |
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
|
13 |
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for |
|
14 |
+ * more details. |
|
15 |
+ * |
|
16 |
+ * You should have received a copy of the GNU General Public License along with |
|
17 |
+ * this program; if not, write to the Free Software Foundation, Inc., 51 |
|
18 |
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. |
|
19 |
+ */ |
|
20 |
+ |
|
21 |
+#ifndef __JSON_C_H__ |
|
22 |
+#define __JSON_C_H__ |
|
23 |
+ |
|
24 |
+#if HAVE_CONFIG_H |
|
25 |
+#include "clamav-config.h" |
|
26 |
+#endif |
|
27 |
+ |
|
28 |
+#include "cltypes.h" |
|
29 |
+#include "others.h" |
|
30 |
+ |
|
31 |
+#ifdef HAVE_JSON |
|
32 |
+int cli_jsonnull(json_object *obj, const char* key); |
|
33 |
+int cli_jsonstr(json_object *obj, const char* key, const char* s); |
|
34 |
+int cli_jsonint(json_object *obj, const char* key, int32_t val); |
|
35 |
+int cli_jsonint64(json_object *obj, const char* key, int64_t i); |
|
36 |
+int cli_jsonbool(json_object *obj, const char* key, int i); |
|
37 |
+int cli_jsondouble(json_object *obj, const char* key, double d); |
|
38 |
+#else |
|
39 |
+#define cli_jsonnull(o,n) cli_dbgmsg("%s: null\n", n) |
|
40 |
+#define cli_jsonstr(o,n,s) cli_dbgmsg("%s: \"%s\"\n", n, s) |
|
41 |
+#define cli_jsonint(o,n,i) cli_dbgmsg("%s: %d [%x]\n", n, i, i) |
|
42 |
+#define cli_jsonint64(o,n,i) cli_dbgmsg("%s: %lld [%llx]\n", n, i, i) |
|
43 |
+#define cli_jsonbool(o,n,b) cli_dbgmsg("%s: %s\n", n, b ? "true":"false") |
|
44 |
+#define cli_jsondouble(o,n,d) cli_dbgmsg("%s: %f\n", n, d) |
|
45 |
+#endif |
|
46 |
+ |
|
47 |
+#endif /*__JSON_C_H__*/ |
... | ... |
@@ -44,6 +44,7 @@ |
44 | 44 |
#include "ole2_extract.h" |
45 | 45 |
#include "scanners.h" |
46 | 46 |
#include "fmap.h" |
47 |
+#include "json_api.h" |
|
47 | 48 |
|
48 | 49 |
#ifdef DEBUG_OLE2_LIST |
49 | 50 |
#define ole2_listmsg(...) cli_dbgmsg( __VA_ARGS__) |
... | ... |
@@ -1217,78 +1218,6 @@ abort: |
1217 | 1217 |
} |
1218 | 1218 |
|
1219 | 1219 |
/* Summary and Document Information Parsing to JSON */ |
1220 |
-#ifdef HAVE_JSON |
|
1221 |
-#define cli_jsonnull(o,n) \ |
|
1222 |
- { \ |
|
1223 |
- json_object *fpobj = json_object_new_string("null"); \ |
|
1224 |
- if (NULL == fpobj) { \ |
|
1225 |
- cli_errmsg("json: no memory for json string object.\n"); \ |
|
1226 |
- return CL_EMEM; \ |
|
1227 |
- } \ |
|
1228 |
- json_object_object_add(o, n, fpobj); \ |
|
1229 |
- } |
|
1230 |
- |
|
1231 |
-#define cli_jsonstr(o,n,s) \ |
|
1232 |
- { \ |
|
1233 |
- json_object *fpobj = json_object_new_string(s); \ |
|
1234 |
- if (NULL == fpobj) { \ |
|
1235 |
- cli_errmsg("json: no memory for json string object.\n"); \ |
|
1236 |
- return CL_EMEM; \ |
|
1237 |
- } \ |
|
1238 |
- json_object_object_add(o, n, fpobj); \ |
|
1239 |
- } |
|
1240 |
- |
|
1241 |
-#define cli_jsonint(o,n,i) \ |
|
1242 |
- { \ |
|
1243 |
- json_object *fpobj = json_object_new_int(i); \ |
|
1244 |
- if (NULL == fpobj) { \ |
|
1245 |
- cli_errmsg("json: no memory for json int object.\n"); \ |
|
1246 |
- return CL_EMEM; \ |
|
1247 |
- } \ |
|
1248 |
- json_object_object_add(o, n, fpobj); \ |
|
1249 |
- } |
|
1250 |
-/* |
|
1251 |
-#define cli_jsonint64(o,n,i) \ |
|
1252 |
- { \ |
|
1253 |
- json_object *fpobj = json_object_new_int64(i); \ |
|
1254 |
- if (NULL == fpobj) { \ |
|
1255 |
- cli_errmsg("json: no memory for json int object.\n"); \ |
|
1256 |
- return CL_EMEM; \ |
|
1257 |
- } \ |
|
1258 |
- json_object_object_add(o, n, fpobj); \ |
|
1259 |
- } |
|
1260 |
-*/ |
|
1261 |
-#define cli_jsonint64(o,n,i) cli_dbgmsg("%s: %lld [%llx]\n", n, i, i) |
|
1262 |
- |
|
1263 |
-#define cli_jsonbool(o,n,b) \ |
|
1264 |
- { \ |
|
1265 |
- json_object *fpobj = json_object_new_boolean(b); \ |
|
1266 |
- if (NULL == fpobj) { \ |
|
1267 |
- cli_errmsg("json: no memory for json int object.\n"); \ |
|
1268 |
- return CL_EMEM; \ |
|
1269 |
- } \ |
|
1270 |
- json_object_object_add(o, n, fpobj); \ |
|
1271 |
- } |
|
1272 |
- |
|
1273 |
-#define cli_jsondouble(o,n,d) \ |
|
1274 |
- { \ |
|
1275 |
- json_object *fpobj = json_object_new_double(d); \ |
|
1276 |
- if (NULL == fpobj) { \ |
|
1277 |
- cli_errmsg("json: no memory for json int object.\n"); \ |
|
1278 |
- return CL_EMEM; \ |
|
1279 |
- } \ |
|
1280 |
- json_object_object_add(o, n, fpobj); \ |
|
1281 |
- } |
|
1282 |
- |
|
1283 |
-#else |
|
1284 |
-#define cli_jsonnull(o,n) cli_dbgmsg("%s: null\n", n) |
|
1285 |
-#define cli_jsonstr(o,n,s) cli_dbgmsg("%s: \"%s\"\n", n, s) |
|
1286 |
-#define cli_jsonint(o,n,i) cli_dbgmsg("%s: %d [%x]\n", n, i, i) |
|
1287 |
-#define cli_jsonint64(o,n,i) cli_dbgmsg("%s: %lld [%llx]\n", n, i, i) |
|
1288 |
-#define cli_jsonbool(o,n,b) cli_dbgmsg("%s: %s\n", n, b ? "true":"false") |
|
1289 |
-#define cli_jsondouble(o,n,d) cli_dbgmsg("%s: %f\n", n, d) |
|
1290 |
-#endif |
|
1291 |
- |
|
1292 | 1220 |
#define WINUNICODE 0x04B0 |
1293 | 1221 |
#define PROPCNTLIMIT 25 |
1294 | 1222 |
#define PROPSTRLIMIT 100 |
... | ... |
@@ -1668,10 +1597,7 @@ ole2_process_property(summary_ctx_t *sctx, unsigned char *databuf, size_t buflen |
1668 | 1668 |
case PT_FILETIME: |
1669 | 1669 |
{ |
1670 | 1670 |
uint32_t ltime, htime; |
1671 |
-#ifdef HAVE_JSON |
|
1672 |
-#else |
|
1673 | 1671 |
uint64_t wtime = 0, utime =0; |
1674 |
-#endif |
|
1675 | 1672 |
|
1676 | 1673 |
if (offset+sizeof(ltime)+sizeof(htime) > buflen) { |
1677 | 1674 |
return CL_EFORMAT; |
... | ... |
@@ -1683,42 +1609,23 @@ ole2_process_property(summary_ctx_t *sctx, unsigned char *databuf, size_t buflen |
1683 | 1683 |
ltime = sum32_endian_convert(ltime); |
1684 | 1684 |
htime = sum32_endian_convert(htime); |
1685 | 1685 |
|
1686 |
-#ifdef HAVE_JSON |
|
1687 |
- /* Raw Output */ |
|
1688 |
- { |
|
1689 |
- json_object *fpobj0, *fpobj1; |
|
1690 |
- json_object *fparr = json_object_new_array(); |
|
1691 |
- if (NULL == fparr) { |
|
1692 |
- cli_errmsg("ole2_process_property: no memory for json array object.\n"); |
|
1693 |
- return CL_EMEM; |
|
1694 |
- } |
|
1695 |
- |
|
1696 |
- fpobj0 = json_object_new_int(ltime); |
|
1697 |
- if (NULL == fpobj0) { |
|
1698 |
- cli_errmsg("ole2_process_property: no memory for json int object.\n"); |
|
1699 |
- return CL_EMEM; |
|
1700 |
- } |
|
1701 |
- fpobj1 = json_object_new_int(htime); |
|
1702 |
- if (NULL == fpobj1) { |
|
1703 |
- cli_errmsg("ole2_process_property: no memory for json int object.\n"); |
|
1704 |
- return CL_EMEM; |
|
1705 |
- } |
|
1706 |
- |
|
1707 |
- json_object_array_add(fparr, fpobj0); |
|
1708 |
- json_object_array_add(fparr, fpobj1); |
|
1709 |
- json_object_object_add(sctx->summary, sctx->propname, fparr); |
|
1710 |
- } |
|
1711 |
-#else |
|
1712 |
- /* human-readable formatting */ |
|
1686 |
+ /* UNIX timestamp formatting */ |
|
1713 | 1687 |
wtime = htime; |
1714 | 1688 |
wtime <<= 32; |
1715 | 1689 |
wtime |= ltime; |
1716 | 1690 |
|
1717 | 1691 |
utime = wtime / 10000000; |
1718 | 1692 |
utime -= 11644473600LL; |
1719 |
- |
|
1720 |
- cli_jsonstr(sctx->summary, sctx->propname, ctime((timer_t*)&utime)); |
|
1721 |
-#endif |
|
1693 |
+ |
|
1694 |
+ if ((uint32_t)((utime & 0xFFFFFFFF00000000) >> 32)) { |
|
1695 |
+ cli_dbgmsg("ole2_process_property: UNIX timestamp is larger than 32-bit number\n"); |
|
1696 |
+ } |
|
1697 |
+ else { |
|
1698 |
+ cli_jsonint(sctx->summary, sctx->propname, (uint32_t)(utime & 0xFFFFFFFF)); |
|
1699 |
+ } |
|
1700 |
+ |
|
1701 |
+ /* human-readble string JSON output */ |
|
1702 |
+ //cli_jsonstr(sctx->summary, sctx->propname, ctime((timer_t*)&utime)); |
|
1722 | 1703 |
break; |
1723 | 1704 |
} |
1724 | 1705 |
default: |
... | ... |
@@ -1,4 +1,4 @@ |
1 |
-# Makefile.in generated by automake 1.11.3 from Makefile.am. |
|
1 |
+# Makefile.in generated by automake 1.11.6 from Makefile.am. |
|
2 | 2 |
# @configure_input@ |
3 | 3 |
|
4 | 4 |
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, |
... | ... |
@@ -19,6 +19,23 @@ |
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 |
+ } |
|
22 | 39 |
pkgdatadir = $(datadir)/@PACKAGE@ |
23 | 40 |
pkgincludedir = $(includedir)/@PACKAGE@ |
24 | 41 |
pkglibdir = $(libdir)/@PACKAGE@ |
... | ... |
@@ -242,6 +259,11 @@ DIST_SOURCES = $(dld_link_la_SOURCES) $(dlopen_la_SOURCES) \ |
242 | 242 |
$(dyld_la_SOURCES) $(libltdl_la_SOURCES) \ |
243 | 243 |
$(libltdlc_la_SOURCES) $(load_add_on_la_SOURCES) \ |
244 | 244 |
$(loadlibrary_la_SOURCES) $(shl_load_la_SOURCES) |
245 |
+am__can_run_installinfo = \ |
|
246 |
+ case $$AM_UPDATE_INFO_DIR in \ |
|
247 |
+ n|no|NO) false;; \ |
|
248 |
+ *) (install-info --version) >/dev/null 2>&1;; \ |
|
249 |
+ esac |
|
245 | 250 |
am__include_HEADERS_DIST = ltdl.h |
246 | 251 |
am__ltdlinclude_HEADERS_DIST = libltdl/lt_system.h libltdl/lt_error.h \ |
247 | 252 |
libltdl/lt_dlloader.h |
... | ... |
@@ -543,7 +565,6 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) |
543 | 543 |
$(am__aclocal_m4_deps): |
544 | 544 |
install-libLTLIBRARIES: $(lib_LTLIBRARIES) |
545 | 545 |
@$(NORMAL_INSTALL) |
546 |
- test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)" |
|
547 | 546 |
@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ |
548 | 547 |
list2=; for p in $$list; do \ |
549 | 548 |
if test -f $$p; then \ |
... | ... |
@@ -551,6 +572,8 @@ install-libLTLIBRARIES: $(lib_LTLIBRARIES) |
551 | 551 |
else :; fi; \ |
552 | 552 |
done; \ |
553 | 553 |
test -z "$$list2" || { \ |
554 |
+ echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \ |
|
555 |
+ $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \ |
|
554 | 556 |
echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \ |
555 | 557 |
$(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \ |
556 | 558 |
} |
... | ... |
@@ -777,8 +800,11 @@ clean-libtool: |
777 | 777 |
-rm -rf .libs _libs |
778 | 778 |
install-includeHEADERS: $(include_HEADERS) |
779 | 779 |
@$(NORMAL_INSTALL) |
780 |
- test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)" |
|
781 | 780 |
@list='$(include_HEADERS)'; test -n "$(includedir)" || list=; \ |
781 |
+ if test -n "$$list"; then \ |
|
782 |
+ echo " $(MKDIR_P) '$(DESTDIR)$(includedir)'"; \ |
|
783 |
+ $(MKDIR_P) "$(DESTDIR)$(includedir)" || exit 1; \ |
|
784 |
+ fi; \ |
|
782 | 785 |
for p in $$list; do \ |
783 | 786 |
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ |
784 | 787 |
echo "$$d$$p"; \ |
... | ... |
@@ -795,8 +821,11 @@ uninstall-includeHEADERS: |
795 | 795 |
dir='$(DESTDIR)$(includedir)'; $(am__uninstall_files_from_dir) |
796 | 796 |
install-ltdlincludeHEADERS: $(ltdlinclude_HEADERS) |
797 | 797 |
@$(NORMAL_INSTALL) |
798 |
- test -z "$(ltdlincludedir)" || $(MKDIR_P) "$(DESTDIR)$(ltdlincludedir)" |
|
799 | 798 |
@list='$(ltdlinclude_HEADERS)'; test -n "$(ltdlincludedir)" || list=; \ |
799 |
+ if test -n "$$list"; then \ |
|
800 |
+ echo " $(MKDIR_P) '$(DESTDIR)$(ltdlincludedir)'"; \ |
|
801 |
+ $(MKDIR_P) "$(DESTDIR)$(ltdlincludedir)" || exit 1; \ |
|
802 |
+ fi; \ |
|
800 | 803 |
for p in $$list; do \ |
801 | 804 |
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ |
802 | 805 |
echo "$$d$$p"; \ |
... | ... |
@@ -1,4 +1,4 @@ |
1 |
-# Makefile.in generated by automake 1.11.3 from Makefile.am. |
|
1 |
+# Makefile.in generated by automake 1.11.6 from Makefile.am. |
|
2 | 2 |
# @configure_input@ |
3 | 3 |
|
4 | 4 |
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, |
... | ... |
@@ -34,6 +34,23 @@ |
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 |
+ } |
|
37 | 54 |
pkgdatadir = $(datadir)/@PACKAGE@ |
38 | 55 |
pkgincludedir = $(includedir)/@PACKAGE@ |
39 | 56 |
pkglibdir = $(libdir)/@PACKAGE@ |
... | ... |
@@ -167,6 +184,11 @@ am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) |
167 | 167 |
am__v_GEN_0 = @echo " GEN " $@; |
168 | 168 |
SOURCES = $(sigtool_SOURCES) |
169 | 169 |
DIST_SOURCES = $(sigtool_SOURCES) |
170 |
+am__can_run_installinfo = \ |
|
171 |
+ case $$AM_UPDATE_INFO_DIR in \ |
|
172 |
+ n|no|NO) false;; \ |
|
173 |
+ *) (install-info --version) >/dev/null 2>&1;; \ |
|
174 |
+ esac |
|
170 | 175 |
ETAGS = etags |
171 | 176 |
CTAGS = ctags |
172 | 177 |
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) |
... | ... |
@@ -418,8 +440,11 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) |
418 | 418 |
$(am__aclocal_m4_deps): |
419 | 419 |
install-binPROGRAMS: $(bin_PROGRAMS) |
420 | 420 |
@$(NORMAL_INSTALL) |
421 |
- test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" |
|
422 | 421 |
@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ |
422 |
+ if test -n "$$list"; then \ |
|
423 |
+ echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \ |
|
424 |
+ $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \ |
|
425 |
+ fi; \ |
|
423 | 426 |
for p in $$list; do echo "$$p $$p"; done | \ |
424 | 427 |
sed 's/$(EXEEXT)$$//' | \ |
425 | 428 |
while read p p1; do if test -f $$p || test -f $$p1; \ |
... | ... |
@@ -1,4 +1,4 @@ |
1 |
-# Makefile.in generated by automake 1.11.3 from Makefile.am. |
|
1 |
+# Makefile.in generated by automake 1.11.6 from Makefile.am. |
|
2 | 2 |
# @configure_input@ |
3 | 3 |
|
4 | 4 |
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, |
... | ... |
@@ -15,6 +15,23 @@ |
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 |
+ } |
|
18 | 35 |
pkgdatadir = $(datadir)/@PACKAGE@ |
19 | 36 |
pkgincludedir = $(includedir)/@PACKAGE@ |
20 | 37 |
pkglibdir = $(libdir)/@PACKAGE@ |
... | ... |
@@ -119,6 +136,11 @@ am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) |
119 | 119 |
am__v_at_0 = @ |
120 | 120 |
SOURCES = |
121 | 121 |
DIST_SOURCES = |
122 |
+am__can_run_installinfo = \ |
|
123 |
+ case $$AM_UPDATE_INFO_DIR in \ |
|
124 |
+ n|no|NO) false;; \ |
|
125 |
+ *) (install-info --version) >/dev/null 2>&1;; \ |
|
126 |
+ esac |
|
122 | 127 |
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) |
123 | 128 |
ACLOCAL = @ACLOCAL@ |
124 | 129 |
AMTAR = @AMTAR@ |
... | ... |
@@ -1,4 +1,4 @@ |
1 |
-# Makefile.in generated by automake 1.11.3 from Makefile.am. |
|
1 |
+# Makefile.in generated by automake 1.11.6 from Makefile.am. |
|
2 | 2 |
# @configure_input@ |
3 | 3 |
|
4 | 4 |
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, |
... | ... |
@@ -15,6 +15,23 @@ |
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 |
+ } |
|
18 | 35 |
pkgdatadir = $(datadir)/@PACKAGE@ |
19 | 36 |
pkgincludedir = $(includedir)/@PACKAGE@ |
20 | 37 |
pkglibdir = $(libdir)/@PACKAGE@ |
... | ... |
@@ -180,6 +197,11 @@ SOURCES = $(check_clamav_SOURCES) $(check_clamd_SOURCES) \ |
180 | 180 |
$(check_fpu_endian_SOURCES) |
181 | 181 |
DIST_SOURCES = $(am__check_clamav_SOURCES_DIST) \ |
182 | 182 |
$(am__check_clamd_SOURCES_DIST) $(check_fpu_endian_SOURCES) |
183 |
+am__can_run_installinfo = \ |
|
184 |
+ case $$AM_UPDATE_INFO_DIR in \ |
|
185 |
+ n|no|NO) false;; \ |
|
186 |
+ *) (install-info --version) >/dev/null 2>&1;; \ |
|
187 |
+ esac |
|
183 | 188 |
ETAGS = etags |
184 | 189 |
CTAGS = ctags |
185 | 190 |
# If stdout is a non-dumb tty, use colors. If test -t is not supported, |
... | ... |
@@ -964,8 +986,7 @@ check-TESTS recheck: |
964 | 964 |
if test -z "$$list"; then list=$$f; else list="$$list $$f"; fi; \ |
965 | 965 |
done; \ |
966 | 966 |
if test $@ = recheck && test -n "$$list"; then \ |
967 |
- echo "am--clean: ; rm -f $$list" \ |
|
968 |
- | $(MAKE) $(AM_MAKEFLAGS) -f - am--clean || exit 1; \ |
|
967 |
+ $(am__make_dryrun) || rm -f $$list || exit 1; \ |
|
969 | 968 |
fi; \ |
970 | 969 |
$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$list" |
971 | 970 |
recheck: $(check_PROGRAMS) $(check_SCRIPTS) |