Browse code

Revert "Fix autotools on FreeBSD"

This reverts commit ff060a0c3a0ff4fec27f2eca640c9c0a7944aa4b.

Shawn Webb authored on 2012/12/28 00:34:38
Showing 46 changed files
... ...
@@ -1,8 +1,9 @@
1
-# Makefile.in generated by automake 1.12.4 from Makefile.am.
1
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
2 2
 # @configure_input@
3 3
 
4
-# Copyright (C) 1994-2012 Free Software Foundation, Inc.
5
-
4
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
5
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
6
+# Foundation, Inc.
6 7
 # This Makefile.in is free software; the Free Software Foundation
7 8
 # gives unlimited permission to copy and/or distribute it,
8 9
 # with or without modifications, as long as this notice is preserved.
... ...
@@ -74,12 +75,7 @@ subdir = .
74 74
 DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
75 75
 	$(srcdir)/Makefile.in $(srcdir)/clamav-config.h.in \
76 76
 	$(srcdir)/clamav-config.in $(srcdir)/libclamav.pc.in \
77
-	$(srcdir)/platform.h.in $(top_srcdir)/config/ar-lib \
78
-	$(top_srcdir)/config/compile $(top_srcdir)/config/config.guess \
79
-	$(top_srcdir)/config/config.rpath \
80
-	$(top_srcdir)/config/config.sub \
81
-	$(top_srcdir)/config/install-sh $(top_srcdir)/config/ltmain.sh \
82
-	$(top_srcdir)/config/missing $(top_srcdir)/configure \
77
+	$(srcdir)/platform.h.in $(top_srcdir)/configure \
83 78
 	$(top_srcdir)/docs/man/clamav-milter.8.in \
84 79
 	$(top_srcdir)/docs/man/clamav-milter.conf.5.in \
85 80
 	$(top_srcdir)/docs/man/clambc.1.in \
... ...
@@ -92,9 +88,9 @@ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
92 92
 	$(top_srcdir)/docs/man/freshclam.1.in \
93 93
 	$(top_srcdir)/docs/man/freshclam.conf.5.in \
94 94
 	$(top_srcdir)/docs/man/sigtool.1.in AUTHORS COPYING ChangeLog \
95
-	INSTALL NEWS config/ar-lib config/compile config/config.guess \
96
-	config/config.rpath config/config.sub config/depcomp \
97
-	config/install-sh config/ltmain.sh config/missing
95
+	INSTALL NEWS config/config.guess config/config.rpath \
96
+	config/config.sub config/depcomp config/install-sh \
97
+	config/ltmain.sh config/missing
98 98
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
99 99
 am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
100 100
 	$(top_srcdir)/m4/argz.m4 \
... ...
@@ -149,18 +145,12 @@ am__uninstall_files_from_dir = { \
149 149
   }
150 150
 am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pkgconfigdir)"
151 151
 SCRIPTS = $(bin_SCRIPTS)
152
-AM_V_P = $(am__v_P_@AM_V@)
153
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
154
-am__v_P_0 = false
155
-am__v_P_1 = :
156 152
 AM_V_GEN = $(am__v_GEN_@AM_V@)
157 153
 am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
158
-am__v_GEN_0 = @echo "  GEN     " $@;
159
-am__v_GEN_1 = 
154
+am__v_GEN_0 = @echo "  GEN   " $@;
160 155
 AM_V_at = $(am__v_at_@AM_V@)
161 156
 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
162 157
 am__v_at_0 = @
163
-am__v_at_1 = 
164 158
 SOURCES =
165 159
 DIST_SOURCES =
166 160
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
... ...
@@ -180,10 +170,9 @@ RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
180 180
   distclean-recursive maintainer-clean-recursive
181 181
 AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
182 182
 	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
183
-	cscope distdir dist dist-all distcheck
183
+	distdir dist dist-all distcheck
184 184
 ETAGS = etags
185 185
 CTAGS = ctags
186
-CSCOPE = cscope
187 186
 DIST_SUBDIRS = $(SUBDIRS)
188 187
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
189 188
 distdir = $(PACKAGE)-$(VERSION)
... ...
@@ -194,7 +183,6 @@ am__remove_distdir = \
194 194
       && rm -rf "$(distdir)" \
195 195
       || { sleep 5 && rm -rf "$(distdir)"; }; \
196 196
   else :; fi
197
-am__post_remove_distdir = $(am__remove_distdir)
198 197
 am__relativize = \
199 198
   dir0=`pwd`; \
200 199
   sed_first='s,^\([^/]*\)/.*$$,\1,'; \
... ...
@@ -222,7 +210,6 @@ am__relativize = \
222 222
   reldir="$$dir2"
223 223
 DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2
224 224
 GZIP_ENV = --best
225
-DIST_TARGETS = dist-bzip2 dist-gzip
226 225
 am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
227 226
   | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
228 227
 distcleancheck_listfiles = find . -type f -print
... ...
@@ -567,12 +554,12 @@ uninstall-pkgconfigDATA:
567 567
 	dir='$(DESTDIR)$(pkgconfigdir)'; $(am__uninstall_files_from_dir)
568 568
 
569 569
 # This directory's subdirectories are mostly independent; you can cd
570
-# into them and run 'make' without going through this Makefile.
571
-# To change the values of 'make' variables: instead of editing Makefiles,
572
-# (1) if the variable is set in 'config.status', edit 'config.status'
573
-#     (which will cause the Makefiles to be regenerated when you run 'make');
574
-# (2) otherwise, pass the desired values on the 'make' command line.
575
-$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS):
570
+# into them and run `make' without going through this Makefile.
571
+# To change the values of `make' variables: instead of editing Makefiles,
572
+# (1) if the variable is set in `config.status', edit `config.status'
573
+#     (which will cause the Makefiles to be regenerated when you run `make');
574
+# (2) otherwise, pass the desired values on the `make' command line.
575
+$(RECURSIVE_TARGETS):
576 576
 	@fail= failcom='exit 1'; \
577 577
 	for f in x $$MAKEFLAGS; do \
578 578
 	  case $$f in \
... ...
@@ -582,11 +569,7 @@ $(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS):
582 582
 	done; \
583 583
 	dot_seen=no; \
584 584
 	target=`echo $@ | sed s/-recursive//`; \
585
-	case "$@" in \
586
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
587
-	  *) list='$(SUBDIRS)' ;; \
588
-	esac; \
589
-	for subdir in $$list; do \
585
+	list='$(SUBDIRS)'; for subdir in $$list; do \
590 586
 	  echo "Making $$target in $$subdir"; \
591 587
 	  if test "$$subdir" = "."; then \
592 588
 	    dot_seen=yes; \
... ...
@@ -600,6 +583,37 @@ $(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS):
600 600
 	if test "$$dot_seen" = "no"; then \
601 601
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
602 602
 	fi; test -z "$$fail"
603
+
604
+$(RECURSIVE_CLEAN_TARGETS):
605
+	@fail= failcom='exit 1'; \
606
+	for f in x $$MAKEFLAGS; do \
607
+	  case $$f in \
608
+	    *=* | --[!k]*);; \
609
+	    *k*) failcom='fail=yes';; \
610
+	  esac; \
611
+	done; \
612
+	dot_seen=no; \
613
+	case "$@" in \
614
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
615
+	  *) list='$(SUBDIRS)' ;; \
616
+	esac; \
617
+	rev=''; for subdir in $$list; do \
618
+	  if test "$$subdir" = "."; then :; else \
619
+	    rev="$$subdir $$rev"; \
620
+	  fi; \
621
+	done; \
622
+	rev="$$rev ."; \
623
+	target=`echo $@ | sed s/-recursive//`; \
624
+	for subdir in $$rev; do \
625
+	  echo "Making $$target in $$subdir"; \
626
+	  if test "$$subdir" = "."; then \
627
+	    local_target="$$target-am"; \
628
+	  else \
629
+	    local_target="$$target"; \
630
+	  fi; \
631
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
632
+	  || eval $$failcom; \
633
+	done && test -z "$$fail"
603 634
 tags-recursive:
604 635
 	list='$(SUBDIRS)'; for subdir in $$list; do \
605 636
 	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
... ...
@@ -608,10 +622,6 @@ ctags-recursive:
608 608
 	list='$(SUBDIRS)'; for subdir in $$list; do \
609 609
 	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
610 610
 	done
611
-cscopelist-recursive:
612
-	list='$(SUBDIRS)'; for subdir in $$list; do \
613
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \
614
-	done
615 611
 
616 612
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
617 613
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
... ...
@@ -675,32 +685,8 @@ GTAGS:
675 675
 	  && $(am__cd) $(top_srcdir) \
676 676
 	  && gtags -i $(GTAGS_ARGS) "$$here"
677 677
 
678
-cscope: cscope.files
679
-	test ! -s cscope.files \
680
-	  || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS)
681
-
682
-clean-cscope:
683
-	-rm -f cscope.files
684
-
685
-cscope.files: clean-cscope cscopelist-recursive cscopelist
686
-
687
-cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP)
688
-	list='$(SOURCES) $(HEADERS) $(LISP)'; \
689
-	case "$(srcdir)" in \
690
-	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
691
-	  *) sdir=$(subdir)/$(srcdir) ;; \
692
-	esac; \
693
-	for i in $$list; do \
694
-	  if test -f "$$i"; then \
695
-	    echo "$(subdir)/$$i"; \
696
-	  else \
697
-	    echo "$$sdir/$$i"; \
698
-	  fi; \
699
-	done >> $(top_builddir)/cscope.files
700
-
701 678
 distclean-tags:
702 679
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
703
-	-rm -f cscope.out cscope.in.out cscope.po.out cscope.files
704 680
 
705 681
 distdir: $(DISTFILES)
706 682
 	$(am__remove_distdir)
... ...
@@ -771,35 +757,40 @@ distdir: $(DISTFILES)
771 771
 	|| chmod -R a+r "$(distdir)"
772 772
 dist-gzip: distdir
773 773
 	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
774
-	$(am__post_remove_distdir)
774
+	$(am__remove_distdir)
775 775
 dist-bzip2: distdir
776 776
 	tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
777
-	$(am__post_remove_distdir)
777
+	$(am__remove_distdir)
778 778
 
779 779
 dist-lzip: distdir
780 780
 	tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
781
-	$(am__post_remove_distdir)
781
+	$(am__remove_distdir)
782
+
783
+dist-lzma: distdir
784
+	tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
785
+	$(am__remove_distdir)
782 786
 
783 787
 dist-xz: distdir
784 788
 	tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
785
-	$(am__post_remove_distdir)
789
+	$(am__remove_distdir)
786 790
 
787 791
 dist-tarZ: distdir
788 792
 	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
789
-	$(am__post_remove_distdir)
793
+	$(am__remove_distdir)
790 794
 
791 795
 dist-shar: distdir
792 796
 	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
793
-	$(am__post_remove_distdir)
797
+	$(am__remove_distdir)
794 798
 
795 799
 dist-zip: distdir
796 800
 	-rm -f $(distdir).zip
797 801
 	zip -rq $(distdir).zip $(distdir)
798
-	$(am__post_remove_distdir)
802
+	$(am__remove_distdir)
799 803
 
800
-dist dist-all:
801
-	$(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:'
802
-	$(am__post_remove_distdir)
804
+dist dist-all: distdir
805
+	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
806
+	tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
807
+	$(am__remove_distdir)
803 808
 
804 809
 # This target untars the dist file and tries a VPATH configuration.  Then
805 810
 # it guarantees that the distribution is self-contained by making another
... ...
@@ -810,6 +801,8 @@ distcheck: dist
810 810
 	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
811 811
 	*.tar.bz2*) \
812 812
 	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
813
+	*.tar.lzma*) \
814
+	  lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
813 815
 	*.tar.lz*) \
814 816
 	  lzip -dc $(distdir).tar.lz | $(am__untar) ;;\
815 817
 	*.tar.xz*) \
... ...
@@ -821,9 +814,9 @@ distcheck: dist
821 821
 	*.zip*) \
822 822
 	  unzip $(distdir).zip ;;\
823 823
 	esac
824
-	chmod -R a-w $(distdir)
825
-	chmod u+w $(distdir)
826
-	mkdir $(distdir)/_build $(distdir)/_inst
824
+	chmod -R a-w $(distdir); chmod u+w $(distdir)
825
+	mkdir $(distdir)/_build
826
+	mkdir $(distdir)/_inst
827 827
 	chmod a-w $(distdir)
828 828
 	test -d $(distdir)/_build || exit 0; \
829 829
 	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
... ...
@@ -855,7 +848,7 @@ distcheck: dist
855 855
 	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
856 856
 	  && cd "$$am__cwd" \
857 857
 	  || exit 1
858
-	$(am__post_remove_distdir)
858
+	$(am__remove_distdir)
859 859
 	@(echo "$(distdir) archives ready for distribution: "; \
860 860
 	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
861 861
 	  sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
... ...
@@ -995,14 +988,12 @@ ps-am:
995 995
 uninstall-am: uninstall-binSCRIPTS uninstall-pkgconfigDATA
996 996
 
997 997
 .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \
998
-	cscopelist-recursive ctags-recursive install-am install-strip \
999
-	tags-recursive
998
+	ctags-recursive install-am install-strip tags-recursive
1000 999
 
1001 1000
 .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
1002
-	all all-am am--refresh check check-am clean clean-cscope \
1003
-	clean-generic clean-libtool cscope cscopelist \
1004
-	cscopelist-recursive ctags ctags-recursive dist dist-all \
1005
-	dist-bzip2 dist-gzip dist-hook dist-lzip dist-shar dist-tarZ \
1001
+	all all-am am--refresh check check-am clean clean-generic \
1002
+	clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \
1003
+	dist-gzip dist-hook dist-lzip dist-lzma dist-shar dist-tarZ \
1006 1004
 	dist-xz dist-zip distcheck distclean distclean-generic \
1007 1005
 	distclean-hdr distclean-libtool distclean-tags distcleancheck \
1008 1006
 	distdir distuninstallcheck dvi dvi-am html html-am info \
... ...
@@ -1,7 +1,8 @@
1
-# generated automatically by aclocal 1.12.4 -*- Autoconf -*-
2
-
3
-# Copyright (C) 1996-2012 Free Software Foundation, Inc.
1
+# generated automatically by aclocal 1.11.6 -*- Autoconf -*-
4 2
 
3
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
4
+# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
5
+# Inc.
5 6
 # This file is free software; the Free Software Foundation
6 7
 # gives unlimited permission to copy and/or distribute it,
7 8
 # with or without modifications, as long as this notice is preserved.
... ...
@@ -17,24 +18,27 @@ m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],,
17 17
 [m4_warning([this file was generated for autoconf 2.69.
18 18
 You have another version of autoconf.  It may work, but is not guaranteed to.
19 19
 If you have problems, you may need to regenerate the build system entirely.
20
-To do so, use the procedure documented by the package, typically 'autoreconf'.])])
20
+To do so, use the procedure documented by the package, typically `autoreconf'.])])
21 21
 
22
-# Copyright (C) 2002-2012 Free Software Foundation, Inc.
22
+# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software
23
+# Foundation, Inc.
23 24
 #
24 25
 # This file is free software; the Free Software Foundation
25 26
 # gives unlimited permission to copy and/or distribute it,
26 27
 # with or without modifications, as long as this notice is preserved.
27 28
 
29
+# serial 1
30
+
28 31
 # AM_AUTOMAKE_VERSION(VERSION)
29 32
 # ----------------------------
30 33
 # Automake X.Y traces this macro to ensure aclocal.m4 has been
31 34
 # generated from the m4 files accompanying Automake X.Y.
32 35
 # (This private macro should not be called outside this file.)
33 36
 AC_DEFUN([AM_AUTOMAKE_VERSION],
34
-[am__api_version='1.12'
37
+[am__api_version='1.11'
35 38
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
36 39
 dnl require some minimum version.  Point them to the right macro.
37
-m4_if([$1], [1.12.4], [],
40
+m4_if([$1], [1.11.6], [],
38 41
       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
39 42
 ])
40 43
 
... ...
@@ -50,81 +54,24 @@ m4_define([_AM_AUTOCONF_VERSION], [])
50 50
 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
51 51
 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
52 52
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
53
-[AM_AUTOMAKE_VERSION([1.12.4])dnl
53
+[AM_AUTOMAKE_VERSION([1.11.6])dnl
54 54
 m4_ifndef([AC_AUTOCONF_VERSION],
55 55
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
56 56
 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
57 57
 
58
-# Copyright (C) 2011-2012 Free Software Foundation, Inc.
59
-#
60
-# This file is free software; the Free Software Foundation
61
-# gives unlimited permission to copy and/or distribute it,
62
-# with or without modifications, as long as this notice is preserved.
63
-
64
-# AM_PROG_AR([ACT-IF-FAIL])
65
-# -------------------------
66
-# Try to determine the archiver interface, and trigger the ar-lib wrapper
67
-# if it is needed.  If the detection of archiver interface fails, run
68
-# ACT-IF-FAIL (default is to abort configure with a proper error message).
69
-AC_DEFUN([AM_PROG_AR],
70
-[AC_BEFORE([$0], [LT_INIT])dnl
71
-AC_BEFORE([$0], [AC_PROG_LIBTOOL])dnl
72
-AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
73
-AC_REQUIRE_AUX_FILE([ar-lib])dnl
74
-AC_CHECK_TOOLS([AR], [ar lib "link -lib"], [false])
75
-: ${AR=ar}
76
-
77
-AC_CACHE_CHECK([the archiver ($AR) interface], [am_cv_ar_interface],
78
-  [am_cv_ar_interface=ar
79
-   AC_COMPILE_IFELSE([AC_LANG_SOURCE([[int some_variable = 0;]])],
80
-     [am_ar_try='$AR cru libconftest.a conftest.$ac_objext >&AS_MESSAGE_LOG_FD'
81
-      AC_TRY_EVAL([am_ar_try])
82
-      if test "$ac_status" -eq 0; then
83
-        am_cv_ar_interface=ar
84
-      else
85
-        am_ar_try='$AR -NOLOGO -OUT:conftest.lib conftest.$ac_objext >&AS_MESSAGE_LOG_FD'
86
-        AC_TRY_EVAL([am_ar_try])
87
-        if test "$ac_status" -eq 0; then
88
-          am_cv_ar_interface=lib
89
-        else
90
-          am_cv_ar_interface=unknown
91
-        fi
92
-      fi
93
-      rm -f conftest.lib libconftest.a
94
-     ])
95
-   ])
96
-
97
-case $am_cv_ar_interface in
98
-ar)
99
-  ;;
100
-lib)
101
-  # Microsoft lib, so override with the ar-lib wrapper script.
102
-  # FIXME: It is wrong to rewrite AR.
103
-  # But if we don't then we get into trouble of one sort or another.
104
-  # A longer-term fix would be to have automake use am__AR in this case,
105
-  # and then we could set am__AR="$am_aux_dir/ar-lib \$(AR)" or something
106
-  # similar.
107
-  AR="$am_aux_dir/ar-lib $AR"
108
-  ;;
109
-unknown)
110
-  m4_default([$1],
111
-             [AC_MSG_ERROR([could not determine $AR interface])])
112
-  ;;
113
-esac
114
-AC_SUBST([AR])dnl
115
-])
116
-
117 58
 # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
118 59
 
119
-# Copyright (C) 2001-2012 Free Software Foundation, Inc.
60
+# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
120 61
 #
121 62
 # This file is free software; the Free Software Foundation
122 63
 # gives unlimited permission to copy and/or distribute it,
123 64
 # with or without modifications, as long as this notice is preserved.
124 65
 
66
+# serial 1
67
+
125 68
 # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
126
-# $ac_aux_dir to '$srcdir/foo'.  In other projects, it is set to
127
-# '$srcdir', '$srcdir/..', or '$srcdir/../..'.
69
+# $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to
70
+# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
128 71
 #
129 72
 # Of course, Automake must honor this variable whenever it calls a
130 73
 # tool from the auxiliary directory.  The problem is that $srcdir (and
... ...
@@ -143,7 +90,7 @@ AC_SUBST([AR])dnl
143 143
 #
144 144
 # The reason of the latter failure is that $top_srcdir and $ac_aux_dir
145 145
 # are both prefixed by $srcdir.  In an in-source build this is usually
146
-# harmless because $srcdir is '.', but things will broke when you
146
+# harmless because $srcdir is `.', but things will broke when you
147 147
 # start a VPATH build or use an absolute $srcdir.
148 148
 #
149 149
 # So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
... ...
@@ -169,19 +116,22 @@ am_aux_dir=`cd $ac_aux_dir && pwd`
169 169
 
170 170
 # AM_CONDITIONAL                                            -*- Autoconf -*-
171 171
 
172
-# Copyright (C) 1997-2012 Free Software Foundation, Inc.
172
+# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008
173
+# Free Software Foundation, Inc.
173 174
 #
174 175
 # This file is free software; the Free Software Foundation
175 176
 # gives unlimited permission to copy and/or distribute it,
176 177
 # with or without modifications, as long as this notice is preserved.
177 178
 
179
+# serial 9
180
+
178 181
 # AM_CONDITIONAL(NAME, SHELL-CONDITION)
179 182
 # -------------------------------------
180 183
 # Define a conditional.
181 184
 AC_DEFUN([AM_CONDITIONAL],
182
-[AC_PREREQ([2.52])dnl
183
- m4_if([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
184
-       [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
185
+[AC_PREREQ(2.52)dnl
186
+ ifelse([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
187
+	[$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
185 188
 AC_SUBST([$1_TRUE])dnl
186 189
 AC_SUBST([$1_FALSE])dnl
187 190
 _AM_SUBST_NOTMAKE([$1_TRUE])dnl
... ...
@@ -200,14 +150,16 @@ AC_CONFIG_COMMANDS_PRE(
200 200
 Usually this means the macro was only invoked conditionally.]])
201 201
 fi])])
202 202
 
203
-# Copyright (C) 1999-2012 Free Software Foundation, Inc.
203
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009,
204
+# 2010, 2011 Free Software Foundation, Inc.
204 205
 #
205 206
 # This file is free software; the Free Software Foundation
206 207
 # gives unlimited permission to copy and/or distribute it,
207 208
 # with or without modifications, as long as this notice is preserved.
208 209
 
210
+# serial 12
209 211
 
210
-# There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be
212
+# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
211 213
 # written in clear, in which case automake, when reading aclocal.m4,
212 214
 # will think it sees a *use*, and therefore will trigger all it's
213 215
 # C support machinery.  Also note that it means that autoscan, seeing
... ...
@@ -217,7 +169,7 @@ fi])])
217 217
 # _AM_DEPENDENCIES(NAME)
218 218
 # ----------------------
219 219
 # See how the compiler implements dependency checking.
220
-# NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC".
220
+# NAME is "CC", "CXX", "GCJ", or "OBJC".
221 221
 # We try a few techniques and use that to set a single cache variable.
222 222
 #
223 223
 # We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
... ...
@@ -230,13 +182,12 @@ AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
230 230
 AC_REQUIRE([AM_MAKE_INCLUDE])dnl
231 231
 AC_REQUIRE([AM_DEP_TRACK])dnl
232 232
 
233
-m4_if([$1], [CC],   [depcc="$CC"   am_compiler_list=],
234
-      [$1], [CXX],  [depcc="$CXX"  am_compiler_list=],
235
-      [$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
236
-      [$1], [OBJCXX], [depcc="$OBJCXX" am_compiler_list='gcc3 gcc'],
237
-      [$1], [UPC],  [depcc="$UPC"  am_compiler_list=],
238
-      [$1], [GCJ],  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
239
-                    [depcc="$$1"   am_compiler_list=])
233
+ifelse([$1], CC,   [depcc="$CC"   am_compiler_list=],
234
+       [$1], CXX,  [depcc="$CXX"  am_compiler_list=],
235
+       [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
236
+       [$1], UPC,  [depcc="$UPC"  am_compiler_list=],
237
+       [$1], GCJ,  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
238
+                   [depcc="$$1"   am_compiler_list=])
240 239
 
241 240
 AC_CACHE_CHECK([dependency style of $depcc],
242 241
                [am_cv_$1_dependencies_compiler_type],
... ...
@@ -244,8 +195,8 @@ AC_CACHE_CHECK([dependency style of $depcc],
244 244
   # We make a subdir and do the tests there.  Otherwise we can end up
245 245
   # making bogus files that we don't know about and never remove.  For
246 246
   # instance it was reported that on HP-UX the gcc test will end up
247
-  # making a dummy file named 'D' -- because '-MD' means "put the output
248
-  # in D".
247
+  # making a dummy file named `D' -- because `-MD' means `put the output
248
+  # in D'.
249 249
   rm -rf conftest.dir
250 250
   mkdir conftest.dir
251 251
   # Copy depcomp to subdir because otherwise we won't find it if we're
... ...
@@ -285,16 +236,16 @@ AC_CACHE_CHECK([dependency style of $depcc],
285 285
     : > sub/conftest.c
286 286
     for i in 1 2 3 4 5 6; do
287 287
       echo '#include "conftst'$i'.h"' >> sub/conftest.c
288
-      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
289
-      # Solaris 10 /bin/sh.
290
-      echo '/* dummy */' > sub/conftst$i.h
288
+      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
289
+      # Solaris 8's {/usr,}/bin/sh.
290
+      touch sub/conftst$i.h
291 291
     done
292 292
     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
293 293
 
294
-    # We check with '-c' and '-o' for the sake of the "dashmstdout"
294
+    # We check with `-c' and `-o' for the sake of the "dashmstdout"
295 295
     # mode.  It turns out that the SunPro C++ compiler does not properly
296
-    # handle '-M -o', and we need to detect this.  Also, some Intel
297
-    # versions had trouble with output in subdirs.
296
+    # handle `-M -o', and we need to detect this.  Also, some Intel
297
+    # versions had trouble with output in subdirs
298 298
     am__obj=sub/conftest.${OBJEXT-o}
299 299
     am__minus_obj="-o $am__obj"
300 300
     case $depmode in
... ...
@@ -303,8 +254,8 @@ AC_CACHE_CHECK([dependency style of $depcc],
303 303
       test "$am__universal" = false || continue
304 304
       ;;
305 305
     nosideeffect)
306
-      # After this tag, mechanisms are not by side-effect, so they'll
307
-      # only be used when explicitly requested.
306
+      # after this tag, mechanisms are not by side-effect, so they'll
307
+      # only be used when explicitly requested
308 308
       if test "x$enable_dependency_tracking" = xyes; then
309 309
 	continue
310 310
       else
... ...
@@ -312,7 +263,7 @@ AC_CACHE_CHECK([dependency style of $depcc],
312 312
       fi
313 313
       ;;
314 314
     msvc7 | msvc7msys | msvisualcpp | msvcmsys)
315
-      # This compiler won't grok '-c -o', but also, the minuso test has
315
+      # This compiler won't grok `-c -o', but also, the minuso test has
316 316
       # not run yet.  These depmodes are late enough in the game, and
317 317
       # so weak that their functioning should not be impacted.
318 318
       am__obj=conftest.${OBJEXT-o}
... ...
@@ -360,7 +311,7 @@ AM_CONDITIONAL([am__fastdep$1], [
360 360
 # AM_SET_DEPDIR
361 361
 # -------------
362 362
 # Choose a directory name for dependency files.
363
-# This macro is AC_REQUIREd in _AM_DEPENDENCIES.
363
+# This macro is AC_REQUIREd in _AM_DEPENDENCIES
364 364
 AC_DEFUN([AM_SET_DEPDIR],
365 365
 [AC_REQUIRE([AM_SET_LEADING_DOT])dnl
366 366
 AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
... ...
@@ -370,13 +321,9 @@ AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
370 370
 # AM_DEP_TRACK
371 371
 # ------------
372 372
 AC_DEFUN([AM_DEP_TRACK],
373
-[AC_ARG_ENABLE([dependency-tracking], [dnl
374
-AS_HELP_STRING(
375
-  [--enable-dependency-tracking],
376
-  [do not reject slow dependency extractors])
377
-AS_HELP_STRING(
378
-  [--disable-dependency-tracking],
379
-  [speeds up one-time build])])
373
+[AC_ARG_ENABLE(dependency-tracking,
374
+[  --disable-dependency-tracking  speeds up one-time build
375
+  --enable-dependency-tracking   do not reject slow dependency extractors])
380 376
 if test "x$enable_dependency_tracking" != xno; then
381 377
   am_depcomp="$ac_aux_dir/depcomp"
382 378
   AMDEPBACKSLASH='\'
... ...
@@ -391,12 +338,14 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl
391 391
 
392 392
 # Generate code to set up dependency tracking.              -*- Autoconf -*-
393 393
 
394
-# Copyright (C) 1999-2012 Free Software Foundation, Inc.
394
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008
395
+# Free Software Foundation, Inc.
395 396
 #
396 397
 # This file is free software; the Free Software Foundation
397 398
 # gives unlimited permission to copy and/or distribute it,
398 399
 # with or without modifications, as long as this notice is preserved.
399 400
 
401
+#serial 5
400 402
 
401 403
 # _AM_OUTPUT_DEPENDENCY_COMMANDS
402 404
 # ------------------------------
... ...
@@ -415,7 +364,7 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
415 415
     # Strip MF so we end up with the name of the file.
416 416
     mf=`echo "$mf" | sed -e 's/:.*$//'`
417 417
     # Check whether this is an Automake generated Makefile or not.
418
-    # We used to match only the files named 'Makefile.in', but
418
+    # We used to match only the files named `Makefile.in', but
419 419
     # some people rename them; so instead we look at the file content.
420 420
     # Grep'ing the first line is not enough: some people post-process
421 421
     # each Makefile.in and add a new line on top of each file to say so.
... ...
@@ -427,19 +376,21 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
427 427
       continue
428 428
     fi
429 429
     # Extract the definition of DEPDIR, am__include, and am__quote
430
-    # from the Makefile without running 'make'.
430
+    # from the Makefile without running `make'.
431 431
     DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
432 432
     test -z "$DEPDIR" && continue
433 433
     am__include=`sed -n 's/^am__include = //p' < "$mf"`
434 434
     test -z "am__include" && continue
435 435
     am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
436
+    # When using ansi2knr, U may be empty or an underscore; expand it
437
+    U=`sed -n 's/^U = //p' < "$mf"`
436 438
     # Find all dependency output files, they are included files with
437 439
     # $(DEPDIR) in their names.  We invoke sed twice because it is the
438 440
     # simplest approach to changing $(DEPDIR) to its actual value in the
439 441
     # expansion.
440 442
     for file in `sed -n "
441 443
       s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
442
-	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
444
+	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
443 445
       # Make sure the directory exists.
444 446
       test -f "$dirpart/$file" && continue
445 447
       fdir=`AS_DIRNAME(["$file"])`
... ...
@@ -457,7 +408,7 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
457 457
 # This macro should only be invoked once -- use via AC_REQUIRE.
458 458
 #
459 459
 # This code is only required when automatic dependency tracking
460
-# is enabled.  FIXME.  This creates each '.P' file that we will
460
+# is enabled.  FIXME.  This creates each `.P' file that we will
461 461
 # need in order to bootstrap the dependency handling code.
462 462
 AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
463 463
 [AC_CONFIG_COMMANDS([depfiles],
... ...
@@ -467,12 +418,15 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
467 467
 
468 468
 # Do all the work for Automake.                             -*- Autoconf -*-
469 469
 
470
-# Copyright (C) 1996-2012 Free Software Foundation, Inc.
470
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
471
+# 2005, 2006, 2008, 2009 Free Software Foundation, Inc.
471 472
 #
472 473
 # This file is free software; the Free Software Foundation
473 474
 # gives unlimited permission to copy and/or distribute it,
474 475
 # with or without modifications, as long as this notice is preserved.
475 476
 
477
+# serial 16
478
+
476 479
 # This macro actually does too much.  Some checks are only needed if
477 480
 # your package does certain things.  But this isn't really a big deal.
478 481
 
... ...
@@ -517,41 +471,31 @@ AC_SUBST([CYGPATH_W])
517 517
 # Define the identity of the package.
518 518
 dnl Distinguish between old-style and new-style calls.
519 519
 m4_ifval([$2],
520
-[AC_DIAGNOSE([obsolete],
521
-[$0: two- and three-arguments forms are deprecated.  For more info, see:
522
-http://www.gnu.org/software/automake/manual/automake.html#Modernize-AM_INIT_AUTOMAKE-invocation])
523
-m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
520
+[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
524 521
  AC_SUBST([PACKAGE], [$1])dnl
525 522
  AC_SUBST([VERSION], [$2])],
526 523
 [_AM_SET_OPTIONS([$1])dnl
527 524
 dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
528
-m4_if(
529
-  m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]),
530
-  [ok:ok],,
525
+m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
531 526
   [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
532 527
  AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
533 528
  AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
534 529
 
535 530
 _AM_IF_OPTION([no-define],,
536
-[AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package])
537
- AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl
531
+[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
532
+ AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
538 533
 
539 534
 # Some tools Automake needs.
540 535
 AC_REQUIRE([AM_SANITY_CHECK])dnl
541 536
 AC_REQUIRE([AC_ARG_PROGRAM])dnl
542
-AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}])
543
-AM_MISSING_PROG([AUTOCONF], [autoconf])
544
-AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}])
545
-AM_MISSING_PROG([AUTOHEADER], [autoheader])
546
-AM_MISSING_PROG([MAKEINFO], [makeinfo])
537
+AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
538
+AM_MISSING_PROG(AUTOCONF, autoconf)
539
+AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
540
+AM_MISSING_PROG(AUTOHEADER, autoheader)
541
+AM_MISSING_PROG(MAKEINFO, makeinfo)
547 542
 AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
548 543
 AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
549
-AC_REQUIRE([AC_PROG_MKDIR_P])dnl
550
-# For better backward compatibility.  To be removed once Automake 1.9.x
551
-# dies out for good.  For more background, see:
552
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
553
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
554
-AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
544
+AC_REQUIRE([AM_PROG_MKDIR_P])dnl
555 545
 # We need awk for the "check" target.  The system "awk" is bad on
556 546
 # some platforms.
557 547
 AC_REQUIRE([AC_PROG_AWK])dnl
... ...
@@ -562,35 +506,28 @@ _AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
562 562
 			     [_AM_PROG_TAR([v7])])])
563 563
 _AM_IF_OPTION([no-dependencies],,
564 564
 [AC_PROVIDE_IFELSE([AC_PROG_CC],
565
-		  [_AM_DEPENDENCIES([CC])],
566
-		  [m4_define([AC_PROG_CC],
567
-			     m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl
565
+		  [_AM_DEPENDENCIES(CC)],
566
+		  [define([AC_PROG_CC],
567
+			  defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
568 568
 AC_PROVIDE_IFELSE([AC_PROG_CXX],
569
-		  [_AM_DEPENDENCIES([CXX])],
570
-		  [m4_define([AC_PROG_CXX],
571
-			     m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl
569
+		  [_AM_DEPENDENCIES(CXX)],
570
+		  [define([AC_PROG_CXX],
571
+			  defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
572 572
 AC_PROVIDE_IFELSE([AC_PROG_OBJC],
573
-		  [_AM_DEPENDENCIES([OBJC])],
574
-		  [m4_define([AC_PROG_OBJC],
575
-			     m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl
576
-dnl Support for Objective C++ was only introduced in Autoconf 2.65,
577
-dnl but we still cater to Autoconf 2.62.
578
-m4_ifdef([AC_PROG_OBJCXX],
579
-[AC_PROVIDE_IFELSE([AC_PROG_OBJCXX],
580
-		  [_AM_DEPENDENCIES([OBJCXX])],
581
-		  [m4_define([AC_PROG_OBJCXX],
582
-			     m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])])dnl
573
+		  [_AM_DEPENDENCIES(OBJC)],
574
+		  [define([AC_PROG_OBJC],
575
+			  defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
583 576
 ])
584 577
 _AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl
585
-dnl The 'parallel-tests' driver may need to know about EXEEXT, so add the
586
-dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen.  This macro
578
+dnl The `parallel-tests' driver may need to know about EXEEXT, so add the
579
+dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen.  This macro
587 580
 dnl is hooked onto _AC_COMPILER_EXEEXT early, see below.
588 581
 AC_CONFIG_COMMANDS_PRE(dnl
589 582
 [m4_provide_if([_AM_COMPILER_EXEEXT],
590 583
   [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
591 584
 ])
592 585
 
593
-dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion.  Do not
586
+dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion.  Do not
594 587
 dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
595 588
 dnl mangled by Autoconf and run in a shell conditional statement.
596 589
 m4_define([_AC_COMPILER_EXEEXT],
... ...
@@ -618,12 +555,15 @@ for _am_header in $config_headers :; do
618 618
 done
619 619
 echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
620 620
 
621
-# Copyright (C) 2001-2012 Free Software Foundation, Inc.
621
+# Copyright (C) 2001, 2003, 2005, 2008, 2011 Free Software Foundation,
622
+# Inc.
622 623
 #
623 624
 # This file is free software; the Free Software Foundation
624 625
 # gives unlimited permission to copy and/or distribute it,
625 626
 # with or without modifications, as long as this notice is preserved.
626 627
 
628
+# serial 1
629
+
627 630
 # AM_PROG_INSTALL_SH
628 631
 # ------------------
629 632
 # Define $install_sh.
... ...
@@ -637,14 +577,16 @@ if test x"${install_sh}" != xset; then
637 637
     install_sh="\${SHELL} $am_aux_dir/install-sh"
638 638
   esac
639 639
 fi
640
-AC_SUBST([install_sh])])
640
+AC_SUBST(install_sh)])
641 641
 
642
-# Copyright (C) 2003-2012 Free Software Foundation, Inc.
642
+# Copyright (C) 2003, 2005  Free Software Foundation, Inc.
643 643
 #
644 644
 # This file is free software; the Free Software Foundation
645 645
 # gives unlimited permission to copy and/or distribute it,
646 646
 # with or without modifications, as long as this notice is preserved.
647 647
 
648
+# serial 2
649
+
648 650
 # Check whether the underlying file-system supports filenames
649 651
 # with a leading dot.  For instance MS-DOS doesn't.
650 652
 AC_DEFUN([AM_SET_LEADING_DOT],
... ...
@@ -660,12 +602,14 @@ AC_SUBST([am__leading_dot])])
660 660
 
661 661
 # Check to see how 'make' treats includes.	            -*- Autoconf -*-
662 662
 
663
-# Copyright (C) 2001-2012 Free Software Foundation, Inc.
663
+# Copyright (C) 2001, 2002, 2003, 2005, 2009  Free Software Foundation, Inc.
664 664
 #
665 665
 # This file is free software; the Free Software Foundation
666 666
 # gives unlimited permission to copy and/or distribute it,
667 667
 # with or without modifications, as long as this notice is preserved.
668 668
 
669
+# serial 4
670
+
669 671
 # AM_MAKE_INCLUDE()
670 672
 # -----------------
671 673
 # Check to see how make treats includes.
... ...
@@ -683,7 +627,7 @@ am__quote=
683 683
 _am_result=none
684 684
 # First try GNU make style include.
685 685
 echo "include confinc" > confmf
686
-# Ignore all kinds of additional output from 'make'.
686
+# Ignore all kinds of additional output from `make'.
687 687
 case `$am_make -s -f confmf 2> /dev/null` in #(
688 688
 *the\ am__doit\ target*)
689 689
   am__include=include
... ...
@@ -708,46 +652,17 @@ AC_MSG_RESULT([$_am_result])
708 708
 rm -f confinc confmf
709 709
 ])
710 710
 
711
-# Copyright (C) 1999-2012 Free Software Foundation, Inc.
712
-#
713
-# This file is free software; the Free Software Foundation
714
-# gives unlimited permission to copy and/or distribute it,
715
-# with or without modifications, as long as this notice is preserved.
716
-
717
-# AM_PROG_CC_C_O
718
-# --------------
719
-# Like AC_PROG_CC_C_O, but changed for automake.
720
-AC_DEFUN([AM_PROG_CC_C_O],
721
-[AC_REQUIRE([AC_PROG_CC_C_O])dnl
722
-AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
723
-AC_REQUIRE_AUX_FILE([compile])dnl
724
-# FIXME: we rely on the cache variable name because
725
-# there is no other way.
726
-set dummy $CC
727
-am_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']`
728
-eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o
729
-if test "$am_t" != yes; then
730
-   # Losing compiler, so override with the script.
731
-   # FIXME: It is wrong to rewrite CC.
732
-   # But if we don't then we get into trouble of one sort or another.
733
-   # A longer-term fix would be to have automake use am__CC in this case,
734
-   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
735
-   CC="$am_aux_dir/compile $CC"
736
-fi
737
-dnl Make sure AC_PROG_CC is never called again, or it will override our
738
-dnl setting of CC.
739
-m4_define([AC_PROG_CC],
740
-          [m4_fatal([AC_PROG_CC cannot be called after AM_PROG_CC_C_O])])
741
-])
742
-
743 711
 # Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
744 712
 
745
-# Copyright (C) 1997-2012 Free Software Foundation, Inc.
713
+# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008
714
+# Free Software Foundation, Inc.
746 715
 #
747 716
 # This file is free software; the Free Software Foundation
748 717
 # gives unlimited permission to copy and/or distribute it,
749 718
 # with or without modifications, as long as this notice is preserved.
750 719
 
720
+# serial 6
721
+
751 722
 # AM_MISSING_PROG(NAME, PROGRAM)
752 723
 # ------------------------------
753 724
 AC_DEFUN([AM_MISSING_PROG],
... ...
@@ -755,6 +670,7 @@ AC_DEFUN([AM_MISSING_PROG],
755 755
 $1=${$1-"${am_missing_run}$2"}
756 756
 AC_SUBST($1)])
757 757
 
758
+
758 759
 # AM_MISSING_HAS_RUN
759 760
 # ------------------
760 761
 # Define MISSING if not defined so far and test if it supports --run.
... ...
@@ -775,18 +691,50 @@ if eval "$MISSING --run true"; then
775 775
   am_missing_run="$MISSING --run "
776 776
 else
777 777
   am_missing_run=
778
-  AC_MSG_WARN(['missing' script is too old or missing])
778
+  AC_MSG_WARN([`missing' script is too old or missing])
779 779
 fi
780 780
 ])
781 781
 
782
+# Copyright (C) 2003, 2004, 2005, 2006, 2011 Free Software Foundation,
783
+# Inc.
784
+#
785
+# This file is free software; the Free Software Foundation
786
+# gives unlimited permission to copy and/or distribute it,
787
+# with or without modifications, as long as this notice is preserved.
788
+
789
+# serial 1
790
+
791
+# AM_PROG_MKDIR_P
792
+# ---------------
793
+# Check for `mkdir -p'.
794
+AC_DEFUN([AM_PROG_MKDIR_P],
795
+[AC_PREREQ([2.60])dnl
796
+AC_REQUIRE([AC_PROG_MKDIR_P])dnl
797
+dnl Automake 1.8 to 1.9.6 used to define mkdir_p.  We now use MKDIR_P,
798
+dnl while keeping a definition of mkdir_p for backward compatibility.
799
+dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
800
+dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
801
+dnl Makefile.ins that do not define MKDIR_P, so we do our own
802
+dnl adjustment using top_builddir (which is defined more often than
803
+dnl MKDIR_P).
804
+AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
805
+case $mkdir_p in
806
+  [[\\/$]]* | ?:[[\\/]]*) ;;
807
+  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
808
+esac
809
+])
810
+
782 811
 # Helper functions for option handling.                     -*- Autoconf -*-
783 812
 
784
-# Copyright (C) 2001-2012 Free Software Foundation, Inc.
813
+# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 Free Software
814
+# Foundation, Inc.
785 815
 #
786 816
 # This file is free software; the Free Software Foundation
787 817
 # gives unlimited permission to copy and/or distribute it,
788 818
 # with or without modifications, as long as this notice is preserved.
789 819
 
820
+# serial 5
821
+
790 822
 # _AM_MANGLE_OPTION(NAME)
791 823
 # -----------------------
792 824
 AC_DEFUN([_AM_MANGLE_OPTION],
... ...
@@ -796,7 +744,7 @@ AC_DEFUN([_AM_MANGLE_OPTION],
796 796
 # --------------------
797 797
 # Set option NAME.  Presently that only means defining a flag for this option.
798 798
 AC_DEFUN([_AM_SET_OPTION],
799
-[m4_define(_AM_MANGLE_OPTION([$1]), [1])])
799
+[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
800 800
 
801 801
 # _AM_SET_OPTIONS(OPTIONS)
802 802
 # ------------------------
... ...
@@ -810,12 +758,14 @@ AC_DEFUN([_AM_SET_OPTIONS],
810 810
 AC_DEFUN([_AM_IF_OPTION],
811 811
 [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
812 812
 
813
-# Copyright (C) 2001-2012 Free Software Foundation, Inc.
813
+# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
814 814
 #
815 815
 # This file is free software; the Free Software Foundation
816 816
 # gives unlimited permission to copy and/or distribute it,
817 817
 # with or without modifications, as long as this notice is preserved.
818 818
 
819
+# serial 1
820
+
819 821
 # AM_RUN_LOG(COMMAND)
820 822
 # -------------------
821 823
 # Run COMMAND, save the exit status in ac_status, and log it.
... ...
@@ -829,16 +779,22 @@ AC_DEFUN([AM_RUN_LOG],
829 829
 
830 830
 # Check to make sure that the build environment is sane.    -*- Autoconf -*-
831 831
 
832
-# Copyright (C) 1996-2012 Free Software Foundation, Inc.
832
+# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008
833
+# Free Software Foundation, Inc.
833 834
 #
834 835
 # This file is free software; the Free Software Foundation
835 836
 # gives unlimited permission to copy and/or distribute it,
836 837
 # with or without modifications, as long as this notice is preserved.
837 838
 
839
+# serial 5
840
+
838 841
 # AM_SANITY_CHECK
839 842
 # ---------------
840 843
 AC_DEFUN([AM_SANITY_CHECK],
841 844
 [AC_MSG_CHECKING([whether build environment is sane])
845
+# Just in case
846
+sleep 1
847
+echo timestamp > conftest.file
842 848
 # Reject unsafe characters in $srcdir or the absolute working directory
843 849
 # name.  Accept space and tab only in the latter.
844 850
 am_lf='
... ...
@@ -849,40 +805,32 @@ case `pwd` in
849 849
 esac
850 850
 case $srcdir in
851 851
   *[[\\\"\#\$\&\'\`$am_lf\ \	]]*)
852
-    AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);;
852
+    AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);;
853 853
 esac
854 854
 
855
-# Do 'set' in a subshell so we don't clobber the current shell's
855
+# Do `set' in a subshell so we don't clobber the current shell's
856 856
 # arguments.  Must try -L first in case configure is actually a
857 857
 # symlink; some systems play weird games with the mod time of symlinks
858 858
 # (eg FreeBSD returns the mod time of the symlink's containing
859 859
 # directory).
860 860
 if (
861
-   am_has_slept=no
862
-   for am_try in 1 2; do
863
-     echo "timestamp, slept: $am_has_slept" > conftest.file
864
-     set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
865
-     if test "$[*]" = "X"; then
866
-	# -L didn't work.
867
-	set X `ls -t "$srcdir/configure" conftest.file`
868
-     fi
869
-     if test "$[*]" != "X $srcdir/configure conftest.file" \
870
-	&& test "$[*]" != "X conftest.file $srcdir/configure"; then
871
-
872
-	# If neither matched, then we have a broken ls.  This can happen
873
-	# if, for instance, CONFIG_SHELL is bash and it inherits a
874
-	# broken ls alias from the environment.  This has actually
875
-	# happened.  Such a system could not be considered "sane".
876
-	AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
877
-  alias in your environment])
878
-     fi
879
-     if test "$[2]" = conftest.file || test $am_try -eq 2; then
880
-       break
881
-     fi
882
-     # Just in case.
883
-     sleep 1
884
-     am_has_slept=yes
885
-   done
861
+   set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
862
+   if test "$[*]" = "X"; then
863
+      # -L didn't work.
864
+      set X `ls -t "$srcdir/configure" conftest.file`
865
+   fi
866
+   rm -f conftest.file
867
+   if test "$[*]" != "X $srcdir/configure conftest.file" \
868
+      && test "$[*]" != "X conftest.file $srcdir/configure"; then
869
+
870
+      # If neither matched, then we have a broken ls.  This can happen
871
+      # if, for instance, CONFIG_SHELL is bash and it inherits a
872
+      # broken ls alias from the environment.  This has actually
873
+      # happened.  Such a system could not be considered "sane".
874
+      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
875
+alias in your environment])
876
+   fi
877
+
886 878
    test "$[2]" = conftest.file
887 879
    )
888 880
 then
... ...
@@ -892,50 +840,31 @@ else
892 892
    AC_MSG_ERROR([newly created file is older than distributed files!
893 893
 Check your system clock])
894 894
 fi
895
-AC_MSG_RESULT([yes])
896
-# If we didn't sleep, we still need to ensure time stamps of config.status and
897
-# generated files are strictly newer.
898
-am_sleep_pid=
899
-if grep 'slept: no' conftest.file >/dev/null 2>&1; then
900
-  ( sleep 1 ) &
901
-  am_sleep_pid=$!
902
-fi
903
-AC_CONFIG_COMMANDS_PRE(
904
-  [AC_MSG_CHECKING([that generated files are newer than configure])
905
-   if test -n "$am_sleep_pid"; then
906
-     # Hide warnings about reused PIDs.
907
-     wait $am_sleep_pid 2>/dev/null
908
-   fi
909
-   AC_MSG_RESULT([done])])
910
-rm -f conftest.file
911
-])
895
+AC_MSG_RESULT(yes)])
912 896
 
913
-# Copyright (C) 2009-2012 Free Software Foundation, Inc.
897
+# Copyright (C) 2009, 2011  Free Software Foundation, Inc.
914 898
 #
915 899
 # This file is free software; the Free Software Foundation
916 900
 # gives unlimited permission to copy and/or distribute it,
917 901
 # with or without modifications, as long as this notice is preserved.
918 902
 
903
+# serial 2
904
+
919 905
 # AM_SILENT_RULES([DEFAULT])
920 906
 # --------------------------
921 907
 # Enable less verbose build rules; with the default set to DEFAULT
922
-# ("yes" being less verbose, "no" or empty being verbose).
908
+# (`yes' being less verbose, `no' or empty being verbose).
923 909
 AC_DEFUN([AM_SILENT_RULES],
924
-[AC_ARG_ENABLE([silent-rules], [dnl
925
-AS_HELP_STRING(
926
-  [--enable-silent-rules],
927
-  [less verbose build output (undo: "make V=1")])
928
-AS_HELP_STRING(
929
-  [--disable-silent-rules],
930
-  [verbose build output (undo: "make V=0")])dnl
931
-])
932
-case $enable_silent_rules in @%:@ (((
933
-  yes) AM_DEFAULT_VERBOSITY=0;;
934
-   no) AM_DEFAULT_VERBOSITY=1;;
935
-    *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);;
910
+[AC_ARG_ENABLE([silent-rules],
911
+[  --enable-silent-rules          less verbose build output (undo: `make V=1')
912
+  --disable-silent-rules         verbose build output (undo: `make V=0')])
913
+case $enable_silent_rules in
914
+yes) AM_DEFAULT_VERBOSITY=0;;
915
+no)  AM_DEFAULT_VERBOSITY=1;;
916
+*)   AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);;
936 917
 esac
937 918
 dnl
938
-dnl A few 'make' implementations (e.g., NonStop OS and NextStep)
919
+dnl A few `make' implementations (e.g., NonStop OS and NextStep)
939 920
 dnl do not support nested variable expansions.
940 921
 dnl See automake bug#9928 and bug#10237.
941 922
 am_make=${MAKE-make}
... ...
@@ -953,7 +882,7 @@ else
953 953
   am_cv_make_support_nested_variables=no
954 954
 fi])
955 955
 if test $am_cv_make_support_nested_variables = yes; then
956
-  dnl Using '$V' instead of '$(V)' breaks IRIX make.
956
+  dnl Using `$V' instead of `$(V)' breaks IRIX make.
957 957
   AM_V='$(V)'
958 958
   AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
959 959
 else
... ...
@@ -970,40 +899,44 @@ AC_SUBST([AM_BACKSLASH])dnl
970 970
 _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
971 971
 ])
972 972
 
973
-# Copyright (C) 2001-2012 Free Software Foundation, Inc.
973
+# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
974 974
 #
975 975
 # This file is free software; the Free Software Foundation
976 976
 # gives unlimited permission to copy and/or distribute it,
977 977
 # with or without modifications, as long as this notice is preserved.
978 978
 
979
+# serial 1
980
+
979 981
 # AM_PROG_INSTALL_STRIP
980 982
 # ---------------------
981
-# One issue with vendor 'install' (even GNU) is that you can't
983
+# One issue with vendor `install' (even GNU) is that you can't
982 984
 # specify the program used to strip binaries.  This is especially
983 985
 # annoying in cross-compiling environments, where the build's strip
984 986
 # is unlikely to handle the host's binaries.
985 987
 # Fortunately install-sh will honor a STRIPPROG variable, so we
986
-# always use install-sh in "make install-strip", and initialize
988
+# always use install-sh in `make install-strip', and initialize
987 989
 # STRIPPROG with the value of the STRIP variable (set by the user).
988 990
 AC_DEFUN([AM_PROG_INSTALL_STRIP],
989 991
 [AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
990
-# Installed binaries are usually stripped using 'strip' when the user
991
-# run "make install-strip".  However 'strip' might not be the right
992
+# Installed binaries are usually stripped using `strip' when the user
993
+# run `make install-strip'.  However `strip' might not be the right
992 994
 # tool to use in cross-compilation environments, therefore Automake
993
-# will honor the 'STRIP' environment variable to overrule this program.
994
-dnl Don't test for $cross_compiling = yes, because it might be 'maybe'.
995
+# will honor the `STRIP' environment variable to overrule this program.
996
+dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
995 997
 if test "$cross_compiling" != no; then
996 998
   AC_CHECK_TOOL([STRIP], [strip], :)
997 999
 fi
998 1000
 INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
999 1001
 AC_SUBST([INSTALL_STRIP_PROGRAM])])
1000 1002
 
1001
-# Copyright (C) 2006-2012 Free Software Foundation, Inc.
1003
+# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc.
1002 1004
 #
1003 1005
 # This file is free software; the Free Software Foundation
1004 1006
 # gives unlimited permission to copy and/or distribute it,
1005 1007
 # with or without modifications, as long as this notice is preserved.
1006 1008
 
1009
+# serial 3
1010
+
1007 1011
 # _AM_SUBST_NOTMAKE(VARIABLE)
1008 1012
 # ---------------------------
1009 1013
 # Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
... ...
@@ -1017,16 +950,18 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
1017 1017
 
1018 1018
 # Check how to create a tarball.                            -*- Autoconf -*-
1019 1019
 
1020
-# Copyright (C) 2004-2012 Free Software Foundation, Inc.
1020
+# Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc.
1021 1021
 #
1022 1022
 # This file is free software; the Free Software Foundation
1023 1023
 # gives unlimited permission to copy and/or distribute it,
1024 1024
 # with or without modifications, as long as this notice is preserved.
1025 1025
 
1026
+# serial 2
1027
+
1026 1028
 # _AM_PROG_TAR(FORMAT)
1027 1029
 # --------------------
1028 1030
 # Check how to create a tarball in format FORMAT.
1029
-# FORMAT should be one of 'v7', 'ustar', or 'pax'.
1031
+# FORMAT should be one of `v7', `ustar', or `pax'.
1030 1032
 #
1031 1033
 # Substitute a variable $(am__tar) that is a command
1032 1034
 # writing to stdout a FORMAT-tarball containing the directory
... ...
@@ -1049,7 +984,7 @@ AC_MSG_CHECKING([how to create a $1 tar archive])
1049 1049
 _am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
1050 1050
 _am_tools=${am_cv_prog_tar_$1-$_am_tools}
1051 1051
 # Do not fold the above two line into one, because Tru64 sh and
1052
-# Solaris sh will not grok spaces in the rhs of '-'.
1052
+# Solaris sh will not grok spaces in the rhs of `-'.
1053 1053
 for _am_tool in $_am_tools
1054 1054
 do
1055 1055
   case $_am_tool in
... ...
@@ -457,9 +457,6 @@
457 457
 /* "no fd_set" */
458 458
 #undef NO_FD_SET
459 459
 
460
-/* Define to 1 if your C compiler doesn't accept -c and -o together. */
461
-#undef NO_MINUS_C_MINUS_O
462
-
463 460
 /* Name of package */
464 461
 #undef PACKAGE
465 462
 
... ...
@@ -1,8 +1,9 @@
1
-# Makefile.in generated by automake 1.12.4 from Makefile.am.
1
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
2 2
 # @configure_input@
3 3
 
4
-# Copyright (C) 1994-2012 Free Software Foundation, Inc.
5
-
4
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
5
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
6
+# Foundation, Inc.
6 7
 # This Makefile.in is free software; the Free Software Foundation
7 8
 # gives unlimited permission to copy and/or distribute it,
8 9
 # with or without modifications, as long as this notice is preserved.
... ...
@@ -72,8 +73,7 @@ target_triplet = @target@
72 72
 @BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@sbin_PROGRAMS =  \
73 73
 @BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@	clamav-milter$(EXEEXT)
74 74
 subdir = clamav-milter
75
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
76
-	$(top_srcdir)/config/depcomp
75
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
77 76
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
78 77
 am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
79 78
 	$(top_srcdir)/m4/argz.m4 \
... ...
@@ -116,19 +116,6 @@ clamav_milter_LDADD = $(LDADD)
116 116
 AM_V_lt = $(am__v_lt_@AM_V@)
117 117
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
118 118
 am__v_lt_0 = --silent
119
-am__v_lt_1 = 
120
-AM_V_P = $(am__v_P_@AM_V@)
121
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
122
-am__v_P_0 = false
123
-am__v_P_1 = :
124
-AM_V_GEN = $(am__v_GEN_@AM_V@)
125
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
126
-am__v_GEN_0 = @echo "  GEN     " $@;
127
-am__v_GEN_1 = 
128
-AM_V_at = $(am__v_at_@AM_V@)
129
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
130
-am__v_at_0 = @
131
-am__v_at_1 = 
132 119
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
133 120
 depcomp = $(SHELL) $(top_srcdir)/config/depcomp
134 121
 am__depfiles_maybe = depfiles
... ...
@@ -141,16 +128,20 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
141 141
 	$(AM_CFLAGS) $(CFLAGS)
142 142
 AM_V_CC = $(am__v_CC_@AM_V@)
143 143
 am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
144
-am__v_CC_0 = @echo "  CC      " $@;
145
-am__v_CC_1 = 
144
+am__v_CC_0 = @echo "  CC    " $@;
145
+AM_V_at = $(am__v_at_@AM_V@)
146
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
147
+am__v_at_0 = @
146 148
 CCLD = $(CC)
147 149
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
148 150
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
149 151
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
150 152
 AM_V_CCLD = $(am__v_CCLD_@AM_V@)
151 153
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
152
-am__v_CCLD_0 = @echo "  CCLD    " $@;
153
-am__v_CCLD_1 = 
154
+am__v_CCLD_0 = @echo "  CCLD  " $@;
155
+AM_V_GEN = $(am__v_GEN_@AM_V@)
156
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
157
+am__v_GEN_0 = @echo "  GEN   " $@;
154 158
 SOURCES = $(clamav_milter_SOURCES)
155 159
 DIST_SOURCES = $(am__clamav_milter_SOURCES_DIST)
156 160
 am__can_run_installinfo = \
... ...
@@ -670,20 +661,6 @@ GTAGS:
670 670
 	  && $(am__cd) $(top_srcdir) \
671 671
 	  && gtags -i $(GTAGS_ARGS) "$$here"
672 672
 
673
-cscopelist:  $(HEADERS) $(SOURCES) $(LISP)
674
-	list='$(SOURCES) $(HEADERS) $(LISP)'; \
675
-	case "$(srcdir)" in \
676
-	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
677
-	  *) sdir=$(subdir)/$(srcdir) ;; \
678
-	esac; \
679
-	for i in $$list; do \
680
-	  if test -f "$$i"; then \
681
-	    echo "$(subdir)/$$i"; \
682
-	  else \
683
-	    echo "$$sdir/$$i"; \
684
-	  fi; \
685
-	done >> $(top_builddir)/cscope.files
686
-
687 673
 distclean-tags:
688 674
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
689 675
 
... ...
@@ -694,10 +671,10 @@ distdir: $(DISTFILES)
694 694
 	    if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \
695 695
 	  if test -n "$$list" && \
696 696
 	    grep 'ab help2man is required to generate this page' $$list >/dev/null; then \
697
-	    echo "error: found man pages containing the 'missing help2man' replacement text:" >&2; \
697
+	    echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \
698 698
 	    grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/         /' >&2; \
699 699
 	    echo "       to fix them, install help2man, remove and regenerate the man pages;" >&2; \
700
-	    echo "       typically 'make maintainer-clean' will remove them" >&2; \
700
+	    echo "       typically \`make maintainer-clean' will remove them" >&2; \
701 701
 	    exit 1; \
702 702
 	  else :; fi; \
703 703
 	else :; fi
... ...
@@ -844,7 +821,7 @@ uninstall-man: uninstall-man8
844 844
 .MAKE: install-am install-strip
845 845
 
846 846
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
847
-	clean-libtool clean-sbinPROGRAMS cscopelist ctags distclean \
847
+	clean-libtool clean-sbinPROGRAMS ctags distclean \
848 848
 	distclean-compile distclean-generic distclean-libtool \
849 849
 	distclean-tags distdir dvi dvi-am html html-am info info-am \
850 850
 	install install-am install-data install-data-am install-dvi \
... ...
@@ -1,8 +1,9 @@
1
-# Makefile.in generated by automake 1.12.4 from Makefile.am.
1
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
2 2
 # @configure_input@
3 3
 
4
-# Copyright (C) 1994-2012 Free Software Foundation, Inc.
5
-
4
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
5
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
6
+# Foundation, Inc.
6 7
 # This Makefile.in is free software; the Free Software Foundation
7 8
 # gives unlimited permission to copy and/or distribute it,
8 9
 # with or without modifications, as long as this notice is preserved.
... ...
@@ -53,8 +54,7 @@ host_triplet = @host@
53 53
 target_triplet = @target@
54 54
 bin_PROGRAMS = clambc$(EXEEXT)
55 55
 subdir = clambc
56
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
57
-	$(top_srcdir)/config/depcomp
56
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
58 57
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
59 58
 am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
60 59
 	$(top_srcdir)/m4/argz.m4 \
... ...
@@ -82,19 +82,6 @@ clambc_LDADD = $(LDADD)
82 82
 AM_V_lt = $(am__v_lt_@AM_V@)
83 83
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
84 84
 am__v_lt_0 = --silent
85
-am__v_lt_1 = 
86
-AM_V_P = $(am__v_P_@AM_V@)
87
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
88
-am__v_P_0 = false
89
-am__v_P_1 = :
90
-AM_V_GEN = $(am__v_GEN_@AM_V@)
91
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
92
-am__v_GEN_0 = @echo "  GEN     " $@;
93
-am__v_GEN_1 = 
94
-AM_V_at = $(am__v_at_@AM_V@)
95
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
96
-am__v_at_0 = @
97
-am__v_at_1 = 
98 85
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
99 86
 depcomp = $(SHELL) $(top_srcdir)/config/depcomp
100 87
 am__depfiles_maybe = depfiles
... ...
@@ -107,16 +94,20 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
107 107
 	$(AM_CFLAGS) $(CFLAGS)
108 108
 AM_V_CC = $(am__v_CC_@AM_V@)
109 109
 am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
110
-am__v_CC_0 = @echo "  CC      " $@;
111
-am__v_CC_1 = 
110
+am__v_CC_0 = @echo "  CC    " $@;
111
+AM_V_at = $(am__v_at_@AM_V@)
112
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
113
+am__v_at_0 = @
112 114
 CCLD = $(CC)
113 115
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
114 116
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
115 117
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
116 118
 AM_V_CCLD = $(am__v_CCLD_@AM_V@)
117 119
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
118
-am__v_CCLD_0 = @echo "  CCLD    " $@;
119
-am__v_CCLD_1 = 
120
+am__v_CCLD_0 = @echo "  CCLD  " $@;
121
+AM_V_GEN = $(am__v_GEN_@AM_V@)
122
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
123
+am__v_GEN_0 = @echo "  GEN   " $@;
120 124
 SOURCES = $(clambc_SOURCES)
121 125
 DIST_SOURCES = $(clambc_SOURCES)
122 126
 am__can_run_installinfo = \
... ...
@@ -533,20 +524,6 @@ GTAGS:
533 533
 	  && $(am__cd) $(top_srcdir) \
534 534
 	  && gtags -i $(GTAGS_ARGS) "$$here"
535 535
 
536
-cscopelist:  $(HEADERS) $(SOURCES) $(LISP)
537
-	list='$(SOURCES) $(HEADERS) $(LISP)'; \
538
-	case "$(srcdir)" in \
539
-	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
540
-	  *) sdir=$(subdir)/$(srcdir) ;; \
541
-	esac; \
542
-	for i in $$list; do \
543
-	  if test -f "$$i"; then \
544
-	    echo "$(subdir)/$$i"; \
545
-	  else \
546
-	    echo "$$sdir/$$i"; \
547
-	  fi; \
548
-	done >> $(top_builddir)/cscope.files
549
-
550 536
 distclean-tags:
551 537
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
552 538
 
... ...
@@ -691,19 +668,18 @@ uninstall-am: uninstall-binPROGRAMS
691 691
 .MAKE: install-am install-strip
692 692
 
693 693
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
694
-	clean-generic clean-libtool cscopelist ctags distclean \
695
-	distclean-compile distclean-generic distclean-libtool \
696
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
697
-	install install-am install-binPROGRAMS install-data \
698
-	install-data-am install-dvi install-dvi-am install-exec \
699
-	install-exec-am install-html install-html-am install-info \
700
-	install-info-am install-man install-pdf install-pdf-am \
701
-	install-ps install-ps-am install-strip installcheck \
702
-	installcheck-am installcheck-binPROGRAMS installdirs \
703
-	maintainer-clean maintainer-clean-generic mostlyclean \
704
-	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
705
-	pdf pdf-am ps ps-am tags uninstall uninstall-am \
706
-	uninstall-binPROGRAMS
694
+	clean-generic clean-libtool ctags distclean distclean-compile \
695
+	distclean-generic distclean-libtool distclean-tags distdir dvi \
696
+	dvi-am html html-am info info-am install install-am \
697
+	install-binPROGRAMS install-data install-data-am install-dvi \
698
+	install-dvi-am install-exec install-exec-am install-html \
699
+	install-html-am install-info install-info-am install-man \
700
+	install-pdf install-pdf-am install-ps install-ps-am \
701
+	install-strip installcheck installcheck-am \
702
+	installcheck-binPROGRAMS installdirs maintainer-clean \
703
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
704
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
705
+	tags uninstall uninstall-am uninstall-binPROGRAMS
707 706
 
708 707
 
709 708
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
... ...
@@ -1,8 +1,9 @@
1
-# Makefile.in generated by automake 1.12.4 from Makefile.am.
1
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
2 2
 # @configure_input@
3 3
 
4
-# Copyright (C) 1994-2012 Free Software Foundation, Inc.
5
-
4
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
5
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
6
+# Foundation, Inc.
6 7
 # This Makefile.in is free software; the Free Software Foundation
7 8
 # gives unlimited permission to copy and/or distribute it,
8 9
 # with or without modifications, as long as this notice is preserved.
... ...
@@ -71,8 +72,7 @@ host_triplet = @host@
71 71
 target_triplet = @target@
72 72
 bin_PROGRAMS = clamconf$(EXEEXT)
73 73
 subdir = clamconf
74
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
75
-	$(top_srcdir)/config/depcomp
74
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
76 75
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
77 76
 am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
78 77
 	$(top_srcdir)/m4/argz.m4 \
... ...
@@ -100,19 +100,6 @@ clamconf_LDADD = $(LDADD)
100 100
 AM_V_lt = $(am__v_lt_@AM_V@)
101 101
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
102 102
 am__v_lt_0 = --silent
103
-am__v_lt_1 = 
104
-AM_V_P = $(am__v_P_@AM_V@)
105
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
106
-am__v_P_0 = false
107
-am__v_P_1 = :
108
-AM_V_GEN = $(am__v_GEN_@AM_V@)
109
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
110
-am__v_GEN_0 = @echo "  GEN     " $@;
111
-am__v_GEN_1 = 
112
-AM_V_at = $(am__v_at_@AM_V@)
113
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
114
-am__v_at_0 = @
115
-am__v_at_1 = 
116 103
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
117 104
 depcomp = $(SHELL) $(top_srcdir)/config/depcomp
118 105
 am__depfiles_maybe = depfiles
... ...
@@ -125,16 +112,20 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
125 125
 	$(AM_CFLAGS) $(CFLAGS)
126 126
 AM_V_CC = $(am__v_CC_@AM_V@)
127 127
 am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
128
-am__v_CC_0 = @echo "  CC      " $@;
129
-am__v_CC_1 = 
128
+am__v_CC_0 = @echo "  CC    " $@;
129
+AM_V_at = $(am__v_at_@AM_V@)
130
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
131
+am__v_at_0 = @
130 132
 CCLD = $(CC)
131 133
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
132 134
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
133 135
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
134 136
 AM_V_CCLD = $(am__v_CCLD_@AM_V@)
135 137
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
136
-am__v_CCLD_0 = @echo "  CCLD    " $@;
137
-am__v_CCLD_1 = 
138
+am__v_CCLD_0 = @echo "  CCLD  " $@;
139
+AM_V_GEN = $(am__v_GEN_@AM_V@)
140
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
141
+am__v_GEN_0 = @echo "  GEN   " $@;
138 142
 SOURCES = $(clamconf_SOURCES)
139 143
 DIST_SOURCES = $(clamconf_SOURCES)
140 144
 am__can_run_installinfo = \
... ...
@@ -555,20 +546,6 @@ GTAGS:
555 555
 	  && $(am__cd) $(top_srcdir) \
556 556
 	  && gtags -i $(GTAGS_ARGS) "$$here"
557 557
 
558
-cscopelist:  $(HEADERS) $(SOURCES) $(LISP)
559
-	list='$(SOURCES) $(HEADERS) $(LISP)'; \
560
-	case "$(srcdir)" in \
561
-	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
562
-	  *) sdir=$(subdir)/$(srcdir) ;; \
563
-	esac; \
564
-	for i in $$list; do \
565
-	  if test -f "$$i"; then \
566
-	    echo "$(subdir)/$$i"; \
567
-	  else \
568
-	    echo "$$sdir/$$i"; \
569
-	  fi; \
570
-	done >> $(top_builddir)/cscope.files
571
-
572 558
 distclean-tags:
573 559
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
574 560
 
... ...
@@ -713,19 +690,18 @@ uninstall-am: uninstall-binPROGRAMS
713 713
 .MAKE: install-am install-strip
714 714
 
715 715
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
716
-	clean-generic clean-libtool cscopelist ctags distclean \
717
-	distclean-compile distclean-generic distclean-libtool \
718
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
719
-	install install-am install-binPROGRAMS install-data \
720
-	install-data-am install-dvi install-dvi-am install-exec \
721
-	install-exec-am install-html install-html-am install-info \
722
-	install-info-am install-man install-pdf install-pdf-am \
723
-	install-ps install-ps-am install-strip installcheck \
724
-	installcheck-am installcheck-binPROGRAMS installdirs \
725
-	maintainer-clean maintainer-clean-generic mostlyclean \
726
-	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
727
-	pdf pdf-am ps ps-am tags uninstall uninstall-am \
728
-	uninstall-binPROGRAMS
716
+	clean-generic clean-libtool ctags distclean distclean-compile \
717
+	distclean-generic distclean-libtool distclean-tags distdir dvi \
718
+	dvi-am html html-am info info-am install install-am \
719
+	install-binPROGRAMS install-data install-data-am install-dvi \
720
+	install-dvi-am install-exec install-exec-am install-html \
721
+	install-html-am install-info install-info-am install-man \
722
+	install-pdf install-pdf-am install-ps install-ps-am \
723
+	install-strip installcheck installcheck-am \
724
+	installcheck-binPROGRAMS installdirs maintainer-clean \
725
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
726
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
727
+	tags uninstall uninstall-am uninstall-binPROGRAMS
729 728
 
730 729
 
731 730
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
... ...
@@ -1,8 +1,9 @@
1
-# Makefile.in generated by automake 1.12.4 from Makefile.am.
1
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
2 2
 # @configure_input@
3 3
 
4
-# Copyright (C) 1994-2012 Free Software Foundation, Inc.
5
-
4
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
5
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
6
+# Foundation, Inc.
6 7
 # This Makefile.in is free software; the Free Software Foundation
7 8
 # gives unlimited permission to copy and/or distribute it,
8 9
 # with or without modifications, as long as this notice is preserved.
... ...
@@ -71,8 +72,7 @@ host_triplet = @host@
71 71
 target_triplet = @target@
72 72
 @BUILD_CLAMD_TRUE@sbin_PROGRAMS = clamd$(EXEEXT)
73 73
 subdir = clamd
74
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
75
-	$(top_srcdir)/config/depcomp
74
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
76 75
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
77 76
 am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
78 77
 	$(top_srcdir)/m4/argz.m4 \
... ...
@@ -113,19 +113,6 @@ clamd_LDADD = $(LDADD)
113 113
 AM_V_lt = $(am__v_lt_@AM_V@)
114 114
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
115 115
 am__v_lt_0 = --silent
116
-am__v_lt_1 = 
117
-AM_V_P = $(am__v_P_@AM_V@)
118
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
119
-am__v_P_0 = false
120
-am__v_P_1 = :
121
-AM_V_GEN = $(am__v_GEN_@AM_V@)
122
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
123
-am__v_GEN_0 = @echo "  GEN     " $@;
124
-am__v_GEN_1 = 
125
-AM_V_at = $(am__v_at_@AM_V@)
126
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
127
-am__v_at_0 = @
128
-am__v_at_1 = 
129 116
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
130 117
 depcomp = $(SHELL) $(top_srcdir)/config/depcomp
131 118
 am__depfiles_maybe = depfiles
... ...
@@ -138,16 +125,20 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
138 138
 	$(AM_CFLAGS) $(CFLAGS)
139 139
 AM_V_CC = $(am__v_CC_@AM_V@)
140 140
 am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
141
-am__v_CC_0 = @echo "  CC      " $@;
142
-am__v_CC_1 = 
141
+am__v_CC_0 = @echo "  CC    " $@;
142
+AM_V_at = $(am__v_at_@AM_V@)
143
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
144
+am__v_at_0 = @
143 145
 CCLD = $(CC)
144 146
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
145 147
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
146 148
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
147 149
 AM_V_CCLD = $(am__v_CCLD_@AM_V@)
148 150
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
149
-am__v_CCLD_0 = @echo "  CCLD    " $@;
150
-am__v_CCLD_1 = 
151
+am__v_CCLD_0 = @echo "  CCLD  " $@;
152
+AM_V_GEN = $(am__v_GEN_@AM_V@)
153
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
154
+am__v_GEN_0 = @echo "  GEN   " $@;
151 155
 SOURCES = $(clamd_SOURCES)
152 156
 DIST_SOURCES = $(am__clamd_SOURCES_DIST)
153 157
 am__can_run_installinfo = \
... ...
@@ -611,20 +602,6 @@ GTAGS:
611 611
 	  && $(am__cd) $(top_srcdir) \
612 612
 	  && gtags -i $(GTAGS_ARGS) "$$here"
613 613
 
614
-cscopelist:  $(HEADERS) $(SOURCES) $(LISP)
615
-	list='$(SOURCES) $(HEADERS) $(LISP)'; \
616
-	case "$(srcdir)" in \
617
-	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
618
-	  *) sdir=$(subdir)/$(srcdir) ;; \
619
-	esac; \
620
-	for i in $$list; do \
621
-	  if test -f "$$i"; then \
622
-	    echo "$(subdir)/$$i"; \
623
-	  else \
624
-	    echo "$$sdir/$$i"; \
625
-	  fi; \
626
-	done >> $(top_builddir)/cscope.files
627
-
628 614
 distclean-tags:
629 615
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
630 616
 
... ...
@@ -770,7 +747,7 @@ uninstall-am: uninstall-sbinPROGRAMS
770 770
 .MAKE: install-am install-strip
771 771
 
772 772
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
773
-	clean-libtool clean-sbinPROGRAMS cscopelist ctags distclean \
773
+	clean-libtool clean-sbinPROGRAMS ctags distclean \
774 774
 	distclean-compile distclean-generic distclean-libtool \
775 775
 	distclean-tags distdir dvi dvi-am html html-am info info-am \
776 776
 	install install-am install-data install-data-am install-dvi \
... ...
@@ -1,8 +1,9 @@
1
-# Makefile.in generated by automake 1.12.4 from Makefile.am.
1
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
2 2
 # @configure_input@
3 3
 
4
-# Copyright (C) 1994-2012 Free Software Foundation, Inc.
5
-
4
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
5
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
6
+# Foundation, Inc.
6 7
 # This Makefile.in is free software; the Free Software Foundation
7 8
 # gives unlimited permission to copy and/or distribute it,
8 9
 # with or without modifications, as long as this notice is preserved.
... ...
@@ -71,8 +72,7 @@ host_triplet = @host@
71 71
 target_triplet = @target@
72 72
 @BUILD_CLAMD_TRUE@bin_PROGRAMS = clamdscan$(EXEEXT)
73 73
 subdir = clamdscan
74
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
75
-	$(top_srcdir)/config/depcomp
74
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
76 75
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
77 76
 am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
78 77
 	$(top_srcdir)/m4/argz.m4 \
... ...
@@ -111,19 +111,6 @@ clamdscan_LDADD = $(LDADD)
111 111
 AM_V_lt = $(am__v_lt_@AM_V@)
112 112
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
113 113
 am__v_lt_0 = --silent
114
-am__v_lt_1 = 
115
-AM_V_P = $(am__v_P_@AM_V@)
116
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
117
-am__v_P_0 = false
118
-am__v_P_1 = :
119
-AM_V_GEN = $(am__v_GEN_@AM_V@)
120
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
121
-am__v_GEN_0 = @echo "  GEN     " $@;
122
-am__v_GEN_1 = 
123
-AM_V_at = $(am__v_at_@AM_V@)
124
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
125
-am__v_at_0 = @
126
-am__v_at_1 = 
127 114
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
128 115
 depcomp = $(SHELL) $(top_srcdir)/config/depcomp
129 116
 am__depfiles_maybe = depfiles
... ...
@@ -136,16 +123,20 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
136 136
 	$(AM_CFLAGS) $(CFLAGS)
137 137
 AM_V_CC = $(am__v_CC_@AM_V@)
138 138
 am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
139
-am__v_CC_0 = @echo "  CC      " $@;
140
-am__v_CC_1 = 
139
+am__v_CC_0 = @echo "  CC    " $@;
140
+AM_V_at = $(am__v_at_@AM_V@)
141
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
142
+am__v_at_0 = @
141 143
 CCLD = $(CC)
142 144
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
143 145
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
144 146
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
145 147
 AM_V_CCLD = $(am__v_CCLD_@AM_V@)
146 148
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
147
-am__v_CCLD_0 = @echo "  CCLD    " $@;
148
-am__v_CCLD_1 = 
149
+am__v_CCLD_0 = @echo "  CCLD  " $@;
150
+AM_V_GEN = $(am__v_GEN_@AM_V@)
151
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
152
+am__v_GEN_0 = @echo "  GEN   " $@;
149 153
 SOURCES = $(clamdscan_SOURCES)
150 154
 DIST_SOURCES = $(am__clamdscan_SOURCES_DIST)
151 155
 am__can_run_installinfo = \
... ...
@@ -620,20 +611,6 @@ GTAGS:
620 620
 	  && $(am__cd) $(top_srcdir) \
621 621
 	  && gtags -i $(GTAGS_ARGS) "$$here"
622 622
 
623
-cscopelist:  $(HEADERS) $(SOURCES) $(LISP)
624
-	list='$(SOURCES) $(HEADERS) $(LISP)'; \
625
-	case "$(srcdir)" in \
626
-	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
627
-	  *) sdir=$(subdir)/$(srcdir) ;; \
628
-	esac; \
629
-	for i in $$list; do \
630
-	  if test -f "$$i"; then \
631
-	    echo "$(subdir)/$$i"; \
632
-	  else \
633
-	    echo "$$sdir/$$i"; \
634
-	  fi; \
635
-	done >> $(top_builddir)/cscope.files
636
-
637 623
 distclean-tags:
638 624
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
639 625
 
... ...
@@ -778,19 +755,18 @@ uninstall-am: uninstall-binPROGRAMS
778 778
 .MAKE: install-am install-strip
779 779
 
780 780
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
781
-	clean-generic clean-libtool cscopelist ctags distclean \
782
-	distclean-compile distclean-generic distclean-libtool \
783
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
784
-	install install-am install-binPROGRAMS install-data \
785
-	install-data-am install-dvi install-dvi-am install-exec \
786
-	install-exec-am install-html install-html-am install-info \
787
-	install-info-am install-man install-pdf install-pdf-am \
788
-	install-ps install-ps-am install-strip installcheck \
789
-	installcheck-am installcheck-binPROGRAMS installdirs \
790
-	maintainer-clean maintainer-clean-generic mostlyclean \
791
-	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
792
-	pdf pdf-am ps ps-am tags uninstall uninstall-am \
793
-	uninstall-binPROGRAMS
781
+	clean-generic clean-libtool ctags distclean distclean-compile \
782
+	distclean-generic distclean-libtool distclean-tags distdir dvi \
783
+	dvi-am html html-am info info-am install install-am \
784
+	install-binPROGRAMS install-data install-data-am install-dvi \
785
+	install-dvi-am install-exec install-exec-am install-html \
786
+	install-html-am install-info install-info-am install-man \
787
+	install-pdf install-pdf-am install-ps install-ps-am \
788
+	install-strip installcheck installcheck-am \
789
+	installcheck-binPROGRAMS installdirs maintainer-clean \
790
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
791
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
792
+	tags uninstall uninstall-am uninstall-binPROGRAMS
794 793
 
795 794
 
796 795
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
... ...
@@ -1,8 +1,9 @@
1
-# Makefile.in generated by automake 1.12.4 from Makefile.am.
1
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
2 2
 # @configure_input@
3 3
 
4
-# Copyright (C) 1994-2012 Free Software Foundation, Inc.
5
-
4
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
5
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
6
+# Foundation, Inc.
6 7
 # This Makefile.in is free software; the Free Software Foundation
7 8
 # gives unlimited permission to copy and/or distribute it,
8 9
 # with or without modifications, as long as this notice is preserved.
... ...
@@ -53,8 +54,7 @@ host_triplet = @host@
53 53
 target_triplet = @target@
54 54
 @HAVE_CURSES_TRUE@bin_PROGRAMS = clamdtop$(EXEEXT)
55 55
 subdir = clamdtop
56
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
57
-	$(top_srcdir)/config/depcomp
56
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
58 57
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
59 58
 am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
60 59
 	$(top_srcdir)/m4/argz.m4 \
... ...
@@ -87,19 +87,6 @@ clamdtop_OBJECTS = $(am_clamdtop_OBJECTS)
87 87
 AM_V_lt = $(am__v_lt_@AM_V@)
88 88
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
89 89
 am__v_lt_0 = --silent
90
-am__v_lt_1 = 
91
-AM_V_P = $(am__v_P_@AM_V@)
92
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
93
-am__v_P_0 = false
94
-am__v_P_1 = :
95
-AM_V_GEN = $(am__v_GEN_@AM_V@)
96
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
97
-am__v_GEN_0 = @echo "  GEN     " $@;
98
-am__v_GEN_1 = 
99
-AM_V_at = $(am__v_at_@AM_V@)
100
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
101
-am__v_at_0 = @
102
-am__v_at_1 = 
103 90
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
104 91
 depcomp = $(SHELL) $(top_srcdir)/config/depcomp
105 92
 am__depfiles_maybe = depfiles
... ...
@@ -112,16 +99,20 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
112 112
 	$(AM_CFLAGS) $(CFLAGS)
113 113
 AM_V_CC = $(am__v_CC_@AM_V@)
114 114
 am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
115
-am__v_CC_0 = @echo "  CC      " $@;
116
-am__v_CC_1 = 
115
+am__v_CC_0 = @echo "  CC    " $@;
116
+AM_V_at = $(am__v_at_@AM_V@)
117
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
118
+am__v_at_0 = @
117 119
 CCLD = $(CC)
118 120
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
119 121
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
120 122
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
121 123
 AM_V_CCLD = $(am__v_CCLD_@AM_V@)
122 124
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
123
-am__v_CCLD_0 = @echo "  CCLD    " $@;
124
-am__v_CCLD_1 = 
125
+am__v_CCLD_0 = @echo "  CCLD  " $@;
126
+AM_V_GEN = $(am__v_GEN_@AM_V@)
127
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
128
+am__v_GEN_0 = @echo "  GEN   " $@;
125 129
 SOURCES = $(clamdtop_SOURCES)
126 130
 DIST_SOURCES = $(am__clamdtop_SOURCES_DIST)
127 131
 am__can_run_installinfo = \
... ...
@@ -613,20 +604,6 @@ GTAGS:
613 613
 	  && $(am__cd) $(top_srcdir) \
614 614
 	  && gtags -i $(GTAGS_ARGS) "$$here"
615 615
 
616
-cscopelist:  $(HEADERS) $(SOURCES) $(LISP)
617
-	list='$(SOURCES) $(HEADERS) $(LISP)'; \
618
-	case "$(srcdir)" in \
619
-	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
620
-	  *) sdir=$(subdir)/$(srcdir) ;; \
621
-	esac; \
622
-	for i in $$list; do \
623
-	  if test -f "$$i"; then \
624
-	    echo "$(subdir)/$$i"; \
625
-	  else \
626
-	    echo "$$sdir/$$i"; \
627
-	  fi; \
628
-	done >> $(top_builddir)/cscope.files
629
-
630 616
 distclean-tags:
631 617
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
632 618
 
... ...
@@ -637,10 +614,10 @@ distdir: $(DISTFILES)
637 637
 	    if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \
638 638
 	  if test -n "$$list" && \
639 639
 	    grep 'ab help2man is required to generate this page' $$list >/dev/null; then \
640
-	    echo "error: found man pages containing the 'missing help2man' replacement text:" >&2; \
640
+	    echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \
641 641
 	    grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/         /' >&2; \
642 642
 	    echo "       to fix them, install help2man, remove and regenerate the man pages;" >&2; \
643
-	    echo "       typically 'make maintainer-clean' will remove them" >&2; \
643
+	    echo "       typically \`make maintainer-clean' will remove them" >&2; \
644 644
 	    exit 1; \
645 645
 	  else :; fi; \
646 646
 	else :; fi
... ...
@@ -785,20 +762,19 @@ uninstall-man: uninstall-man1
785 785
 .MAKE: install-am install-strip
786 786
 
787 787
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
788
-	clean-generic clean-libtool cscopelist ctags distclean \
789
-	distclean-compile distclean-generic distclean-libtool \
790
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
791
-	install install-am install-binPROGRAMS install-data \
792
-	install-data-am install-dvi install-dvi-am install-exec \
793
-	install-exec-am install-html install-html-am install-info \
794
-	install-info-am install-man install-man1 install-pdf \
795
-	install-pdf-am install-ps install-ps-am install-strip \
796
-	installcheck installcheck-am installcheck-binPROGRAMS \
797
-	installdirs maintainer-clean maintainer-clean-generic \
798
-	mostlyclean mostlyclean-compile mostlyclean-generic \
799
-	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
800
-	uninstall-am uninstall-binPROGRAMS uninstall-man \
801
-	uninstall-man1
788
+	clean-generic clean-libtool ctags distclean distclean-compile \
789
+	distclean-generic distclean-libtool distclean-tags distdir dvi \
790
+	dvi-am html html-am info info-am install install-am \
791
+	install-binPROGRAMS install-data install-data-am install-dvi \
792
+	install-dvi-am install-exec install-exec-am install-html \
793
+	install-html-am install-info install-info-am install-man \
794
+	install-man1 install-pdf install-pdf-am install-ps \
795
+	install-ps-am install-strip installcheck installcheck-am \
796
+	installcheck-binPROGRAMS installdirs maintainer-clean \
797
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
798
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
799
+	tags uninstall uninstall-am uninstall-binPROGRAMS \
800
+	uninstall-man uninstall-man1
802 801
 
803 802
 
804 803
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
... ...
@@ -1,8 +1,9 @@
1
-# Makefile.in generated by automake 1.12.4 from Makefile.am.
1
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
2 2
 # @configure_input@
3 3
 
4
-# Copyright (C) 1994-2012 Free Software Foundation, Inc.
5
-
4
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
5
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
6
+# Foundation, Inc.
6 7
 # This Makefile.in is free software; the Free Software Foundation
7 8
 # gives unlimited permission to copy and/or distribute it,
8 9
 # with or without modifications, as long as this notice is preserved.
... ...
@@ -72,8 +73,7 @@ host_triplet = @host@
72 72
 target_triplet = @target@
73 73
 bin_PROGRAMS = clamscan$(EXEEXT)
74 74
 subdir = clamscan
75
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
76
-	$(top_srcdir)/config/depcomp
75
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
77 76
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
78 77
 am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
79 78
 	$(top_srcdir)/m4/argz.m4 \
... ...
@@ -102,19 +102,6 @@ clamscan_LDADD = $(LDADD)
102 102
 AM_V_lt = $(am__v_lt_@AM_V@)
103 103
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
104 104
 am__v_lt_0 = --silent
105
-am__v_lt_1 = 
106
-AM_V_P = $(am__v_P_@AM_V@)
107
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
108
-am__v_P_0 = false
109
-am__v_P_1 = :
110
-AM_V_GEN = $(am__v_GEN_@AM_V@)
111
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
112
-am__v_GEN_0 = @echo "  GEN     " $@;
113
-am__v_GEN_1 = 
114
-AM_V_at = $(am__v_at_@AM_V@)
115
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
116
-am__v_at_0 = @
117
-am__v_at_1 = 
118 105
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
119 106
 depcomp = $(SHELL) $(top_srcdir)/config/depcomp
120 107
 am__depfiles_maybe = depfiles
... ...
@@ -127,16 +114,20 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
127 127
 	$(AM_CFLAGS) $(CFLAGS)
128 128
 AM_V_CC = $(am__v_CC_@AM_V@)
129 129
 am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
130
-am__v_CC_0 = @echo "  CC      " $@;
131
-am__v_CC_1 = 
130
+am__v_CC_0 = @echo "  CC    " $@;
131
+AM_V_at = $(am__v_at_@AM_V@)
132
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
133
+am__v_at_0 = @
132 134
 CCLD = $(CC)
133 135
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
134 136
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
135 137
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
136 138
 AM_V_CCLD = $(am__v_CCLD_@AM_V@)
137 139
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
138
-am__v_CCLD_0 = @echo "  CCLD    " $@;
139
-am__v_CCLD_1 = 
140
+am__v_CCLD_0 = @echo "  CCLD  " $@;
141
+AM_V_GEN = $(am__v_GEN_@AM_V@)
142
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
143
+am__v_GEN_0 = @echo "  GEN   " $@;
140 144
 SOURCES = $(clamscan_SOURCES)
141 145
 DIST_SOURCES = $(clamscan_SOURCES)
142 146
 am__can_run_installinfo = \
... ...
@@ -591,20 +582,6 @@ GTAGS:
591 591
 	  && $(am__cd) $(top_srcdir) \
592 592
 	  && gtags -i $(GTAGS_ARGS) "$$here"
593 593
 
594
-cscopelist:  $(HEADERS) $(SOURCES) $(LISP)
595
-	list='$(SOURCES) $(HEADERS) $(LISP)'; \
596
-	case "$(srcdir)" in \
597
-	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
598
-	  *) sdir=$(subdir)/$(srcdir) ;; \
599
-	esac; \
600
-	for i in $$list; do \
601
-	  if test -f "$$i"; then \
602
-	    echo "$(subdir)/$$i"; \
603
-	  else \
604
-	    echo "$$sdir/$$i"; \
605
-	  fi; \
606
-	done >> $(top_builddir)/cscope.files
607
-
608 594
 distclean-tags:
609 595
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
610 596
 
... ...
@@ -749,19 +726,18 @@ uninstall-am: uninstall-binPROGRAMS
749 749
 .MAKE: install-am install-strip
750 750
 
751 751
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
752
-	clean-generic clean-libtool cscopelist ctags distclean \
753
-	distclean-compile distclean-generic distclean-libtool \
754
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
755
-	install install-am install-binPROGRAMS install-data \
756
-	install-data-am install-dvi install-dvi-am install-exec \
757
-	install-exec-am install-html install-html-am install-info \
758
-	install-info-am install-man install-pdf install-pdf-am \
759
-	install-ps install-ps-am install-strip installcheck \
760
-	installcheck-am installcheck-binPROGRAMS installdirs \
761
-	maintainer-clean maintainer-clean-generic mostlyclean \
762
-	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
763
-	pdf pdf-am ps ps-am tags uninstall uninstall-am \
764
-	uninstall-binPROGRAMS
752
+	clean-generic clean-libtool ctags distclean distclean-compile \
753
+	distclean-generic distclean-libtool distclean-tags distdir dvi \
754
+	dvi-am html html-am info info-am install install-am \
755
+	install-binPROGRAMS install-data install-data-am install-dvi \
756
+	install-dvi-am install-exec install-exec-am install-html \
757
+	install-html-am install-info install-info-am install-man \
758
+	install-pdf install-pdf-am install-ps install-ps-am \
759
+	install-strip installcheck installcheck-am \
760
+	installcheck-binPROGRAMS installdirs maintainer-clean \
761
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
762
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
763
+	tags uninstall uninstall-am uninstall-binPROGRAMS
765 764
 
766 765
 
767 766
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
768 767
deleted file mode 100755
... ...
@@ -1,270 +0,0 @@
1
-#! /bin/sh
2
-# Wrapper for Microsoft lib.exe
3
-
4
-me=ar-lib
5
-scriptversion=2012-03-01.08; # UTC
6
-
7
-# Copyright (C) 2010-2012 Free Software Foundation, Inc.
8
-# Written by Peter Rosin <peda@lysator.liu.se>.
9
-#
10
-# This program is free software; you can redistribute it and/or modify
11
-# it under the terms of the GNU General Public License as published by
12
-# the Free Software Foundation; either version 2, or (at your option)
13
-# any later version.
14
-#
15
-# This program is distributed in the hope that it will be useful,
16
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
17
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
18
-# GNU General Public License for more details.
19
-#
20
-# You should have received a copy of the GNU General Public License
21
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
22
-
23
-# As a special exception to the GNU General Public License, if you
24
-# distribute this file as part of a program that contains a
25
-# configuration script generated by Autoconf, you may include it under
26
-# the same distribution terms that you use for the rest of that program.
27
-
28
-# This file is maintained in Automake, please report
29
-# bugs to <bug-automake@gnu.org> or send patches to
30
-# <automake-patches@gnu.org>.
31
-
32
-
33
-# func_error message
34
-func_error ()
35
-{
36
-  echo "$me: $1" 1>&2
37
-  exit 1
38
-}
39
-
40
-file_conv=
41
-
42
-# func_file_conv build_file
43
-# Convert a $build file to $host form and store it in $file
44
-# Currently only supports Windows hosts.
45
-func_file_conv ()
46
-{
47
-  file=$1
48
-  case $file in
49
-    / | /[!/]*) # absolute file, and not a UNC file
50
-      if test -z "$file_conv"; then
51
-	# lazily determine how to convert abs files
52
-	case `uname -s` in
53
-	  MINGW*)
54
-	    file_conv=mingw
55
-	    ;;
56
-	  CYGWIN*)
57
-	    file_conv=cygwin
58
-	    ;;
59
-	  *)
60
-	    file_conv=wine
61
-	    ;;
62
-	esac
63
-      fi
64
-      case $file_conv in
65
-	mingw)
66
-	  file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
67
-	  ;;
68
-	cygwin)
69
-	  file=`cygpath -m "$file" || echo "$file"`
70
-	  ;;
71
-	wine)
72
-	  file=`winepath -w "$file" || echo "$file"`
73
-	  ;;
74
-      esac
75
-      ;;
76
-  esac
77
-}
78
-
79
-# func_at_file at_file operation archive
80
-# Iterate over all members in AT_FILE performing OPERATION on ARCHIVE
81
-# for each of them.
82
-# When interpreting the content of the @FILE, do NOT use func_file_conv,
83
-# since the user would need to supply preconverted file names to
84
-# binutils ar, at least for MinGW.
85
-func_at_file ()
86
-{
87
-  operation=$2
88
-  archive=$3
89
-  at_file_contents=`cat "$1"`
90
-  eval set x "$at_file_contents"
91
-  shift
92
-
93
-  for member
94
-  do
95
-    $AR -NOLOGO $operation:"$member" "$archive" || exit $?
96
-  done
97
-}
98
-
99
-case $1 in
100
-  '')
101
-     func_error "no command.  Try '$0 --help' for more information."
102
-     ;;
103
-  -h | --h*)
104
-    cat <<EOF
105
-Usage: $me [--help] [--version] PROGRAM ACTION ARCHIVE [MEMBER...]
106
-
107
-Members may be specified in a file named with @FILE.
108
-EOF
109
-    exit $?
110
-    ;;
111
-  -v | --v*)
112
-    echo "$me, version $scriptversion"
113
-    exit $?
114
-    ;;
115
-esac
116
-
117
-if test $# -lt 3; then
118
-  func_error "you must specify a program, an action and an archive"
119
-fi
120
-
121
-AR=$1
122
-shift
123
-while :
124
-do
125
-  if test $# -lt 2; then
126
-    func_error "you must specify a program, an action and an archive"
127
-  fi
128
-  case $1 in
129
-    -lib | -LIB \
130
-    | -ltcg | -LTCG \
131
-    | -machine* | -MACHINE* \
132
-    | -subsystem* | -SUBSYSTEM* \
133
-    | -verbose | -VERBOSE \
134
-    | -wx* | -WX* )
135
-      AR="$AR $1"
136
-      shift
137
-      ;;
138
-    *)
139
-      action=$1
140
-      shift
141
-      break
142
-      ;;
143
-  esac
144
-done
145
-orig_archive=$1
146
-shift
147
-func_file_conv "$orig_archive"
148
-archive=$file
149
-
150
-# strip leading dash in $action
151
-action=${action#-}
152
-
153
-delete=
154
-extract=
155
-list=
156
-quick=
157
-replace=
158
-index=
159
-create=
160
-
161
-while test -n "$action"
162
-do
163
-  case $action in
164
-    d*) delete=yes  ;;
165
-    x*) extract=yes ;;
166
-    t*) list=yes    ;;
167
-    q*) quick=yes   ;;
168
-    r*) replace=yes ;;
169
-    s*) index=yes   ;;
170
-    S*)             ;; # the index is always updated implicitly
171
-    c*) create=yes  ;;
172
-    u*)             ;; # TODO: don't ignore the update modifier
173
-    v*)             ;; # TODO: don't ignore the verbose modifier
174
-    *)
175
-      func_error "unknown action specified"
176
-      ;;
177
-  esac
178
-  action=${action#?}
179
-done
180
-
181
-case $delete$extract$list$quick$replace,$index in
182
-  yes,* | ,yes)
183
-    ;;
184
-  yesyes*)
185
-    func_error "more than one action specified"
186
-    ;;
187
-  *)
188
-    func_error "no action specified"
189
-    ;;
190
-esac
191
-
192
-if test -n "$delete"; then
193
-  if test ! -f "$orig_archive"; then
194
-    func_error "archive not found"
195
-  fi
196
-  for member
197
-  do
198
-    case $1 in
199
-      @*)
200
-        func_at_file "${1#@}" -REMOVE "$archive"
201
-        ;;
202
-      *)
203
-        func_file_conv "$1"
204
-        $AR -NOLOGO -REMOVE:"$file" "$archive" || exit $?
205
-        ;;
206
-    esac
207
-  done
208
-
209
-elif test -n "$extract"; then
210
-  if test ! -f "$orig_archive"; then
211
-    func_error "archive not found"
212
-  fi
213
-  if test $# -gt 0; then
214
-    for member
215
-    do
216
-      case $1 in
217
-        @*)
218
-          func_at_file "${1#@}" -EXTRACT "$archive"
219
-          ;;
220
-        *)
221
-          func_file_conv "$1"
222
-          $AR -NOLOGO -EXTRACT:"$file" "$archive" || exit $?
223
-          ;;
224
-      esac
225
-    done
226
-  else
227
-    $AR -NOLOGO -LIST "$archive" | sed -e 's/\\/\\\\/g' | while read member
228
-    do
229
-      $AR -NOLOGO -EXTRACT:"$member" "$archive" || exit $?
230
-    done
231
-  fi
232
-
233
-elif test -n "$quick$replace"; then
234
-  if test ! -f "$orig_archive"; then
235
-    if test -z "$create"; then
236
-      echo "$me: creating $orig_archive"
237
-    fi
238
-    orig_archive=
239
-  else
240
-    orig_archive=$archive
241
-  fi
242
-
243
-  for member
244
-  do
245
-    case $1 in
246
-    @*)
247
-      func_file_conv "${1#@}"
248
-      set x "$@" "@$file"
249
-      ;;
250
-    *)
251
-      func_file_conv "$1"
252
-      set x "$@" "$file"
253
-      ;;
254
-    esac
255
-    shift
256
-    shift
257
-  done
258
-
259
-  if test -n "$orig_archive"; then
260
-    $AR -NOLOGO -OUT:"$archive" "$orig_archive" "$@" || exit $?
261
-  else
262
-    $AR -NOLOGO -OUT:"$archive" "$@" || exit $?
263
-  fi
264
-
265
-elif test -n "$list"; then
266
-  if test ! -f "$orig_archive"; then
267
-    func_error "archive not found"
268
-  fi
269
-  $AR -NOLOGO -LIST "$archive" || exit $?
270
-fi
271 1
deleted file mode 100755
... ...
@@ -1,342 +0,0 @@
1
-#! /bin/sh
2
-# Wrapper for compilers which do not understand '-c -o'.
3
-
4
-scriptversion=2012-03-05.13; # UTC
5
-
6
-# Copyright (C) 1999-2012 Free Software Foundation, Inc.
7
-# Written by Tom Tromey <tromey@cygnus.com>.
8
-#
9
-# This program is free software; you can redistribute it and/or modify
10
-# it under the terms of the GNU General Public License as published by
11
-# the Free Software Foundation; either version 2, or (at your option)
12
-# any later version.
13
-#
14
-# This program is distributed in the hope that it will be useful,
15
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
16
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
17
-# GNU General Public License for more details.
18
-#
19
-# You should have received a copy of the GNU General Public License
20
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
21
-
22
-# As a special exception to the GNU General Public License, if you
23
-# distribute this file as part of a program that contains a
24
-# configuration script generated by Autoconf, you may include it under
25
-# the same distribution terms that you use for the rest of that program.
26
-
27
-# This file is maintained in Automake, please report
28
-# bugs to <bug-automake@gnu.org> or send patches to
29
-# <automake-patches@gnu.org>.
30
-
31
-nl='
32
-'
33
-
34
-# We need space, tab and new line, in precisely that order.  Quoting is
35
-# there to prevent tools from complaining about whitespace usage.
36
-IFS=" ""	$nl"
37
-
38
-file_conv=
39
-
40
-# func_file_conv build_file lazy
41
-# Convert a $build file to $host form and store it in $file
42
-# Currently only supports Windows hosts. If the determined conversion
43
-# type is listed in (the comma separated) LAZY, no conversion will
44
-# take place.
45
-func_file_conv ()
46
-{
47
-  file=$1
48
-  case $file in
49
-    / | /[!/]*) # absolute file, and not a UNC file
50
-      if test -z "$file_conv"; then
51
-	# lazily determine how to convert abs files
52
-	case `uname -s` in
53
-	  MINGW*)
54
-	    file_conv=mingw
55
-	    ;;
56
-	  CYGWIN*)
57
-	    file_conv=cygwin
58
-	    ;;
59
-	  *)
60
-	    file_conv=wine
61
-	    ;;
62
-	esac
63
-      fi
64
-      case $file_conv/,$2, in
65
-	*,$file_conv,*)
66
-	  ;;
67
-	mingw/*)
68
-	  file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
69
-	  ;;
70
-	cygwin/*)
71
-	  file=`cygpath -m "$file" || echo "$file"`
72
-	  ;;
73
-	wine/*)
74
-	  file=`winepath -w "$file" || echo "$file"`
75
-	  ;;
76
-      esac
77
-      ;;
78
-  esac
79
-}
80
-
81
-# func_cl_dashL linkdir
82
-# Make cl look for libraries in LINKDIR
83
-func_cl_dashL ()
84
-{
85
-  func_file_conv "$1"
86
-  if test -z "$lib_path"; then
87
-    lib_path=$file
88
-  else
89
-    lib_path="$lib_path;$file"
90
-  fi
91
-  linker_opts="$linker_opts -LIBPATH:$file"
92
-}
93
-
94
-# func_cl_dashl library
95
-# Do a library search-path lookup for cl
96
-func_cl_dashl ()
97
-{
98
-  lib=$1
99
-  found=no
100
-  save_IFS=$IFS
101
-  IFS=';'
102
-  for dir in $lib_path $LIB
103
-  do
104
-    IFS=$save_IFS
105
-    if $shared && test -f "$dir/$lib.dll.lib"; then
106
-      found=yes
107
-      lib=$dir/$lib.dll.lib
108
-      break
109
-    fi
110
-    if test -f "$dir/$lib.lib"; then
111
-      found=yes
112
-      lib=$dir/$lib.lib
113
-      break
114
-    fi
115
-  done
116
-  IFS=$save_IFS
117
-
118
-  if test "$found" != yes; then
119
-    lib=$lib.lib
120
-  fi
121
-}
122
-
123
-# func_cl_wrapper cl arg...
124
-# Adjust compile command to suit cl
125
-func_cl_wrapper ()
126
-{
127
-  # Assume a capable shell
128
-  lib_path=
129
-  shared=:
130
-  linker_opts=
131
-  for arg
132
-  do
133
-    if test -n "$eat"; then
134
-      eat=
135
-    else
136
-      case $1 in
137
-	-o)
138
-	  # configure might choose to run compile as 'compile cc -o foo foo.c'.
139
-	  eat=1
140
-	  case $2 in
141
-	    *.o | *.[oO][bB][jJ])
142
-	      func_file_conv "$2"
143
-	      set x "$@" -Fo"$file"
144
-	      shift
145
-	      ;;
146
-	    *)
147
-	      func_file_conv "$2"
148
-	      set x "$@" -Fe"$file"
149
-	      shift
150
-	      ;;
151
-	  esac
152
-	  ;;
153
-	-I)
154
-	  eat=1
155
-	  func_file_conv "$2" mingw
156
-	  set x "$@" -I"$file"
157
-	  shift
158
-	  ;;
159
-	-I*)
160
-	  func_file_conv "${1#-I}" mingw
161
-	  set x "$@" -I"$file"
162
-	  shift
163
-	  ;;
164
-	-l)
165
-	  eat=1
166
-	  func_cl_dashl "$2"
167
-	  set x "$@" "$lib"
168
-	  shift
169
-	  ;;
170
-	-l*)
171
-	  func_cl_dashl "${1#-l}"
172
-	  set x "$@" "$lib"
173
-	  shift
174
-	  ;;
175
-	-L)
176
-	  eat=1
177
-	  func_cl_dashL "$2"
178
-	  ;;
179
-	-L*)
180
-	  func_cl_dashL "${1#-L}"
181
-	  ;;
182
-	-static)
183
-	  shared=false
184
-	  ;;
185
-	-Wl,*)
186
-	  arg=${1#-Wl,}
187
-	  save_ifs="$IFS"; IFS=','
188
-	  for flag in $arg; do
189
-	    IFS="$save_ifs"
190
-	    linker_opts="$linker_opts $flag"
191
-	  done
192
-	  IFS="$save_ifs"
193
-	  ;;
194
-	-Xlinker)
195
-	  eat=1
196
-	  linker_opts="$linker_opts $2"
197
-	  ;;
198
-	-*)
199
-	  set x "$@" "$1"
200
-	  shift
201
-	  ;;
202
-	*.cc | *.CC | *.cxx | *.CXX | *.[cC]++)
203
-	  func_file_conv "$1"
204
-	  set x "$@" -Tp"$file"
205
-	  shift
206
-	  ;;
207
-	*.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO])
208
-	  func_file_conv "$1" mingw
209
-	  set x "$@" "$file"
210
-	  shift
211
-	  ;;
212
-	*)
213
-	  set x "$@" "$1"
214
-	  shift
215
-	  ;;
216
-      esac
217
-    fi
218
-    shift
219
-  done
220
-  if test -n "$linker_opts"; then
221
-    linker_opts="-link$linker_opts"
222
-  fi
223
-  exec "$@" $linker_opts
224
-  exit 1
225
-}
226
-
227
-eat=
228
-
229
-case $1 in
230
-  '')
231
-     echo "$0: No command.  Try '$0 --help' for more information." 1>&2
232
-     exit 1;
233
-     ;;
234
-  -h | --h*)
235
-    cat <<\EOF
236
-Usage: compile [--help] [--version] PROGRAM [ARGS]
237
-
238
-Wrapper for compilers which do not understand '-c -o'.
239
-Remove '-o dest.o' from ARGS, run PROGRAM with the remaining
240
-arguments, and rename the output as expected.
241
-
242
-If you are trying to build a whole package this is not the
243
-right script to run: please start by reading the file 'INSTALL'.
244
-
245
-Report bugs to <bug-automake@gnu.org>.
246
-EOF
247
-    exit $?
248
-    ;;
249
-  -v | --v*)
250
-    echo "compile $scriptversion"
251
-    exit $?
252
-    ;;
253
-  cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
254
-    func_cl_wrapper "$@"      # Doesn't return...
255
-    ;;
256
-esac
257
-
258
-ofile=
259
-cfile=
260
-
261
-for arg
262
-do
263
-  if test -n "$eat"; then
264
-    eat=
265
-  else
266
-    case $1 in
267
-      -o)
268
-	# configure might choose to run compile as 'compile cc -o foo foo.c'.
269
-	# So we strip '-o arg' only if arg is an object.
270
-	eat=1
271
-	case $2 in
272
-	  *.o | *.obj)
273
-	    ofile=$2
274
-	    ;;
275
-	  *)
276
-	    set x "$@" -o "$2"
277
-	    shift
278
-	    ;;
279
-	esac
280
-	;;
281
-      *.c)
282
-	cfile=$1
283
-	set x "$@" "$1"
284
-	shift
285
-	;;
286
-      *)
287
-	set x "$@" "$1"
288
-	shift
289
-	;;
290
-    esac
291
-  fi
292
-  shift
293
-done
294
-
295
-if test -z "$ofile" || test -z "$cfile"; then
296
-  # If no '-o' option was seen then we might have been invoked from a
297
-  # pattern rule where we don't need one.  That is ok -- this is a
298
-  # normal compilation that the losing compiler can handle.  If no
299
-  # '.c' file was seen then we are probably linking.  That is also
300
-  # ok.
301
-  exec "$@"
302
-fi
303
-
304
-# Name of file we expect compiler to create.
305
-cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'`
306
-
307
-# Create the lock directory.
308
-# Note: use '[/\\:.-]' here to ensure that we don't use the same name
309
-# that we are using for the .o file.  Also, base the name on the expected
310
-# object file name, since that is what matters with a parallel build.
311
-lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d
312
-while true; do
313
-  if mkdir "$lockdir" >/dev/null 2>&1; then
314
-    break
315
-  fi
316
-  sleep 1
317
-done
318
-# FIXME: race condition here if user kills between mkdir and trap.
319
-trap "rmdir '$lockdir'; exit 1" 1 2 15
320
-
321
-# Run the compile.
322
-"$@"
323
-ret=$?
324
-
325
-if test -f "$cofile"; then
326
-  test "$cofile" = "$ofile" || mv "$cofile" "$ofile"
327
-elif test -f "${cofile}bj"; then
328
-  test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile"
329
-fi
330
-
331
-rmdir "$lockdir"
332
-exit $ret
333
-
334
-# Local Variables:
335
-# mode: shell-script
336
-# sh-indentation: 2
337
-# eval: (add-hook 'write-file-hooks 'time-stamp)
338
-# time-stamp-start: "scriptversion="
339
-# time-stamp-format: "%:y-%02m-%02d.%02H"
340
-# time-stamp-time-zone: "UTC"
341
-# time-stamp-end: "; # UTC"
342
-# End:
... ...
@@ -1,9 +1,10 @@
1 1
 #! /bin/sh
2 2
 # Attempt to guess a canonical system name.
3 3
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
4
-#   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
4
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
5
+#   Free Software Foundation, Inc.
5 6
 
6
-timestamp='2003-07-02'
7
+timestamp='2009-12-30'
7 8
 
8 9
 # This file is free software; you can redistribute it and/or modify it
9 10
 # under the terms of the GNU General Public License as published by
... ...
@@ -17,23 +18,25 @@ timestamp='2003-07-02'
17 17
 #
18 18
 # You should have received a copy of the GNU General Public License
19 19
 # along with this program; if not, write to the Free Software
20
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
20
+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
21
+# 02110-1301, USA.
21 22
 #
22 23
 # As a special exception to the GNU General Public License, if you
23 24
 # distribute this file as part of a program that contains a
24 25
 # configuration script generated by Autoconf, you may include it under
25 26
 # the same distribution terms that you use for the rest of that program.
26 27
 
27
-# Originally written by Per Bothner <per@bothner.com>.
28
-# Please send patches to <config-patches@gnu.org>.  Submit a context
29
-# diff and a properly formatted ChangeLog entry.
28
+
29
+# Originally written by Per Bothner.  Please send patches (context
30
+# diff format) to <config-patches@gnu.org> and include a ChangeLog
31
+# entry.
30 32
 #
31 33
 # This script attempts to guess a canonical system name similar to
32 34
 # config.sub.  If it succeeds, it prints the system name on stdout, and
33 35
 # exits with 0.  Otherwise, it exits with 1.
34 36
 #
35
-# The plan is that this can be called by configure scripts if you
36
-# don't specify an explicit build system type.
37
+# You can get the latest version of this script from:
38
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
37 39
 
38 40
 me=`echo "$0" | sed -e 's,.*/,,'`
39 41
 
... ...
@@ -53,8 +56,9 @@ version="\
53 53
 GNU config.guess ($timestamp)
54 54
 
55 55
 Originally written by Per Bothner.
56
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
57
-Free Software Foundation, Inc.
56
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
57
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
58
+Software Foundation, Inc.
58 59
 
59 60
 This is free software; see the source for copying conditions.  There is NO
60 61
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
... ...
@@ -66,11 +70,11 @@ Try \`$me --help' for more information."
66 66
 while test $# -gt 0 ; do
67 67
   case $1 in
68 68
     --time-stamp | --time* | -t )
69
-       echo "$timestamp" ; exit 0 ;;
69
+       echo "$timestamp" ; exit ;;
70 70
     --version | -v )
71
-       echo "$version" ; exit 0 ;;
71
+       echo "$version" ; exit ;;
72 72
     --help | --h* | -h )
73
-       echo "$usage"; exit 0 ;;
73
+       echo "$usage"; exit ;;
74 74
     -- )     # Stop option processing
75 75
        shift; break ;;
76 76
     - )	# Use stdin as input.
... ...
@@ -104,7 +108,7 @@ set_cc_for_build='
104 104
 trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
105 105
 trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
106 106
 : ${TMPDIR=/tmp} ;
107
- { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
107
+ { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
108 108
  { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
109 109
  { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
110 110
  { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
... ...
@@ -123,7 +127,7 @@ case $CC_FOR_BUILD,$HOST_CC,$CC in
123 123
 	;;
124 124
  ,,*)   CC_FOR_BUILD=$CC ;;
125 125
  ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
126
-esac ;'
126
+esac ; set_cc_for_build= ;'
127 127
 
128 128
 # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
129 129
 # (ghazi@noc.rutgers.edu 1994-08-24)
... ...
@@ -158,6 +162,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
158 158
 	    arm*) machine=arm-unknown ;;
159 159
 	    sh3el) machine=shl-unknown ;;
160 160
 	    sh3eb) machine=sh-unknown ;;
161
+	    sh5el) machine=sh5le-unknown ;;
161 162
 	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
162 163
 	esac
163 164
 	# The Operating System including object format, if it has switched
... ...
@@ -166,7 +171,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
166 166
 	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
167 167
 		eval $set_cc_for_build
168 168
 		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
169
-			| grep __ELF__ >/dev/null
169
+			| grep -q __ELF__
170 170
 		then
171 171
 		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
172 172
 		    # Return netbsd for either.  FIX?
... ...
@@ -196,50 +201,32 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
196 196
 	# contains redundant information, the shorter form:
197 197
 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
198 198
 	echo "${machine}-${os}${release}"
199
-	exit 0 ;;
200
-    amiga:OpenBSD:*:*)
201
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
202
-	exit 0 ;;
203
-    arc:OpenBSD:*:*)
204
-	echo mipsel-unknown-openbsd${UNAME_RELEASE}
205
-	exit 0 ;;
206
-    hp300:OpenBSD:*:*)
207
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
208
-	exit 0 ;;
209
-    mac68k:OpenBSD:*:*)
210
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
211
-	exit 0 ;;
212
-    macppc:OpenBSD:*:*)
213
-	echo powerpc-unknown-openbsd${UNAME_RELEASE}
214
-	exit 0 ;;
215
-    mvme68k:OpenBSD:*:*)
216
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
217
-	exit 0 ;;
218
-    mvme88k:OpenBSD:*:*)
219
-	echo m88k-unknown-openbsd${UNAME_RELEASE}
220
-	exit 0 ;;
221
-    mvmeppc:OpenBSD:*:*)
222
-	echo powerpc-unknown-openbsd${UNAME_RELEASE}
223
-	exit 0 ;;
224
-    pmax:OpenBSD:*:*)
225
-	echo mipsel-unknown-openbsd${UNAME_RELEASE}
226
-	exit 0 ;;
227
-    sgi:OpenBSD:*:*)
228
-	echo mipseb-unknown-openbsd${UNAME_RELEASE}
229
-	exit 0 ;;
230
-    sun3:OpenBSD:*:*)
231
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
232
-	exit 0 ;;
233
-    wgrisc:OpenBSD:*:*)
234
-	echo mipsel-unknown-openbsd${UNAME_RELEASE}
235
-	exit 0 ;;
199
+	exit ;;
236 200
     *:OpenBSD:*:*)
237
-	echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
238
-	exit 0 ;;
201
+	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
202
+	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
203
+	exit ;;
204
+    *:ekkoBSD:*:*)
205
+	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
206
+	exit ;;
207
+    *:SolidBSD:*:*)
208
+	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
209
+	exit ;;
210
+    macppc:MirBSD:*:*)
211
+	echo powerpc-unknown-mirbsd${UNAME_RELEASE}
212
+	exit ;;
213
+    *:MirBSD:*:*)
214
+	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
215
+	exit ;;
239 216
     alpha:OSF1:*:*)
240
-	if test $UNAME_RELEASE = "V4.0"; then
217
+	case $UNAME_RELEASE in
218
+	*4.0)
241 219
 		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
242
-	fi
220
+		;;
221
+	*5.*)
222
+	        UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
223
+		;;
224
+	esac
243 225
 	# According to Compaq, /usr/sbin/psrinfo has been available on
244 226
 	# OSF/1 and Tru64 systems produced since 1995.  I hope that
245 227
 	# covers most systems running today.  This code pipes the CPU
... ...
@@ -277,42 +264,49 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
277 277
 	    "EV7.9 (21364A)")
278 278
 		UNAME_MACHINE="alphaev79" ;;
279 279
 	esac
280
+	# A Pn.n version is a patched version.
280 281
 	# A Vn.n version is a released version.
281 282
 	# A Tn.n version is a released field test version.
282 283
 	# A Xn.n version is an unreleased experimental baselevel.
283 284
 	# 1.2 uses "1.2" for uname -r.
284
-	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
285
-	exit 0 ;;
286
-    Alpha*:OpenVMS:*:*)
287
-	echo alpha-hp-vms
288
-	exit 0 ;;
285
+	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
286
+	exit ;;
289 287
     Alpha\ *:Windows_NT*:*)
290 288
 	# How do we know it's Interix rather than the generic POSIX subsystem?
291 289
 	# Should we change UNAME_MACHINE based on the output of uname instead
292 290
 	# of the specific Alpha model?
293 291
 	echo alpha-pc-interix
294
-	exit 0 ;;
292
+	exit ;;
295 293
     21064:Windows_NT:50:3)
296 294
 	echo alpha-dec-winnt3.5
297
-	exit 0 ;;
295
+	exit ;;
298 296
     Amiga*:UNIX_System_V:4.0:*)
299 297
 	echo m68k-unknown-sysv4
300
-	exit 0;;
298
+	exit ;;
301 299
     *:[Aa]miga[Oo][Ss]:*:*)
302 300
 	echo ${UNAME_MACHINE}-unknown-amigaos
303
-	exit 0 ;;
301
+	exit ;;
304 302
     *:[Mm]orph[Oo][Ss]:*:*)
305 303
 	echo ${UNAME_MACHINE}-unknown-morphos
306
-	exit 0 ;;
304
+	exit ;;
307 305
     *:OS/390:*:*)
308 306
 	echo i370-ibm-openedition
309
-	exit 0 ;;
307
+	exit ;;
308
+    *:z/VM:*:*)
309
+	echo s390-ibm-zvmoe
310
+	exit ;;
311
+    *:OS400:*:*)
312
+        echo powerpc-ibm-os400
313
+	exit ;;
310 314
     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
311 315
 	echo arm-acorn-riscix${UNAME_RELEASE}
312
-	exit 0;;
316
+	exit ;;
317
+    arm:riscos:*:*|arm:RISCOS:*:*)
318
+	echo arm-unknown-riscos
319
+	exit ;;
313 320
     SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
314 321
 	echo hppa1.1-hitachi-hiuxmpp
315
-	exit 0;;
322
+	exit ;;
316 323
     Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
317 324
 	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
318 325
 	if test "`(/bin/universe) 2>/dev/null`" = att ; then
... ...
@@ -320,32 +314,51 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
320 320
 	else
321 321
 		echo pyramid-pyramid-bsd
322 322
 	fi
323
-	exit 0 ;;
323
+	exit ;;
324 324
     NILE*:*:*:dcosx)
325 325
 	echo pyramid-pyramid-svr4
326
-	exit 0 ;;
326
+	exit ;;
327 327
     DRS?6000:unix:4.0:6*)
328 328
 	echo sparc-icl-nx6
329
-	exit 0 ;;
330
-    DRS?6000:UNIX_SV:4.2*:7*)
329
+	exit ;;
330
+    DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
331 331
 	case `/usr/bin/uname -p` in
332
-	    sparc) echo sparc-icl-nx7 && exit 0 ;;
332
+	    sparc) echo sparc-icl-nx7; exit ;;
333 333
 	esac ;;
334
+    s390x:SunOS:*:*)
335
+	echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
336
+	exit ;;
334 337
     sun4H:SunOS:5.*:*)
335 338
 	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
336
-	exit 0 ;;
339
+	exit ;;
337 340
     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
338 341
 	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
339
-	exit 0 ;;
340
-    i86pc:SunOS:5.*:*)
341
-	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
342
-	exit 0 ;;
342
+	exit ;;
343
+    i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
344
+	echo i386-pc-auroraux${UNAME_RELEASE}
345
+	exit ;;
346
+    i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
347
+	eval $set_cc_for_build
348
+	SUN_ARCH="i386"
349
+	# If there is a compiler, see if it is configured for 64-bit objects.
350
+	# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
351
+	# This test works for both compilers.
352
+	if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
353
+	    if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
354
+		(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
355
+		grep IS_64BIT_ARCH >/dev/null
356
+	    then
357
+		SUN_ARCH="x86_64"
358
+	    fi
359
+	fi
360
+	echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
361
+	exit ;;
343 362
     sun4*:SunOS:6*:*)
344 363
 	# According to config.sub, this is the proper way to canonicalize
345 364
 	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
346 365
 	# it's likely to be more like Solaris than SunOS4.
347 366
 	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
348
-	exit 0 ;;
367
+	exit ;;
349 368
     sun4*:SunOS:*:*)
350 369
 	case "`/usr/bin/arch -k`" in
351 370
 	    Series*|S4*)
... ...
@@ -354,10 +367,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
354 354
 	esac
355 355
 	# Japanese Language versions have a version number like `4.1.3-JL'.
356 356
 	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
357
-	exit 0 ;;
357
+	exit ;;
358 358
     sun3*:SunOS:*:*)
359 359
 	echo m68k-sun-sunos${UNAME_RELEASE}
360
-	exit 0 ;;
360
+	exit ;;
361 361
     sun*:*:4.2BSD:*)
362 362
 	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
363 363
 	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
... ...
@@ -369,10 +382,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
369 369
 		echo sparc-sun-sunos${UNAME_RELEASE}
370 370
 		;;
371 371
 	esac
372
-	exit 0 ;;
372
+	exit ;;
373 373
     aushp:SunOS:*:*)
374 374
 	echo sparc-auspex-sunos${UNAME_RELEASE}
375
-	exit 0 ;;
375
+	exit ;;
376 376
     # The situation for MiNT is a little confusing.  The machine name
377 377
     # can be virtually everything (everything which is not
378 378
     # "atarist" or "atariste" at least should have a processor
... ...
@@ -383,37 +396,40 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
383 383
     # be no problem.
384 384
     atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
385 385
         echo m68k-atari-mint${UNAME_RELEASE}
386
-	exit 0 ;;
386
+	exit ;;
387 387
     atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
388 388
 	echo m68k-atari-mint${UNAME_RELEASE}
389
-        exit 0 ;;
389
+        exit ;;
390 390
     *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
391 391
         echo m68k-atari-mint${UNAME_RELEASE}
392
-	exit 0 ;;
392
+	exit ;;
393 393
     milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
394 394
         echo m68k-milan-mint${UNAME_RELEASE}
395
-        exit 0 ;;
395
+        exit ;;
396 396
     hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
397 397
         echo m68k-hades-mint${UNAME_RELEASE}
398
-        exit 0 ;;
398
+        exit ;;
399 399
     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
400 400
         echo m68k-unknown-mint${UNAME_RELEASE}
401
-        exit 0 ;;
401
+        exit ;;
402
+    m68k:machten:*:*)
403
+	echo m68k-apple-machten${UNAME_RELEASE}
404
+	exit ;;
402 405
     powerpc:machten:*:*)
403 406
 	echo powerpc-apple-machten${UNAME_RELEASE}
404
-	exit 0 ;;
407
+	exit ;;
405 408
     RISC*:Mach:*:*)
406 409
 	echo mips-dec-mach_bsd4.3
407
-	exit 0 ;;
410
+	exit ;;
408 411
     RISC*:ULTRIX:*:*)
409 412
 	echo mips-dec-ultrix${UNAME_RELEASE}
410
-	exit 0 ;;
413
+	exit ;;
411 414
     VAX*:ULTRIX*:*:*)
412 415
 	echo vax-dec-ultrix${UNAME_RELEASE}
413
-	exit 0 ;;
416
+	exit ;;
414 417
     2020:CLIX:*:* | 2430:CLIX:*:*)
415 418
 	echo clipper-intergraph-clix${UNAME_RELEASE}
416
-	exit 0 ;;
419
+	exit ;;
417 420
     mips:*:*:UMIPS | mips:*:*:RISCos)
418 421
 	eval $set_cc_for_build
419 422
 	sed 's/^	//' << EOF >$dummy.c
... ...
@@ -437,32 +453,33 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
437 437
 	  exit (-1);
438 438
 	}
439 439
 EOF
440
-	$CC_FOR_BUILD -o $dummy $dummy.c \
441
-	  && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
442
-	  && exit 0
440
+	$CC_FOR_BUILD -o $dummy $dummy.c &&
441
+	  dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
442
+	  SYSTEM_NAME=`$dummy $dummyarg` &&
443
+	    { echo "$SYSTEM_NAME"; exit; }
443 444
 	echo mips-mips-riscos${UNAME_RELEASE}
444
-	exit 0 ;;
445
+	exit ;;
445 446
     Motorola:PowerMAX_OS:*:*)
446 447
 	echo powerpc-motorola-powermax
447
-	exit 0 ;;
448
+	exit ;;
448 449
     Motorola:*:4.3:PL8-*)
449 450
 	echo powerpc-harris-powermax
450
-	exit 0 ;;
451
+	exit ;;
451 452
     Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
452 453
 	echo powerpc-harris-powermax
453
-	exit 0 ;;
454
+	exit ;;
454 455
     Night_Hawk:Power_UNIX:*:*)
455 456
 	echo powerpc-harris-powerunix
456
-	exit 0 ;;
457
+	exit ;;
457 458
     m88k:CX/UX:7*:*)
458 459
 	echo m88k-harris-cxux7
459
-	exit 0 ;;
460
+	exit ;;
460 461
     m88k:*:4*:R4*)
461 462
 	echo m88k-motorola-sysv4
462
-	exit 0 ;;
463
+	exit ;;
463 464
     m88k:*:3*:R3*)
464 465
 	echo m88k-motorola-sysv3
465
-	exit 0 ;;
466
+	exit ;;
466 467
     AViiON:dgux:*:*)
467 468
         # DG/UX returns AViiON for all architectures
468 469
         UNAME_PROCESSOR=`/usr/bin/uname -p`
... ...
@@ -478,29 +495,29 @@ EOF
478 478
 	else
479 479
 	    echo i586-dg-dgux${UNAME_RELEASE}
480 480
 	fi
481
- 	exit 0 ;;
481
+ 	exit ;;
482 482
     M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
483 483
 	echo m88k-dolphin-sysv3
484
-	exit 0 ;;
484
+	exit ;;
485 485
     M88*:*:R3*:*)
486 486
 	# Delta 88k system running SVR3
487 487
 	echo m88k-motorola-sysv3
488
-	exit 0 ;;
488
+	exit ;;
489 489
     XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
490 490
 	echo m88k-tektronix-sysv3
491
-	exit 0 ;;
491
+	exit ;;
492 492
     Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
493 493
 	echo m68k-tektronix-bsd
494
-	exit 0 ;;
494
+	exit ;;
495 495
     *:IRIX*:*:*)
496 496
 	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
497
-	exit 0 ;;
497
+	exit ;;
498 498
     ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
499
-	echo romp-ibm-aix      # uname -m gives an 8 hex-code CPU id
500
-	exit 0 ;;              # Note that: echo "'`uname -s`'" gives 'AIX '
499
+	echo romp-ibm-aix     # uname -m gives an 8 hex-code CPU id
500
+	exit ;;               # Note that: echo "'`uname -s`'" gives 'AIX '
501 501
     i*86:AIX:*:*)
502 502
 	echo i386-ibm-aix
503
-	exit 0 ;;
503
+	exit ;;
504 504
     ia64:AIX:*:*)
505 505
 	if [ -x /usr/bin/oslevel ] ; then
506 506
 		IBM_REV=`/usr/bin/oslevel`
... ...
@@ -508,7 +525,7 @@ EOF
508 508
 		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
509 509
 	fi
510 510
 	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
511
-	exit 0 ;;
511
+	exit ;;
512 512
     *:AIX:2:3)
513 513
 	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
514 514
 		eval $set_cc_for_build
... ...
@@ -523,15 +540,19 @@ EOF
523 523
 			exit(0);
524 524
 			}
525 525
 EOF
526
-		$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
527
-		echo rs6000-ibm-aix3.2.5
526
+		if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
527
+		then
528
+			echo "$SYSTEM_NAME"
529
+		else
530
+			echo rs6000-ibm-aix3.2.5
531
+		fi
528 532
 	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
529 533
 		echo rs6000-ibm-aix3.2.4
530 534
 	else
531 535
 		echo rs6000-ibm-aix3.2
532 536
 	fi
533
-	exit 0 ;;
534
-    *:AIX:*:[45])
537
+	exit ;;
538
+    *:AIX:*:[456])
535 539
 	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
536 540
 	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
537 541
 		IBM_ARCH=rs6000
... ...
@@ -544,28 +565,28 @@ EOF
544 544
 		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
545 545
 	fi
546 546
 	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
547
-	exit 0 ;;
547
+	exit ;;
548 548
     *:AIX:*:*)
549 549
 	echo rs6000-ibm-aix
550
-	exit 0 ;;
550
+	exit ;;
551 551
     ibmrt:4.4BSD:*|romp-ibm:BSD:*)
552 552
 	echo romp-ibm-bsd4.4
553
-	exit 0 ;;
553
+	exit ;;
554 554
     ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
555 555
 	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
556
-	exit 0 ;;                           # report: romp-ibm BSD 4.3
556
+	exit ;;                             # report: romp-ibm BSD 4.3
557 557
     *:BOSX:*:*)
558 558
 	echo rs6000-bull-bosx
559
-	exit 0 ;;
559
+	exit ;;
560 560
     DPX/2?00:B.O.S.:*:*)
561 561
 	echo m68k-bull-sysv3
562
-	exit 0 ;;
562
+	exit ;;
563 563
     9000/[34]??:4.3bsd:1.*:*)
564 564
 	echo m68k-hp-bsd
565
-	exit 0 ;;
565
+	exit ;;
566 566
     hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
567 567
 	echo m68k-hp-bsd4.4
568
-	exit 0 ;;
568
+	exit ;;
569 569
     9000/[34678]??:HP-UX:*:*)
570 570
 	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
571 571
 	case "${UNAME_MACHINE}" in
... ...
@@ -627,9 +648,19 @@ EOF
627 627
 	esac
628 628
 	if [ ${HP_ARCH} = "hppa2.0w" ]
629 629
 	then
630
-	    # avoid double evaluation of $set_cc_for_build
631
-	    test -n "$CC_FOR_BUILD" || eval $set_cc_for_build
632
-	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null
630
+	    eval $set_cc_for_build
631
+
632
+	    # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
633
+	    # 32-bit code.  hppa64-hp-hpux* has the same kernel and a compiler
634
+	    # generating 64-bit code.  GNU and HP use different nomenclature:
635
+	    #
636
+	    # $ CC_FOR_BUILD=cc ./config.guess
637
+	    # => hppa2.0w-hp-hpux11.23
638
+	    # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
639
+	    # => hppa64-hp-hpux11.23
640
+
641
+	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
642
+		grep -q __LP64__
633 643
 	    then
634 644
 		HP_ARCH="hppa2.0w"
635 645
 	    else
... ...
@@ -637,11 +668,11 @@ EOF
637 637
 	    fi
638 638
 	fi
639 639
 	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
640
-	exit 0 ;;
640
+	exit ;;
641 641
     ia64:HP-UX:*:*)
642 642
 	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
643 643
 	echo ia64-hp-hpux${HPUX_REV}
644
-	exit 0 ;;
644
+	exit ;;
645 645
     3050*:HI-UX:*:*)
646 646
 	eval $set_cc_for_build
647 647
 	sed 's/^	//' << EOF >$dummy.c
... ...
@@ -669,211 +700,248 @@ EOF
669 669
 	  exit (0);
670 670
 	}
671 671
 EOF
672
-	$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
672
+	$CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
673
+		{ echo "$SYSTEM_NAME"; exit; }
673 674
 	echo unknown-hitachi-hiuxwe2
674
-	exit 0 ;;
675
+	exit ;;
675 676
     9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
676 677
 	echo hppa1.1-hp-bsd
677
-	exit 0 ;;
678
+	exit ;;
678 679
     9000/8??:4.3bsd:*:*)
679 680
 	echo hppa1.0-hp-bsd
680
-	exit 0 ;;
681
+	exit ;;
681 682
     *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
682 683
 	echo hppa1.0-hp-mpeix
683
-	exit 0 ;;
684
+	exit ;;
684 685
     hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
685 686
 	echo hppa1.1-hp-osf
686
-	exit 0 ;;
687
+	exit ;;
687 688
     hp8??:OSF1:*:*)
688 689
 	echo hppa1.0-hp-osf
689
-	exit 0 ;;
690
+	exit ;;
690 691
     i*86:OSF1:*:*)
691 692
 	if [ -x /usr/sbin/sysversion ] ; then
692 693
 	    echo ${UNAME_MACHINE}-unknown-osf1mk
693 694
 	else
694 695
 	    echo ${UNAME_MACHINE}-unknown-osf1
695 696
 	fi
696
-	exit 0 ;;
697
+	exit ;;
697 698
     parisc*:Lites*:*:*)
698 699
 	echo hppa1.1-hp-lites
699
-	exit 0 ;;
700
+	exit ;;
700 701
     C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
701 702
 	echo c1-convex-bsd
702
-        exit 0 ;;
703
+        exit ;;
703 704
     C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
704 705
 	if getsysinfo -f scalar_acc
705 706
 	then echo c32-convex-bsd
706 707
 	else echo c2-convex-bsd
707 708
 	fi
708
-        exit 0 ;;
709
+        exit ;;
709 710
     C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
710 711
 	echo c34-convex-bsd
711
-        exit 0 ;;
712
+        exit ;;
712 713
     C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
713 714
 	echo c38-convex-bsd
714
-        exit 0 ;;
715
+        exit ;;
715 716
     C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
716 717
 	echo c4-convex-bsd
717
-        exit 0 ;;
718
+        exit ;;
718 719
     CRAY*Y-MP:*:*:*)
719 720
 	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
720
-	exit 0 ;;
721
+	exit ;;
721 722
     CRAY*[A-Z]90:*:*:*)
722 723
 	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
723 724
 	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
724 725
 	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
725 726
 	      -e 's/\.[^.]*$/.X/'
726
-	exit 0 ;;
727
+	exit ;;
727 728
     CRAY*TS:*:*:*)
728 729
 	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
729
-	exit 0 ;;
730
+	exit ;;
730 731
     CRAY*T3E:*:*:*)
731 732
 	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
732
-	exit 0 ;;
733
+	exit ;;
733 734
     CRAY*SV1:*:*:*)
734 735
 	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
735
-	exit 0 ;;
736
+	exit ;;
736 737
     *:UNICOS/mp:*:*)
737
-	echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' 
738
-	exit 0 ;;
738
+	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
739
+	exit ;;
739 740
     F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
740 741
 	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
741 742
         FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
742 743
         FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
743 744
         echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
744
-        exit 0 ;;
745
+        exit ;;
746
+    5000:UNIX_System_V:4.*:*)
747
+        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
748
+        FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
749
+        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
750
+	exit ;;
745 751
     i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
746 752
 	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
747
-	exit 0 ;;
753
+	exit ;;
748 754
     sparc*:BSD/OS:*:*)
749 755
 	echo sparc-unknown-bsdi${UNAME_RELEASE}
750
-	exit 0 ;;
756
+	exit ;;
751 757
     *:BSD/OS:*:*)
752 758
 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
753
-	exit 0 ;;
754
-    *:FreeBSD:*:*|*:GNU/FreeBSD:*:*)
755
-	# Determine whether the default compiler uses glibc.
756
-	eval $set_cc_for_build
757
-	sed 's/^	//' << EOF >$dummy.c
758
-	#include <features.h>
759
-	#if __GLIBC__ >= 2
760
-	LIBC=gnu
761
-	#else
762
-	LIBC=
763
-	#endif
764
-EOF
765
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
766
-	# GNU/FreeBSD systems have a "k" prefix to indicate we are using
767
-	# FreeBSD's kernel, but not the complete OS.
768
-	case ${LIBC} in gnu) kernel_only='k' ;; esac
769
-	echo ${UNAME_MACHINE}-unknown-${kernel_only}freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC}
770
-	exit 0 ;;
759
+	exit ;;
760
+    *:FreeBSD:*:*)
761
+	case ${UNAME_MACHINE} in
762
+	    pc98)
763
+		echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
764
+	    amd64)
765
+		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
766
+	    *)
767
+		echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
768
+	esac
769
+	exit ;;
771 770
     i*:CYGWIN*:*)
772 771
 	echo ${UNAME_MACHINE}-pc-cygwin
773
-	exit 0 ;;
774
-    i*:MINGW*:*)
772
+	exit ;;
773
+    *:MINGW*:*)
775 774
 	echo ${UNAME_MACHINE}-pc-mingw32
776
-	exit 0 ;;
775
+	exit ;;
776
+    i*:windows32*:*)
777
+    	# uname -m includes "-pc" on this system.
778
+    	echo ${UNAME_MACHINE}-mingw32
779
+	exit ;;
777 780
     i*:PW*:*)
778 781
 	echo ${UNAME_MACHINE}-pc-pw32
779
-	exit 0 ;;
780
-    x86:Interix*:[34]*)
781
-	echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
782
-	exit 0 ;;
782
+	exit ;;
783
+    *:Interix*:*)
784
+    	case ${UNAME_MACHINE} in
785
+	    x86)
786
+		echo i586-pc-interix${UNAME_RELEASE}
787
+		exit ;;
788
+	    authenticamd | genuineintel | EM64T)
789
+		echo x86_64-unknown-interix${UNAME_RELEASE}
790
+		exit ;;
791
+	    IA64)
792
+		echo ia64-unknown-interix${UNAME_RELEASE}
793
+		exit ;;
794
+	esac ;;
783 795
     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
784 796
 	echo i${UNAME_MACHINE}-pc-mks
785
-	exit 0 ;;
797
+	exit ;;
798
+    8664:Windows_NT:*)
799
+	echo x86_64-pc-mks
800
+	exit ;;
786 801
     i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
787 802
 	# How do we know it's Interix rather than the generic POSIX subsystem?
788 803
 	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
789 804
 	# UNAME_MACHINE based on the output of uname instead of i386?
790 805
 	echo i586-pc-interix
791
-	exit 0 ;;
806
+	exit ;;
792 807
     i*:UWIN*:*)
793 808
 	echo ${UNAME_MACHINE}-pc-uwin
794
-	exit 0 ;;
809
+	exit ;;
810
+    amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
811
+	echo x86_64-unknown-cygwin
812
+	exit ;;
795 813
     p*:CYGWIN*:*)
796 814
 	echo powerpcle-unknown-cygwin
797
-	exit 0 ;;
815
+	exit ;;
798 816
     prep*:SunOS:5.*:*)
799 817
 	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
800
-	exit 0 ;;
818
+	exit ;;
801 819
     *:GNU:*:*)
820
+	# the GNU system
802 821
 	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
803
-	exit 0 ;;
822
+	exit ;;
823
+    *:GNU/*:*:*)
824
+	# other systems with GNU libc and userland
825
+	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
826
+	exit ;;
804 827
     i*86:Minix:*:*)
805 828
 	echo ${UNAME_MACHINE}-pc-minix
806
-	exit 0 ;;
829
+	exit ;;
830
+    alpha:Linux:*:*)
831
+	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
832
+	  EV5)   UNAME_MACHINE=alphaev5 ;;
833
+	  EV56)  UNAME_MACHINE=alphaev56 ;;
834
+	  PCA56) UNAME_MACHINE=alphapca56 ;;
835
+	  PCA57) UNAME_MACHINE=alphapca56 ;;
836
+	  EV6)   UNAME_MACHINE=alphaev6 ;;
837
+	  EV67)  UNAME_MACHINE=alphaev67 ;;
838
+	  EV68*) UNAME_MACHINE=alphaev68 ;;
839
+        esac
840
+	objdump --private-headers /bin/sh | grep -q ld.so.1
841
+	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
842
+	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
843
+	exit ;;
807 844
     arm*:Linux:*:*)
845
+	eval $set_cc_for_build
846
+	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
847
+	    | grep -q __ARM_EABI__
848
+	then
849
+	    echo ${UNAME_MACHINE}-unknown-linux-gnu
850
+	else
851
+	    echo ${UNAME_MACHINE}-unknown-linux-gnueabi
852
+	fi
853
+	exit ;;
854
+    avr32*:Linux:*:*)
808 855
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
809
-	exit 0 ;;
856
+	exit ;;
810 857
     cris:Linux:*:*)
811 858
 	echo cris-axis-linux-gnu
812
-	exit 0 ;;
813
-    ia64:Linux:*:*)
814
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
815
-	exit 0 ;;
816
-    m68*:Linux:*:*)
817
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
818
-	exit 0 ;;
819
-    mips:Linux:*:*)
859
+	exit ;;
860
+    crisv32:Linux:*:*)
861
+	echo crisv32-axis-linux-gnu
862
+	exit ;;
863
+    frv:Linux:*:*)
864
+    	echo frv-unknown-linux-gnu
865
+	exit ;;
866
+    i*86:Linux:*:*)
867
+	LIBC=gnu
820 868
 	eval $set_cc_for_build
821 869
 	sed 's/^	//' << EOF >$dummy.c
822
-	#undef CPU
823
-	#undef mips
824
-	#undef mipsel
825
-	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
826
-	CPU=mipsel
827
-	#else
828
-	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
829
-	CPU=mips
830
-	#else
831
-	CPU=
832
-	#endif
870
+	#ifdef __dietlibc__
871
+	LIBC=dietlibc
833 872
 	#endif
834 873
 EOF
835
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
836
-	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
837
-	;;
838
-    mips64:Linux:*:*)
874
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
875
+	echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
876
+	exit ;;
877
+    ia64:Linux:*:*)
878
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
879
+	exit ;;
880
+    m32r*:Linux:*:*)
881
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
882
+	exit ;;
883
+    m68*:Linux:*:*)
884
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
885
+	exit ;;
886
+    mips:Linux:*:* | mips64:Linux:*:*)
839 887
 	eval $set_cc_for_build
840 888
 	sed 's/^	//' << EOF >$dummy.c
841 889
 	#undef CPU
842
-	#undef mips64
843
-	#undef mips64el
890
+	#undef ${UNAME_MACHINE}
891
+	#undef ${UNAME_MACHINE}el
844 892
 	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
845
-	CPU=mips64el
893
+	CPU=${UNAME_MACHINE}el
846 894
 	#else
847 895
 	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
848
-	CPU=mips64
896
+	CPU=${UNAME_MACHINE}
849 897
 	#else
850 898
 	CPU=
851 899
 	#endif
852 900
 	#endif
853 901
 EOF
854
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
855
-	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
902
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
903
+	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
856 904
 	;;
857
-    ppc:Linux:*:*)
858
-	echo powerpc-unknown-linux-gnu
859
-	exit 0 ;;
860
-    ppc64:Linux:*:*)
861
-	echo powerpc64-unknown-linux-gnu
862
-	exit 0 ;;
863
-    alpha:Linux:*:*)
864
-	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
865
-	  EV5)   UNAME_MACHINE=alphaev5 ;;
866
-	  EV56)  UNAME_MACHINE=alphaev56 ;;
867
-	  PCA56) UNAME_MACHINE=alphapca56 ;;
868
-	  PCA57) UNAME_MACHINE=alphapca56 ;;
869
-	  EV6)   UNAME_MACHINE=alphaev6 ;;
870
-	  EV67)  UNAME_MACHINE=alphaev67 ;;
871
-	  EV68*) UNAME_MACHINE=alphaev68 ;;
872
-        esac
873
-	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
874
-	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
875
-	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
876
-	exit 0 ;;
905
+    or32:Linux:*:*)
906
+	echo or32-unknown-linux-gnu
907
+	exit ;;
908
+    padre:Linux:*:*)
909
+	echo sparc-unknown-linux-gnu
910
+	exit ;;
911
+    parisc64:Linux:*:* | hppa64:Linux:*:*)
912
+	echo hppa64-unknown-linux-gnu
913
+	exit ;;
877 914
     parisc:Linux:*:* | hppa:Linux:*:*)
878 915
 	# Look for CPU level
879 916
 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
... ...
@@ -881,84 +949,40 @@ EOF
881 881
 	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
882 882
 	  *)    echo hppa-unknown-linux-gnu ;;
883 883
 	esac
884
-	exit 0 ;;
885
-    parisc64:Linux:*:* | hppa64:Linux:*:*)
886
-	echo hppa64-unknown-linux-gnu
887
-	exit 0 ;;
884
+	exit ;;
885
+    ppc64:Linux:*:*)
886
+	echo powerpc64-unknown-linux-gnu
887
+	exit ;;
888
+    ppc:Linux:*:*)
889
+	echo powerpc-unknown-linux-gnu
890
+	exit ;;
888 891
     s390:Linux:*:* | s390x:Linux:*:*)
889 892
 	echo ${UNAME_MACHINE}-ibm-linux
890
-	exit 0 ;;
893
+	exit ;;
891 894
     sh64*:Linux:*:*)
892 895
     	echo ${UNAME_MACHINE}-unknown-linux-gnu
893
-	exit 0 ;;
896
+	exit ;;
894 897
     sh*:Linux:*:*)
895 898
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
896
-	exit 0 ;;
899
+	exit ;;
897 900
     sparc:Linux:*:* | sparc64:Linux:*:*)
898 901
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
899
-	exit 0 ;;
902
+	exit ;;
903
+    vax:Linux:*:*)
904
+	echo ${UNAME_MACHINE}-dec-linux-gnu
905
+	exit ;;
900 906
     x86_64:Linux:*:*)
901 907
 	echo x86_64-unknown-linux-gnu
902
-	exit 0 ;;
903
-    i*86:Linux:*:*)
904
-	# The BFD linker knows what the default object file format is, so
905
-	# first see if it will tell us. cd to the root directory to prevent
906
-	# problems with other programs or directories called `ld' in the path.
907
-	# Set LC_ALL=C to ensure ld outputs messages in English.
908
-	ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
909
-			 | sed -ne '/supported targets:/!d
910
-				    s/[ 	][ 	]*/ /g
911
-				    s/.*supported targets: *//
912
-				    s/ .*//
913
-				    p'`
914
-        case "$ld_supported_targets" in
915
-	  elf32-i386)
916
-		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
917
-		;;
918
-	  a.out-i386-linux)
919
-		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
920
-		exit 0 ;;
921
-	  coff-i386)
922
-		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
923
-		exit 0 ;;
924
-	  "")
925
-		# Either a pre-BFD a.out linker (linux-gnuoldld) or
926
-		# one that does not give us useful --help.
927
-		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
928
-		exit 0 ;;
929
-	esac
930
-	# Determine whether the default compiler is a.out or elf
931
-	eval $set_cc_for_build
932
-	sed 's/^	//' << EOF >$dummy.c
933
-	#include <features.h>
934
-	#ifdef __ELF__
935
-	# ifdef __GLIBC__
936
-	#  if __GLIBC__ >= 2
937
-	LIBC=gnu
938
-	#  else
939
-	LIBC=gnulibc1
940
-	#  endif
941
-	# else
942
-	LIBC=gnulibc1
943
-	# endif
944
-	#else
945
-	#ifdef __INTEL_COMPILER
946
-	LIBC=gnu
947
-	#else
948
-	LIBC=gnuaout
949
-	#endif
950
-	#endif
951
-EOF
952
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
953
-	test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
954
-	test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
955
-	;;
908
+	exit ;;
909
+    xtensa*:Linux:*:*)
910
+    	echo ${UNAME_MACHINE}-unknown-linux-gnu
911
+	exit ;;
956 912
     i*86:DYNIX/ptx:4*:*)
957 913
 	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
958 914
 	# earlier versions are messed up and put the nodename in both
959 915
 	# sysname and nodename.
960 916
 	echo i386-sequent-sysv4
961
-	exit 0 ;;
917
+	exit ;;
962 918
     i*86:UNIX_SV:4.2MP:2.*)
963 919
         # Unixware is an offshoot of SVR4, but it has its own version
964 920
         # number series starting with 2...
... ...
@@ -966,24 +990,27 @@ EOF
966 966
 	# I just have to hope.  -- rms.
967 967
         # Use sysv4.2uw... so that sysv4* matches it.
968 968
 	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
969
-	exit 0 ;;
969
+	exit ;;
970 970
     i*86:OS/2:*:*)
971 971
 	# If we were able to find `uname', then EMX Unix compatibility
972 972
 	# is probably installed.
973 973
 	echo ${UNAME_MACHINE}-pc-os2-emx
974
-	exit 0 ;;
974
+	exit ;;
975 975
     i*86:XTS-300:*:STOP)
976 976
 	echo ${UNAME_MACHINE}-unknown-stop
977
-	exit 0 ;;
977
+	exit ;;
978 978
     i*86:atheos:*:*)
979 979
 	echo ${UNAME_MACHINE}-unknown-atheos
980
-	exit 0 ;;
981
-    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
980
+	exit ;;
981
+    i*86:syllable:*:*)
982
+	echo ${UNAME_MACHINE}-pc-syllable
983
+	exit ;;
984
+    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
982 985
 	echo i386-unknown-lynxos${UNAME_RELEASE}
983
-	exit 0 ;;
986
+	exit ;;
984 987
     i*86:*DOS:*:*)
985 988
 	echo ${UNAME_MACHINE}-pc-msdosdjgpp
986
-	exit 0 ;;
989
+	exit ;;
987 990
     i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
988 991
 	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
989 992
 	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
... ...
@@ -991,15 +1018,16 @@ EOF
991 991
 	else
992 992
 		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
993 993
 	fi
994
-	exit 0 ;;
995
-    i*86:*:5:[78]*)
994
+	exit ;;
995
+    i*86:*:5:[678]*)
996
+    	# UnixWare 7.x, OpenUNIX and OpenServer 6.
996 997
 	case `/bin/uname -X | grep "^Machine"` in
997 998
 	    *486*)	     UNAME_MACHINE=i486 ;;
998 999
 	    *Pentium)	     UNAME_MACHINE=i586 ;;
999 1000
 	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
1000 1001
 	esac
1001 1002
 	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
1002
-	exit 0 ;;
1003
+	exit ;;
1003 1004
     i*86:*:3.2:*)
1004 1005
 	if test -f /usr/options/cb.name; then
1005 1006
 		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
... ...
@@ -1017,73 +1045,86 @@ EOF
1017 1017
 	else
1018 1018
 		echo ${UNAME_MACHINE}-pc-sysv32
1019 1019
 	fi
1020
-	exit 0 ;;
1020
+	exit ;;
1021 1021
     pc:*:*:*)
1022 1022
 	# Left here for compatibility:
1023 1023
         # uname -m prints for DJGPP always 'pc', but it prints nothing about
1024
-        # the processor, so we play safe by assuming i386.
1025
-	echo i386-pc-msdosdjgpp
1026
-        exit 0 ;;
1024
+        # the processor, so we play safe by assuming i586.
1025
+	# Note: whatever this is, it MUST be the same as what config.sub
1026
+	# prints for the "djgpp" host, or else GDB configury will decide that
1027
+	# this is a cross-build.
1028
+	echo i586-pc-msdosdjgpp
1029
+        exit ;;
1027 1030
     Intel:Mach:3*:*)
1028 1031
 	echo i386-pc-mach3
1029
-	exit 0 ;;
1032
+	exit ;;
1030 1033
     paragon:*:*:*)
1031 1034
 	echo i860-intel-osf1
1032
-	exit 0 ;;
1035
+	exit ;;
1033 1036
     i860:*:4.*:*) # i860-SVR4
1034 1037
 	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
1035 1038
 	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
1036 1039
 	else # Add other i860-SVR4 vendors below as they are discovered.
1037 1040
 	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
1038 1041
 	fi
1039
-	exit 0 ;;
1042
+	exit ;;
1040 1043
     mini*:CTIX:SYS*5:*)
1041 1044
 	# "miniframe"
1042 1045
 	echo m68010-convergent-sysv
1043
-	exit 0 ;;
1046
+	exit ;;
1044 1047
     mc68k:UNIX:SYSTEM5:3.51m)
1045 1048
 	echo m68k-convergent-sysv
1046
-	exit 0 ;;
1049
+	exit ;;
1047 1050
     M680?0:D-NIX:5.3:*)
1048 1051
 	echo m68k-diab-dnix
1049
-	exit 0 ;;
1050
-    M68*:*:R3V[567]*:*)
1051
-	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
1052
-    3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0)
1052
+	exit ;;
1053
+    M68*:*:R3V[5678]*:*)
1054
+	test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
1055
+    3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
1053 1056
 	OS_REL=''
1054 1057
 	test -r /etc/.relid \
1055 1058
 	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
1056 1059
 	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
1057
-	  && echo i486-ncr-sysv4.3${OS_REL} && exit 0
1060
+	  && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
1058 1061
 	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
1059
-	  && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;;
1062
+	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
1060 1063
     3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
1061 1064
         /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
1062
-          && echo i486-ncr-sysv4 && exit 0 ;;
1065
+          && { echo i486-ncr-sysv4; exit; } ;;
1066
+    NCR*:*:4.2:* | MPRAS*:*:4.2:*)
1067
+	OS_REL='.3'
1068
+	test -r /etc/.relid \
1069
+	    && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
1070
+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
1071
+	    && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
1072
+	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
1073
+	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
1074
+	/bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
1075
+	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
1063 1076
     m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
1064 1077
 	echo m68k-unknown-lynxos${UNAME_RELEASE}
1065
-	exit 0 ;;
1078
+	exit ;;
1066 1079
     mc68030:UNIX_System_V:4.*:*)
1067 1080
 	echo m68k-atari-sysv4
1068
-	exit 0 ;;
1081
+	exit ;;
1069 1082
     TSUNAMI:LynxOS:2.*:*)
1070 1083
 	echo sparc-unknown-lynxos${UNAME_RELEASE}
1071
-	exit 0 ;;
1084
+	exit ;;
1072 1085
     rs6000:LynxOS:2.*:*)
1073 1086
 	echo rs6000-unknown-lynxos${UNAME_RELEASE}
1074
-	exit 0 ;;
1075
-    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
1087
+	exit ;;
1088
+    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
1076 1089
 	echo powerpc-unknown-lynxos${UNAME_RELEASE}
1077
-	exit 0 ;;
1090
+	exit ;;
1078 1091
     SM[BE]S:UNIX_SV:*:*)
1079 1092
 	echo mips-dde-sysv${UNAME_RELEASE}
1080
-	exit 0 ;;
1093
+	exit ;;
1081 1094
     RM*:ReliantUNIX-*:*:*)
1082 1095
 	echo mips-sni-sysv4
1083
-	exit 0 ;;
1096
+	exit ;;
1084 1097
     RM*:SINIX-*:*:*)
1085 1098
 	echo mips-sni-sysv4
1086
-	exit 0 ;;
1099
+	exit ;;
1087 1100
     *:SINIX-*:*:*)
1088 1101
 	if uname -p 2>/dev/null >/dev/null ; then
1089 1102
 		UNAME_MACHINE=`(uname -p) 2>/dev/null`
... ...
@@ -1091,68 +1132,94 @@ EOF
1091 1091
 	else
1092 1092
 		echo ns32k-sni-sysv
1093 1093
 	fi
1094
-	exit 0 ;;
1094
+	exit ;;
1095 1095
     PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
1096 1096
                       # says <Richard.M.Bartel@ccMail.Census.GOV>
1097 1097
         echo i586-unisys-sysv4
1098
-        exit 0 ;;
1098
+        exit ;;
1099 1099
     *:UNIX_System_V:4*:FTX*)
1100 1100
 	# From Gerald Hewes <hewes@openmarket.com>.
1101 1101
 	# How about differentiating between stratus architectures? -djm
1102 1102
 	echo hppa1.1-stratus-sysv4
1103
-	exit 0 ;;
1103
+	exit ;;
1104 1104
     *:*:*:FTX*)
1105 1105
 	# From seanf@swdc.stratus.com.
1106 1106
 	echo i860-stratus-sysv4
1107
-	exit 0 ;;
1107
+	exit ;;
1108
+    i*86:VOS:*:*)
1109
+	# From Paul.Green@stratus.com.
1110
+	echo ${UNAME_MACHINE}-stratus-vos
1111
+	exit ;;
1108 1112
     *:VOS:*:*)
1109 1113
 	# From Paul.Green@stratus.com.
1110 1114
 	echo hppa1.1-stratus-vos
1111
-	exit 0 ;;
1115
+	exit ;;
1112 1116
     mc68*:A/UX:*:*)
1113 1117
 	echo m68k-apple-aux${UNAME_RELEASE}
1114
-	exit 0 ;;
1118
+	exit ;;
1115 1119
     news*:NEWS-OS:6*:*)
1116 1120
 	echo mips-sony-newsos6
1117
-	exit 0 ;;
1121
+	exit ;;
1118 1122
     R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
1119 1123
 	if [ -d /usr/nec ]; then
1120 1124
 	        echo mips-nec-sysv${UNAME_RELEASE}
1121 1125
 	else
1122 1126
 	        echo mips-unknown-sysv${UNAME_RELEASE}
1123 1127
 	fi
1124
-        exit 0 ;;
1128
+        exit ;;
1125 1129
     BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
1126 1130
 	echo powerpc-be-beos
1127
-	exit 0 ;;
1131
+	exit ;;
1128 1132
     BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
1129 1133
 	echo powerpc-apple-beos
1130
-	exit 0 ;;
1134
+	exit ;;
1131 1135
     BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
1132 1136
 	echo i586-pc-beos
1133
-	exit 0 ;;
1137
+	exit ;;
1138
+    BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
1139
+	echo i586-pc-haiku
1140
+	exit ;;
1134 1141
     SX-4:SUPER-UX:*:*)
1135 1142
 	echo sx4-nec-superux${UNAME_RELEASE}
1136
-	exit 0 ;;
1143
+	exit ;;
1137 1144
     SX-5:SUPER-UX:*:*)
1138 1145
 	echo sx5-nec-superux${UNAME_RELEASE}
1139
-	exit 0 ;;
1146
+	exit ;;
1140 1147
     SX-6:SUPER-UX:*:*)
1141 1148
 	echo sx6-nec-superux${UNAME_RELEASE}
1142
-	exit 0 ;;
1149
+	exit ;;
1150
+    SX-7:SUPER-UX:*:*)
1151
+	echo sx7-nec-superux${UNAME_RELEASE}
1152
+	exit ;;
1153
+    SX-8:SUPER-UX:*:*)
1154
+	echo sx8-nec-superux${UNAME_RELEASE}
1155
+	exit ;;
1156
+    SX-8R:SUPER-UX:*:*)
1157
+	echo sx8r-nec-superux${UNAME_RELEASE}
1158
+	exit ;;
1143 1159
     Power*:Rhapsody:*:*)
1144 1160
 	echo powerpc-apple-rhapsody${UNAME_RELEASE}
1145
-	exit 0 ;;
1161
+	exit ;;
1146 1162
     *:Rhapsody:*:*)
1147 1163
 	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
1148
-	exit 0 ;;
1164
+	exit ;;
1149 1165
     *:Darwin:*:*)
1150
-	case `uname -p` in
1151
-	    *86) UNAME_PROCESSOR=i686 ;;
1152
-	    powerpc) UNAME_PROCESSOR=powerpc ;;
1166
+	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
1167
+	case $UNAME_PROCESSOR in
1168
+	    i386)
1169
+		eval $set_cc_for_build
1170
+		if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
1171
+		  if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
1172
+		      (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
1173
+		      grep IS_64BIT_ARCH >/dev/null
1174
+		  then
1175
+		      UNAME_PROCESSOR="x86_64"
1176
+		  fi
1177
+		fi ;;
1178
+	    unknown) UNAME_PROCESSOR=powerpc ;;
1153 1179
 	esac
1154 1180
 	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
1155
-	exit 0 ;;
1181
+	exit ;;
1156 1182
     *:procnto*:*:* | *:QNX:[0123456789]*:*)
1157 1183
 	UNAME_PROCESSOR=`uname -p`
1158 1184
 	if test "$UNAME_PROCESSOR" = "x86"; then
... ...
@@ -1160,22 +1227,25 @@ EOF
1160 1160
 		UNAME_MACHINE=pc
1161 1161
 	fi
1162 1162
 	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
1163
-	exit 0 ;;
1163
+	exit ;;
1164 1164
     *:QNX:*:4*)
1165 1165
 	echo i386-pc-qnx
1166
-	exit 0 ;;
1167
-    NSR-[DGKLNPTVW]:NONSTOP_KERNEL:*:*)
1166
+	exit ;;
1167
+    NSE-?:NONSTOP_KERNEL:*:*)
1168
+	echo nse-tandem-nsk${UNAME_RELEASE}
1169
+	exit ;;
1170
+    NSR-?:NONSTOP_KERNEL:*:*)
1168 1171
 	echo nsr-tandem-nsk${UNAME_RELEASE}
1169
-	exit 0 ;;
1172
+	exit ;;
1170 1173
     *:NonStop-UX:*:*)
1171 1174
 	echo mips-compaq-nonstopux
1172
-	exit 0 ;;
1175
+	exit ;;
1173 1176
     BS2000:POSIX*:*:*)
1174 1177
 	echo bs2000-siemens-sysv
1175
-	exit 0 ;;
1178
+	exit ;;
1176 1179
     DS/*:UNIX_System_V:*:*)
1177 1180
 	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
1178
-	exit 0 ;;
1181
+	exit ;;
1179 1182
     *:Plan9:*:*)
1180 1183
 	# "uname -m" is not consistent, so use $cputype instead. 386
1181 1184
 	# is converted to i386 for consistency with other x86
... ...
@@ -1186,28 +1256,50 @@ EOF
1186 1186
 	    UNAME_MACHINE="$cputype"
1187 1187
 	fi
1188 1188
 	echo ${UNAME_MACHINE}-unknown-plan9
1189
-	exit 0 ;;
1189
+	exit ;;
1190 1190
     *:TOPS-10:*:*)
1191 1191
 	echo pdp10-unknown-tops10
1192
-	exit 0 ;;
1192
+	exit ;;
1193 1193
     *:TENEX:*:*)
1194 1194
 	echo pdp10-unknown-tenex
1195
-	exit 0 ;;
1195
+	exit ;;
1196 1196
     KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
1197 1197
 	echo pdp10-dec-tops20
1198
-	exit 0 ;;
1198
+	exit ;;
1199 1199
     XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
1200 1200
 	echo pdp10-xkl-tops20
1201
-	exit 0 ;;
1201
+	exit ;;
1202 1202
     *:TOPS-20:*:*)
1203 1203
 	echo pdp10-unknown-tops20
1204
-	exit 0 ;;
1204
+	exit ;;
1205 1205
     *:ITS:*:*)
1206 1206
 	echo pdp10-unknown-its
1207
-	exit 0 ;;
1207
+	exit ;;
1208 1208
     SEI:*:*:SEIUX)
1209 1209
         echo mips-sei-seiux${UNAME_RELEASE}
1210
-	exit 0 ;;
1210
+	exit ;;
1211
+    *:DragonFly:*:*)
1212
+	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
1213
+	exit ;;
1214
+    *:*VMS:*:*)
1215
+    	UNAME_MACHINE=`(uname -p) 2>/dev/null`
1216
+	case "${UNAME_MACHINE}" in
1217
+	    A*) echo alpha-dec-vms ; exit ;;
1218
+	    I*) echo ia64-dec-vms ; exit ;;
1219
+	    V*) echo vax-dec-vms ; exit ;;
1220
+	esac ;;
1221
+    *:XENIX:*:SysV)
1222
+	echo i386-pc-xenix
1223
+	exit ;;
1224
+    i*86:skyos:*:*)
1225
+	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
1226
+	exit ;;
1227
+    i*86:rdos:*:*)
1228
+	echo ${UNAME_MACHINE}-pc-rdos
1229
+	exit ;;
1230
+    i*86:AROS:*:*)
1231
+	echo ${UNAME_MACHINE}-pc-aros
1232
+	exit ;;
1211 1233
 esac
1212 1234
 
1213 1235
 #echo '(No uname command or uname output not recognized.)' 1>&2
... ...
@@ -1239,7 +1331,7 @@ main ()
1239 1239
 #endif
1240 1240
 
1241 1241
 #if defined (__arm) && defined (__acorn) && defined (__unix)
1242
-  printf ("arm-acorn-riscix"); exit (0);
1242
+  printf ("arm-acorn-riscix\n"); exit (0);
1243 1243
 #endif
1244 1244
 
1245 1245
 #if defined (hp300) && !defined (hpux)
... ...
@@ -1328,11 +1420,12 @@ main ()
1328 1328
 }
1329 1329
 EOF
1330 1330
 
1331
-$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0
1331
+$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
1332
+	{ echo "$SYSTEM_NAME"; exit; }
1332 1333
 
1333 1334
 # Apollos put the system type in the environment.
1334 1335
 
1335
-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; }
1336
+test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
1336 1337
 
1337 1338
 # Convex versions that predate uname can use getsysinfo(1)
1338 1339
 
... ...
@@ -1341,22 +1434,22 @@ then
1341 1341
     case `getsysinfo -f cpu_type` in
1342 1342
     c1*)
1343 1343
 	echo c1-convex-bsd
1344
-	exit 0 ;;
1344
+	exit ;;
1345 1345
     c2*)
1346 1346
 	if getsysinfo -f scalar_acc
1347 1347
 	then echo c32-convex-bsd
1348 1348
 	else echo c2-convex-bsd
1349 1349
 	fi
1350
-	exit 0 ;;
1350
+	exit ;;
1351 1351
     c34*)
1352 1352
 	echo c34-convex-bsd
1353
-	exit 0 ;;
1353
+	exit ;;
1354 1354
     c38*)
1355 1355
 	echo c38-convex-bsd
1356
-	exit 0 ;;
1356
+	exit ;;
1357 1357
     c4*)
1358 1358
 	echo c4-convex-bsd
1359
-	exit 0 ;;
1359
+	exit ;;
1360 1360
     esac
1361 1361
 fi
1362 1362
 
... ...
@@ -1367,7 +1460,9 @@ This script, last modified $timestamp, has failed to recognize
1367 1367
 the operating system you are using. It is advised that you
1368 1368
 download the most up to date version of the config scripts from
1369 1369
 
1370
-    ftp://ftp.gnu.org/pub/gnu/config/
1370
+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
1371
+and
1372
+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
1371 1373
 
1372 1374
 If the version you run ($0) is already up to date, please
1373 1375
 send the following data and any information you think might be
... ...
@@ -1,9 +1,10 @@
1 1
 #! /bin/sh
2 2
 # Configuration validation subroutine script.
3 3
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
4
-#   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
4
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
5
+#   Free Software Foundation, Inc.
5 6
 
6
-timestamp='2003-07-04'
7
+timestamp='2010-01-22'
7 8
 
8 9
 # This file is (in principle) common to ALL GNU software.
9 10
 # The presence of a machine in this file suggests that SOME GNU software
... ...
@@ -21,22 +22,26 @@ timestamp='2003-07-04'
21 21
 #
22 22
 # You should have received a copy of the GNU General Public License
23 23
 # along with this program; if not, write to the Free Software
24
-# Foundation, Inc., 59 Temple Place - Suite 330,
25
-# Boston, MA 02111-1307, USA.
26
-
24
+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
25
+# 02110-1301, USA.
26
+#
27 27
 # As a special exception to the GNU General Public License, if you
28 28
 # distribute this file as part of a program that contains a
29 29
 # configuration script generated by Autoconf, you may include it under
30 30
 # the same distribution terms that you use for the rest of that program.
31 31
 
32
+
32 33
 # Please send patches to <config-patches@gnu.org>.  Submit a context
33
-# diff and a properly formatted ChangeLog entry.
34
+# diff and a properly formatted GNU ChangeLog entry.
34 35
 #
35 36
 # Configuration subroutine to validate and canonicalize a configuration type.
36 37
 # Supply the specified configuration type as an argument.
37 38
 # If it is invalid, we print an error message on stderr and exit with code 1.
38 39
 # Otherwise, we print the canonical config type on stdout and succeed.
39 40
 
41
+# You can get the latest version of this script from:
42
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
43
+
40 44
 # This file is supposed to be the same for all GNU packages
41 45
 # and recognize all the CPU types, system types and aliases
42 46
 # that are meaningful with *any* GNU software.
... ...
@@ -70,8 +75,9 @@ Report bugs and patches to <config-patches@gnu.org>."
70 70
 version="\
71 71
 GNU config.sub ($timestamp)
72 72
 
73
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
74
-Free Software Foundation, Inc.
73
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
74
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
75
+Software Foundation, Inc.
75 76
 
76 77
 This is free software; see the source for copying conditions.  There is NO
77 78
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
... ...
@@ -83,11 +89,11 @@ Try \`$me --help' for more information."
83 83
 while test $# -gt 0 ; do
84 84
   case $1 in
85 85
     --time-stamp | --time* | -t )
86
-       echo "$timestamp" ; exit 0 ;;
86
+       echo "$timestamp" ; exit ;;
87 87
     --version | -v )
88
-       echo "$version" ; exit 0 ;;
88
+       echo "$version" ; exit ;;
89 89
     --help | --h* | -h )
90
-       echo "$usage"; exit 0 ;;
90
+       echo "$usage"; exit ;;
91 91
     -- )     # Stop option processing
92 92
        shift; break ;;
93 93
     - )	# Use stdin as input.
... ...
@@ -99,7 +105,7 @@ while test $# -gt 0 ; do
99 99
     *local*)
100 100
        # First pass through any local machine types.
101 101
        echo $1
102
-       exit 0;;
102
+       exit ;;
103 103
 
104 104
     * )
105 105
        break ;;
... ...
@@ -118,7 +124,10 @@ esac
118 118
 # Here we must recognize all the valid KERNEL-OS combinations.
119 119
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
120 120
 case $maybe_os in
121
-  nto-qnx* | linux-gnu* | kfreebsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
121
+  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
122
+  uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
123
+  kopensolaris*-gnu* | \
124
+  storm-chaos* | os2-emx* | rtmk-nova*)
122 125
     os=-$maybe_os
123 126
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
124 127
     ;;
... ...
@@ -144,10 +153,13 @@ case $os in
144 144
 	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
145 145
 	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
146 146
 	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
147
-	-apple | -axis)
147
+	-apple | -axis | -knuth | -cray | -microblaze)
148 148
 		os=
149 149
 		basic_machine=$1
150 150
 		;;
151
+        -bluegene*)
152
+	        os=-cnk
153
+		;;
151 154
 	-sim | -cisco | -oki | -wec | -winbond)
152 155
 		os=
153 156
 		basic_machine=$1
... ...
@@ -169,6 +181,10 @@ case $os in
169 169
 	-hiux*)
170 170
 		os=-hiuxwe2
171 171
 		;;
172
+	-sco6)
173
+		os=-sco5v6
174
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
175
+		;;
172 176
 	-sco5)
173 177
 		os=-sco3.2v5
174 178
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
... ...
@@ -185,6 +201,10 @@ case $os in
185 185
 		# Don't forget version if it is 3.2v4 or newer.
186 186
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
187 187
 		;;
188
+	-sco5v6*)
189
+		# Don't forget version if it is 3.2v4 or newer.
190
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
191
+		;;
188 192
 	-sco*)
189 193
 		os=-sco3.2v2
190 194
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
... ...
@@ -228,53 +248,71 @@ case $basic_machine in
228 228
 	| a29k \
229 229
 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
230 230
 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
231
-	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
231
+	| am33_2.0 \
232
+	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
233
+	| bfin \
232 234
 	| c4x | clipper \
233 235
 	| d10v | d30v | dlx | dsp16xx \
234
-	| fr30 | frv \
236
+	| fido | fr30 | frv \
235 237
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
236 238
 	| i370 | i860 | i960 | ia64 \
237
-	| ip2k \
238
-	| m32r | m68000 | m68k | m88k | mcore \
239
+	| ip2k | iq2000 \
240
+	| lm32 \
241
+	| m32c | m32r | m32rle | m68000 | m68k | m88k \
242
+	| maxq | mb | microblaze | mcore | mep | metag \
239 243
 	| mips | mipsbe | mipseb | mipsel | mipsle \
240 244
 	| mips16 \
241 245
 	| mips64 | mips64el \
242
-	| mips64vr | mips64vrel \
246
+	| mips64octeon | mips64octeonel \
243 247
 	| mips64orion | mips64orionel \
248
+	| mips64r5900 | mips64r5900el \
249
+	| mips64vr | mips64vrel \
244 250
 	| mips64vr4100 | mips64vr4100el \
245 251
 	| mips64vr4300 | mips64vr4300el \
246 252
 	| mips64vr5000 | mips64vr5000el \
253
+	| mips64vr5900 | mips64vr5900el \
247 254
 	| mipsisa32 | mipsisa32el \
248 255
 	| mipsisa32r2 | mipsisa32r2el \
249 256
 	| mipsisa64 | mipsisa64el \
257
+	| mipsisa64r2 | mipsisa64r2el \
250 258
 	| mipsisa64sb1 | mipsisa64sb1el \
251 259
 	| mipsisa64sr71k | mipsisa64sr71kel \
252 260
 	| mipstx39 | mipstx39el \
253 261
 	| mn10200 | mn10300 \
262
+	| moxie \
263
+	| mt \
254 264
 	| msp430 \
265
+	| nios | nios2 \
255 266
 	| ns16k | ns32k \
256
-	| openrisc | or32 \
267
+	| or32 \
257 268
 	| pdp10 | pdp11 | pj | pjl \
258 269
 	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
259 270
 	| pyramid \
260
-	| sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
271
+	| rx \
272
+	| score \
273
+	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
261 274
 	| sh64 | sh64le \
262
-	| sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \
263
-	| strongarm \
275
+	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
276
+	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
277
+	| spu | strongarm \
264 278
 	| tahoe | thumb | tic4x | tic80 | tron \
279
+	| ubicom32 \
265 280
 	| v850 | v850e \
266 281
 	| we32k \
267
-	| x86 | xscale | xstormy16 | xtensa \
268
-	| z8k)
282
+	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
283
+	| z8k | z80)
269 284
 		basic_machine=$basic_machine-unknown
270 285
 		;;
271
-	m6811 | m68hc11 | m6812 | m68hc12)
286
+	m6811 | m68hc11 | m6812 | m68hc12 | picochip)
272 287
 		# Motorola 68HC11/12.
273 288
 		basic_machine=$basic_machine-unknown
274 289
 		os=-none
275 290
 		;;
276 291
 	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
277 292
 		;;
293
+	ms1)
294
+		basic_machine=mt-unknown
295
+		;;
278 296
 
279 297
 	# We use `pc' rather than `unknown'
280 298
 	# because (1) that's what they normally are, and
... ...
@@ -292,56 +330,71 @@ case $basic_machine in
292 292
 	| a29k-* \
293 293
 	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
294 294
 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
295
-	| alphapca5[67]-* | alpha64pca5[67]-* | amd64-* | arc-* \
295
+	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
296 296
 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
297
-	| avr-* \
298
-	| bs2000-* \
297
+	| avr-* | avr32-* \
298
+	| bfin-* | bs2000-* \
299 299
 	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
300
-	| clipper-* | cydra-* \
300
+	| clipper-* | craynv-* | cydra-* \
301 301
 	| d10v-* | d30v-* | dlx-* \
302 302
 	| elxsi-* \
303
-	| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
303
+	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
304 304
 	| h8300-* | h8500-* \
305 305
 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
306 306
 	| i*86-* | i860-* | i960-* | ia64-* \
307
-	| ip2k-* \
308
-	| m32r-* \
307
+	| ip2k-* | iq2000-* \
308
+	| lm32-* \
309
+	| m32c-* | m32r-* | m32rle-* \
309 310
 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
310
-	| m88110-* | m88k-* | mcore-* \
311
+	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
311 312
 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
312 313
 	| mips16-* \
313 314
 	| mips64-* | mips64el-* \
314
-	| mips64vr-* | mips64vrel-* \
315
+	| mips64octeon-* | mips64octeonel-* \
315 316
 	| mips64orion-* | mips64orionel-* \
317
+	| mips64r5900-* | mips64r5900el-* \
318
+	| mips64vr-* | mips64vrel-* \
316 319
 	| mips64vr4100-* | mips64vr4100el-* \
317 320
 	| mips64vr4300-* | mips64vr4300el-* \
318 321
 	| mips64vr5000-* | mips64vr5000el-* \
322
+	| mips64vr5900-* | mips64vr5900el-* \
319 323
 	| mipsisa32-* | mipsisa32el-* \
320 324
 	| mipsisa32r2-* | mipsisa32r2el-* \
321 325
 	| mipsisa64-* | mipsisa64el-* \
326
+	| mipsisa64r2-* | mipsisa64r2el-* \
322 327
 	| mipsisa64sb1-* | mipsisa64sb1el-* \
323 328
 	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
324 329
 	| mipstx39-* | mipstx39el-* \
330
+	| mmix-* \
331
+	| mt-* \
325 332
 	| msp430-* \
326
-	| none-* | np1-* | nv1-* | ns16k-* | ns32k-* \
333
+	| nios-* | nios2-* \
334
+	| none-* | np1-* | ns16k-* | ns32k-* \
327 335
 	| orion-* \
328 336
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
329 337
 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
330 338
 	| pyramid-* \
331
-	| romp-* | rs6000-* \
332
-	| sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
339
+	| romp-* | rs6000-* | rx-* \
340
+	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
333 341
 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
334
-	| sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
335
-	| sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
342
+	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
343
+	| sparclite-* \
344
+	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
336 345
 	| tahoe-* | thumb-* \
337 346
 	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
347
+	| tile-* | tilegx-* \
338 348
 	| tron-* \
349
+	| ubicom32-* \
339 350
 	| v850-* | v850e-* | vax-* \
340 351
 	| we32k-* \
341
-	| x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
342
-	| xtensa-* \
352
+	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
353
+	| xstormy16-* | xtensa*-* \
343 354
 	| ymp-* \
344
-	| z8k-*)
355
+	| z8k-* | z80-*)
356
+		;;
357
+	# Recognize the basic CPU types without company name, with glob match.
358
+	xtensa*)
359
+		basic_machine=$basic_machine-unknown
345 360
 		;;
346 361
 	# Recognize the various machine names and aliases which stand
347 362
 	# for a CPU type and a company and sometimes even an OS.
... ...
@@ -359,6 +412,9 @@ case $basic_machine in
359 359
 		basic_machine=a29k-amd
360 360
 		os=-udi
361 361
 		;;
362
+    	abacus)
363
+		basic_machine=abacus-unknown
364
+		;;
362 365
 	adobe68k)
363 366
 		basic_machine=m68010-adobe
364 367
 		os=-scout
... ...
@@ -376,6 +432,9 @@ case $basic_machine in
376 376
 	amd64)
377 377
 		basic_machine=x86_64-pc
378 378
 		;;
379
+	amd64-*)
380
+		basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
381
+		;;
379 382
 	amdahl)
380 383
 		basic_machine=580-amdahl
381 384
 		os=-sysv
... ...
@@ -399,6 +458,10 @@ case $basic_machine in
399 399
 		basic_machine=m68k-apollo
400 400
 		os=-bsd
401 401
 		;;
402
+	aros)
403
+		basic_machine=i386-pc
404
+		os=-aros
405
+		;;
402 406
 	aux)
403 407
 		basic_machine=m68k-apple
404 408
 		os=-aux
... ...
@@ -407,10 +470,26 @@ case $basic_machine in
407 407
 		basic_machine=ns32k-sequent
408 408
 		os=-dynix
409 409
 		;;
410
+	blackfin)
411
+		basic_machine=bfin-unknown
412
+		os=-linux
413
+		;;
414
+	blackfin-*)
415
+		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
416
+		os=-linux
417
+		;;
418
+	bluegene*)
419
+		basic_machine=powerpc-ibm
420
+		os=-cnk
421
+		;;
410 422
 	c90)
411 423
 		basic_machine=c90-cray
412 424
 		os=-unicos
413 425
 		;;
426
+        cegcc)
427
+		basic_machine=arm-unknown
428
+		os=-cegcc
429
+		;;
414 430
 	convex-c1)
415 431
 		basic_machine=c1-convex
416 432
 		os=-bsd
... ...
@@ -435,12 +514,27 @@ case $basic_machine in
435 435
 		basic_machine=j90-cray
436 436
 		os=-unicos
437 437
 		;;
438
+	craynv)
439
+		basic_machine=craynv-cray
440
+		os=-unicosmp
441
+		;;
442
+	cr16)
443
+		basic_machine=cr16-unknown
444
+		os=-elf
445
+		;;
438 446
 	crds | unos)
439 447
 		basic_machine=m68k-crds
440 448
 		;;
449
+	crisv32 | crisv32-* | etraxfs*)
450
+		basic_machine=crisv32-axis
451
+		;;
441 452
 	cris | cris-* | etrax*)
442 453
 		basic_machine=cris-axis
443 454
 		;;
455
+	crx)
456
+		basic_machine=crx-unknown
457
+		os=-elf
458
+		;;
444 459
 	da30 | da30-*)
445 460
 		basic_machine=m68k-da30
446 461
 		;;
... ...
@@ -463,6 +557,14 @@ case $basic_machine in
463 463
 		basic_machine=m88k-motorola
464 464
 		os=-sysv3
465 465
 		;;
466
+	dicos)
467
+		basic_machine=i686-pc
468
+		os=-dicos
469
+		;;
470
+	djgpp)
471
+		basic_machine=i586-pc
472
+		os=-msdosdjgpp
473
+		;;
466 474
 	dpx20 | dpx20-*)
467 475
 		basic_machine=rs6000-bull
468 476
 		os=-bosx
... ...
@@ -613,6 +715,14 @@ case $basic_machine in
613 613
 		basic_machine=m68k-isi
614 614
 		os=-sysv
615 615
 		;;
616
+	m68knommu)
617
+		basic_machine=m68k-unknown
618
+		os=-linux
619
+		;;
620
+	m68knommu-*)
621
+		basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
622
+		os=-linux
623
+		;;
616 624
 	m88k-omron*)
617 625
 		basic_machine=m88k-omron
618 626
 		;;
... ...
@@ -624,10 +734,17 @@ case $basic_machine in
624 624
 		basic_machine=ns32k-utek
625 625
 		os=-sysv
626 626
 		;;
627
+        microblaze)
628
+		basic_machine=microblaze-xilinx
629
+		;;
627 630
 	mingw32)
628 631
 		basic_machine=i386-pc
629 632
 		os=-mingw32
630 633
 		;;
634
+	mingw32ce)
635
+		basic_machine=arm-unknown
636
+		os=-mingw32ce
637
+		;;
631 638
 	miniframe)
632 639
 		basic_machine=m68000-convergent
633 640
 		;;
... ...
@@ -641,10 +758,6 @@ case $basic_machine in
641 641
 	mips3*)
642 642
 		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
643 643
 		;;
644
-	mmix*)
645
-		basic_machine=mmix-knuth
646
-		os=-mmixware
647
-		;;
648 644
 	monitor)
649 645
 		basic_machine=m68k-rom68k
650 646
 		os=-coff
... ...
@@ -657,6 +770,9 @@ case $basic_machine in
657 657
 		basic_machine=i386-pc
658 658
 		os=-msdos
659 659
 		;;
660
+	ms1-*)
661
+		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
662
+		;;
660 663
 	mvs)
661 664
 		basic_machine=i370-ibm
662 665
 		os=-mvs
... ...
@@ -725,10 +841,6 @@ case $basic_machine in
725 725
 	np1)
726 726
 		basic_machine=np1-gould
727 727
 		;;
728
-	nv1)
729
-		basic_machine=nv1-cray
730
-		os=-unicosmp
731
-		;;
732 728
 	nsr-tandem)
733 729
 		basic_machine=nsr-tandem
734 730
 		;;
... ...
@@ -736,9 +848,12 @@ case $basic_machine in
736 736
 		basic_machine=hppa1.1-oki
737 737
 		os=-proelf
738 738
 		;;
739
-	or32 | or32-*)
739
+	openrisc | openrisc-*)
740 740
 		basic_machine=or32-unknown
741
-		os=-coff
741
+		;;
742
+	os400)
743
+		basic_machine=powerpc-ibm
744
+		os=-os400
742 745
 		;;
743 746
 	OSE68000 | ose68000)
744 747
 		basic_machine=m68000-ericsson
... ...
@@ -756,6 +871,14 @@ case $basic_machine in
756 756
 		basic_machine=i860-intel
757 757
 		os=-osf
758 758
 		;;
759
+	parisc)
760
+		basic_machine=hppa-unknown
761
+		os=-linux
762
+		;;
763
+	parisc-*)
764
+		basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
765
+		os=-linux
766
+		;;
759 767
 	pbd)
760 768
 		basic_machine=sparc-tti
761 769
 		;;
... ...
@@ -765,6 +888,12 @@ case $basic_machine in
765 765
 	pc532 | pc532-*)
766 766
 		basic_machine=ns32k-pc532
767 767
 		;;
768
+	pc98)
769
+		basic_machine=i386-pc
770
+		;;
771
+	pc98-*)
772
+		basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
773
+		;;
768 774
 	pentium | p5 | k5 | k6 | nexgen | viac3)
769 775
 		basic_machine=i586-pc
770 776
 		;;
... ...
@@ -821,6 +950,10 @@ case $basic_machine in
821 821
 		basic_machine=i586-unknown
822 822
 		os=-pw32
823 823
 		;;
824
+	rdos)
825
+		basic_machine=i386-pc
826
+		os=-rdos
827
+		;;
824 828
 	rom68k)
825 829
 		basic_machine=m68k-rom68k
826 830
 		os=-coff
... ...
@@ -847,6 +980,10 @@ case $basic_machine in
847 847
 	sb1el)
848 848
 		basic_machine=mipsisa64sb1el-unknown
849 849
 		;;
850
+	sde)
851
+		basic_machine=mipsisa32-sde
852
+		os=-elf
853
+		;;
850 854
 	sei)
851 855
 		basic_machine=mips-sei
852 856
 		os=-seiux
... ...
@@ -858,6 +995,9 @@ case $basic_machine in
858 858
 		basic_machine=sh-hitachi
859 859
 		os=-hms
860 860
 		;;
861
+	sh5el)
862
+		basic_machine=sh5le-unknown
863
+		;;
861 864
 	sh64)
862 865
 		basic_machine=sh64-unknown
863 866
 		;;
... ...
@@ -947,6 +1087,15 @@ case $basic_machine in
947 947
 		basic_machine=tic6x-unknown
948 948
 		os=-coff
949 949
 		;;
950
+        # This must be matched before tile*.
951
+        tilegx*)
952
+		basic_machine=tilegx-unknown
953
+		os=-linux-gnu
954
+		;;
955
+	tile*)
956
+		basic_machine=tile-unknown
957
+		os=-linux-gnu
958
+		;;
950 959
 	tx39)
951 960
 		basic_machine=mipstx39-unknown
952 961
 		;;
... ...
@@ -960,6 +1109,10 @@ case $basic_machine in
960 960
 	tower | tower-32)
961 961
 		basic_machine=m68k-ncr
962 962
 		;;
963
+	tpf)
964
+		basic_machine=s390x-ibm
965
+		os=-tpf
966
+		;;
963 967
 	udi29k)
964 968
 		basic_machine=a29k-amd
965 969
 		os=-udi
... ...
@@ -1003,6 +1156,10 @@ case $basic_machine in
1003 1003
 		basic_machine=hppa1.1-winbond
1004 1004
 		os=-proelf
1005 1005
 		;;
1006
+	xbox)
1007
+		basic_machine=i686-pc
1008
+		os=-mingw32
1009
+		;;
1006 1010
 	xps | xps100)
1007 1011
 		basic_machine=xps100-honeywell
1008 1012
 		;;
... ...
@@ -1014,6 +1171,10 @@ case $basic_machine in
1014 1014
 		basic_machine=z8k-unknown
1015 1015
 		os=-sim
1016 1016
 		;;
1017
+	z80-*-coff)
1018
+		basic_machine=z80-unknown
1019
+		os=-sim
1020
+		;;
1017 1021
 	none)
1018 1022
 		basic_machine=none-none
1019 1023
 		os=-none
... ...
@@ -1033,6 +1194,9 @@ case $basic_machine in
1033 1033
 	romp)
1034 1034
 		basic_machine=romp-ibm
1035 1035
 		;;
1036
+	mmix)
1037
+		basic_machine=mmix-knuth
1038
+		;;
1036 1039
 	rs6000)
1037 1040
 		basic_machine=rs6000-ibm
1038 1041
 		;;
... ...
@@ -1049,13 +1213,10 @@ case $basic_machine in
1049 1049
 	we32k)
1050 1050
 		basic_machine=we32k-att
1051 1051
 		;;
1052
-	sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele)
1052
+	sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
1053 1053
 		basic_machine=sh-unknown
1054 1054
 		;;
1055
-	sh64)
1056
-		basic_machine=sh64-unknown
1057
-		;;
1058
-	sparc | sparcv9 | sparcv9b)
1055
+	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
1059 1056
 		basic_machine=sparc-sun
1060 1057
 		;;
1061 1058
 	cydra)
... ...
@@ -1102,6 +1263,9 @@ case $os in
1102 1102
         # First match some system type aliases
1103 1103
         # that might get confused with valid system types.
1104 1104
 	# -solaris* is a basic system type, with this one exception.
1105
+        -auroraux)
1106
+	        os=-auroraux
1107
+		;;
1105 1108
 	-solaris1 | -solaris1.*)
1106 1109
 		os=`echo $os | sed -e 's|solaris1|sunos4|'`
1107 1110
 		;;
... ...
@@ -1122,25 +1286,30 @@ case $os in
1122 1122
 	# Each alternative MUST END IN A *, to match a version number.
1123 1123
 	# -sysv* is not here because it comes later, after sysvr4.
1124 1124
 	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
1125
-	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
1126
-	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
1125
+	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
1126
+	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
1127
+	      | -sym* | -kopensolaris* \
1127 1128
 	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
1128
-	      | -aos* \
1129
+	      | -aos* | -aros* \
1129 1130
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
1130 1131
 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
1131
-	      | -hiux* | -386bsd* | -netbsd* | -openbsd* | -kfreebsd* | -freebsd* | -riscix* \
1132
-	      | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
1132
+	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
1133
+	      | -openbsd* | -solidbsd* \
1134
+	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
1135
+	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
1133 1136
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
1134 1137
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
1135
-	      | -chorusos* | -chorusrdb* \
1138
+	      | -chorusos* | -chorusrdb* | -cegcc* \
1136 1139
 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
1137
-	      | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
1140
+	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
1141
+	      | -uxpv* | -beos* | -mpeix* | -udk* \
1138 1142
 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
1139 1143
 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
1140 1144
 	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
1141 1145
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
1142 1146
 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
1143
-	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei*)
1147
+	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
1148
+	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
1144 1149
 	# Remember, each alternative MUST END IN *, to match a version number.
1145 1150
 		;;
1146 1151
 	-qnx*)
... ...
@@ -1158,12 +1327,15 @@ case $os in
1158 1158
 		os=`echo $os | sed -e 's|nto|nto-qnx|'`
1159 1159
 		;;
1160 1160
 	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
1161
-	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
1161
+	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
1162 1162
 	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
1163 1163
 		;;
1164 1164
 	-mac*)
1165 1165
 		os=`echo $os | sed -e 's|mac|macos|'`
1166 1166
 		;;
1167
+	-linux-dietlibc)
1168
+		os=-linux-dietlibc
1169
+		;;
1167 1170
 	-linux*)
1168 1171
 		os=`echo $os | sed -e 's|linux|linux-gnu|'`
1169 1172
 		;;
... ...
@@ -1176,6 +1348,9 @@ case $os in
1176 1176
 	-opened*)
1177 1177
 		os=-openedition
1178 1178
 		;;
1179
+        -os400*)
1180
+		os=-os400
1181
+		;;
1179 1182
 	-wince*)
1180 1183
 		os=-wince
1181 1184
 		;;
... ...
@@ -1197,6 +1372,9 @@ case $os in
1197 1197
 	-atheos*)
1198 1198
 		os=-atheos
1199 1199
 		;;
1200
+	-syllable*)
1201
+		os=-syllable
1202
+		;;
1200 1203
 	-386bsd)
1201 1204
 		os=-bsd
1202 1205
 		;;
... ...
@@ -1219,6 +1397,9 @@ case $os in
1219 1219
 	-sinix*)
1220 1220
 		os=-sysv4
1221 1221
 		;;
1222
+        -tpf*)
1223
+		os=-tpf
1224
+		;;
1222 1225
 	-triton*)
1223 1226
 		os=-sysv3
1224 1227
 		;;
... ...
@@ -1255,6 +1436,14 @@ case $os in
1255 1255
 	-kaos*)
1256 1256
 		os=-kaos
1257 1257
 		;;
1258
+	-zvmoe)
1259
+		os=-zvmoe
1260
+		;;
1261
+	-dicos*)
1262
+		os=-dicos
1263
+		;;
1264
+        -nacl*)
1265
+	        ;;
1258 1266
 	-none)
1259 1267
 		;;
1260 1268
 	*)
... ...
@@ -1277,6 +1466,12 @@ else
1277 1277
 # system, and we'll never get to this point.
1278 1278
 
1279 1279
 case $basic_machine in
1280
+        score-*)
1281
+		os=-elf
1282
+		;;
1283
+        spu-*)
1284
+		os=-elf
1285
+		;;
1280 1286
 	*-acorn)
1281 1287
 		os=-riscix1.2
1282 1288
 		;;
... ...
@@ -1286,9 +1481,9 @@ case $basic_machine in
1286 1286
 	arm*-semi)
1287 1287
 		os=-aout
1288 1288
 		;;
1289
-    c4x-* | tic4x-*)
1290
-        os=-coff
1291
-        ;;
1289
+        c4x-* | tic4x-*)
1290
+        	os=-coff
1291
+		;;
1292 1292
 	# This must come before the *-dec entry.
1293 1293
 	pdp10-*)
1294 1294
 		os=-tops20
... ...
@@ -1314,6 +1509,9 @@ case $basic_machine in
1314 1314
 	m68*-cisco)
1315 1315
 		os=-aout
1316 1316
 		;;
1317
+        mep-*)
1318
+		os=-elf
1319
+		;;
1317 1320
 	mips*-cisco)
1318 1321
 		os=-elf
1319 1322
 		;;
... ...
@@ -1332,9 +1530,15 @@ case $basic_machine in
1332 1332
 	*-be)
1333 1333
 		os=-beos
1334 1334
 		;;
1335
+	*-haiku)
1336
+		os=-haiku
1337
+		;;
1335 1338
 	*-ibm)
1336 1339
 		os=-aix
1337 1340
 		;;
1341
+    	*-knuth)
1342
+		os=-mmixware
1343
+		;;
1338 1344
 	*-wec)
1339 1345
 		os=-proelf
1340 1346
 		;;
... ...
@@ -1437,7 +1641,7 @@ case $basic_machine in
1437 1437
 			-sunos*)
1438 1438
 				vendor=sun
1439 1439
 				;;
1440
-			-aix*)
1440
+			-cnk*|-aix*)
1441 1441
 				vendor=ibm
1442 1442
 				;;
1443 1443
 			-beos*)
... ...
@@ -1467,9 +1671,15 @@ case $basic_machine in
1467 1467
 			-mvs* | -opened*)
1468 1468
 				vendor=ibm
1469 1469
 				;;
1470
+			-os400*)
1471
+				vendor=ibm
1472
+				;;
1470 1473
 			-ptx*)
1471 1474
 				vendor=sequent
1472 1475
 				;;
1476
+			-tpf*)
1477
+				vendor=ibm
1478
+				;;
1473 1479
 			-vxsim* | -vxworks* | -windiss*)
1474 1480
 				vendor=wrs
1475 1481
 				;;
... ...
@@ -1494,7 +1704,7 @@ case $basic_machine in
1494 1494
 esac
1495 1495
 
1496 1496
 echo $basic_machine$os
1497
-exit 0
1497
+exit
1498 1498
 
1499 1499
 # Local variables:
1500 1500
 # eval: (add-hook 'write-file-hooks 'time-stamp)
... ...
@@ -1,9 +1,10 @@
1 1
 #! /bin/sh
2 2
 # depcomp - compile a program generating dependencies as side-effects
3 3
 
4
-scriptversion=2012-07-12.20; # UTC
4
+scriptversion=2009-04-28.21; # UTC
5 5
 
6
-# Copyright (C) 1999-2012 Free Software Foundation, Inc.
6
+# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009 Free
7
+# Software Foundation, Inc.
7 8
 
8 9
 # This program is free software; you can redistribute it and/or modify
9 10
 # it under the terms of the GNU General Public License as published by
... ...
@@ -27,7 +28,7 @@ scriptversion=2012-07-12.20; # UTC
27 27
 
28 28
 case $1 in
29 29
   '')
30
-     echo "$0: No command.  Try '$0 --help' for more information." 1>&2
30
+     echo "$0: No command.  Try \`$0 --help' for more information." 1>&2
31 31
      exit 1;
32 32
      ;;
33 33
   -h | --h*)
... ...
@@ -39,11 +40,11 @@ as side-effects.
39 39
 
40 40
 Environment variables:
41 41
   depmode     Dependency tracking mode.
42
-  source      Source file read by 'PROGRAMS ARGS'.
43
-  object      Object file output by 'PROGRAMS ARGS'.
42
+  source      Source file read by `PROGRAMS ARGS'.
43
+  object      Object file output by `PROGRAMS ARGS'.
44 44
   DEPDIR      directory where to store dependencies.
45 45
   depfile     Dependency file to output.
46
-  tmpdepfile  Temporary file to use when outputting dependencies.
46
+  tmpdepfile  Temporary file to use when outputing dependencies.
47 47
   libtool     Whether libtool is used (yes/no).
48 48
 
49 49
 Report bugs to <bug-automake@gnu.org>.
... ...
@@ -56,12 +57,6 @@ EOF
56 56
     ;;
57 57
 esac
58 58
 
59
-# A tabulation character.
60
-tab='	'
61
-# A newline character.
62
-nl='
63
-'
64
-
65 59
 if test -z "$depmode" || test -z "$source" || test -z "$object"; then
66 60
   echo "depcomp: Variables source, object and depmode must be set" 1>&2
67 61
   exit 1
... ...
@@ -95,24 +90,10 @@ if test "$depmode" = msvcmsys; then
95 95
    # This is just like msvisualcpp but w/o cygpath translation.
96 96
    # Just convert the backslash-escaped backslashes to single forward
97 97
    # slashes to satisfy depend.m4
98
-   cygpath_u='sed s,\\\\,/,g'
98
+   cygpath_u="sed s,\\\\\\\\,/,g"
99 99
    depmode=msvisualcpp
100 100
 fi
101 101
 
102
-if test "$depmode" = msvc7msys; then
103
-   # This is just like msvc7 but w/o cygpath translation.
104
-   # Just convert the backslash-escaped backslashes to single forward
105
-   # slashes to satisfy depend.m4
106
-   cygpath_u='sed s,\\\\,/,g'
107
-   depmode=msvc7
108
-fi
109
-
110
-if test "$depmode" = xlc; then
111
-   # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency informations.
112
-   gccflag=-qmakedep=gcc,-MF
113
-   depmode=gcc
114
-fi
115
-
116 102
 case "$depmode" in
117 103
 gcc3)
118 104
 ## gcc 3 implements dependency tracking that does exactly what
... ...
@@ -167,21 +148,20 @@ gcc)
167 167
 ## The second -e expression handles DOS-style file names with drive letters.
168 168
   sed -e 's/^[^:]*: / /' \
169 169
       -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
170
-## This next piece of magic avoids the "deleted header file" problem.
170
+## This next piece of magic avoids the `deleted header file' problem.
171 171
 ## The problem is that when a header file which appears in a .P file
172 172
 ## is deleted, the dependency causes make to die (because there is
173 173
 ## typically no way to rebuild the header).  We avoid this by adding
174 174
 ## dummy dependencies for each header file.  Too bad gcc doesn't do
175 175
 ## this for us directly.
176
-  tr ' ' "$nl" < "$tmpdepfile" |
177
-## Some versions of gcc put a space before the ':'.  On the theory
176
+  tr ' ' '
177
+' < "$tmpdepfile" |
178
+## Some versions of gcc put a space before the `:'.  On the theory
178 179
 ## that the space means something, we add a space to the output as
179
-## well.  hp depmode also adds that space, but also prefixes the VPATH
180
-## to the object.  Take care to not repeat it in the output.
180
+## well.
181 181
 ## Some versions of the HPUX 10.20 sed can't process this invocation
182 182
 ## correctly.  Breaking it into two sed invocations is a workaround.
183
-    sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \
184
-      | sed -e 's/$/ :/' >> "$depfile"
183
+    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
185 184
   rm -f "$tmpdepfile"
186 185
   ;;
187 186
 
... ...
@@ -213,15 +193,18 @@ sgi)
213 213
     # clever and replace this with sed code, as IRIX sed won't handle
214 214
     # lines with more than a fixed number of characters (4096 in
215 215
     # IRIX 6.2 sed, 8192 in IRIX 6.5).  We also remove comment lines;
216
-    # the IRIX cc adds comments like '#:fec' to the end of the
216
+    # the IRIX cc adds comments like `#:fec' to the end of the
217 217
     # dependency line.
218
-    tr ' ' "$nl" < "$tmpdepfile" \
218
+    tr ' ' '
219
+' < "$tmpdepfile" \
219 220
     | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
220
-    tr "$nl" ' ' >> "$depfile"
221
+    tr '
222
+' ' ' >> "$depfile"
221 223
     echo >> "$depfile"
222 224
 
223 225
     # The second pass generates a dummy entry for each header file.
224
-    tr ' ' "$nl" < "$tmpdepfile" \
226
+    tr ' ' '
227
+' < "$tmpdepfile" \
225 228
    | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
226 229
    >> "$depfile"
227 230
   else
... ...
@@ -233,17 +216,10 @@ sgi)
233 233
   rm -f "$tmpdepfile"
234 234
   ;;
235 235
 
236
-xlc)
237
-  # This case exists only to let depend.m4 do its work.  It works by
238
-  # looking at the text of this script.  This case will never be run,
239
-  # since it is checked for above.
240
-  exit 1
241
-  ;;
242
-
243 236
 aix)
244 237
   # The C for AIX Compiler uses -M and outputs the dependencies
245 238
   # in a .u file.  In older versions, this file always lives in the
246
-  # current directory.  Also, the AIX compiler puts '$object:' at the
239
+  # current directory.  Also, the AIX compiler puts `$object:' at the
247 240
   # start of each line; $object doesn't have directory information.
248 241
   # Version 6 uses the directory in both cases.
249 242
   dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
... ...
@@ -273,11 +249,12 @@ aix)
273 273
     test -f "$tmpdepfile" && break
274 274
   done
275 275
   if test -f "$tmpdepfile"; then
276
-    # Each line is of the form 'foo.o: dependent.h'.
276
+    # Each line is of the form `foo.o: dependent.h'.
277 277
     # Do two passes, one to just change these to
278
-    # '$object: dependent.h' and one to simply 'dependent.h:'.
278
+    # `$object: dependent.h' and one to simply `dependent.h:'.
279 279
     sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
280
-    sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
280
+    # That's a tab and a space in the [].
281
+    sed -e 's,^.*\.[a-z]*:[	 ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
281 282
   else
282 283
     # The sourcefile does not contain any dependencies, so just
283 284
     # store a dummy comment line, to avoid errors with the Makefile
... ...
@@ -288,26 +265,23 @@ aix)
288 288
   ;;
289 289
 
290 290
 icc)
291
-  # Intel's C compiler anf tcc (Tiny C Compiler) understand '-MD -MF file'.
292
-  # However on
293
-  #    $CC -MD -MF foo.d -c -o sub/foo.o sub/foo.c
291
+  # Intel's C compiler understands `-MD -MF file'.  However on
292
+  #    icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c
294 293
   # ICC 7.0 will fill foo.d with something like
295 294
   #    foo.o: sub/foo.c
296 295
   #    foo.o: sub/foo.h
297
-  # which is wrong.  We want
296
+  # which is wrong.  We want:
298 297
   #    sub/foo.o: sub/foo.c
299 298
   #    sub/foo.o: sub/foo.h
300 299
   #    sub/foo.c:
301 300
   #    sub/foo.h:
302 301
   # ICC 7.1 will output
303 302
   #    foo.o: sub/foo.c sub/foo.h
304
-  # and will wrap long lines using '\':
303
+  # and will wrap long lines using \ :
305 304
   #    foo.o: sub/foo.c ... \
306 305
   #     sub/foo.h ... \
307 306
   #     ...
308
-  # tcc 0.9.26 (FIXME still under development at the moment of writing)
309
-  # will emit a similar output, but also prepend the continuation lines
310
-  # with horizontal tabulation characters.
307
+
311 308
   "$@" -MD -MF "$tmpdepfile"
312 309
   stat=$?
313 310
   if test $stat -eq 0; then :
... ...
@@ -316,85 +290,6 @@ icc)
316 316
     exit $stat
317 317
   fi
318 318
   rm -f "$depfile"
319
-  # Each line is of the form 'foo.o: dependent.h',
320
-  # or 'foo.o: dep1.h dep2.h \', or ' dep3.h dep4.h \'.
321
-  # Do two passes, one to just change these to
322
-  # '$object: dependent.h' and one to simply 'dependent.h:'.
323
-  sed -e "s/^[ $tab][ $tab]*/  /" -e "s,^[^:]*:,$object :," \
324
-    < "$tmpdepfile" > "$depfile"
325
-  sed '
326
-    s/[ '"$tab"'][ '"$tab"']*/ /g
327
-    s/^ *//
328
-    s/ *\\*$//
329
-    s/^[^:]*: *//
330
-    /^$/d
331
-    /:$/d
332
-    s/$/ :/
333
-  ' < "$tmpdepfile" >> "$depfile"
334
-  rm -f "$tmpdepfile"
335
-  ;;
336
-
337
-## The order of this option in the case statement is important, since the
338
-## shell code in configure will try each of these formats in the order
339
-## listed in this file.  A plain '-MD' option would be understood by many
340
-## compilers, so we must ensure this comes after the gcc and icc options.
341
-pgcc)
342
-  # Portland's C compiler understands '-MD'.
343
-  # Will always output deps to 'file.d' where file is the root name of the
344
-  # source file under compilation, even if file resides in a subdirectory.
345
-  # The object file name does not affect the name of the '.d' file.
346
-  # pgcc 10.2 will output
347
-  #    foo.o: sub/foo.c sub/foo.h
348
-  # and will wrap long lines using '\' :
349
-  #    foo.o: sub/foo.c ... \
350
-  #     sub/foo.h ... \
351
-  #     ...
352
-  dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
353
-  test "x$dir" = "x$object" && dir=
354
-  # Use the source, not the object, to determine the base name, since
355
-  # that's sadly what pgcc will do too.
356
-  base=`echo "$source" | sed -e 's|^.*/||' -e 's/\.[-_a-zA-Z0-9]*$//'`
357
-  tmpdepfile="$base.d"
358
-
359
-  # For projects that build the same source file twice into different object
360
-  # files, the pgcc approach of using the *source* file root name can cause
361
-  # problems in parallel builds.  Use a locking strategy to avoid stomping on
362
-  # the same $tmpdepfile.
363
-  lockdir="$base.d-lock"
364
-  trap "echo '$0: caught signal, cleaning up...' >&2; rm -rf $lockdir" 1 2 13 15
365
-  numtries=100
366
-  i=$numtries
367
-  while test $i -gt 0 ; do
368
-    # mkdir is a portable test-and-set.
369
-    if mkdir $lockdir 2>/dev/null; then
370
-      # This process acquired the lock.
371
-      "$@" -MD
372
-      stat=$?
373
-      # Release the lock.
374
-      rm -rf $lockdir
375
-      break
376
-    else
377
-      ## the lock is being held by a different process,
378
-      ## wait until the winning process is done or we timeout
379
-      while test -d $lockdir && test $i -gt 0; do
380
-        sleep 1
381
-        i=`expr $i - 1`
382
-      done
383
-    fi
384
-    i=`expr $i - 1`
385
-  done
386
-  trap - 1 2 13 15
387
-  if test $i -le 0; then
388
-    echo "$0: failed to acquire lock after $numtries attempts" >&2
389
-    echo "$0: check lockdir '$lockdir'" >&2
390
-    exit 1
391
-  fi
392
-
393
-  if test $stat -ne 0; then
394
-    rm -f "$tmpdepfile"
395
-    exit $stat
396
-  fi
397
-  rm -f "$depfile"
398 319
   # Each line is of the form `foo.o: dependent.h',
399 320
   # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'.
400 321
   # Do two passes, one to just change these to
... ...
@@ -439,7 +334,7 @@ hp2)
439 439
   done
440 440
   if test -f "$tmpdepfile"; then
441 441
     sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile"
442
-    # Add 'dependent.h:' lines.
442
+    # Add `dependent.h:' lines.
443 443
     sed -ne '2,${
444 444
 	       s/^ *//
445 445
 	       s/ \\*$//
... ...
@@ -454,9 +349,9 @@ hp2)
454 454
 
455 455
 tru64)
456 456
    # The Tru64 compiler uses -MD to generate dependencies as a side
457
-   # effect.  'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'.
457
+   # effect.  `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
458 458
    # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
459
-   # dependencies in 'foo.d' instead, so we check for that too.
459
+   # dependencies in `foo.d' instead, so we check for that too.
460 460
    # Subdirectories are respected.
461 461
    dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
462 462
    test "x$dir" = "x$object" && dir=
... ...
@@ -502,59 +397,14 @@ tru64)
502 502
    done
503 503
    if test -f "$tmpdepfile"; then
504 504
       sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
505
-      sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
505
+      # That's a tab and a space in the [].
506
+      sed -e 's,^.*\.[a-z]*:[	 ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
506 507
    else
507 508
       echo "#dummy" > "$depfile"
508 509
    fi
509 510
    rm -f "$tmpdepfile"
510 511
    ;;
511 512
 
512
-msvc7)
513
-  if test "$libtool" = yes; then
514
-    showIncludes=-Wc,-showIncludes
515
-  else
516
-    showIncludes=-showIncludes
517
-  fi
518
-  "$@" $showIncludes > "$tmpdepfile"
519
-  stat=$?
520
-  grep -v '^Note: including file: ' "$tmpdepfile"
521
-  if test "$stat" = 0; then :
522
-  else
523
-    rm -f "$tmpdepfile"
524
-    exit $stat
525
-  fi
526
-  rm -f "$depfile"
527
-  echo "$object : \\" > "$depfile"
528
-  # The first sed program below extracts the file names and escapes
529
-  # backslashes for cygpath.  The second sed program outputs the file
530
-  # name when reading, but also accumulates all include files in the
531
-  # hold buffer in order to output them again at the end.  This only
532
-  # works with sed implementations that can handle large buffers.
533
-  sed < "$tmpdepfile" -n '
534
-/^Note: including file:  *\(.*\)/ {
535
-  s//\1/
536
-  s/\\/\\\\/g
537
-  p
538
-}' | $cygpath_u | sort -u | sed -n '
539
-s/ /\\ /g
540
-s/\(.*\)/'"$tab"'\1 \\/p
541
-s/.\(.*\) \\/\1:/
542
-H
543
-$ {
544
-  s/.*/'"$tab"'/
545
-  G
546
-  p
547
-}' >> "$depfile"
548
-  rm -f "$tmpdepfile"
549
-  ;;
550
-
551
-msvc7msys)
552
-  # This case exists only to let depend.m4 do its work.  It works by
553
-  # looking at the text of this script.  This case will never be run,
554
-  # since it is checked for above.
555
-  exit 1
556
-  ;;
557
-
558 513
 #nosideeffect)
559 514
   # This comment above is used by automake to tell side-effect
560 515
   # dependency tracking mechanisms from slower ones.
... ...
@@ -572,7 +422,7 @@ dashmstdout)
572 572
     shift
573 573
   fi
574 574
 
575
-  # Remove '-o $object'.
575
+  # Remove `-o $object'.
576 576
   IFS=" "
577 577
   for arg
578 578
   do
... ...
@@ -592,14 +442,15 @@ dashmstdout)
592 592
   done
593 593
 
594 594
   test -z "$dashmflag" && dashmflag=-M
595
-  # Require at least two characters before searching for ':'
595
+  # Require at least two characters before searching for `:'
596 596
   # in the target name.  This is to cope with DOS-style filenames:
597
-  # a dependency such as 'c:/foo/bar' could be seen as target 'c' otherwise.
597
+  # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise.
598 598
   "$@" $dashmflag |
599
-    sed 's:^['"$tab"' ]*[^:'"$tab"' ][^:][^:]*\:['"$tab"' ]*:'"$object"'\: :' > "$tmpdepfile"
599
+    sed 's:^[  ]*[^: ][^:][^:]*\:[    ]*:'"$object"'\: :' > "$tmpdepfile"
600 600
   rm -f "$depfile"
601 601
   cat < "$tmpdepfile" > "$depfile"
602
-  tr ' ' "$nl" < "$tmpdepfile" | \
602
+  tr ' ' '
603
+' < "$tmpdepfile" | \
603 604
 ## Some versions of the HPUX 10.20 sed can't process this invocation
604 605
 ## correctly.  Breaking it into two sed invocations is a workaround.
605 606
     sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
... ...
@@ -652,10 +503,9 @@ makedepend)
652 652
   touch "$tmpdepfile"
653 653
   ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
654 654
   rm -f "$depfile"
655
-  # makedepend may prepend the VPATH from the source file name to the object.
656
-  # No need to regex-escape $object, excess matching of '.' is harmless.
657
-  sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile"
658
-  sed '1,2d' "$tmpdepfile" | tr ' ' "$nl" | \
655
+  cat < "$tmpdepfile" > "$depfile"
656
+  sed '1,2d' "$tmpdepfile" | tr ' ' '
657
+' | \
659 658
 ## Some versions of the HPUX 10.20 sed can't process this invocation
660 659
 ## correctly.  Breaking it into two sed invocations is a workaround.
661 660
     sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
... ...
@@ -675,7 +525,7 @@ cpp)
675 675
     shift
676 676
   fi
677 677
 
678
-  # Remove '-o $object'.
678
+  # Remove `-o $object'.
679 679
   IFS=" "
680 680
   for arg
681 681
   do
... ...
@@ -744,8 +594,8 @@ msvisualcpp)
744 744
   sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile"
745 745
   rm -f "$depfile"
746 746
   echo "$object : \\" > "$depfile"
747
-  sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::'"$tab"'\1 \\:p' >> "$depfile"
748
-  echo "$tab" >> "$depfile"
747
+  sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::	\1 \\:p' >> "$depfile"
748
+  echo "	" >> "$depfile"
749 749
   sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile"
750 750
   rm -f "$tmpdepfile"
751 751
   ;;
... ...
@@ -1,7 +1,7 @@
1 1
 #!/bin/sh
2 2
 # install - install a program, script, or datafile
3 3
 
4
-scriptversion=2011-11-20.07; # UTC
4
+scriptversion=2009-04-28.21; # UTC
5 5
 
6 6
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
7 7
 # later released in X11R6 (xc/config/util/install.sh) with the
... ...
@@ -35,7 +35,7 @@ scriptversion=2011-11-20.07; # UTC
35 35
 # FSF changes to this file are in the public domain.
36 36
 #
37 37
 # Calling this script install-sh is preferred over install.sh, to prevent
38
-# 'make' implicit rules from creating a file called install from it
38
+# `make' implicit rules from creating a file called install from it
39 39
 # when there is no Makefile.
40 40
 #
41 41
 # This script is compatible with the BSD install script, but was written
... ...
@@ -156,10 +156,6 @@ while test $# -ne 0; do
156 156
     -s) stripcmd=$stripprog;;
157 157
 
158 158
     -t) dst_arg=$2
159
-	# Protect names problematic for 'test' and other utilities.
160
-	case $dst_arg in
161
-	  -* | [=\(\)!]) dst_arg=./$dst_arg;;
162
-	esac
163 159
 	shift;;
164 160
 
165 161
     -T) no_target_directory=true;;
... ...
@@ -190,10 +186,6 @@ if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
190 190
     fi
191 191
     shift # arg
192 192
     dst_arg=$arg
193
-    # Protect names problematic for 'test' and other utilities.
194
-    case $dst_arg in
195
-      -* | [=\(\)!]) dst_arg=./$dst_arg;;
196
-    esac
197 193
   done
198 194
 fi
199 195
 
... ...
@@ -202,17 +194,13 @@ if test $# -eq 0; then
202 202
     echo "$0: no input file specified." >&2
203 203
     exit 1
204 204
   fi
205
-  # It's OK to call 'install-sh -d' without argument.
205
+  # It's OK to call `install-sh -d' without argument.
206 206
   # This can happen when creating conditional directories.
207 207
   exit 0
208 208
 fi
209 209
 
210 210
 if test -z "$dir_arg"; then
211
-  do_exit='(exit $ret); exit $ret'
212
-  trap "ret=129; $do_exit" 1
213
-  trap "ret=130; $do_exit" 2
214
-  trap "ret=141; $do_exit" 13
215
-  trap "ret=143; $do_exit" 15
211
+  trap '(exit $?); exit' 1 2 13 15
216 212
 
217 213
   # Set umask so as not to create temps with too-generous modes.
218 214
   # However, 'strip' requires both read and write access to temps.
... ...
@@ -240,9 +228,9 @@ fi
240 240
 
241 241
 for src
242 242
 do
243
-  # Protect names problematic for 'test' and other utilities.
243
+  # Protect names starting with `-'.
244 244
   case $src in
245
-    -* | [=\(\)!]) src=./$src;;
245
+    -*) src=./$src;;
246 246
   esac
247 247
 
248 248
   if test -n "$dir_arg"; then
... ...
@@ -264,7 +252,12 @@ do
264 264
       echo "$0: no destination specified." >&2
265 265
       exit 1
266 266
     fi
267
+
267 268
     dst=$dst_arg
269
+    # Protect names starting with `-'.
270
+    case $dst in
271
+      -*) dst=./$dst;;
272
+    esac
268 273
 
269 274
     # If destination is a directory, append the input filename; won't work
270 275
     # if double slashes aren't ignored.
... ...
@@ -354,7 +347,7 @@ do
354 354
 	      if test -z "$dir_arg" || {
355 355
 		   # Check for POSIX incompatibilities with -m.
356 356
 		   # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
357
-		   # other-writable bit of parent directory when it shouldn't.
357
+		   # other-writeable bit of parent directory when it shouldn't.
358 358
 		   # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
359 359
 		   ls_ld_tmpdir=`ls -ld "$tmpdir"`
360 360
 		   case $ls_ld_tmpdir in
... ...
@@ -392,7 +385,7 @@ do
392 392
 
393 393
       case $dstdir in
394 394
 	/*) prefix='/';;
395
-	[-=\(\)!]*) prefix='./';;
395
+	-*) prefix='./';;
396 396
 	*)  prefix='';;
397 397
       esac
398 398
 
... ...
@@ -410,7 +403,7 @@ do
410 410
 
411 411
       for d
412 412
       do
413
-	test X"$d" = X && continue
413
+	test -z "$d" && continue
414 414
 
415 415
 	prefix=$prefix$d
416 416
 	if test -d "$prefix"; then
... ...
@@ -70,7 +70,7 @@
70 70
 #         compiler:		$LTCC
71 71
 #         compiler flags:		$LTCFLAGS
72 72
 #         linker:		$LD (gnu? $with_gnu_ld)
73
-#         $progname:	(GNU libtool) 2.4.2
73
+#         $progname:	(GNU libtool) 2.4.2 Debian-2.4.2-1ubuntu1
74 74
 #         automake:	$automake_version
75 75
 #         autoconf:	$autoconf_version
76 76
 #
... ...
@@ -80,7 +80,7 @@
80 80
 
81 81
 PROGRAM=libtool
82 82
 PACKAGE=libtool
83
-VERSION=2.4.2
83
+VERSION="2.4.2 Debian-2.4.2-1ubuntu1"
84 84
 TIMESTAMP=""
85 85
 package_revision=1.3337
86 86
 
... ...
@@ -1375,21 +1375,6 @@ func_replace_sysroot ()
1375 1375
 func_infer_tag ()
1376 1376
 {
1377 1377
     $opt_debug
1378
-
1379
-    # FreeBSD-specific: where we install compilers with non-standard names
1380
-    tag_compilers_CC="*cc cc* *gcc gcc* clang"
1381
-    tag_compilers_CXX="*c++ c++* *g++ g++* clang++"
1382
-    base_compiler=`set -- "$@"; echo $1`
1383
-
1384
-    # If $tagname isn't set, then try to infer if the default "CC" tag applies
1385
-    if test -z "$tagname"; then
1386
-      for zp in $tag_compilers_CC; do
1387
-        case $base_compiler in
1388
-	 $zp) tagname="CC"; break;;
1389
-	esac
1390
-      done
1391
-    fi
1392
-
1393 1378
     if test -n "$available_tags" && test -z "$tagname"; then
1394 1379
       CC_quoted=
1395 1380
       for arg in $CC; do
... ...
@@ -1426,22 +1411,7 @@ func_infer_tag ()
1426 1426
 	      break
1427 1427
 	      ;;
1428 1428
 	    esac
1429
-
1430
-	    # FreeBSD-specific: try compilers based on inferred tag
1431
-	    if test -z "$tagname"; then
1432
-	      eval "tag_compilers=\$tag_compilers_${z}"
1433
-	      if test -n "$tag_compilers"; then
1434
-		for zp in $tag_compilers; do
1435
-		  case $base_compiler in   
1436
-		    $zp) tagname=$z; break;;
1437
-		  esac
1438
-		done
1439
-		if test -n "$tagname"; then
1440
-		  break
1441
-		fi
1442
-	      fi
1443
-            fi
1444
-          fi
1429
+	  fi
1445 1430
 	done
1446 1431
 	# If $tagname still isn't set, then no tagged configuration
1447 1432
 	# was found and let the user know that the "--tag" command
... ...
@@ -3547,9 +3517,6 @@ static const void *lt_preloaded_setup() {
3547 3547
 	  ;;
3548 3548
 	esac
3549 3549
 	;;
3550
-      *-*-freebsd*)
3551
-	# FreeBSD doesn't need this...
3552
-	;;
3553 3550
       *)
3554 3551
 	func_fatal_error "unknown suffix for \`$my_dlsyms'"
3555 3552
 	;;
... ...
@@ -5628,7 +5595,6 @@ func_mode_link ()
5628 5628
 	  esac
5629 5629
 	  ;;
5630 5630
 	esac
5631
-	deplibs="$deplibs $arg"
5632 5631
 	continue
5633 5632
 	;;
5634 5633
 
... ...
@@ -6158,7 +6124,10 @@ func_mode_link ()
6158 6158
 	case $pass in
6159 6159
 	dlopen) libs="$dlfiles" ;;
6160 6160
 	dlpreopen) libs="$dlprefiles" ;;
6161
-	link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
6161
+	link)
6162
+	  libs="$deplibs %DEPLIBS%"
6163
+	  test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
6164
+	  ;;
6162 6165
 	esac
6163 6166
       fi
6164 6167
       if test "$linkmode,$pass" = "lib,dlpreopen"; then
... ...
@@ -6201,30 +6170,13 @@ func_mode_link ()
6201 6201
 	    finalize_deplibs="$deplib $finalize_deplibs"
6202 6202
 	  else
6203 6203
 	    func_append compiler_flags " $deplib"
6204
-	  fi
6205
-
6206
-	  case $linkmode in
6207
-	  lib)
6208
-	    deplibs="$deplib $deplibs"
6209
-	    test "$pass" = conv && continue
6210
-	    newdependency_libs="$deplib $newdependency_libs"
6211
-	    ;;
6212
-	  prog)
6213
-	    if test "$pass" = conv; then
6214
-	      deplibs="$deplib $deplibs"
6215
-	      continue
6216
-	    fi
6217
-	    if test "$pass" = scan; then
6218
-	      deplibs="$deplib $deplibs"
6219
-	    else
6220
-	      compile_deplibs="$deplib $compile_deplibs"
6221
-	      finalize_deplibs="$deplib $finalize_deplibs"
6204
+	    if test "$linkmode" = lib ; then
6205
+		case "$new_inherited_linker_flags " in
6206
+		    *" $deplib "*) ;;
6207
+		    * ) func_append new_inherited_linker_flags " $deplib" ;;
6208
+		esac
6222 6209
 	    fi
6223
-	    ;;
6224
-	  *)
6225
-	    ;;
6226
-	  esac # linkmode
6227
-
6210
+	  fi
6228 6211
 	  continue
6229 6212
 	  ;;
6230 6213
 	-l*)
... ...
@@ -6495,19 +6447,19 @@ func_mode_link ()
6495 6495
 	    # It is a libtool convenience library, so add in its objects.
6496 6496
 	    func_append convenience " $ladir/$objdir/$old_library"
6497 6497
 	    func_append old_convenience " $ladir/$objdir/$old_library"
6498
+	    tmp_libs=
6499
+	    for deplib in $dependency_libs; do
6500
+	      deplibs="$deplib $deplibs"
6501
+	      if $opt_preserve_dup_deps ; then
6502
+		case "$tmp_libs " in
6503
+		*" $deplib "*) func_append specialdeplibs " $deplib" ;;
6504
+		esac
6505
+	      fi
6506
+	      func_append tmp_libs " $deplib"
6507
+	    done
6498 6508
 	  elif test "$linkmode" != prog && test "$linkmode" != lib; then
6499 6509
 	    func_fatal_error "\`$lib' is not a convenience library"
6500 6510
 	  fi
6501
-	  tmp_libs=
6502
-	  for deplib in $dependency_libs; do
6503
-	    deplibs="$deplib $deplibs"
6504
-	    if $opt_preserve_dup_deps ; then
6505
-	      case "$tmp_libs " in
6506
-	      *" $deplib "*) func_append specialdeplibs " $deplib" ;;
6507
-	      esac
6508
-	    fi
6509
-	    func_append tmp_libs " $deplib"
6510
-	  done
6511 6511
 	  continue
6512 6512
 	fi # $pass = conv
6513 6513
 
... ...
@@ -7400,6 +7352,9 @@ func_mode_link ()
7400 7400
 	    revision="$number_minor"
7401 7401
 	    lt_irix_increment=no
7402 7402
 	    ;;
7403
+	  *)
7404
+	    func_fatal_configuration "$modename: unknown library version type \`$version_type'"
7405
+	    ;;
7403 7406
 	  esac
7404 7407
 	  ;;
7405 7408
 	no)
... ...
@@ -1,9 +1,10 @@
1 1
 #! /bin/sh
2 2
 # Common stub for a few missing GNU programs while installing.
3 3
 
4
-scriptversion=2012-01-06.18; # UTC
4
+scriptversion=2009-04-28.21; # UTC
5 5
 
6
-# Copyright (C) 1996-2012 Free Software Foundation, Inc.
6
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
7
+# 2008, 2009 Free Software Foundation, Inc.
7 8
 # Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
8 9
 
9 10
 # This program is free software; you can redistribute it and/or modify
... ...
@@ -25,7 +26,7 @@ scriptversion=2012-01-06.18; # UTC
25 25
 # the same distribution terms that you use for the rest of that program.
26 26
 
27 27
 if test $# -eq 0; then
28
-  echo 1>&2 "Try '$0 --help' for more information"
28
+  echo 1>&2 "Try \`$0 --help' for more information"
29 29
   exit 1
30 30
 fi
31 31
 
... ...
@@ -33,7 +34,7 @@ run=:
33 33
 sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
34 34
 sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
35 35
 
36
-# In the cases where this matters, 'missing' is being run in the
36
+# In the cases where this matters, `missing' is being run in the
37 37
 # srcdir already.
38 38
 if test -f configure.ac; then
39 39
   configure_ac=configure.ac
... ...
@@ -64,7 +65,7 @@ case $1 in
64 64
     echo "\
65 65
 $0 [OPTION]... PROGRAM [ARGUMENT]...
66 66
 
67
-Handle 'PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
67
+Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
68 68
 error status if there is no known handling for PROGRAM.
69 69
 
70 70
 Options:
... ...
@@ -73,20 +74,21 @@ Options:
73 73
   --run           try to run the given command, and emulate it if it fails
74 74
 
75 75
 Supported PROGRAM values:
76
-  aclocal      touch file 'aclocal.m4'
77
-  autoconf     touch file 'configure'
78
-  autoheader   touch file 'config.h.in'
76
+  aclocal      touch file \`aclocal.m4'
77
+  autoconf     touch file \`configure'
78
+  autoheader   touch file \`config.h.in'
79 79
   autom4te     touch the output file, or create a stub one
80
-  automake     touch all 'Makefile.in' files
81
-  bison        create 'y.tab.[ch]', if possible, from existing .[ch]
82
-  flex         create 'lex.yy.c', if possible, from existing .c
80
+  automake     touch all \`Makefile.in' files
81
+  bison        create \`y.tab.[ch]', if possible, from existing .[ch]
82
+  flex         create \`lex.yy.c', if possible, from existing .c
83 83
   help2man     touch the output file
84
-  lex          create 'lex.yy.c', if possible, from existing .c
84
+  lex          create \`lex.yy.c', if possible, from existing .c
85 85
   makeinfo     touch the output file
86
-  yacc         create 'y.tab.[ch]', if possible, from existing .[ch]
86
+  tar          try tar, gnutar, gtar, then tar without non-portable flags
87
+  yacc         create \`y.tab.[ch]', if possible, from existing .[ch]
87 88
 
88
-Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and
89
-'g' are ignored when checking the name.
89
+Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
90
+\`g' are ignored when checking the name.
90 91
 
91 92
 Send bug reports to <bug-automake@gnu.org>."
92 93
     exit $?
... ...
@@ -98,8 +100,8 @@ Send bug reports to <bug-automake@gnu.org>."
98 98
     ;;
99 99
 
100 100
   -*)
101
-    echo 1>&2 "$0: Unknown '$1' option"
102
-    echo 1>&2 "Try '$0 --help' for more information"
101
+    echo 1>&2 "$0: Unknown \`$1' option"
102
+    echo 1>&2 "Try \`$0 --help' for more information"
103 103
     exit 1
104 104
     ;;
105 105
 
... ...
@@ -120,13 +122,22 @@ case $1 in
120 120
     # Not GNU programs, they don't have --version.
121 121
     ;;
122 122
 
123
+  tar*)
124
+    if test -n "$run"; then
125
+       echo 1>&2 "ERROR: \`tar' requires --run"
126
+       exit 1
127
+    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
128
+       exit 1
129
+    fi
130
+    ;;
131
+
123 132
   *)
124 133
     if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
125 134
        # We have it, but it failed.
126 135
        exit 1
127 136
     elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
128 137
        # Could not run --version or --help.  This is probably someone
129
-       # running '$TOOL --version' or '$TOOL --help' to check whether
138
+       # running `$TOOL --version' or `$TOOL --help' to check whether
130 139
        # $TOOL exists and not knowing $TOOL uses missing.
131 140
        exit 1
132 141
     fi
... ...
@@ -138,27 +149,27 @@ esac
138 138
 case $program in
139 139
   aclocal*)
140 140
     echo 1>&2 "\
141
-WARNING: '$1' is $msg.  You should only need it if
142
-         you modified 'acinclude.m4' or '${configure_ac}'.  You might want
143
-         to install the Automake and Perl packages.  Grab them from
141
+WARNING: \`$1' is $msg.  You should only need it if
142
+         you modified \`acinclude.m4' or \`${configure_ac}'.  You might want
143
+         to install the \`Automake' and \`Perl' packages.  Grab them from
144 144
          any GNU archive site."
145 145
     touch aclocal.m4
146 146
     ;;
147 147
 
148 148
   autoconf*)
149 149
     echo 1>&2 "\
150
-WARNING: '$1' is $msg.  You should only need it if
151
-         you modified '${configure_ac}'.  You might want to install the
152
-         Autoconf and GNU m4 packages.  Grab them from any GNU
150
+WARNING: \`$1' is $msg.  You should only need it if
151
+         you modified \`${configure_ac}'.  You might want to install the
152
+         \`Autoconf' and \`GNU m4' packages.  Grab them from any GNU
153 153
          archive site."
154 154
     touch configure
155 155
     ;;
156 156
 
157 157
   autoheader*)
158 158
     echo 1>&2 "\
159
-WARNING: '$1' is $msg.  You should only need it if
160
-         you modified 'acconfig.h' or '${configure_ac}'.  You might want
161
-         to install the Autoconf and GNU m4 packages.  Grab them
159
+WARNING: \`$1' is $msg.  You should only need it if
160
+         you modified \`acconfig.h' or \`${configure_ac}'.  You might want
161
+         to install the \`Autoconf' and \`GNU m4' packages.  Grab them
162 162
          from any GNU archive site."
163 163
     files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}`
164 164
     test -z "$files" && files="config.h"
... ...
@@ -175,9 +186,9 @@ WARNING: '$1' is $msg.  You should only need it if
175 175
 
176 176
   automake*)
177 177
     echo 1>&2 "\
178
-WARNING: '$1' is $msg.  You should only need it if
179
-         you modified 'Makefile.am', 'acinclude.m4' or '${configure_ac}'.
180
-         You might want to install the Automake and Perl packages.
178
+WARNING: \`$1' is $msg.  You should only need it if
179
+         you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
180
+         You might want to install the \`Automake' and \`Perl' packages.
181 181
          Grab them from any GNU archive site."
182 182
     find . -type f -name Makefile.am -print |
183 183
 	   sed 's/\.am$/.in/' |
... ...
@@ -186,10 +197,10 @@ WARNING: '$1' is $msg.  You should only need it if
186 186
 
187 187
   autom4te*)
188 188
     echo 1>&2 "\
189
-WARNING: '$1' is needed, but is $msg.
189
+WARNING: \`$1' is needed, but is $msg.
190 190
          You might have modified some files without having the
191 191
          proper tools for further handling them.
192
-         You can get '$1' as part of Autoconf from any GNU
192
+         You can get \`$1' as part of \`Autoconf' from any GNU
193 193
          archive site."
194 194
 
195 195
     file=`echo "$*" | sed -n "$sed_output"`
... ...
@@ -209,13 +220,13 @@ WARNING: '$1' is needed, but is $msg.
209 209
 
210 210
   bison*|yacc*)
211 211
     echo 1>&2 "\
212
-WARNING: '$1' $msg.  You should only need it if
213
-         you modified a '.y' file.  You may need the Bison package
212
+WARNING: \`$1' $msg.  You should only need it if
213
+         you modified a \`.y' file.  You may need the \`Bison' package
214 214
          in order for those modifications to take effect.  You can get
215
-         Bison from any GNU archive site."
215
+         \`Bison' from any GNU archive site."
216 216
     rm -f y.tab.c y.tab.h
217 217
     if test $# -ne 1; then
218
-        eval LASTARG=\${$#}
218
+        eval LASTARG="\${$#}"
219 219
 	case $LASTARG in
220 220
 	*.y)
221 221
 	    SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
... ...
@@ -239,13 +250,13 @@ WARNING: '$1' $msg.  You should only need it if
239 239
 
240 240
   lex*|flex*)
241 241
     echo 1>&2 "\
242
-WARNING: '$1' is $msg.  You should only need it if
243
-         you modified a '.l' file.  You may need the Flex package
242
+WARNING: \`$1' is $msg.  You should only need it if
243
+         you modified a \`.l' file.  You may need the \`Flex' package
244 244
          in order for those modifications to take effect.  You can get
245
-         Flex from any GNU archive site."
245
+         \`Flex' from any GNU archive site."
246 246
     rm -f lex.yy.c
247 247
     if test $# -ne 1; then
248
-        eval LASTARG=\${$#}
248
+        eval LASTARG="\${$#}"
249 249
 	case $LASTARG in
250 250
 	*.l)
251 251
 	    SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
... ...
@@ -262,10 +273,10 @@ WARNING: '$1' is $msg.  You should only need it if
262 262
 
263 263
   help2man*)
264 264
     echo 1>&2 "\
265
-WARNING: '$1' is $msg.  You should only need it if
265
+WARNING: \`$1' is $msg.  You should only need it if
266 266
 	 you modified a dependency of a manual page.  You may need the
267
-	 Help2man package in order for those modifications to take
268
-	 effect.  You can get Help2man from any GNU archive site."
267
+	 \`Help2man' package in order for those modifications to take
268
+	 effect.  You can get \`Help2man' from any GNU archive site."
269 269
 
270 270
     file=`echo "$*" | sed -n "$sed_output"`
271 271
     test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
... ...
@@ -280,12 +291,12 @@ WARNING: '$1' is $msg.  You should only need it if
280 280
 
281 281
   makeinfo*)
282 282
     echo 1>&2 "\
283
-WARNING: '$1' is $msg.  You should only need it if
284
-         you modified a '.texi' or '.texinfo' file, or any other file
283
+WARNING: \`$1' is $msg.  You should only need it if
284
+         you modified a \`.texi' or \`.texinfo' file, or any other file
285 285
          indirectly affecting the aspect of the manual.  The spurious
286
-         call might also be the consequence of using a buggy 'make' (AIX,
287
-         DU, IRIX).  You might want to install the Texinfo package or
288
-         the GNU make package.  Grab either from any GNU archive site."
286
+         call might also be the consequence of using a buggy \`make' (AIX,
287
+         DU, IRIX).  You might want to install the \`Texinfo' package or
288
+         the \`GNU make' package.  Grab either from any GNU archive site."
289 289
     # The file to touch is that specified with -o ...
290 290
     file=`echo "$*" | sed -n "$sed_output"`
291 291
     test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
... ...
@@ -307,14 +318,49 @@ WARNING: '$1' is $msg.  You should only need it if
307 307
     touch $file
308 308
     ;;
309 309
 
310
+  tar*)
311
+    shift
312
+
313
+    # We have already tried tar in the generic part.
314
+    # Look for gnutar/gtar before invocation to avoid ugly error
315
+    # messages.
316
+    if (gnutar --version > /dev/null 2>&1); then
317
+       gnutar "$@" && exit 0
318
+    fi
319
+    if (gtar --version > /dev/null 2>&1); then
320
+       gtar "$@" && exit 0
321
+    fi
322
+    firstarg="$1"
323
+    if shift; then
324
+	case $firstarg in
325
+	*o*)
326
+	    firstarg=`echo "$firstarg" | sed s/o//`
327
+	    tar "$firstarg" "$@" && exit 0
328
+	    ;;
329
+	esac
330
+	case $firstarg in
331
+	*h*)
332
+	    firstarg=`echo "$firstarg" | sed s/h//`
333
+	    tar "$firstarg" "$@" && exit 0
334
+	    ;;
335
+	esac
336
+    fi
337
+
338
+    echo 1>&2 "\
339
+WARNING: I can't seem to be able to run \`tar' with the given arguments.
340
+         You may want to install GNU tar or Free paxutils, or check the
341
+         command line arguments."
342
+    exit 1
343
+    ;;
344
+
310 345
   *)
311 346
     echo 1>&2 "\
312
-WARNING: '$1' is needed, and is $msg.
347
+WARNING: \`$1' is needed, and is $msg.
313 348
          You might have modified some files without having the
314
-         proper tools for further handling them.  Check the 'README' file,
349
+         proper tools for further handling them.  Check the \`README' file,
315 350
          it often tells you about the needed prerequisites for installing
316 351
          this package.  You may also peek at any GNU archive site, in case
317
-         some other package would contain this missing '$1' program."
352
+         some other package would contain this missing \`$1' program."
318 353
     exit 1
319 354
     ;;
320 355
 esac
... ...
@@ -715,6 +715,8 @@ NMEDIT
715 715
 DSYMUTIL
716 716
 MANIFEST_TOOL
717 717
 RANLIB
718
+ac_ct_AR
719
+AR
718 720
 DLLTOOL
719 721
 OBJDUMP
720 722
 NM
... ...
@@ -725,9 +727,6 @@ FGREP
725 725
 EGREP
726 726
 GREP
727 727
 SED
728
-LIBTOOL
729
-ac_ct_AR
730
-AR
731 728
 am__fastdepCC_FALSE
732 729
 am__fastdepCC_TRUE
733 730
 CCDEPMODE
... ...
@@ -745,6 +744,7 @@ CPPFLAGS
745 745
 LDFLAGS
746 746
 CFLAGS
747 747
 CC
748
+LIBTOOL
748 749
 LN_S
749 750
 LIBCLAMAV_VERSION
750 751
 AM_BACKSLASH
... ...
@@ -828,11 +828,11 @@ ac_subst_files=''
828 828
 ac_user_opts='
829 829
 enable_option_checking
830 830
 enable_silent_rules
831
-enable_dependency_tracking
832 831
 enable_static
833 832
 enable_shared
834 833
 with_pic
835 834
 enable_fast_install
835
+enable_dependency_tracking
836 836
 with_gnu_ld
837 837
 with_sysroot
838 838
 enable_libtool_lock
... ...
@@ -1511,16 +1511,14 @@ Optional Features:
1511 1511
   --disable-option-checking  ignore unrecognized --enable/--with options
1512 1512
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
1513 1513
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
1514
-  --enable-silent-rules   less verbose build output (undo: "make V=1")
1515
-  --disable-silent-rules  verbose build output (undo: "make V=0")
1516
-  --enable-dependency-tracking
1517
-                          do not reject slow dependency extractors
1518
-  --disable-dependency-tracking
1519
-                          speeds up one-time build
1514
+  --enable-silent-rules          less verbose build output (undo: `make V=1')
1515
+  --disable-silent-rules         verbose build output (undo: `make V=0')
1520 1516
   --enable-static[=PKGS]  build static libraries [default=no]
1521 1517
   --enable-shared[=PKGS]  build shared libraries [default=yes]
1522 1518
   --enable-fast-install[=PKGS]
1523 1519
                           optimize for fast installation [default=yes]
1520
+  --disable-dependency-tracking  speeds up one-time build
1521
+  --enable-dependency-tracking   do not reject slow dependency extractors
1524 1522
   --disable-libtool-lock  avoid locking (might break parallel builds)
1525 1523
   --enable-ltdl-install   install libltdl
1526 1524
   --disable-gcc-vcheck	  do not check for buggy gcc version
... ...
@@ -2815,7 +2813,7 @@ done
2815 2815
 
2816 2816
 
2817 2817
 
2818
-am__api_version='1.12'
2818
+am__api_version='1.11'
2819 2819
 
2820 2820
 # Find a good install program.  We prefer a C program (faster),
2821 2821
 # so one script is as good as another.  But avoid the broken or
... ...
@@ -2912,6 +2910,9 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
2912 2912
 
2913 2913
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
2914 2914
 $as_echo_n "checking whether build environment is sane... " >&6; }
2915
+# Just in case
2916
+sleep 1
2917
+echo timestamp > conftest.file
2915 2918
 # Reject unsafe characters in $srcdir or the absolute working directory
2916 2919
 # name.  Accept space and tab only in the latter.
2917 2920
 am_lf='
... ...
@@ -2922,40 +2923,32 @@ case `pwd` in
2922 2922
 esac
2923 2923
 case $srcdir in
2924 2924
   *[\\\"\#\$\&\'\`$am_lf\ \	]*)
2925
-    as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;;
2925
+    as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
2926 2926
 esac
2927 2927
 
2928
-# Do 'set' in a subshell so we don't clobber the current shell's
2928
+# Do `set' in a subshell so we don't clobber the current shell's
2929 2929
 # arguments.  Must try -L first in case configure is actually a
2930 2930
 # symlink; some systems play weird games with the mod time of symlinks
2931 2931
 # (eg FreeBSD returns the mod time of the symlink's containing
2932 2932
 # directory).
2933 2933
 if (
2934
-   am_has_slept=no
2935
-   for am_try in 1 2; do
2936
-     echo "timestamp, slept: $am_has_slept" > conftest.file
2937
-     set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
2938
-     if test "$*" = "X"; then
2939
-	# -L didn't work.
2940
-	set X `ls -t "$srcdir/configure" conftest.file`
2941
-     fi
2942
-     if test "$*" != "X $srcdir/configure conftest.file" \
2943
-	&& test "$*" != "X conftest.file $srcdir/configure"; then
2944
-
2945
-	# If neither matched, then we have a broken ls.  This can happen
2946
-	# if, for instance, CONFIG_SHELL is bash and it inherits a
2947
-	# broken ls alias from the environment.  This has actually
2948
-	# happened.  Such a system could not be considered "sane".
2949
-	as_fn_error $? "ls -t appears to fail.  Make sure there is not a broken
2950
-  alias in your environment" "$LINENO" 5
2951
-     fi
2952
-     if test "$2" = conftest.file || test $am_try -eq 2; then
2953
-       break
2954
-     fi
2955
-     # Just in case.
2956
-     sleep 1
2957
-     am_has_slept=yes
2958
-   done
2934
+   set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
2935
+   if test "$*" = "X"; then
2936
+      # -L didn't work.
2937
+      set X `ls -t "$srcdir/configure" conftest.file`
2938
+   fi
2939
+   rm -f conftest.file
2940
+   if test "$*" != "X $srcdir/configure conftest.file" \
2941
+      && test "$*" != "X conftest.file $srcdir/configure"; then
2942
+
2943
+      # If neither matched, then we have a broken ls.  This can happen
2944
+      # if, for instance, CONFIG_SHELL is bash and it inherits a
2945
+      # broken ls alias from the environment.  This has actually
2946
+      # happened.  Such a system could not be considered "sane".
2947
+      as_fn_error $? "ls -t appears to fail.  Make sure there is not a broken
2948
+alias in your environment" "$LINENO" 5
2949
+   fi
2950
+
2959 2951
    test "$2" = conftest.file
2960 2952
    )
2961 2953
 then
... ...
@@ -2967,16 +2960,6 @@ Check your system clock" "$LINENO" 5
2967 2967
 fi
2968 2968
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
2969 2969
 $as_echo "yes" >&6; }
2970
-# If we didn't sleep, we still need to ensure time stamps of config.status and
2971
-# generated files are strictly newer.
2972
-am_sleep_pid=
2973
-if grep 'slept: no' conftest.file >/dev/null 2>&1; then
2974
-  ( sleep 1 ) &
2975
-  am_sleep_pid=$!
2976
-fi
2977
-
2978
-rm -f conftest.file
2979
-
2980 2970
 test "$program_prefix" != NONE &&
2981 2971
   program_transform_name="s&^&$program_prefix&;$program_transform_name"
2982 2972
 # Use a double $ so make ignores it.
... ...
@@ -3003,8 +2986,8 @@ if eval "$MISSING --run true"; then
3003 3003
   am_missing_run="$MISSING --run "
3004 3004
 else
3005 3005
   am_missing_run=
3006
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5
3007
-$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
3006
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5
3007
+$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
3008 3008
 fi
3009 3009
 
3010 3010
 if test x"${install_sh}" != xset; then
... ...
@@ -3016,10 +2999,10 @@ if test x"${install_sh}" != xset; then
3016 3016
   esac
3017 3017
 fi
3018 3018
 
3019
-# Installed binaries are usually stripped using 'strip' when the user
3020
-# run "make install-strip".  However 'strip' might not be the right
3019
+# Installed binaries are usually stripped using `strip' when the user
3020
+# run `make install-strip'.  However `strip' might not be the right
3021 3021
 # tool to use in cross-compilation environments, therefore Automake
3022
-# will honor the 'STRIP' environment variable to overrule this program.
3022
+# will honor the `STRIP' environment variable to overrule this program.
3023 3023
 if test "$cross_compiling" != no; then
3024 3024
   if test -n "$ac_tool_prefix"; then
3025 3025
   # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
... ...
@@ -3158,6 +3141,12 @@ fi
3158 3158
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
3159 3159
 $as_echo "$MKDIR_P" >&6; }
3160 3160
 
3161
+mkdir_p="$MKDIR_P"
3162
+case $mkdir_p in
3163
+  [\\/$]* | ?:[\\/]*) ;;
3164
+  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
3165
+esac
3166
+
3161 3167
 for ac_prog in gawk mawk nawk awk
3162 3168
 do
3163 3169
   # Extract the first word of "$ac_prog", so it can be a program name with args.
... ...
@@ -3281,12 +3270,6 @@ AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
3281 3281
 
3282 3282
 MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
3283 3283
 
3284
-# For better backward compatibility.  To be removed once Automake 1.9.x
3285
-# dies out for good.  For more background, see:
3286
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
3287
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
3288
-mkdir_p='$(MKDIR_P)'
3289
-
3290 3284
 # We need awk for the "check" target.  The system "awk" is bad on
3291 3285
 # some platforms.
3292 3286
 # Always define AMTAR for backward compatibility.  Yes, it's still used
... ...
@@ -3300,7 +3283,7 @@ $as_echo_n "checking how to create a ustar tar archive... " >&6; }
3300 3300
 _am_tools='gnutar plaintar pax cpio none'
3301 3301
 _am_tools=${am_cv_prog_tar_ustar-$_am_tools}
3302 3302
 # Do not fold the above two line into one, because Tru64 sh and
3303
-# Solaris sh will not grok spaces in the rhs of '-'.
3303
+# Solaris sh will not grok spaces in the rhs of `-'.
3304 3304
 for _am_tool in $_am_tools
3305 3305
 do
3306 3306
   case $_am_tool in
... ...
@@ -3385,10 +3368,10 @@ if test "${enable_silent_rules+set}" = set; then :
3385 3385
   enableval=$enable_silent_rules;
3386 3386
 fi
3387 3387
 
3388
-case $enable_silent_rules in # (((
3389
-  yes) AM_DEFAULT_VERBOSITY=0;;
3390
-   no) AM_DEFAULT_VERBOSITY=1;;
3391
-    *) AM_DEFAULT_VERBOSITY=0;;
3388
+case $enable_silent_rules in
3389
+yes) AM_DEFAULT_VERBOSITY=0;;
3390
+no)  AM_DEFAULT_VERBOSITY=1;;
3391
+*)   AM_DEFAULT_VERBOSITY=0;;
3392 3392
 esac
3393 3393
 am_make=${MAKE-make}
3394 3394
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
... ...
@@ -3517,6 +3500,108 @@ $as_echo "no" >&6; }
3517 3517
   SET_MAKE="MAKE=${MAKE-make}"
3518 3518
 fi
3519 3519
 
3520
+
3521
+
3522
+
3523
+
3524
+
3525
+
3526
+
3527
+
3528
+case `pwd` in
3529
+  *\ * | *\	*)
3530
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
3531
+$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
3532
+esac
3533
+
3534
+
3535
+
3536
+macro_version='2.4.2'
3537
+macro_revision='1.3337'
3538
+
3539
+
3540
+
3541
+
3542
+
3543
+
3544
+
3545
+
3546
+
3547
+
3548
+
3549
+
3550
+
3551
+ltmain="$ac_aux_dir/ltmain.sh"
3552
+
3553
+# Backslashify metacharacters that are still active within
3554
+# double-quoted strings.
3555
+sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
3556
+
3557
+# Same as above, but do not quote variable references.
3558
+double_quote_subst='s/\(["`\\]\)/\\\1/g'
3559
+
3560
+# Sed substitution to delay expansion of an escaped shell variable in a
3561
+# double_quote_subst'ed string.
3562
+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
3563
+
3564
+# Sed substitution to delay expansion of an escaped single quote.
3565
+delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
3566
+
3567
+# Sed substitution to avoid accidental globbing in evaled expressions
3568
+no_glob_subst='s/\*/\\\*/g'
3569
+
3570
+ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
3571
+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
3572
+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
3573
+
3574
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
3575
+$as_echo_n "checking how to print strings... " >&6; }
3576
+# Test print first, because it will be a builtin if present.
3577
+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
3578
+   test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
3579
+  ECHO='print -r --'
3580
+elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
3581
+  ECHO='printf %s\n'
3582
+else
3583
+  # Use this function as a fallback that always works.
3584
+  func_fallback_echo ()
3585
+  {
3586
+    eval 'cat <<_LTECHO_EOF
3587
+$1
3588
+_LTECHO_EOF'
3589
+  }
3590
+  ECHO='func_fallback_echo'
3591
+fi
3592
+
3593
+# func_echo_all arg...
3594
+# Invoke $ECHO with all args, space-separated.
3595
+func_echo_all ()
3596
+{
3597
+    $ECHO ""
3598
+}
3599
+
3600
+case "$ECHO" in
3601
+  printf*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5
3602
+$as_echo "printf" >&6; } ;;
3603
+  print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5
3604
+$as_echo "print -r" >&6; } ;;
3605
+  *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: cat" >&5
3606
+$as_echo "cat" >&6; } ;;
3607
+esac
3608
+
3609
+
3610
+
3611
+
3612
+
3613
+
3614
+
3615
+
3616
+
3617
+
3618
+
3619
+
3620
+
3621
+
3520 3622
 DEPDIR="${am__leading_dot}deps"
3521 3623
 
3522 3624
 ac_config_commands="$ac_config_commands depfiles"
... ...
@@ -3536,7 +3621,7 @@ am__quote=
3536 3536
 _am_result=none
3537 3537
 # First try GNU make style include.
3538 3538
 echo "include confinc" > confmf
3539
-# Ignore all kinds of additional output from 'make'.
3539
+# Ignore all kinds of additional output from `make'.
3540 3540
 case `$am_make -s -f confmf 2> /dev/null` in #(
3541 3541
 *the\ am__doit\ target*)
3542 3542
   am__include=include
... ...
@@ -4380,8 +4465,8 @@ else
4380 4380
   # We make a subdir and do the tests there.  Otherwise we can end up
4381 4381
   # making bogus files that we don't know about and never remove.  For
4382 4382
   # instance it was reported that on HP-UX the gcc test will end up
4383
-  # making a dummy file named 'D' -- because '-MD' means "put the output
4384
-  # in D".
4383
+  # making a dummy file named `D' -- because `-MD' means `put the output
4384
+  # in D'.
4385 4385
   rm -rf conftest.dir
4386 4386
   mkdir conftest.dir
4387 4387
   # Copy depcomp to subdir because otherwise we won't find it if we're
... ...
@@ -4416,16 +4501,16 @@ else
4416 4416
     : > sub/conftest.c
4417 4417
     for i in 1 2 3 4 5 6; do
4418 4418
       echo '#include "conftst'$i'.h"' >> sub/conftest.c
4419
-      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
4420
-      # Solaris 10 /bin/sh.
4421
-      echo '/* dummy */' > sub/conftst$i.h
4419
+      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
4420
+      # Solaris 8's {/usr,}/bin/sh.
4421
+      touch sub/conftst$i.h
4422 4422
     done
4423 4423
     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
4424 4424
 
4425
-    # We check with '-c' and '-o' for the sake of the "dashmstdout"
4425
+    # We check with `-c' and `-o' for the sake of the "dashmstdout"
4426 4426
     # mode.  It turns out that the SunPro C++ compiler does not properly
4427
-    # handle '-M -o', and we need to detect this.  Also, some Intel
4428
-    # versions had trouble with output in subdirs.
4427
+    # handle `-M -o', and we need to detect this.  Also, some Intel
4428
+    # versions had trouble with output in subdirs
4429 4429
     am__obj=sub/conftest.${OBJEXT-o}
4430 4430
     am__minus_obj="-o $am__obj"
4431 4431
     case $depmode in
... ...
@@ -4434,8 +4519,8 @@ else
4434 4434
       test "$am__universal" = false || continue
4435 4435
       ;;
4436 4436
     nosideeffect)
4437
-      # After this tag, mechanisms are not by side-effect, so they'll
4438
-      # only be used when explicitly requested.
4437
+      # after this tag, mechanisms are not by side-effect, so they'll
4438
+      # only be used when explicitly requested
4439 4439
       if test "x$enable_dependency_tracking" = xyes; then
4440 4440
 	continue
4441 4441
       else
... ...
@@ -4443,7 +4528,7 @@ else
4443 4443
       fi
4444 4444
       ;;
4445 4445
     msvc7 | msvc7msys | msvisualcpp | msvcmsys)
4446
-      # This compiler won't grok '-c -o', but also, the minuso test has
4446
+      # This compiler won't grok `-c -o', but also, the minuso test has
4447 4447
       # not run yet.  These depmodes are late enough in the game, and
4448 4448
       # so weak that their functioning should not be impacted.
4449 4449
       am__obj=conftest.${OBJEXT-o}
... ...
@@ -4497,395 +4582,6 @@ else
4497 4497
 fi
4498 4498
 
4499 4499
 
4500
-if test "x$CC" != xcc; then
4501
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC and cc understand -c and -o together" >&5
4502
-$as_echo_n "checking whether $CC and cc understand -c and -o together... " >&6; }
4503
-else
4504
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cc understands -c and -o together" >&5
4505
-$as_echo_n "checking whether cc understands -c and -o together... " >&6; }
4506
-fi
4507
-set dummy $CC; ac_cc=`$as_echo "$2" |
4508
-		      sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
4509
-if eval \${ac_cv_prog_cc_${ac_cc}_c_o+:} false; then :
4510
-  $as_echo_n "(cached) " >&6
4511
-else
4512
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
4513
-/* end confdefs.h.  */
4514
-
4515
-int
4516
-main ()
4517
-{
4518
-
4519
-  ;
4520
-  return 0;
4521
-}
4522
-_ACEOF
4523
-# Make sure it works both with $CC and with simple cc.
4524
-# We do the test twice because some compilers refuse to overwrite an
4525
-# existing .o file with -o, though they will create one.
4526
-ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
4527
-rm -f conftest2.*
4528
-if { { case "(($ac_try" in
4529
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
4530
-  *) ac_try_echo=$ac_try;;
4531
-esac
4532
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
4533
-$as_echo "$ac_try_echo"; } >&5
4534
-  (eval "$ac_try") 2>&5
4535
-  ac_status=$?
4536
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
4537
-  test $ac_status = 0; } &&
4538
-   test -f conftest2.$ac_objext && { { case "(($ac_try" in
4539
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
4540
-  *) ac_try_echo=$ac_try;;
4541
-esac
4542
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
4543
-$as_echo "$ac_try_echo"; } >&5
4544
-  (eval "$ac_try") 2>&5
4545
-  ac_status=$?
4546
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
4547
-  test $ac_status = 0; };
4548
-then
4549
-  eval ac_cv_prog_cc_${ac_cc}_c_o=yes
4550
-  if test "x$CC" != xcc; then
4551
-    # Test first that cc exists at all.
4552
-    if { ac_try='cc -c conftest.$ac_ext >&5'
4553
-  { { case "(($ac_try" in
4554
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
4555
-  *) ac_try_echo=$ac_try;;
4556
-esac
4557
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
4558
-$as_echo "$ac_try_echo"; } >&5
4559
-  (eval "$ac_try") 2>&5
4560
-  ac_status=$?
4561
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
4562
-  test $ac_status = 0; }; }; then
4563
-      ac_try='cc -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
4564
-      rm -f conftest2.*
4565
-      if { { case "(($ac_try" in
4566
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
4567
-  *) ac_try_echo=$ac_try;;
4568
-esac
4569
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
4570
-$as_echo "$ac_try_echo"; } >&5
4571
-  (eval "$ac_try") 2>&5
4572
-  ac_status=$?
4573
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
4574
-  test $ac_status = 0; } &&
4575
-	 test -f conftest2.$ac_objext && { { case "(($ac_try" in
4576
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
4577
-  *) ac_try_echo=$ac_try;;
4578
-esac
4579
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
4580
-$as_echo "$ac_try_echo"; } >&5
4581
-  (eval "$ac_try") 2>&5
4582
-  ac_status=$?
4583
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
4584
-  test $ac_status = 0; };
4585
-      then
4586
-	# cc works too.
4587
-	:
4588
-      else
4589
-	# cc exists but doesn't like -o.
4590
-	eval ac_cv_prog_cc_${ac_cc}_c_o=no
4591
-      fi
4592
-    fi
4593
-  fi
4594
-else
4595
-  eval ac_cv_prog_cc_${ac_cc}_c_o=no
4596
-fi
4597
-rm -f core conftest*
4598
-
4599
-fi
4600
-if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then
4601
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
4602
-$as_echo "yes" >&6; }
4603
-else
4604
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4605
-$as_echo "no" >&6; }
4606
-
4607
-$as_echo "#define NO_MINUS_C_MINUS_O 1" >>confdefs.h
4608
-
4609
-fi
4610
-
4611
-# FIXME: we rely on the cache variable name because
4612
-# there is no other way.
4613
-set dummy $CC
4614
-am_cc=`echo $2 | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
4615
-eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o
4616
-if test "$am_t" != yes; then
4617
-   # Losing compiler, so override with the script.
4618
-   # FIXME: It is wrong to rewrite CC.
4619
-   # But if we don't then we get into trouble of one sort or another.
4620
-   # A longer-term fix would be to have automake use am__CC in this case,
4621
-   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
4622
-   CC="$am_aux_dir/compile $CC"
4623
-fi
4624
-
4625
-
4626
-
4627
-if test -n "$ac_tool_prefix"; then
4628
-  for ac_prog in ar lib "link -lib"
4629
-  do
4630
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
4631
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
4632
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4633
-$as_echo_n "checking for $ac_word... " >&6; }
4634
-if ${ac_cv_prog_AR+:} false; then :
4635
-  $as_echo_n "(cached) " >&6
4636
-else
4637
-  if test -n "$AR"; then
4638
-  ac_cv_prog_AR="$AR" # Let the user override the test.
4639
-else
4640
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
4641
-for as_dir in $PATH
4642
-do
4643
-  IFS=$as_save_IFS
4644
-  test -z "$as_dir" && as_dir=.
4645
-    for ac_exec_ext in '' $ac_executable_extensions; do
4646
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
4647
-    ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
4648
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4649
-    break 2
4650
-  fi
4651
-done
4652
-  done
4653
-IFS=$as_save_IFS
4654
-
4655
-fi
4656
-fi
4657
-AR=$ac_cv_prog_AR
4658
-if test -n "$AR"; then
4659
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
4660
-$as_echo "$AR" >&6; }
4661
-else
4662
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4663
-$as_echo "no" >&6; }
4664
-fi
4665
-
4666
-
4667
-    test -n "$AR" && break
4668
-  done
4669
-fi
4670
-if test -z "$AR"; then
4671
-  ac_ct_AR=$AR
4672
-  for ac_prog in ar lib "link -lib"
4673
-do
4674
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
4675
-set dummy $ac_prog; ac_word=$2
4676
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4677
-$as_echo_n "checking for $ac_word... " >&6; }
4678
-if ${ac_cv_prog_ac_ct_AR+:} false; then :
4679
-  $as_echo_n "(cached) " >&6
4680
-else
4681
-  if test -n "$ac_ct_AR"; then
4682
-  ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
4683
-else
4684
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
4685
-for as_dir in $PATH
4686
-do
4687
-  IFS=$as_save_IFS
4688
-  test -z "$as_dir" && as_dir=.
4689
-    for ac_exec_ext in '' $ac_executable_extensions; do
4690
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
4691
-    ac_cv_prog_ac_ct_AR="$ac_prog"
4692
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4693
-    break 2
4694
-  fi
4695
-done
4696
-  done
4697
-IFS=$as_save_IFS
4698
-
4699
-fi
4700
-fi
4701
-ac_ct_AR=$ac_cv_prog_ac_ct_AR
4702
-if test -n "$ac_ct_AR"; then
4703
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
4704
-$as_echo "$ac_ct_AR" >&6; }
4705
-else
4706
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4707
-$as_echo "no" >&6; }
4708
-fi
4709
-
4710
-
4711
-  test -n "$ac_ct_AR" && break
4712
-done
4713
-
4714
-  if test "x$ac_ct_AR" = x; then
4715
-    AR="false"
4716
-  else
4717
-    case $cross_compiling:$ac_tool_warned in
4718
-yes:)
4719
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
4720
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
4721
-ac_tool_warned=yes ;;
4722
-esac
4723
-    AR=$ac_ct_AR
4724
-  fi
4725
-fi
4726
-
4727
-: ${AR=ar}
4728
-
4729
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the archiver ($AR) interface" >&5
4730
-$as_echo_n "checking the archiver ($AR) interface... " >&6; }
4731
-if ${am_cv_ar_interface+:} false; then :
4732
-  $as_echo_n "(cached) " >&6
4733
-else
4734
-  am_cv_ar_interface=ar
4735
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
4736
-/* end confdefs.h.  */
4737
-int some_variable = 0;
4738
-_ACEOF
4739
-if ac_fn_c_try_compile "$LINENO"; then :
4740
-  am_ar_try='$AR cru libconftest.a conftest.$ac_objext >&5'
4741
-      { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$am_ar_try\""; } >&5
4742
-  (eval $am_ar_try) 2>&5
4743
-  ac_status=$?
4744
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
4745
-  test $ac_status = 0; }
4746
-      if test "$ac_status" -eq 0; then
4747
-        am_cv_ar_interface=ar
4748
-      else
4749
-        am_ar_try='$AR -NOLOGO -OUT:conftest.lib conftest.$ac_objext >&5'
4750
-        { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$am_ar_try\""; } >&5
4751
-  (eval $am_ar_try) 2>&5
4752
-  ac_status=$?
4753
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
4754
-  test $ac_status = 0; }
4755
-        if test "$ac_status" -eq 0; then
4756
-          am_cv_ar_interface=lib
4757
-        else
4758
-          am_cv_ar_interface=unknown
4759
-        fi
4760
-      fi
4761
-      rm -f conftest.lib libconftest.a
4762
-
4763
-fi
4764
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
4765
-
4766
-fi
4767
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_ar_interface" >&5
4768
-$as_echo "$am_cv_ar_interface" >&6; }
4769
-
4770
-case $am_cv_ar_interface in
4771
-ar)
4772
-  ;;
4773
-lib)
4774
-  # Microsoft lib, so override with the ar-lib wrapper script.
4775
-  # FIXME: It is wrong to rewrite AR.
4776
-  # But if we don't then we get into trouble of one sort or another.
4777
-  # A longer-term fix would be to have automake use am__AR in this case,
4778
-  # and then we could set am__AR="$am_aux_dir/ar-lib \$(AR)" or something
4779
-  # similar.
4780
-  AR="$am_aux_dir/ar-lib $AR"
4781
-  ;;
4782
-unknown)
4783
-  as_fn_error $? "could not determine $AR interface" "$LINENO" 5
4784
-  ;;
4785
-esac
4786
-
4787
-
4788
-
4789
-
4790
-
4791
-
4792
-
4793
-
4794
-
4795
-case `pwd` in
4796
-  *\ * | *\	*)
4797
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
4798
-$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
4799
-esac
4800
-
4801
-
4802
-
4803
-macro_version='2.4.2'
4804
-macro_revision='1.3337'
4805
-
4806
-
4807
-
4808
-
4809
-
4810
-
4811
-
4812
-
4813
-
4814
-
4815
-
4816
-
4817
-
4818
-ltmain="$ac_aux_dir/ltmain.sh"
4819
-
4820
-# Backslashify metacharacters that are still active within
4821
-# double-quoted strings.
4822
-sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
4823
-
4824
-# Same as above, but do not quote variable references.
4825
-double_quote_subst='s/\(["`\\]\)/\\\1/g'
4826
-
4827
-# Sed substitution to delay expansion of an escaped shell variable in a
4828
-# double_quote_subst'ed string.
4829
-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
4830
-
4831
-# Sed substitution to delay expansion of an escaped single quote.
4832
-delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
4833
-
4834
-# Sed substitution to avoid accidental globbing in evaled expressions
4835
-no_glob_subst='s/\*/\\\*/g'
4836
-
4837
-ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
4838
-ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
4839
-ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
4840
-
4841
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
4842
-$as_echo_n "checking how to print strings... " >&6; }
4843
-# Test print first, because it will be a builtin if present.
4844
-if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
4845
-   test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
4846
-  ECHO='print -r --'
4847
-elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
4848
-  ECHO='printf %s\n'
4849
-else
4850
-  # Use this function as a fallback that always works.
4851
-  func_fallback_echo ()
4852
-  {
4853
-    eval 'cat <<_LTECHO_EOF
4854
-$1
4855
-_LTECHO_EOF'
4856
-  }
4857
-  ECHO='func_fallback_echo'
4858
-fi
4859
-
4860
-# func_echo_all arg...
4861
-# Invoke $ECHO with all args, space-separated.
4862
-func_echo_all ()
4863
-{
4864
-    $ECHO ""
4865
-}
4866
-
4867
-case "$ECHO" in
4868
-  printf*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5
4869
-$as_echo "printf" >&6; } ;;
4870
-  print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5
4871
-$as_echo "print -r" >&6; } ;;
4872
-  *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: cat" >&5
4873
-$as_echo "cat" >&6; } ;;
4874
-esac
4875
-
4876
-
4877
-
4878
-
4879
-
4880
-
4881
-
4882
-
4883
-
4884
-
4885
-
4886
-
4887
-
4888
-
4889 4500
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
4890 4501
 $as_echo_n "checking for a sed that does not truncate output... " >&6; }
4891 4502
 if ${ac_cv_path_SED+:} false; then :
... ...
@@ -6042,7 +5738,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
6042 6042
   lt_cv_deplibs_check_method=pass_all
6043 6043
   ;;
6044 6044
 
6045
-netbsd*)
6045
+netbsd* | netbsdelf*-gnu)
6046 6046
   if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
6047 6047
     lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
6048 6048
   else
... ...
@@ -6300,6 +5996,7 @@ test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
6300 6300
 
6301 6301
 
6302 6302
 
6303
+
6303 6304
 if test -n "$ac_tool_prefix"; then
6304 6305
   for ac_prog in ar
6305 6306
   do
... ...
@@ -9440,6 +9137,9 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
9440 9440
   openbsd*)
9441 9441
     with_gnu_ld=no
9442 9442
     ;;
9443
+  linux* | k*bsd*-gnu | gnu*)
9444
+    link_all_deplibs=no
9445
+    ;;
9443 9446
   esac
9444 9447
 
9445 9448
   ld_shlibs=yes
... ...
@@ -9661,7 +9361,7 @@ _LT_EOF
9661 9661
       fi
9662 9662
       ;;
9663 9663
 
9664
-    netbsd*)
9664
+    netbsd* | netbsdelf*-gnu)
9665 9665
       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
9666 9666
 	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
9667 9667
 	wlarc=
... ...
@@ -9838,6 +9538,7 @@ _LT_EOF
9838 9838
 	if test "$aix_use_runtimelinking" = yes; then
9839 9839
 	  shared_flag="$shared_flag "'${wl}-G'
9840 9840
 	fi
9841
+	link_all_deplibs=no
9841 9842
       else
9842 9843
 	# not using gcc
9843 9844
 	if test "$host_cpu" = ia64; then
... ...
@@ -10291,7 +9992,7 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; }
10291 10291
       link_all_deplibs=yes
10292 10292
       ;;
10293 10293
 
10294
-    netbsd*)
10294
+    netbsd* | netbsdelf*-gnu)
10295 10295
       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
10296 10296
 	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
10297 10297
       else
... ...
@@ -11319,6 +11020,18 @@ fi
11319 11319
   dynamic_linker='GNU/Linux ld.so'
11320 11320
   ;;
11321 11321
 
11322
+netbsdelf*-gnu)
11323
+  version_type=linux
11324
+  need_lib_prefix=no
11325
+  need_version=no
11326
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
11327
+  soname_spec='${libname}${release}${shared_ext}$major'
11328
+  shlibpath_var=LD_LIBRARY_PATH
11329
+  shlibpath_overrides_runpath=no
11330
+  hardcode_into_libs=yes
11331
+  dynamic_linker='NetBSD ld.elf_so'
11332
+  ;;
11333
+
11322 11334
 netbsd*)
11323 11335
   version_type=sunos
11324 11336
   need_lib_prefix=no
... ...
@@ -12899,7 +12612,7 @@ else
12899 12899
     # at 6.2 and later dlopen does load deplibs.
12900 12900
     lt_cv_sys_dlopen_deplibs=yes
12901 12901
     ;;
12902
-  netbsd*)
12902
+  netbsd* | netbsdelf*-gnu)
12903 12903
     lt_cv_sys_dlopen_deplibs=yes
12904 12904
     ;;
12905 12905
   openbsd*)
... ...
@@ -21337,14 +21050,6 @@ LIBOBJS=$ac_libobjs
21337 21337
 LTLIBOBJS=$ac_ltlibobjs
21338 21338
 
21339 21339
 
21340
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5
21341
-$as_echo_n "checking that generated files are newer than configure... " >&6; }
21342
-   if test -n "$am_sleep_pid"; then
21343
-     # Hide warnings about reused PIDs.
21344
-     wait $am_sleep_pid 2>/dev/null
21345
-   fi
21346
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5
21347
-$as_echo "done" >&6; }
21348 21340
  if test -n "$EXEEXT"; then
21349 21341
   am__EXEEXT_TRUE=
21350 21342
   am__EXEEXT_FALSE='#'
... ...
@@ -22932,7 +22637,7 @@ $as_echo "$as_me: executing $ac_file commands" >&6;}
22932 22932
     # Strip MF so we end up with the name of the file.
22933 22933
     mf=`echo "$mf" | sed -e 's/:.*$//'`
22934 22934
     # Check whether this is an Automake generated Makefile or not.
22935
-    # We used to match only the files named 'Makefile.in', but
22935
+    # We used to match only the files named `Makefile.in', but
22936 22936
     # some people rename them; so instead we look at the file content.
22937 22937
     # Grep'ing the first line is not enough: some people post-process
22938 22938
     # each Makefile.in and add a new line on top of each file to say so.
... ...
@@ -22966,19 +22671,21 @@ $as_echo X"$mf" |
22966 22966
       continue
22967 22967
     fi
22968 22968
     # Extract the definition of DEPDIR, am__include, and am__quote
22969
-    # from the Makefile without running 'make'.
22969
+    # from the Makefile without running `make'.
22970 22970
     DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
22971 22971
     test -z "$DEPDIR" && continue
22972 22972
     am__include=`sed -n 's/^am__include = //p' < "$mf"`
22973 22973
     test -z "am__include" && continue
22974 22974
     am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
22975
+    # When using ansi2knr, U may be empty or an underscore; expand it
22976
+    U=`sed -n 's/^U = //p' < "$mf"`
22975 22977
     # Find all dependency output files, they are included files with
22976 22978
     # $(DEPDIR) in their names.  We invoke sed twice because it is the
22977 22979
     # simplest approach to changing $(DEPDIR) to its actual value in the
22978 22980
     # expansion.
22979 22981
     for file in `sed -n "
22980 22982
       s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
22981
-	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
22983
+	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
22982 22984
       # Make sure the directory exists.
22983 22985
       test -f "$dirpart/$file" && continue
22984 22986
       fdir=`$as_dirname -- "$file" ||
... ...
@@ -23951,14 +23658,6 @@ LIBOBJS=$ac_libobjs
23951 23951
 LTLIBOBJS=$ac_ltlibobjs
23952 23952
 
23953 23953
 
23954
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5
23955
-$as_echo_n "checking that generated files are newer than configure... " >&6; }
23956
-   if test -n "$am_sleep_pid"; then
23957
-     # Hide warnings about reused PIDs.
23958
-     wait $am_sleep_pid 2>/dev/null
23959
-   fi
23960
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5
23961
-$as_echo "done" >&6; }
23962 23954
  if test -n "$EXEEXT"; then
23963 23955
   am__EXEEXT_TRUE=
23964 23956
   am__EXEEXT_FALSE='#'
... ...
@@ -25556,7 +25255,7 @@ $as_echo "$as_me: executing $ac_file commands" >&6;}
25556 25556
     # Strip MF so we end up with the name of the file.
25557 25557
     mf=`echo "$mf" | sed -e 's/:.*$//'`
25558 25558
     # Check whether this is an Automake generated Makefile or not.
25559
-    # We used to match only the files named 'Makefile.in', but
25559
+    # We used to match only the files named `Makefile.in', but
25560 25560
     # some people rename them; so instead we look at the file content.
25561 25561
     # Grep'ing the first line is not enough: some people post-process
25562 25562
     # each Makefile.in and add a new line on top of each file to say so.
... ...
@@ -25590,19 +25289,21 @@ $as_echo X"$mf" |
25590 25590
       continue
25591 25591
     fi
25592 25592
     # Extract the definition of DEPDIR, am__include, and am__quote
25593
-    # from the Makefile without running 'make'.
25593
+    # from the Makefile without running `make'.
25594 25594
     DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
25595 25595
     test -z "$DEPDIR" && continue
25596 25596
     am__include=`sed -n 's/^am__include = //p' < "$mf"`
25597 25597
     test -z "am__include" && continue
25598 25598
     am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
25599
+    # When using ansi2knr, U may be empty or an underscore; expand it
25600
+    U=`sed -n 's/^U = //p' < "$mf"`
25599 25601
     # Find all dependency output files, they are included files with
25600 25602
     # $(DEPDIR) in their names.  We invoke sed twice because it is the
25601 25603
     # simplest approach to changing $(DEPDIR) to its actual value in the
25602 25604
     # expansion.
25603 25605
     for file in `sed -n "
25604 25606
       s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
25605
-	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
25607
+	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
25606 25608
       # Make sure the directory exists.
25607 25609
       test -f "$dirpart/$file" && continue
25608 25610
       fdir=`$as_dirname -- "$file" ||
... ...
@@ -55,8 +55,6 @@ AC_PROG_AWK
55 55
 AC_PROG_INSTALL
56 56
 AC_PROG_LN_S
57 57
 AC_PROG_MAKE_SET
58
-AM_PROG_CC_C_O
59
-AM_PROG_AR
60 58
 
61 59
 LT_CONFIG_LTDL_DIR([libltdl])
62 60
 LT_INIT([dlopen disable-static])
... ...
@@ -1,8 +1,9 @@
1
-# Makefile.in generated by automake 1.12.4 from Makefile.am.
1
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
2 2
 # @configure_input@
3 3
 
4
-# Copyright (C) 1994-2012 Free Software Foundation, Inc.
5
-
4
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
5
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
6
+# Foundation, Inc.
6 7
 # This Makefile.in is free software; the Free Software Foundation
7 8
 # gives unlimited permission to copy and/or distribute it,
8 9
 # with or without modifications, as long as this notice is preserved.
... ...
@@ -89,18 +90,12 @@ mkinstalldirs = $(install_sh) -d
89 89
 CONFIG_HEADER = $(top_builddir)/clamav-config.h
90 90
 CONFIG_CLEAN_FILES =
91 91
 CONFIG_CLEAN_VPATH_FILES =
92
-AM_V_P = $(am__v_P_@AM_V@)
93
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
94
-am__v_P_0 = false
95
-am__v_P_1 = :
96 92
 AM_V_GEN = $(am__v_GEN_@AM_V@)
97 93
 am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
98
-am__v_GEN_0 = @echo "  GEN     " $@;
99
-am__v_GEN_1 = 
94
+am__v_GEN_0 = @echo "  GEN   " $@;
100 95
 AM_V_at = $(am__v_at_@AM_V@)
101 96
 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
102 97
 am__v_at_0 = @
103
-am__v_at_1 = 
104 98
 SOURCES =
105 99
 DIST_SOURCES =
106 100
 am__can_run_installinfo = \
... ...
@@ -321,8 +316,6 @@ TAGS:
321 321
 ctags: CTAGS
322 322
 CTAGS:
323 323
 
324
-cscope cscopelist:
325
-
326 324
 
327 325
 distdir: $(DISTFILES)
328 326
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
... ...
@@ -1,8 +1,9 @@
1
-# Makefile.in generated by automake 1.12.4 from Makefile.am.
1
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
2 2
 # @configure_input@
3 3
 
4
-# Copyright (C) 1994-2012 Free Software Foundation, Inc.
5
-
4
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
5
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
6
+# Foundation, Inc.
6 7
 # This Makefile.in is free software; the Free Software Foundation
7 8
 # gives unlimited permission to copy and/or distribute it,
8 9
 # with or without modifications, as long as this notice is preserved.
... ...
@@ -88,18 +89,12 @@ mkinstalldirs = $(install_sh) -d
88 88
 CONFIG_HEADER = $(top_builddir)/clamav-config.h
89 89
 CONFIG_CLEAN_FILES =
90 90
 CONFIG_CLEAN_VPATH_FILES =
91
-AM_V_P = $(am__v_P_@AM_V@)
92
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
93
-am__v_P_0 = false
94
-am__v_P_1 = :
95 91
 AM_V_GEN = $(am__v_GEN_@AM_V@)
96 92
 am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
97
-am__v_GEN_0 = @echo "  GEN     " $@;
98
-am__v_GEN_1 = 
93
+am__v_GEN_0 = @echo "  GEN   " $@;
99 94
 AM_V_at = $(am__v_at_@AM_V@)
100 95
 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
101 96
 am__v_at_0 = @
102
-am__v_at_1 = 
103 97
 SOURCES =
104 98
 DIST_SOURCES =
105 99
 am__can_run_installinfo = \
... ...
@@ -483,8 +478,6 @@ TAGS:
483 483
 ctags: CTAGS
484 484
 CTAGS:
485 485
 
486
-cscope cscopelist:
487
-
488 486
 
489 487
 distdir: $(DISTFILES)
490 488
 	@list='$(MANS)'; if test -n "$$list"; then \
... ...
@@ -493,10 +486,10 @@ distdir: $(DISTFILES)
493 493
 	    if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \
494 494
 	  if test -n "$$list" && \
495 495
 	    grep 'ab help2man is required to generate this page' $$list >/dev/null; then \
496
-	    echo "error: found man pages containing the 'missing help2man' replacement text:" >&2; \
496
+	    echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \
497 497
 	    grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/         /' >&2; \
498 498
 	    echo "       to fix them, install help2man, remove and regenerate the man pages;" >&2; \
499
-	    echo "       typically 'make maintainer-clean' will remove them" >&2; \
499
+	    echo "       typically \`make maintainer-clean' will remove them" >&2; \
500 500
 	    exit 1; \
501 501
 	  else :; fi; \
502 502
 	else :; fi
... ...
@@ -1,8 +1,9 @@
1
-# Makefile.in generated by automake 1.12.4 from Makefile.am.
1
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
2 2
 # @configure_input@
3 3
 
4
-# Copyright (C) 1994-2012 Free Software Foundation, Inc.
5
-
4
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
5
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
6
+# Foundation, Inc.
6 7
 # This Makefile.in is free software; the Free Software Foundation
7 8
 # gives unlimited permission to copy and/or distribute it,
8 9
 # with or without modifications, as long as this notice is preserved.
... ...
@@ -90,18 +91,12 @@ mkinstalldirs = $(install_sh) -d
90 90
 CONFIG_HEADER = $(top_builddir)/clamav-config.h
91 91
 CONFIG_CLEAN_FILES =
92 92
 CONFIG_CLEAN_VPATH_FILES =
93
-AM_V_P = $(am__v_P_@AM_V@)
94
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
95
-am__v_P_0 = false
96
-am__v_P_1 = :
97 93
 AM_V_GEN = $(am__v_GEN_@AM_V@)
98 94
 am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
99
-am__v_GEN_0 = @echo "  GEN     " $@;
100
-am__v_GEN_1 = 
95
+am__v_GEN_0 = @echo "  GEN   " $@;
101 96
 AM_V_at = $(am__v_at_@AM_V@)
102 97
 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
103 98
 am__v_at_0 = @
104
-am__v_at_1 = 
105 99
 SOURCES =
106 100
 DIST_SOURCES =
107 101
 am__can_run_installinfo = \
... ...
@@ -373,8 +368,6 @@ TAGS:
373 373
 ctags: CTAGS
374 374
 CTAGS:
375 375
 
376
-cscope cscopelist:
377
-
378 376
 
379 377
 distdir: $(DISTFILES)
380 378
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
... ...
@@ -1,8 +1,9 @@
1
-# Makefile.in generated by automake 1.12.4 from Makefile.am.
1
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
2 2
 # @configure_input@
3 3
 
4
-# Copyright (C) 1994-2012 Free Software Foundation, Inc.
5
-
4
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
5
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
6
+# Foundation, Inc.
6 7
 # This Makefile.in is free software; the Free Software Foundation
7 8
 # gives unlimited permission to copy and/or distribute it,
8 9
 # with or without modifications, as long as this notice is preserved.
... ...
@@ -72,8 +73,7 @@ host_triplet = @host@
72 72
 target_triplet = @target@
73 73
 bin_PROGRAMS = freshclam$(EXEEXT)
74 74
 subdir = freshclam
75
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
76
-	$(top_srcdir)/config/depcomp
75
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
77 76
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
78 77
 am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
79 78
 	$(top_srcdir)/m4/argz.m4 \
... ...
@@ -104,19 +104,6 @@ freshclam_LDADD = $(LDADD)
104 104
 AM_V_lt = $(am__v_lt_@AM_V@)
105 105
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
106 106
 am__v_lt_0 = --silent
107
-am__v_lt_1 = 
108
-AM_V_P = $(am__v_P_@AM_V@)
109
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
110
-am__v_P_0 = false
111
-am__v_P_1 = :
112
-AM_V_GEN = $(am__v_GEN_@AM_V@)
113
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
114
-am__v_GEN_0 = @echo "  GEN     " $@;
115
-am__v_GEN_1 = 
116
-AM_V_at = $(am__v_at_@AM_V@)
117
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
118
-am__v_at_0 = @
119
-am__v_at_1 = 
120 107
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
121 108
 depcomp = $(SHELL) $(top_srcdir)/config/depcomp
122 109
 am__depfiles_maybe = depfiles
... ...
@@ -129,16 +116,20 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
129 129
 	$(AM_CFLAGS) $(CFLAGS)
130 130
 AM_V_CC = $(am__v_CC_@AM_V@)
131 131
 am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
132
-am__v_CC_0 = @echo "  CC      " $@;
133
-am__v_CC_1 = 
132
+am__v_CC_0 = @echo "  CC    " $@;
133
+AM_V_at = $(am__v_at_@AM_V@)
134
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
135
+am__v_at_0 = @
134 136
 CCLD = $(CC)
135 137
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
136 138
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
137 139
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
138 140
 AM_V_CCLD = $(am__v_CCLD_@AM_V@)
139 141
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
140
-am__v_CCLD_0 = @echo "  CCLD    " $@;
141
-am__v_CCLD_1 = 
142
+am__v_CCLD_0 = @echo "  CCLD  " $@;
143
+AM_V_GEN = $(am__v_GEN_@AM_V@)
144
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
145
+am__v_GEN_0 = @echo "  GEN   " $@;
142 146
 SOURCES = $(freshclam_SOURCES)
143 147
 DIST_SOURCES = $(freshclam_SOURCES)
144 148
 am__can_run_installinfo = \
... ...
@@ -329,8 +320,8 @@ freshclam_SOURCES = \
329 329
     $(top_srcdir)/shared/tar.h \
330 330
     $(top_srcdir)/shared/clamdcom.c \
331 331
     $(top_srcdir)/shared/clamdcom.h \
332
-    freshclam.c \
333 332
     freshclamcodes.h \
333
+    freshclam.c \
334 334
     manager.c \
335 335
     manager.h \
336 336
     notify.c \
... ...
@@ -643,20 +634,6 @@ GTAGS:
643 643
 	  && $(am__cd) $(top_srcdir) \
644 644
 	  && gtags -i $(GTAGS_ARGS) "$$here"
645 645
 
646
-cscopelist:  $(HEADERS) $(SOURCES) $(LISP)
647
-	list='$(SOURCES) $(HEADERS) $(LISP)'; \
648
-	case "$(srcdir)" in \
649
-	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
650
-	  *) sdir=$(subdir)/$(srcdir) ;; \
651
-	esac; \
652
-	for i in $$list; do \
653
-	  if test -f "$$i"; then \
654
-	    echo "$(subdir)/$$i"; \
655
-	  else \
656
-	    echo "$$sdir/$$i"; \
657
-	  fi; \
658
-	done >> $(top_builddir)/cscope.files
659
-
660 646
 distclean-tags:
661 647
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
662 648
 
... ...
@@ -801,19 +778,18 @@ uninstall-am: uninstall-binPROGRAMS
801 801
 .MAKE: install-am install-strip
802 802
 
803 803
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
804
-	clean-generic clean-libtool cscopelist ctags distclean \
805
-	distclean-compile distclean-generic distclean-libtool \
806
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
807
-	install install-am install-binPROGRAMS install-data \
808
-	install-data-am install-dvi install-dvi-am install-exec \
809
-	install-exec-am install-html install-html-am install-info \
810
-	install-info-am install-man install-pdf install-pdf-am \
811
-	install-ps install-ps-am install-strip installcheck \
812
-	installcheck-am installcheck-binPROGRAMS installdirs \
813
-	maintainer-clean maintainer-clean-generic mostlyclean \
814
-	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
815
-	pdf pdf-am ps ps-am tags uninstall uninstall-am \
816
-	uninstall-binPROGRAMS
804
+	clean-generic clean-libtool ctags distclean distclean-compile \
805
+	distclean-generic distclean-libtool distclean-tags distdir dvi \
806
+	dvi-am html html-am info info-am install install-am \
807
+	install-binPROGRAMS install-data install-data-am install-dvi \
808
+	install-dvi-am install-exec install-exec-am install-html \
809
+	install-html-am install-info install-info-am install-man \
810
+	install-pdf install-pdf-am install-ps install-ps-am \
811
+	install-strip installcheck installcheck-am \
812
+	installcheck-binPROGRAMS installdirs maintainer-clean \
813
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
814
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
815
+	tags uninstall uninstall-am uninstall-binPROGRAMS
817 816
 
818 817
 
819 818
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
... ...
@@ -1,8 +1,9 @@
1
-# Makefile.in generated by automake 1.12.4 from Makefile.am.
1
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
2 2
 # @configure_input@
3 3
 
4
-# Copyright (C) 1994-2012 Free Software Foundation, Inc.
5
-
4
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
5
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
6
+# Foundation, Inc.
6 7
 # This Makefile.in is free software; the Free Software Foundation
7 8
 # gives unlimited permission to copy and/or distribute it,
8 9
 # with or without modifications, as long as this notice is preserved.
... ...
@@ -81,7 +82,7 @@ target_triplet = @target@
81 81
 @VERSIONSCRIPT_TRUE@am__append_6 = -Wl,@VERSIONSCRIPTFLAG@,@top_srcdir@/libclamav/libclamav.map
82 82
 subdir = libclamav
83 83
 DIST_COMMON = $(include_HEADERS) $(srcdir)/Makefile.am \
84
-	$(srcdir)/Makefile.in $(top_srcdir)/config/depcomp
84
+	$(srcdir)/Makefile.in
85 85
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
86 86
 am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
87 87
 	$(top_srcdir)/m4/argz.m4 \
... ...
@@ -241,7 +242,6 @@ libclamav_la_OBJECTS = $(am_libclamav_la_OBJECTS)
241 241
 AM_V_lt = $(am__v_lt_@AM_V@)
242 242
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
243 243
 am__v_lt_0 = --silent
244
-am__v_lt_1 = 
245 244
 libclamav_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
246 245
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(libclamav_la_CFLAGS) \
247 246
 	$(CFLAGS) $(libclamav_la_LDFLAGS) $(LDFLAGS) -o $@
... ...
@@ -316,18 +316,6 @@ libclamunrar_iface_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
316 316
 	$(AM_CFLAGS) $(CFLAGS) $(libclamunrar_iface_la_LDFLAGS) \
317 317
 	$(LDFLAGS) -o $@
318 318
 @ENABLE_UNRAR_TRUE@am_libclamunrar_iface_la_rpath = -rpath $(libdir)
319
-AM_V_P = $(am__v_P_@AM_V@)
320
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
321
-am__v_P_0 = false
322
-am__v_P_1 = :
323
-AM_V_GEN = $(am__v_GEN_@AM_V@)
324
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
325
-am__v_GEN_0 = @echo "  GEN     " $@;
326
-am__v_GEN_1 = 
327
-AM_V_at = $(am__v_at_@AM_V@)
328
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
329
-am__v_at_0 = @
330
-am__v_at_1 = 
331 319
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
332 320
 depcomp = $(SHELL) $(top_srcdir)/config/depcomp
333 321
 am__depfiles_maybe = depfiles
... ...
@@ -340,16 +328,20 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
340 340
 	$(AM_CFLAGS) $(CFLAGS)
341 341
 AM_V_CC = $(am__v_CC_@AM_V@)
342 342
 am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
343
-am__v_CC_0 = @echo "  CC      " $@;
344
-am__v_CC_1 = 
343
+am__v_CC_0 = @echo "  CC    " $@;
344
+AM_V_at = $(am__v_at_@AM_V@)
345
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
346
+am__v_at_0 = @
345 347
 CCLD = $(CC)
346 348
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
347 349
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
348 350
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
349 351
 AM_V_CCLD = $(am__v_CCLD_@AM_V@)
350 352
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
351
-am__v_CCLD_0 = @echo "  CCLD    " $@;
352
-am__v_CCLD_1 = 
353
+am__v_CCLD_0 = @echo "  CCLD  " $@;
354
+AM_V_GEN = $(am__v_GEN_@AM_V@)
355
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
356
+am__v_GEN_0 = @echo "  GEN   " $@;
353 357
 SOURCES = $(libclamav_la_SOURCES) \
354 358
 	$(libclamav_internal_utils_la_SOURCES) \
355 359
 	$(libclamav_internal_utils_nothreads_la_SOURCES) \
... ...
@@ -847,25 +839,21 @@ uninstall-libLTLIBRARIES:
847 847
 
848 848
 clean-libLTLIBRARIES:
849 849
 	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
850
-	@list='$(lib_LTLIBRARIES)'; \
851
-	locs=`for p in $$list; do echo $$p; done | \
852
-	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
853
-	      sort -u`; \
854
-	test -z "$$locs" || { \
855
-	  echo rm -f $${locs}; \
856
-	  rm -f $${locs}; \
857
-	}
850
+	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
851
+	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
852
+	  test "$$dir" != "$$p" || dir=.; \
853
+	  echo "rm -f \"$${dir}/so_locations\""; \
854
+	  rm -f "$${dir}/so_locations"; \
855
+	done
858 856
 
859 857
 clean-noinstLTLIBRARIES:
860 858
 	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
861
-	@list='$(noinst_LTLIBRARIES)'; \
862
-	locs=`for p in $$list; do echo $$p; done | \
863
-	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
864
-	      sort -u`; \
865
-	test -z "$$locs" || { \
866
-	  echo rm -f $${locs}; \
867
-	  rm -f $${locs}; \
868
-	}
859
+	@list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
860
+	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
861
+	  test "$$dir" != "$$p" || dir=.; \
862
+	  echo "rm -f \"$${dir}/so_locations\""; \
863
+	  rm -f "$${dir}/so_locations"; \
864
+	done
869 865
 libclamav.la: $(libclamav_la_OBJECTS) $(libclamav_la_DEPENDENCIES) $(EXTRA_libclamav_la_DEPENDENCIES) 
870 866
 	$(AM_V_CCLD)$(libclamav_la_LINK) -rpath $(libdir) $(libclamav_la_OBJECTS) $(libclamav_la_LIBADD) $(LIBS)
871 867
 libclamav_internal_utils.la: $(libclamav_internal_utils_la_OBJECTS) $(libclamav_internal_utils_la_DEPENDENCIES) $(EXTRA_libclamav_internal_utils_la_DEPENDENCIES) 
... ...
@@ -2704,12 +2692,12 @@ uninstall-includeHEADERS:
2704 2704
 	dir='$(DESTDIR)$(includedir)'; $(am__uninstall_files_from_dir)
2705 2705
 
2706 2706
 # This directory's subdirectories are mostly independent; you can cd
2707
-# into them and run 'make' without going through this Makefile.
2708
-# To change the values of 'make' variables: instead of editing Makefiles,
2709
-# (1) if the variable is set in 'config.status', edit 'config.status'
2710
-#     (which will cause the Makefiles to be regenerated when you run 'make');
2711
-# (2) otherwise, pass the desired values on the 'make' command line.
2712
-$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS):
2707
+# into them and run `make' without going through this Makefile.
2708
+# To change the values of `make' variables: instead of editing Makefiles,
2709
+# (1) if the variable is set in `config.status', edit `config.status'
2710
+#     (which will cause the Makefiles to be regenerated when you run `make');
2711
+# (2) otherwise, pass the desired values on the `make' command line.
2712
+$(RECURSIVE_TARGETS):
2713 2713
 	@fail= failcom='exit 1'; \
2714 2714
 	for f in x $$MAKEFLAGS; do \
2715 2715
 	  case $$f in \
... ...
@@ -2719,11 +2707,7 @@ $(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS):
2719 2719
 	done; \
2720 2720
 	dot_seen=no; \
2721 2721
 	target=`echo $@ | sed s/-recursive//`; \
2722
-	case "$@" in \
2723
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
2724
-	  *) list='$(SUBDIRS)' ;; \
2725
-	esac; \
2726
-	for subdir in $$list; do \
2722
+	list='$(SUBDIRS)'; for subdir in $$list; do \
2727 2723
 	  echo "Making $$target in $$subdir"; \
2728 2724
 	  if test "$$subdir" = "."; then \
2729 2725
 	    dot_seen=yes; \
... ...
@@ -2737,6 +2721,37 @@ $(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS):
2737 2737
 	if test "$$dot_seen" = "no"; then \
2738 2738
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
2739 2739
 	fi; test -z "$$fail"
2740
+
2741
+$(RECURSIVE_CLEAN_TARGETS):
2742
+	@fail= failcom='exit 1'; \
2743
+	for f in x $$MAKEFLAGS; do \
2744
+	  case $$f in \
2745
+	    *=* | --[!k]*);; \
2746
+	    *k*) failcom='fail=yes';; \
2747
+	  esac; \
2748
+	done; \
2749
+	dot_seen=no; \
2750
+	case "$@" in \
2751
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
2752
+	  *) list='$(SUBDIRS)' ;; \
2753
+	esac; \
2754
+	rev=''; for subdir in $$list; do \
2755
+	  if test "$$subdir" = "."; then :; else \
2756
+	    rev="$$subdir $$rev"; \
2757
+	  fi; \
2758
+	done; \
2759
+	rev="$$rev ."; \
2760
+	target=`echo $@ | sed s/-recursive//`; \
2761
+	for subdir in $$rev; do \
2762
+	  echo "Making $$target in $$subdir"; \
2763
+	  if test "$$subdir" = "."; then \
2764
+	    local_target="$$target-am"; \
2765
+	  else \
2766
+	    local_target="$$target"; \
2767
+	  fi; \
2768
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
2769
+	  || eval $$failcom; \
2770
+	done && test -z "$$fail"
2740 2771
 tags-recursive:
2741 2772
 	list='$(SUBDIRS)'; for subdir in $$list; do \
2742 2773
 	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
... ...
@@ -2745,10 +2760,6 @@ ctags-recursive:
2745 2745
 	list='$(SUBDIRS)'; for subdir in $$list; do \
2746 2746
 	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
2747 2747
 	done
2748
-cscopelist-recursive:
2749
-	list='$(SUBDIRS)'; for subdir in $$list; do \
2750
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \
2751
-	done
2752 2748
 
2753 2749
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
2754 2750
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
... ...
@@ -2812,20 +2823,6 @@ GTAGS:
2812 2812
 	  && $(am__cd) $(top_srcdir) \
2813 2813
 	  && gtags -i $(GTAGS_ARGS) "$$here"
2814 2814
 
2815
-cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP)
2816
-	list='$(SOURCES) $(HEADERS) $(LISP)'; \
2817
-	case "$(srcdir)" in \
2818
-	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
2819
-	  *) sdir=$(subdir)/$(srcdir) ;; \
2820
-	esac; \
2821
-	for i in $$list; do \
2822
-	  if test -f "$$i"; then \
2823
-	    echo "$(subdir)/$$i"; \
2824
-	  else \
2825
-	    echo "$$sdir/$$i"; \
2826
-	  fi; \
2827
-	done >> $(top_builddir)/cscope.files
2828
-
2829 2815
 distclean-tags:
2830 2816
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
2831 2817
 
... ...
@@ -2998,18 +2995,17 @@ ps-am:
2998 2998
 uninstall-am: uninstall-includeHEADERS uninstall-libLTLIBRARIES
2999 2999
 
3000 3000
 .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all check \
3001
-	cscopelist-recursive ctags-recursive install install-am \
3002
-	install-strip tags-recursive
3001
+	ctags-recursive install install-am install-strip \
3002
+	tags-recursive
3003 3003
 
3004 3004
 .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
3005 3005
 	all all-am check check-am clean clean-generic \
3006 3006
 	clean-libLTLIBRARIES clean-libtool clean-noinstLTLIBRARIES \
3007
-	cscopelist cscopelist-recursive ctags ctags-recursive \
3008
-	distclean distclean-compile distclean-generic \
3009
-	distclean-libtool distclean-tags distdir dvi dvi-am html \
3010
-	html-am info info-am install install-am install-data \
3011
-	install-data-am install-dvi install-dvi-am install-exec \
3012
-	install-exec-am install-html install-html-am \
3007
+	ctags ctags-recursive distclean distclean-compile \
3008
+	distclean-generic distclean-libtool distclean-tags distdir dvi \
3009
+	dvi-am html html-am info info-am install install-am \
3010
+	install-data install-data-am install-dvi install-dvi-am \
3011
+	install-exec install-exec-am install-html install-html-am \
3013 3012
 	install-includeHEADERS install-info install-info-am \
3014 3013
 	install-libLTLIBRARIES install-man install-pdf install-pdf-am \
3015 3014
 	install-ps install-ps-am install-strip installcheck \
... ...
@@ -1,8 +1,9 @@
1
-# Makefile.in generated by automake 1.12.4 from Makefile.am.
1
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
2 2
 # @configure_input@
3 3
 
4
-# Copyright (C) 1994-2012 Free Software Foundation, Inc.
5
-
4
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
5
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
6
+# Foundation, Inc.
6 7
 # This Makefile.in is free software; the Free Software Foundation
7 8
 # gives unlimited permission to copy and/or distribute it,
8 9
 # with or without modifications, as long as this notice is preserved.
... ...
@@ -82,14 +83,9 @@ target_triplet = @target@
82 82
 subdir = .
83 83
 DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \
84 84
 	$(srcdir)/Makefile.in $(srcdir)/clamavcxx-config.h.in \
85
-	$(top_srcdir)/config/ar-lib $(top_srcdir)/config/compile \
86
-	$(top_srcdir)/config/config.guess \
87
-	$(top_srcdir)/config/config.sub $(top_srcdir)/config/depcomp \
88
-	$(top_srcdir)/config/install-sh $(top_srcdir)/config/ltmain.sh \
89
-	$(top_srcdir)/config/missing $(top_srcdir)/configure \
90
-	config/ar-lib config/compile config/config.guess \
91
-	config/config.sub config/depcomp config/install-sh \
92
-	config/ltmain.sh config/missing
85
+	$(top_srcdir)/configure config/config.guess config/config.sub \
86
+	config/depcomp config/install-sh config/ltmain.sh \
87
+	config/missing
93 88
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
94 89
 am__aclocal_m4_deps = $(top_srcdir)/m4/check_gnu_make.m4 \
95 90
 	$(top_srcdir)/m4/cxx_flag_check.m4 $(top_srcdir)/m4/libtool.m4 \
... ...
@@ -118,7 +114,6 @@ libclamavcxx_la_OBJECTS = $(am_libclamavcxx_la_OBJECTS)
118 118
 AM_V_lt = $(am__v_lt_@AM_V@)
119 119
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
120 120
 am__v_lt_0 = --silent
121
-am__v_lt_1 = 
122 121
 libclamavcxx_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
123 122
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
124 123
 	$(libclamavcxx_la_CXXFLAGS) $(CXXFLAGS) \
... ...
@@ -784,18 +779,6 @@ tblgen_LDADD = $(LDADD)
784 784
 tblgen_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
785 785
 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(tblgen_CXXFLAGS) \
786 786
 	$(CXXFLAGS) $(tblgen_LDFLAGS) $(LDFLAGS) -o $@
787
-AM_V_P = $(am__v_P_@AM_V@)
788
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
789
-am__v_P_0 = false
790
-am__v_P_1 = :
791
-AM_V_GEN = $(am__v_GEN_@AM_V@)
792
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
793
-am__v_GEN_0 = @echo "  GEN     " $@;
794
-am__v_GEN_1 = 
795
-AM_V_at = $(am__v_at_@AM_V@)
796
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
797
-am__v_at_0 = @
798
-am__v_at_1 = 
799 787
 DEFAULT_INCLUDES = -I.@am__isrc@
800 788
 depcomp = $(SHELL) $(top_srcdir)/config/depcomp
801 789
 am__depfiles_maybe = depfiles
... ...
@@ -808,16 +791,17 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
808 808
 	$(AM_CFLAGS) $(CFLAGS)
809 809
 AM_V_CC = $(am__v_CC_@AM_V@)
810 810
 am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
811
-am__v_CC_0 = @echo "  CC      " $@;
812
-am__v_CC_1 = 
811
+am__v_CC_0 = @echo "  CC    " $@;
812
+AM_V_at = $(am__v_at_@AM_V@)
813
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
814
+am__v_at_0 = @
813 815
 CCLD = $(CC)
814 816
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
815 817
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
816 818
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
817 819
 AM_V_CCLD = $(am__v_CCLD_@AM_V@)
818 820
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
819
-am__v_CCLD_0 = @echo "  CCLD    " $@;
820
-am__v_CCLD_1 = 
821
+am__v_CCLD_0 = @echo "  CCLD  " $@;
821 822
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
822 823
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
823 824
 LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
... ...
@@ -826,16 +810,17 @@ LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
826 826
 	$(AM_CXXFLAGS) $(CXXFLAGS)
827 827
 AM_V_CXX = $(am__v_CXX_@AM_V@)
828 828
 am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@)
829
-am__v_CXX_0 = @echo "  CXX     " $@;
830
-am__v_CXX_1 = 
829
+am__v_CXX_0 = @echo "  CXX   " $@;
831 830
 CXXLD = $(CXX)
832 831
 CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
833 832
 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
834 833
 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
835 834
 AM_V_CXXLD = $(am__v_CXXLD_@AM_V@)
836 835
 am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@)
837
-am__v_CXXLD_0 = @echo "  CXXLD   " $@;
838
-am__v_CXXLD_1 = 
836
+am__v_CXXLD_0 = @echo "  CXXLD " $@;
837
+AM_V_GEN = $(am__v_GEN_@AM_V@)
838
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
839
+am__v_GEN_0 = @echo "  GEN   " $@;
839 840
 SOURCES = $(libclamavcxx_la_SOURCES) $(libllvmcodegen_la_SOURCES) \
840 841
 	$(libllvmjit_la_SOURCES) $(libllvmpowerpccodegen_la_SOURCES) \
841 842
 	$(libllvmsystem_la_SOURCES) $(libllvmx86codegen_la_SOURCES) \
... ...
@@ -854,8 +839,6 @@ am__can_run_installinfo = \
854 854
   esac
855 855
 ETAGS = etags
856 856
 CTAGS = ctags
857
-CSCOPE = cscope
858
-AM_RECURSIVE_TARGETS = cscope
859 857
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
860 858
 distdir = $(PACKAGE)-$(VERSION)
861 859
 top_distdir = $(distdir)
... ...
@@ -865,10 +848,8 @@ am__remove_distdir = \
865 865
       && rm -rf "$(distdir)" \
866 866
       || { sleep 5 && rm -rf "$(distdir)"; }; \
867 867
   else :; fi
868
-am__post_remove_distdir = $(am__remove_distdir)
869 868
 DIST_ARCHIVES = $(distdir).tar.gz
870 869
 GZIP_ENV = --best
871
-DIST_TARGETS = dist-gzip
872 870
 distuninstallcheck_listfiles = find . -type f -print
873 871
 am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
874 872
   | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
... ...
@@ -1539,14 +1520,12 @@ distclean-hdr:
1539 1539
 
1540 1540
 clean-noinstLTLIBRARIES:
1541 1541
 	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
1542
-	@list='$(noinst_LTLIBRARIES)'; \
1543
-	locs=`for p in $$list; do echo $$p; done | \
1544
-	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
1545
-	      sort -u`; \
1546
-	test -z "$$locs" || { \
1547
-	  echo rm -f $${locs}; \
1548
-	  rm -f $${locs}; \
1549
-	}
1542
+	@list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
1543
+	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
1544
+	  test "$$dir" != "$$p" || dir=.; \
1545
+	  echo "rm -f \"$${dir}/so_locations\""; \
1546
+	  rm -f "$${dir}/so_locations"; \
1547
+	done
1550 1548
 libclamavcxx.la: $(libclamavcxx_la_OBJECTS) $(libclamavcxx_la_DEPENDENCIES) $(EXTRA_libclamavcxx_la_DEPENDENCIES) 
1551 1549
 	$(AM_V_CXXLD)$(libclamavcxx_la_LINK) $(am_libclamavcxx_la_rpath) $(libclamavcxx_la_OBJECTS) $(libclamavcxx_la_LIBADD) $(LIBS)
1552 1550
 libllvmcodegen.la: $(libllvmcodegen_la_OBJECTS) $(libllvmcodegen_la_DEPENDENCIES) $(EXTRA_libllvmcodegen_la_DEPENDENCIES) 
... ...
@@ -5482,32 +5461,8 @@ GTAGS:
5482 5482
 	  && $(am__cd) $(top_srcdir) \
5483 5483
 	  && gtags -i $(GTAGS_ARGS) "$$here"
5484 5484
 
5485
-cscope: cscope.files
5486
-	test ! -s cscope.files \
5487
-	  || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS)
5488
-
5489
-clean-cscope:
5490
-	-rm -f cscope.files
5491
-
5492
-cscope.files: clean-cscope  cscopelist
5493
-
5494
-cscopelist:  $(HEADERS) $(SOURCES) $(LISP)
5495
-	list='$(SOURCES) $(HEADERS) $(LISP)'; \
5496
-	case "$(srcdir)" in \
5497
-	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
5498
-	  *) sdir=$(subdir)/$(srcdir) ;; \
5499
-	esac; \
5500
-	for i in $$list; do \
5501
-	  if test -f "$$i"; then \
5502
-	    echo "$(subdir)/$$i"; \
5503
-	  else \
5504
-	    echo "$$sdir/$$i"; \
5505
-	  fi; \
5506
-	done >> $(top_builddir)/cscope.files
5507
-
5508 5485
 distclean-tags:
5509 5486
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
5510
-	-rm -f cscope.out cscope.in.out cscope.po.out cscope.files
5511 5487
 
5512 5488
 distdir: $(DISTFILES)
5513 5489
 	$(am__remove_distdir)
... ...
@@ -5553,36 +5508,40 @@ distdir: $(DISTFILES)
5553 5553
 	|| chmod -R a+r "$(distdir)"
5554 5554
 dist-gzip: distdir
5555 5555
 	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
5556
-	$(am__post_remove_distdir)
5556
+	$(am__remove_distdir)
5557 5557
 
5558 5558
 dist-bzip2: distdir
5559 5559
 	tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
5560
-	$(am__post_remove_distdir)
5560
+	$(am__remove_distdir)
5561 5561
 
5562 5562
 dist-lzip: distdir
5563 5563
 	tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
5564
-	$(am__post_remove_distdir)
5564
+	$(am__remove_distdir)
5565
+
5566
+dist-lzma: distdir
5567
+	tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
5568
+	$(am__remove_distdir)
5565 5569
 
5566 5570
 dist-xz: distdir
5567 5571
 	tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
5568
-	$(am__post_remove_distdir)
5572
+	$(am__remove_distdir)
5569 5573
 
5570 5574
 dist-tarZ: distdir
5571 5575
 	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
5572
-	$(am__post_remove_distdir)
5576
+	$(am__remove_distdir)
5573 5577
 
5574 5578
 dist-shar: distdir
5575 5579
 	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
5576
-	$(am__post_remove_distdir)
5580
+	$(am__remove_distdir)
5577 5581
 
5578 5582
 dist-zip: distdir
5579 5583
 	-rm -f $(distdir).zip
5580 5584
 	zip -rq $(distdir).zip $(distdir)
5581
-	$(am__post_remove_distdir)
5585
+	$(am__remove_distdir)
5582 5586
 
5583
-dist dist-all:
5584
-	$(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:'
5585
-	$(am__post_remove_distdir)
5587
+dist dist-all: distdir
5588
+	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
5589
+	$(am__remove_distdir)
5586 5590
 
5587 5591
 # This target untars the dist file and tries a VPATH configuration.  Then
5588 5592
 # it guarantees that the distribution is self-contained by making another
... ...
@@ -5593,6 +5552,8 @@ distcheck: dist
5593 5593
 	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
5594 5594
 	*.tar.bz2*) \
5595 5595
 	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
5596
+	*.tar.lzma*) \
5597
+	  lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
5596 5598
 	*.tar.lz*) \
5597 5599
 	  lzip -dc $(distdir).tar.lz | $(am__untar) ;;\
5598 5600
 	*.tar.xz*) \
... ...
@@ -5604,9 +5565,9 @@ distcheck: dist
5604 5604
 	*.zip*) \
5605 5605
 	  unzip $(distdir).zip ;;\
5606 5606
 	esac
5607
-	chmod -R a-w $(distdir)
5608
-	chmod u+w $(distdir)
5609
-	mkdir $(distdir)/_build $(distdir)/_inst
5607
+	chmod -R a-w $(distdir); chmod u+w $(distdir)
5608
+	mkdir $(distdir)/_build
5609
+	mkdir $(distdir)/_inst
5610 5610
 	chmod a-w $(distdir)
5611 5611
 	test -d $(distdir)/_build || exit 0; \
5612 5612
 	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
... ...
@@ -5638,7 +5599,7 @@ distcheck: dist
5638 5638
 	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
5639 5639
 	  && cd "$$am__cwd" \
5640 5640
 	  || exit 1
5641
-	$(am__post_remove_distdir)
5641
+	$(am__remove_distdir)
5642 5642
 	@(echo "$(distdir) archives ready for distribution: "; \
5643 5643
 	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
5644 5644
 	  sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
... ...
@@ -5784,9 +5745,9 @@ uninstall-am:
5784 5784
 .MAKE: all check install install-am install-strip
5785 5785
 
5786 5786
 .PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \
5787
-	clean-cscope clean-generic clean-libtool clean-local \
5788
-	clean-noinstLTLIBRARIES clean-noinstPROGRAMS cscope cscopelist \
5789
-	ctags dist dist-all dist-bzip2 dist-gzip dist-hook dist-lzip \
5787
+	clean-generic clean-libtool clean-local \
5788
+	clean-noinstLTLIBRARIES clean-noinstPROGRAMS ctags dist \
5789
+	dist-all dist-bzip2 dist-gzip dist-hook dist-lzip dist-lzma \
5790 5790
 	dist-shar dist-tarZ dist-xz dist-zip distcheck distclean \
5791 5791
 	distclean-compile distclean-generic distclean-hdr \
5792 5792
 	distclean-libtool distclean-local distclean-tags \
... ...
@@ -1,7 +1,8 @@
1
-# generated automatically by aclocal 1.12.4 -*- Autoconf -*-
2
-
3
-# Copyright (C) 1996-2012 Free Software Foundation, Inc.
1
+# generated automatically by aclocal 1.11.6 -*- Autoconf -*-
4 2
 
3
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
4
+# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
5
+# Inc.
5 6
 # This file is free software; the Free Software Foundation
6 7
 # gives unlimited permission to copy and/or distribute it,
7 8
 # with or without modifications, as long as this notice is preserved.
... ...
@@ -17,24 +18,27 @@ m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],,
17 17
 [m4_warning([this file was generated for autoconf 2.69.
18 18
 You have another version of autoconf.  It may work, but is not guaranteed to.
19 19
 If you have problems, you may need to regenerate the build system entirely.
20
-To do so, use the procedure documented by the package, typically 'autoreconf'.])])
20
+To do so, use the procedure documented by the package, typically `autoreconf'.])])
21 21
 
22
-# Copyright (C) 2002-2012 Free Software Foundation, Inc.
22
+# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software
23
+# Foundation, Inc.
23 24
 #
24 25
 # This file is free software; the Free Software Foundation
25 26
 # gives unlimited permission to copy and/or distribute it,
26 27
 # with or without modifications, as long as this notice is preserved.
27 28
 
29
+# serial 1
30
+
28 31
 # AM_AUTOMAKE_VERSION(VERSION)
29 32
 # ----------------------------
30 33
 # Automake X.Y traces this macro to ensure aclocal.m4 has been
31 34
 # generated from the m4 files accompanying Automake X.Y.
32 35
 # (This private macro should not be called outside this file.)
33 36
 AC_DEFUN([AM_AUTOMAKE_VERSION],
34
-[am__api_version='1.12'
37
+[am__api_version='1.11'
35 38
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
36 39
 dnl require some minimum version.  Point them to the right macro.
37
-m4_if([$1], [1.12.4], [],
40
+m4_if([$1], [1.11.6], [],
38 41
       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
39 42
 ])
40 43
 
... ...
@@ -50,81 +54,24 @@ m4_define([_AM_AUTOCONF_VERSION], [])
50 50
 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
51 51
 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
52 52
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
53
-[AM_AUTOMAKE_VERSION([1.12.4])dnl
53
+[AM_AUTOMAKE_VERSION([1.11.6])dnl
54 54
 m4_ifndef([AC_AUTOCONF_VERSION],
55 55
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
56 56
 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
57 57
 
58
-# Copyright (C) 2011-2012 Free Software Foundation, Inc.
59
-#
60
-# This file is free software; the Free Software Foundation
61
-# gives unlimited permission to copy and/or distribute it,
62
-# with or without modifications, as long as this notice is preserved.
63
-
64
-# AM_PROG_AR([ACT-IF-FAIL])
65
-# -------------------------
66
-# Try to determine the archiver interface, and trigger the ar-lib wrapper
67
-# if it is needed.  If the detection of archiver interface fails, run
68
-# ACT-IF-FAIL (default is to abort configure with a proper error message).
69
-AC_DEFUN([AM_PROG_AR],
70
-[AC_BEFORE([$0], [LT_INIT])dnl
71
-AC_BEFORE([$0], [AC_PROG_LIBTOOL])dnl
72
-AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
73
-AC_REQUIRE_AUX_FILE([ar-lib])dnl
74
-AC_CHECK_TOOLS([AR], [ar lib "link -lib"], [false])
75
-: ${AR=ar}
76
-
77
-AC_CACHE_CHECK([the archiver ($AR) interface], [am_cv_ar_interface],
78
-  [am_cv_ar_interface=ar
79
-   AC_COMPILE_IFELSE([AC_LANG_SOURCE([[int some_variable = 0;]])],
80
-     [am_ar_try='$AR cru libconftest.a conftest.$ac_objext >&AS_MESSAGE_LOG_FD'
81
-      AC_TRY_EVAL([am_ar_try])
82
-      if test "$ac_status" -eq 0; then
83
-        am_cv_ar_interface=ar
84
-      else
85
-        am_ar_try='$AR -NOLOGO -OUT:conftest.lib conftest.$ac_objext >&AS_MESSAGE_LOG_FD'
86
-        AC_TRY_EVAL([am_ar_try])
87
-        if test "$ac_status" -eq 0; then
88
-          am_cv_ar_interface=lib
89
-        else
90
-          am_cv_ar_interface=unknown
91
-        fi
92
-      fi
93
-      rm -f conftest.lib libconftest.a
94
-     ])
95
-   ])
96
-
97
-case $am_cv_ar_interface in
98
-ar)
99
-  ;;
100
-lib)
101
-  # Microsoft lib, so override with the ar-lib wrapper script.
102
-  # FIXME: It is wrong to rewrite AR.
103
-  # But if we don't then we get into trouble of one sort or another.
104
-  # A longer-term fix would be to have automake use am__AR in this case,
105
-  # and then we could set am__AR="$am_aux_dir/ar-lib \$(AR)" or something
106
-  # similar.
107
-  AR="$am_aux_dir/ar-lib $AR"
108
-  ;;
109
-unknown)
110
-  m4_default([$1],
111
-             [AC_MSG_ERROR([could not determine $AR interface])])
112
-  ;;
113
-esac
114
-AC_SUBST([AR])dnl
115
-])
116
-
117 58
 # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
118 59
 
119
-# Copyright (C) 2001-2012 Free Software Foundation, Inc.
60
+# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
120 61
 #
121 62
 # This file is free software; the Free Software Foundation
122 63
 # gives unlimited permission to copy and/or distribute it,
123 64
 # with or without modifications, as long as this notice is preserved.
124 65
 
66
+# serial 1
67
+
125 68
 # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
126
-# $ac_aux_dir to '$srcdir/foo'.  In other projects, it is set to
127
-# '$srcdir', '$srcdir/..', or '$srcdir/../..'.
69
+# $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to
70
+# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
128 71
 #
129 72
 # Of course, Automake must honor this variable whenever it calls a
130 73
 # tool from the auxiliary directory.  The problem is that $srcdir (and
... ...
@@ -143,7 +90,7 @@ AC_SUBST([AR])dnl
143 143
 #
144 144
 # The reason of the latter failure is that $top_srcdir and $ac_aux_dir
145 145
 # are both prefixed by $srcdir.  In an in-source build this is usually
146
-# harmless because $srcdir is '.', but things will broke when you
146
+# harmless because $srcdir is `.', but things will broke when you
147 147
 # start a VPATH build or use an absolute $srcdir.
148 148
 #
149 149
 # So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
... ...
@@ -169,19 +116,22 @@ am_aux_dir=`cd $ac_aux_dir && pwd`
169 169
 
170 170
 # AM_CONDITIONAL                                            -*- Autoconf -*-
171 171
 
172
-# Copyright (C) 1997-2012 Free Software Foundation, Inc.
172
+# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008
173
+# Free Software Foundation, Inc.
173 174
 #
174 175
 # This file is free software; the Free Software Foundation
175 176
 # gives unlimited permission to copy and/or distribute it,
176 177
 # with or without modifications, as long as this notice is preserved.
177 178
 
179
+# serial 9
180
+
178 181
 # AM_CONDITIONAL(NAME, SHELL-CONDITION)
179 182
 # -------------------------------------
180 183
 # Define a conditional.
181 184
 AC_DEFUN([AM_CONDITIONAL],
182
-[AC_PREREQ([2.52])dnl
183
- m4_if([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
184
-       [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
185
+[AC_PREREQ(2.52)dnl
186
+ ifelse([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
187
+	[$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
185 188
 AC_SUBST([$1_TRUE])dnl
186 189
 AC_SUBST([$1_FALSE])dnl
187 190
 _AM_SUBST_NOTMAKE([$1_TRUE])dnl
... ...
@@ -200,14 +150,16 @@ AC_CONFIG_COMMANDS_PRE(
200 200
 Usually this means the macro was only invoked conditionally.]])
201 201
 fi])])
202 202
 
203
-# Copyright (C) 1999-2012 Free Software Foundation, Inc.
203
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009,
204
+# 2010, 2011 Free Software Foundation, Inc.
204 205
 #
205 206
 # This file is free software; the Free Software Foundation
206 207
 # gives unlimited permission to copy and/or distribute it,
207 208
 # with or without modifications, as long as this notice is preserved.
208 209
 
210
+# serial 12
209 211
 
210
-# There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be
212
+# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
211 213
 # written in clear, in which case automake, when reading aclocal.m4,
212 214
 # will think it sees a *use*, and therefore will trigger all it's
213 215
 # C support machinery.  Also note that it means that autoscan, seeing
... ...
@@ -217,7 +169,7 @@ fi])])
217 217
 # _AM_DEPENDENCIES(NAME)
218 218
 # ----------------------
219 219
 # See how the compiler implements dependency checking.
220
-# NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC".
220
+# NAME is "CC", "CXX", "GCJ", or "OBJC".
221 221
 # We try a few techniques and use that to set a single cache variable.
222 222
 #
223 223
 # We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
... ...
@@ -230,13 +182,12 @@ AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
230 230
 AC_REQUIRE([AM_MAKE_INCLUDE])dnl
231 231
 AC_REQUIRE([AM_DEP_TRACK])dnl
232 232
 
233
-m4_if([$1], [CC],   [depcc="$CC"   am_compiler_list=],
234
-      [$1], [CXX],  [depcc="$CXX"  am_compiler_list=],
235
-      [$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
236
-      [$1], [OBJCXX], [depcc="$OBJCXX" am_compiler_list='gcc3 gcc'],
237
-      [$1], [UPC],  [depcc="$UPC"  am_compiler_list=],
238
-      [$1], [GCJ],  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
239
-                    [depcc="$$1"   am_compiler_list=])
233
+ifelse([$1], CC,   [depcc="$CC"   am_compiler_list=],
234
+       [$1], CXX,  [depcc="$CXX"  am_compiler_list=],
235
+       [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
236
+       [$1], UPC,  [depcc="$UPC"  am_compiler_list=],
237
+       [$1], GCJ,  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
238
+                   [depcc="$$1"   am_compiler_list=])
240 239
 
241 240
 AC_CACHE_CHECK([dependency style of $depcc],
242 241
                [am_cv_$1_dependencies_compiler_type],
... ...
@@ -244,8 +195,8 @@ AC_CACHE_CHECK([dependency style of $depcc],
244 244
   # We make a subdir and do the tests there.  Otherwise we can end up
245 245
   # making bogus files that we don't know about and never remove.  For
246 246
   # instance it was reported that on HP-UX the gcc test will end up
247
-  # making a dummy file named 'D' -- because '-MD' means "put the output
248
-  # in D".
247
+  # making a dummy file named `D' -- because `-MD' means `put the output
248
+  # in D'.
249 249
   rm -rf conftest.dir
250 250
   mkdir conftest.dir
251 251
   # Copy depcomp to subdir because otherwise we won't find it if we're
... ...
@@ -285,16 +236,16 @@ AC_CACHE_CHECK([dependency style of $depcc],
285 285
     : > sub/conftest.c
286 286
     for i in 1 2 3 4 5 6; do
287 287
       echo '#include "conftst'$i'.h"' >> sub/conftest.c
288
-      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
289
-      # Solaris 10 /bin/sh.
290
-      echo '/* dummy */' > sub/conftst$i.h
288
+      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
289
+      # Solaris 8's {/usr,}/bin/sh.
290
+      touch sub/conftst$i.h
291 291
     done
292 292
     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
293 293
 
294
-    # We check with '-c' and '-o' for the sake of the "dashmstdout"
294
+    # We check with `-c' and `-o' for the sake of the "dashmstdout"
295 295
     # mode.  It turns out that the SunPro C++ compiler does not properly
296
-    # handle '-M -o', and we need to detect this.  Also, some Intel
297
-    # versions had trouble with output in subdirs.
296
+    # handle `-M -o', and we need to detect this.  Also, some Intel
297
+    # versions had trouble with output in subdirs
298 298
     am__obj=sub/conftest.${OBJEXT-o}
299 299
     am__minus_obj="-o $am__obj"
300 300
     case $depmode in
... ...
@@ -303,8 +254,8 @@ AC_CACHE_CHECK([dependency style of $depcc],
303 303
       test "$am__universal" = false || continue
304 304
       ;;
305 305
     nosideeffect)
306
-      # After this tag, mechanisms are not by side-effect, so they'll
307
-      # only be used when explicitly requested.
306
+      # after this tag, mechanisms are not by side-effect, so they'll
307
+      # only be used when explicitly requested
308 308
       if test "x$enable_dependency_tracking" = xyes; then
309 309
 	continue
310 310
       else
... ...
@@ -312,7 +263,7 @@ AC_CACHE_CHECK([dependency style of $depcc],
312 312
       fi
313 313
       ;;
314 314
     msvc7 | msvc7msys | msvisualcpp | msvcmsys)
315
-      # This compiler won't grok '-c -o', but also, the minuso test has
315
+      # This compiler won't grok `-c -o', but also, the minuso test has
316 316
       # not run yet.  These depmodes are late enough in the game, and
317 317
       # so weak that their functioning should not be impacted.
318 318
       am__obj=conftest.${OBJEXT-o}
... ...
@@ -360,7 +311,7 @@ AM_CONDITIONAL([am__fastdep$1], [
360 360
 # AM_SET_DEPDIR
361 361
 # -------------
362 362
 # Choose a directory name for dependency files.
363
-# This macro is AC_REQUIREd in _AM_DEPENDENCIES.
363
+# This macro is AC_REQUIREd in _AM_DEPENDENCIES
364 364
 AC_DEFUN([AM_SET_DEPDIR],
365 365
 [AC_REQUIRE([AM_SET_LEADING_DOT])dnl
366 366
 AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
... ...
@@ -370,13 +321,9 @@ AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
370 370
 # AM_DEP_TRACK
371 371
 # ------------
372 372
 AC_DEFUN([AM_DEP_TRACK],
373
-[AC_ARG_ENABLE([dependency-tracking], [dnl
374
-AS_HELP_STRING(
375
-  [--enable-dependency-tracking],
376
-  [do not reject slow dependency extractors])
377
-AS_HELP_STRING(
378
-  [--disable-dependency-tracking],
379
-  [speeds up one-time build])])
373
+[AC_ARG_ENABLE(dependency-tracking,
374
+[  --disable-dependency-tracking  speeds up one-time build
375
+  --enable-dependency-tracking   do not reject slow dependency extractors])
380 376
 if test "x$enable_dependency_tracking" != xno; then
381 377
   am_depcomp="$ac_aux_dir/depcomp"
382 378
   AMDEPBACKSLASH='\'
... ...
@@ -391,12 +338,14 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl
391 391
 
392 392
 # Generate code to set up dependency tracking.              -*- Autoconf -*-
393 393
 
394
-# Copyright (C) 1999-2012 Free Software Foundation, Inc.
394
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008
395
+# Free Software Foundation, Inc.
395 396
 #
396 397
 # This file is free software; the Free Software Foundation
397 398
 # gives unlimited permission to copy and/or distribute it,
398 399
 # with or without modifications, as long as this notice is preserved.
399 400
 
401
+#serial 5
400 402
 
401 403
 # _AM_OUTPUT_DEPENDENCY_COMMANDS
402 404
 # ------------------------------
... ...
@@ -415,7 +364,7 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
415 415
     # Strip MF so we end up with the name of the file.
416 416
     mf=`echo "$mf" | sed -e 's/:.*$//'`
417 417
     # Check whether this is an Automake generated Makefile or not.
418
-    # We used to match only the files named 'Makefile.in', but
418
+    # We used to match only the files named `Makefile.in', but
419 419
     # some people rename them; so instead we look at the file content.
420 420
     # Grep'ing the first line is not enough: some people post-process
421 421
     # each Makefile.in and add a new line on top of each file to say so.
... ...
@@ -427,19 +376,21 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
427 427
       continue
428 428
     fi
429 429
     # Extract the definition of DEPDIR, am__include, and am__quote
430
-    # from the Makefile without running 'make'.
430
+    # from the Makefile without running `make'.
431 431
     DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
432 432
     test -z "$DEPDIR" && continue
433 433
     am__include=`sed -n 's/^am__include = //p' < "$mf"`
434 434
     test -z "am__include" && continue
435 435
     am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
436
+    # When using ansi2knr, U may be empty or an underscore; expand it
437
+    U=`sed -n 's/^U = //p' < "$mf"`
436 438
     # Find all dependency output files, they are included files with
437 439
     # $(DEPDIR) in their names.  We invoke sed twice because it is the
438 440
     # simplest approach to changing $(DEPDIR) to its actual value in the
439 441
     # expansion.
440 442
     for file in `sed -n "
441 443
       s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
442
-	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
444
+	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
443 445
       # Make sure the directory exists.
444 446
       test -f "$dirpart/$file" && continue
445 447
       fdir=`AS_DIRNAME(["$file"])`
... ...
@@ -457,7 +408,7 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
457 457
 # This macro should only be invoked once -- use via AC_REQUIRE.
458 458
 #
459 459
 # This code is only required when automatic dependency tracking
460
-# is enabled.  FIXME.  This creates each '.P' file that we will
460
+# is enabled.  FIXME.  This creates each `.P' file that we will
461 461
 # need in order to bootstrap the dependency handling code.
462 462
 AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
463 463
 [AC_CONFIG_COMMANDS([depfiles],
... ...
@@ -467,12 +418,15 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
467 467
 
468 468
 # Do all the work for Automake.                             -*- Autoconf -*-
469 469
 
470
-# Copyright (C) 1996-2012 Free Software Foundation, Inc.
470
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
471
+# 2005, 2006, 2008, 2009 Free Software Foundation, Inc.
471 472
 #
472 473
 # This file is free software; the Free Software Foundation
473 474
 # gives unlimited permission to copy and/or distribute it,
474 475
 # with or without modifications, as long as this notice is preserved.
475 476
 
477
+# serial 16
478
+
476 479
 # This macro actually does too much.  Some checks are only needed if
477 480
 # your package does certain things.  But this isn't really a big deal.
478 481
 
... ...
@@ -517,41 +471,31 @@ AC_SUBST([CYGPATH_W])
517 517
 # Define the identity of the package.
518 518
 dnl Distinguish between old-style and new-style calls.
519 519
 m4_ifval([$2],
520
-[AC_DIAGNOSE([obsolete],
521
-[$0: two- and three-arguments forms are deprecated.  For more info, see:
522
-http://www.gnu.org/software/automake/manual/automake.html#Modernize-AM_INIT_AUTOMAKE-invocation])
523
-m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
520
+[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
524 521
  AC_SUBST([PACKAGE], [$1])dnl
525 522
  AC_SUBST([VERSION], [$2])],
526 523
 [_AM_SET_OPTIONS([$1])dnl
527 524
 dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
528
-m4_if(
529
-  m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]),
530
-  [ok:ok],,
525
+m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
531 526
   [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
532 527
  AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
533 528
  AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
534 529
 
535 530
 _AM_IF_OPTION([no-define],,
536
-[AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package])
537
- AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl
531
+[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
532
+ AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
538 533
 
539 534
 # Some tools Automake needs.
540 535
 AC_REQUIRE([AM_SANITY_CHECK])dnl
541 536
 AC_REQUIRE([AC_ARG_PROGRAM])dnl
542
-AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}])
543
-AM_MISSING_PROG([AUTOCONF], [autoconf])
544
-AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}])
545
-AM_MISSING_PROG([AUTOHEADER], [autoheader])
546
-AM_MISSING_PROG([MAKEINFO], [makeinfo])
537
+AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
538
+AM_MISSING_PROG(AUTOCONF, autoconf)
539
+AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
540
+AM_MISSING_PROG(AUTOHEADER, autoheader)
541
+AM_MISSING_PROG(MAKEINFO, makeinfo)
547 542
 AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
548 543
 AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
549
-AC_REQUIRE([AC_PROG_MKDIR_P])dnl
550
-# For better backward compatibility.  To be removed once Automake 1.9.x
551
-# dies out for good.  For more background, see:
552
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
553
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
554
-AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
544
+AC_REQUIRE([AM_PROG_MKDIR_P])dnl
555 545
 # We need awk for the "check" target.  The system "awk" is bad on
556 546
 # some platforms.
557 547
 AC_REQUIRE([AC_PROG_AWK])dnl
... ...
@@ -562,35 +506,28 @@ _AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
562 562
 			     [_AM_PROG_TAR([v7])])])
563 563
 _AM_IF_OPTION([no-dependencies],,
564 564
 [AC_PROVIDE_IFELSE([AC_PROG_CC],
565
-		  [_AM_DEPENDENCIES([CC])],
566
-		  [m4_define([AC_PROG_CC],
567
-			     m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl
565
+		  [_AM_DEPENDENCIES(CC)],
566
+		  [define([AC_PROG_CC],
567
+			  defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
568 568
 AC_PROVIDE_IFELSE([AC_PROG_CXX],
569
-		  [_AM_DEPENDENCIES([CXX])],
570
-		  [m4_define([AC_PROG_CXX],
571
-			     m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl
569
+		  [_AM_DEPENDENCIES(CXX)],
570
+		  [define([AC_PROG_CXX],
571
+			  defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
572 572
 AC_PROVIDE_IFELSE([AC_PROG_OBJC],
573
-		  [_AM_DEPENDENCIES([OBJC])],
574
-		  [m4_define([AC_PROG_OBJC],
575
-			     m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl
576
-dnl Support for Objective C++ was only introduced in Autoconf 2.65,
577
-dnl but we still cater to Autoconf 2.62.
578
-m4_ifdef([AC_PROG_OBJCXX],
579
-[AC_PROVIDE_IFELSE([AC_PROG_OBJCXX],
580
-		  [_AM_DEPENDENCIES([OBJCXX])],
581
-		  [m4_define([AC_PROG_OBJCXX],
582
-			     m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])])dnl
573
+		  [_AM_DEPENDENCIES(OBJC)],
574
+		  [define([AC_PROG_OBJC],
575
+			  defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
583 576
 ])
584 577
 _AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl
585
-dnl The 'parallel-tests' driver may need to know about EXEEXT, so add the
586
-dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen.  This macro
578
+dnl The `parallel-tests' driver may need to know about EXEEXT, so add the
579
+dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen.  This macro
587 580
 dnl is hooked onto _AC_COMPILER_EXEEXT early, see below.
588 581
 AC_CONFIG_COMMANDS_PRE(dnl
589 582
 [m4_provide_if([_AM_COMPILER_EXEEXT],
590 583
   [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
591 584
 ])
592 585
 
593
-dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion.  Do not
586
+dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion.  Do not
594 587
 dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
595 588
 dnl mangled by Autoconf and run in a shell conditional statement.
596 589
 m4_define([_AC_COMPILER_EXEEXT],
... ...
@@ -618,12 +555,15 @@ for _am_header in $config_headers :; do
618 618
 done
619 619
 echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
620 620
 
621
-# Copyright (C) 2001-2012 Free Software Foundation, Inc.
621
+# Copyright (C) 2001, 2003, 2005, 2008, 2011 Free Software Foundation,
622
+# Inc.
622 623
 #
623 624
 # This file is free software; the Free Software Foundation
624 625
 # gives unlimited permission to copy and/or distribute it,
625 626
 # with or without modifications, as long as this notice is preserved.
626 627
 
628
+# serial 1
629
+
627 630
 # AM_PROG_INSTALL_SH
628 631
 # ------------------
629 632
 # Define $install_sh.
... ...
@@ -637,14 +577,16 @@ if test x"${install_sh}" != xset; then
637 637
     install_sh="\${SHELL} $am_aux_dir/install-sh"
638 638
   esac
639 639
 fi
640
-AC_SUBST([install_sh])])
640
+AC_SUBST(install_sh)])
641 641
 
642
-# Copyright (C) 2003-2012 Free Software Foundation, Inc.
642
+# Copyright (C) 2003, 2005  Free Software Foundation, Inc.
643 643
 #
644 644
 # This file is free software; the Free Software Foundation
645 645
 # gives unlimited permission to copy and/or distribute it,
646 646
 # with or without modifications, as long as this notice is preserved.
647 647
 
648
+# serial 2
649
+
648 650
 # Check whether the underlying file-system supports filenames
649 651
 # with a leading dot.  For instance MS-DOS doesn't.
650 652
 AC_DEFUN([AM_SET_LEADING_DOT],
... ...
@@ -661,17 +603,20 @@ AC_SUBST([am__leading_dot])])
661 661
 # Add --enable-maintainer-mode option to configure.         -*- Autoconf -*-
662 662
 # From Jim Meyering
663 663
 
664
-# Copyright (C) 1996-2012 Free Software Foundation, Inc.
664
+# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008,
665
+# 2011 Free Software Foundation, Inc.
665 666
 #
666 667
 # This file is free software; the Free Software Foundation
667 668
 # gives unlimited permission to copy and/or distribute it,
668 669
 # with or without modifications, as long as this notice is preserved.
669 670
 
671
+# serial 5
672
+
670 673
 # AM_MAINTAINER_MODE([DEFAULT-MODE])
671 674
 # ----------------------------------
672 675
 # Control maintainer-specific portions of Makefiles.
673
-# Default is to disable them, unless 'enable' is passed literally.
674
-# For symmetry, 'disable' may be passed as well.  Anyway, the user
676
+# Default is to disable them, unless `enable' is passed literally.
677
+# For symmetry, `disable' may be passed as well.  Anyway, the user
675 678
 # can override the default with the --enable/--disable switch.
676 679
 AC_DEFUN([AM_MAINTAINER_MODE],
677 680
 [m4_case(m4_default([$1], [disable]),
... ...
@@ -682,11 +627,10 @@ AC_DEFUN([AM_MAINTAINER_MODE],
682 682
 AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
683 683
   dnl maintainer-mode's default is 'disable' unless 'enable' is passed
684 684
   AC_ARG_ENABLE([maintainer-mode],
685
-    [AS_HELP_STRING([--]am_maintainer_other[-maintainer-mode],
686
-      am_maintainer_other[ make rules and dependencies not useful
687
-      (and sometimes confusing) to the casual installer])],
688
-    [USE_MAINTAINER_MODE=$enableval],
689
-    [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes]))
685
+[  --][am_maintainer_other][-maintainer-mode  am_maintainer_other make rules and dependencies not useful
686
+			  (and sometimes confusing) to the casual installer],
687
+      [USE_MAINTAINER_MODE=$enableval],
688
+      [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes]))
690 689
   AC_MSG_RESULT([$USE_MAINTAINER_MODE])
691 690
   AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes])
692 691
   MAINT=$MAINTAINER_MODE_TRUE
... ...
@@ -698,12 +642,14 @@ AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
698 698
 
699 699
 # Check to see how 'make' treats includes.	            -*- Autoconf -*-
700 700
 
701
-# Copyright (C) 2001-2012 Free Software Foundation, Inc.
701
+# Copyright (C) 2001, 2002, 2003, 2005, 2009  Free Software Foundation, Inc.
702 702
 #
703 703
 # This file is free software; the Free Software Foundation
704 704
 # gives unlimited permission to copy and/or distribute it,
705 705
 # with or without modifications, as long as this notice is preserved.
706 706
 
707
+# serial 4
708
+
707 709
 # AM_MAKE_INCLUDE()
708 710
 # -----------------
709 711
 # Check to see how make treats includes.
... ...
@@ -721,7 +667,7 @@ am__quote=
721 721
 _am_result=none
722 722
 # First try GNU make style include.
723 723
 echo "include confinc" > confmf
724
-# Ignore all kinds of additional output from 'make'.
724
+# Ignore all kinds of additional output from `make'.
725 725
 case `$am_make -s -f confmf 2> /dev/null` in #(
726 726
 *the\ am__doit\ target*)
727 727
   am__include=include
... ...
@@ -746,46 +692,17 @@ AC_MSG_RESULT([$_am_result])
746 746
 rm -f confinc confmf
747 747
 ])
748 748
 
749
-# Copyright (C) 1999-2012 Free Software Foundation, Inc.
750
-#
751
-# This file is free software; the Free Software Foundation
752
-# gives unlimited permission to copy and/or distribute it,
753
-# with or without modifications, as long as this notice is preserved.
754
-
755
-# AM_PROG_CC_C_O
756
-# --------------
757
-# Like AC_PROG_CC_C_O, but changed for automake.
758
-AC_DEFUN([AM_PROG_CC_C_O],
759
-[AC_REQUIRE([AC_PROG_CC_C_O])dnl
760
-AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
761
-AC_REQUIRE_AUX_FILE([compile])dnl
762
-# FIXME: we rely on the cache variable name because
763
-# there is no other way.
764
-set dummy $CC
765
-am_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']`
766
-eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o
767
-if test "$am_t" != yes; then
768
-   # Losing compiler, so override with the script.
769
-   # FIXME: It is wrong to rewrite CC.
770
-   # But if we don't then we get into trouble of one sort or another.
771
-   # A longer-term fix would be to have automake use am__CC in this case,
772
-   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
773
-   CC="$am_aux_dir/compile $CC"
774
-fi
775
-dnl Make sure AC_PROG_CC is never called again, or it will override our
776
-dnl setting of CC.
777
-m4_define([AC_PROG_CC],
778
-          [m4_fatal([AC_PROG_CC cannot be called after AM_PROG_CC_C_O])])
779
-])
780
-
781 749
 # Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
782 750
 
783
-# Copyright (C) 1997-2012 Free Software Foundation, Inc.
751
+# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008
752
+# Free Software Foundation, Inc.
784 753
 #
785 754
 # This file is free software; the Free Software Foundation
786 755
 # gives unlimited permission to copy and/or distribute it,
787 756
 # with or without modifications, as long as this notice is preserved.
788 757
 
758
+# serial 6
759
+
789 760
 # AM_MISSING_PROG(NAME, PROGRAM)
790 761
 # ------------------------------
791 762
 AC_DEFUN([AM_MISSING_PROG],
... ...
@@ -793,6 +710,7 @@ AC_DEFUN([AM_MISSING_PROG],
793 793
 $1=${$1-"${am_missing_run}$2"}
794 794
 AC_SUBST($1)])
795 795
 
796
+
796 797
 # AM_MISSING_HAS_RUN
797 798
 # ------------------
798 799
 # Define MISSING if not defined so far and test if it supports --run.
... ...
@@ -813,18 +731,50 @@ if eval "$MISSING --run true"; then
813 813
   am_missing_run="$MISSING --run "
814 814
 else
815 815
   am_missing_run=
816
-  AC_MSG_WARN(['missing' script is too old or missing])
816
+  AC_MSG_WARN([`missing' script is too old or missing])
817 817
 fi
818 818
 ])
819 819
 
820
+# Copyright (C) 2003, 2004, 2005, 2006, 2011 Free Software Foundation,
821
+# Inc.
822
+#
823
+# This file is free software; the Free Software Foundation
824
+# gives unlimited permission to copy and/or distribute it,
825
+# with or without modifications, as long as this notice is preserved.
826
+
827
+# serial 1
828
+
829
+# AM_PROG_MKDIR_P
830
+# ---------------
831
+# Check for `mkdir -p'.
832
+AC_DEFUN([AM_PROG_MKDIR_P],
833
+[AC_PREREQ([2.60])dnl
834
+AC_REQUIRE([AC_PROG_MKDIR_P])dnl
835
+dnl Automake 1.8 to 1.9.6 used to define mkdir_p.  We now use MKDIR_P,
836
+dnl while keeping a definition of mkdir_p for backward compatibility.
837
+dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
838
+dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
839
+dnl Makefile.ins that do not define MKDIR_P, so we do our own
840
+dnl adjustment using top_builddir (which is defined more often than
841
+dnl MKDIR_P).
842
+AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
843
+case $mkdir_p in
844
+  [[\\/$]]* | ?:[[\\/]]*) ;;
845
+  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
846
+esac
847
+])
848
+
820 849
 # Helper functions for option handling.                     -*- Autoconf -*-
821 850
 
822
-# Copyright (C) 2001-2012 Free Software Foundation, Inc.
851
+# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 Free Software
852
+# Foundation, Inc.
823 853
 #
824 854
 # This file is free software; the Free Software Foundation
825 855
 # gives unlimited permission to copy and/or distribute it,
826 856
 # with or without modifications, as long as this notice is preserved.
827 857
 
858
+# serial 5
859
+
828 860
 # _AM_MANGLE_OPTION(NAME)
829 861
 # -----------------------
830 862
 AC_DEFUN([_AM_MANGLE_OPTION],
... ...
@@ -834,7 +784,7 @@ AC_DEFUN([_AM_MANGLE_OPTION],
834 834
 # --------------------
835 835
 # Set option NAME.  Presently that only means defining a flag for this option.
836 836
 AC_DEFUN([_AM_SET_OPTION],
837
-[m4_define(_AM_MANGLE_OPTION([$1]), [1])])
837
+[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
838 838
 
839 839
 # _AM_SET_OPTIONS(OPTIONS)
840 840
 # ------------------------
... ...
@@ -848,12 +798,14 @@ AC_DEFUN([_AM_SET_OPTIONS],
848 848
 AC_DEFUN([_AM_IF_OPTION],
849 849
 [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
850 850
 
851
-# Copyright (C) 2001-2012 Free Software Foundation, Inc.
851
+# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
852 852
 #
853 853
 # This file is free software; the Free Software Foundation
854 854
 # gives unlimited permission to copy and/or distribute it,
855 855
 # with or without modifications, as long as this notice is preserved.
856 856
 
857
+# serial 1
858
+
857 859
 # AM_RUN_LOG(COMMAND)
858 860
 # -------------------
859 861
 # Run COMMAND, save the exit status in ac_status, and log it.
... ...
@@ -867,16 +819,22 @@ AC_DEFUN([AM_RUN_LOG],
867 867
 
868 868
 # Check to make sure that the build environment is sane.    -*- Autoconf -*-
869 869
 
870
-# Copyright (C) 1996-2012 Free Software Foundation, Inc.
870
+# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008
871
+# Free Software Foundation, Inc.
871 872
 #
872 873
 # This file is free software; the Free Software Foundation
873 874
 # gives unlimited permission to copy and/or distribute it,
874 875
 # with or without modifications, as long as this notice is preserved.
875 876
 
877
+# serial 5
878
+
876 879
 # AM_SANITY_CHECK
877 880
 # ---------------
878 881
 AC_DEFUN([AM_SANITY_CHECK],
879 882
 [AC_MSG_CHECKING([whether build environment is sane])
883
+# Just in case
884
+sleep 1
885
+echo timestamp > conftest.file
880 886
 # Reject unsafe characters in $srcdir or the absolute working directory
881 887
 # name.  Accept space and tab only in the latter.
882 888
 am_lf='
... ...
@@ -887,40 +845,32 @@ case `pwd` in
887 887
 esac
888 888
 case $srcdir in
889 889
   *[[\\\"\#\$\&\'\`$am_lf\ \	]]*)
890
-    AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);;
890
+    AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);;
891 891
 esac
892 892
 
893
-# Do 'set' in a subshell so we don't clobber the current shell's
893
+# Do `set' in a subshell so we don't clobber the current shell's
894 894
 # arguments.  Must try -L first in case configure is actually a
895 895
 # symlink; some systems play weird games with the mod time of symlinks
896 896
 # (eg FreeBSD returns the mod time of the symlink's containing
897 897
 # directory).
898 898
 if (
899
-   am_has_slept=no
900
-   for am_try in 1 2; do
901
-     echo "timestamp, slept: $am_has_slept" > conftest.file
902
-     set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
903
-     if test "$[*]" = "X"; then
904
-	# -L didn't work.
905
-	set X `ls -t "$srcdir/configure" conftest.file`
906
-     fi
907
-     if test "$[*]" != "X $srcdir/configure conftest.file" \
908
-	&& test "$[*]" != "X conftest.file $srcdir/configure"; then
909
-
910
-	# If neither matched, then we have a broken ls.  This can happen
911
-	# if, for instance, CONFIG_SHELL is bash and it inherits a
912
-	# broken ls alias from the environment.  This has actually
913
-	# happened.  Such a system could not be considered "sane".
914
-	AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
915
-  alias in your environment])
916
-     fi
917
-     if test "$[2]" = conftest.file || test $am_try -eq 2; then
918
-       break
919
-     fi
920
-     # Just in case.
921
-     sleep 1
922
-     am_has_slept=yes
923
-   done
899
+   set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
900
+   if test "$[*]" = "X"; then
901
+      # -L didn't work.
902
+      set X `ls -t "$srcdir/configure" conftest.file`
903
+   fi
904
+   rm -f conftest.file
905
+   if test "$[*]" != "X $srcdir/configure conftest.file" \
906
+      && test "$[*]" != "X conftest.file $srcdir/configure"; then
907
+
908
+      # If neither matched, then we have a broken ls.  This can happen
909
+      # if, for instance, CONFIG_SHELL is bash and it inherits a
910
+      # broken ls alias from the environment.  This has actually
911
+      # happened.  Such a system could not be considered "sane".
912
+      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
913
+alias in your environment])
914
+   fi
915
+
924 916
    test "$[2]" = conftest.file
925 917
    )
926 918
 then
... ...
@@ -930,50 +880,31 @@ else
930 930
    AC_MSG_ERROR([newly created file is older than distributed files!
931 931
 Check your system clock])
932 932
 fi
933
-AC_MSG_RESULT([yes])
934
-# If we didn't sleep, we still need to ensure time stamps of config.status and
935
-# generated files are strictly newer.
936
-am_sleep_pid=
937
-if grep 'slept: no' conftest.file >/dev/null 2>&1; then
938
-  ( sleep 1 ) &
939
-  am_sleep_pid=$!
940
-fi
941
-AC_CONFIG_COMMANDS_PRE(
942
-  [AC_MSG_CHECKING([that generated files are newer than configure])
943
-   if test -n "$am_sleep_pid"; then
944
-     # Hide warnings about reused PIDs.
945
-     wait $am_sleep_pid 2>/dev/null
946
-   fi
947
-   AC_MSG_RESULT([done])])
948
-rm -f conftest.file
949
-])
933
+AC_MSG_RESULT(yes)])
950 934
 
951
-# Copyright (C) 2009-2012 Free Software Foundation, Inc.
935
+# Copyright (C) 2009, 2011  Free Software Foundation, Inc.
952 936
 #
953 937
 # This file is free software; the Free Software Foundation
954 938
 # gives unlimited permission to copy and/or distribute it,
955 939
 # with or without modifications, as long as this notice is preserved.
956 940
 
941
+# serial 2
942
+
957 943
 # AM_SILENT_RULES([DEFAULT])
958 944
 # --------------------------
959 945
 # Enable less verbose build rules; with the default set to DEFAULT
960
-# ("yes" being less verbose, "no" or empty being verbose).
946
+# (`yes' being less verbose, `no' or empty being verbose).
961 947
 AC_DEFUN([AM_SILENT_RULES],
962
-[AC_ARG_ENABLE([silent-rules], [dnl
963
-AS_HELP_STRING(
964
-  [--enable-silent-rules],
965
-  [less verbose build output (undo: "make V=1")])
966
-AS_HELP_STRING(
967
-  [--disable-silent-rules],
968
-  [verbose build output (undo: "make V=0")])dnl
969
-])
970
-case $enable_silent_rules in @%:@ (((
971
-  yes) AM_DEFAULT_VERBOSITY=0;;
972
-   no) AM_DEFAULT_VERBOSITY=1;;
973
-    *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);;
948
+[AC_ARG_ENABLE([silent-rules],
949
+[  --enable-silent-rules          less verbose build output (undo: `make V=1')
950
+  --disable-silent-rules         verbose build output (undo: `make V=0')])
951
+case $enable_silent_rules in
952
+yes) AM_DEFAULT_VERBOSITY=0;;
953
+no)  AM_DEFAULT_VERBOSITY=1;;
954
+*)   AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);;
974 955
 esac
975 956
 dnl
976
-dnl A few 'make' implementations (e.g., NonStop OS and NextStep)
957
+dnl A few `make' implementations (e.g., NonStop OS and NextStep)
977 958
 dnl do not support nested variable expansions.
978 959
 dnl See automake bug#9928 and bug#10237.
979 960
 am_make=${MAKE-make}
... ...
@@ -991,7 +922,7 @@ else
991 991
   am_cv_make_support_nested_variables=no
992 992
 fi])
993 993
 if test $am_cv_make_support_nested_variables = yes; then
994
-  dnl Using '$V' instead of '$(V)' breaks IRIX make.
994
+  dnl Using `$V' instead of `$(V)' breaks IRIX make.
995 995
   AM_V='$(V)'
996 996
   AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
997 997
 else
... ...
@@ -1008,40 +939,44 @@ AC_SUBST([AM_BACKSLASH])dnl
1008 1008
 _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
1009 1009
 ])
1010 1010
 
1011
-# Copyright (C) 2001-2012 Free Software Foundation, Inc.
1011
+# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
1012 1012
 #
1013 1013
 # This file is free software; the Free Software Foundation
1014 1014
 # gives unlimited permission to copy and/or distribute it,
1015 1015
 # with or without modifications, as long as this notice is preserved.
1016 1016
 
1017
+# serial 1
1018
+
1017 1019
 # AM_PROG_INSTALL_STRIP
1018 1020
 # ---------------------
1019
-# One issue with vendor 'install' (even GNU) is that you can't
1021
+# One issue with vendor `install' (even GNU) is that you can't
1020 1022
 # specify the program used to strip binaries.  This is especially
1021 1023
 # annoying in cross-compiling environments, where the build's strip
1022 1024
 # is unlikely to handle the host's binaries.
1023 1025
 # Fortunately install-sh will honor a STRIPPROG variable, so we
1024
-# always use install-sh in "make install-strip", and initialize
1026
+# always use install-sh in `make install-strip', and initialize
1025 1027
 # STRIPPROG with the value of the STRIP variable (set by the user).
1026 1028
 AC_DEFUN([AM_PROG_INSTALL_STRIP],
1027 1029
 [AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
1028
-# Installed binaries are usually stripped using 'strip' when the user
1029
-# run "make install-strip".  However 'strip' might not be the right
1030
+# Installed binaries are usually stripped using `strip' when the user
1031
+# run `make install-strip'.  However `strip' might not be the right
1030 1032
 # tool to use in cross-compilation environments, therefore Automake
1031
-# will honor the 'STRIP' environment variable to overrule this program.
1032
-dnl Don't test for $cross_compiling = yes, because it might be 'maybe'.
1033
+# will honor the `STRIP' environment variable to overrule this program.
1034
+dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
1033 1035
 if test "$cross_compiling" != no; then
1034 1036
   AC_CHECK_TOOL([STRIP], [strip], :)
1035 1037
 fi
1036 1038
 INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
1037 1039
 AC_SUBST([INSTALL_STRIP_PROGRAM])])
1038 1040
 
1039
-# Copyright (C) 2006-2012 Free Software Foundation, Inc.
1041
+# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc.
1040 1042
 #
1041 1043
 # This file is free software; the Free Software Foundation
1042 1044
 # gives unlimited permission to copy and/or distribute it,
1043 1045
 # with or without modifications, as long as this notice is preserved.
1044 1046
 
1047
+# serial 3
1048
+
1045 1049
 # _AM_SUBST_NOTMAKE(VARIABLE)
1046 1050
 # ---------------------------
1047 1051
 # Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
... ...
@@ -1055,16 +990,18 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
1055 1055
 
1056 1056
 # Check how to create a tarball.                            -*- Autoconf -*-
1057 1057
 
1058
-# Copyright (C) 2004-2012 Free Software Foundation, Inc.
1058
+# Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc.
1059 1059
 #
1060 1060
 # This file is free software; the Free Software Foundation
1061 1061
 # gives unlimited permission to copy and/or distribute it,
1062 1062
 # with or without modifications, as long as this notice is preserved.
1063 1063
 
1064
+# serial 2
1065
+
1064 1066
 # _AM_PROG_TAR(FORMAT)
1065 1067
 # --------------------
1066 1068
 # Check how to create a tarball in format FORMAT.
1067
-# FORMAT should be one of 'v7', 'ustar', or 'pax'.
1069
+# FORMAT should be one of `v7', `ustar', or `pax'.
1068 1070
 #
1069 1071
 # Substitute a variable $(am__tar) that is a command
1070 1072
 # writing to stdout a FORMAT-tarball containing the directory
... ...
@@ -1087,7 +1024,7 @@ AC_MSG_CHECKING([how to create a $1 tar archive])
1087 1087
 _am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
1088 1088
 _am_tools=${am_cv_prog_tar_$1-$_am_tools}
1089 1089
 # Do not fold the above two line into one, because Tru64 sh and
1090
-# Solaris sh will not grok spaces in the rhs of '-'.
1090
+# Solaris sh will not grok spaces in the rhs of `-'.
1091 1091
 for _am_tool in $_am_tools
1092 1092
 do
1093 1093
   case $_am_tool in
... ...
@@ -37,9 +37,6 @@
37 37
    */
38 38
 #undef LT_OBJDIR
39 39
 
40
-/* Define to 1 if your C compiler doesn't accept -c and -o together. */
41
-#undef NO_MINUS_C_MINUS_O
42
-
43 40
 /* Define to the address where bug reports for this package should be sent. */
44 41
 #undef PACKAGE_BUGREPORT
45 42
 
46 43
deleted file mode 100755
... ...
@@ -1,270 +0,0 @@
1
-#! /bin/sh
2
-# Wrapper for Microsoft lib.exe
3
-
4
-me=ar-lib
5
-scriptversion=2012-03-01.08; # UTC
6
-
7
-# Copyright (C) 2010-2012 Free Software Foundation, Inc.
8
-# Written by Peter Rosin <peda@lysator.liu.se>.
9
-#
10
-# This program is free software; you can redistribute it and/or modify
11
-# it under the terms of the GNU General Public License as published by
12
-# the Free Software Foundation; either version 2, or (at your option)
13
-# any later version.
14
-#
15
-# This program is distributed in the hope that it will be useful,
16
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
17
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
18
-# GNU General Public License for more details.
19
-#
20
-# You should have received a copy of the GNU General Public License
21
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
22
-
23
-# As a special exception to the GNU General Public License, if you
24
-# distribute this file as part of a program that contains a
25
-# configuration script generated by Autoconf, you may include it under
26
-# the same distribution terms that you use for the rest of that program.
27
-
28
-# This file is maintained in Automake, please report
29
-# bugs to <bug-automake@gnu.org> or send patches to
30
-# <automake-patches@gnu.org>.
31
-
32
-
33
-# func_error message
34
-func_error ()
35
-{
36
-  echo "$me: $1" 1>&2
37
-  exit 1
38
-}
39
-
40
-file_conv=
41
-
42
-# func_file_conv build_file
43
-# Convert a $build file to $host form and store it in $file
44
-# Currently only supports Windows hosts.
45
-func_file_conv ()
46
-{
47
-  file=$1
48
-  case $file in
49
-    / | /[!/]*) # absolute file, and not a UNC file
50
-      if test -z "$file_conv"; then
51
-	# lazily determine how to convert abs files
52
-	case `uname -s` in
53
-	  MINGW*)
54
-	    file_conv=mingw
55
-	    ;;
56
-	  CYGWIN*)
57
-	    file_conv=cygwin
58
-	    ;;
59
-	  *)
60
-	    file_conv=wine
61
-	    ;;
62
-	esac
63
-      fi
64
-      case $file_conv in
65
-	mingw)
66
-	  file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
67
-	  ;;
68
-	cygwin)
69
-	  file=`cygpath -m "$file" || echo "$file"`
70
-	  ;;
71
-	wine)
72
-	  file=`winepath -w "$file" || echo "$file"`
73
-	  ;;
74
-      esac
75
-      ;;
76
-  esac
77
-}
78
-
79
-# func_at_file at_file operation archive
80
-# Iterate over all members in AT_FILE performing OPERATION on ARCHIVE
81
-# for each of them.
82
-# When interpreting the content of the @FILE, do NOT use func_file_conv,
83
-# since the user would need to supply preconverted file names to
84
-# binutils ar, at least for MinGW.
85
-func_at_file ()
86
-{
87
-  operation=$2
88
-  archive=$3
89
-  at_file_contents=`cat "$1"`
90
-  eval set x "$at_file_contents"
91
-  shift
92
-
93
-  for member
94
-  do
95
-    $AR -NOLOGO $operation:"$member" "$archive" || exit $?
96
-  done
97
-}
98
-
99
-case $1 in
100
-  '')
101
-     func_error "no command.  Try '$0 --help' for more information."
102
-     ;;
103
-  -h | --h*)
104
-    cat <<EOF
105
-Usage: $me [--help] [--version] PROGRAM ACTION ARCHIVE [MEMBER...]
106
-
107
-Members may be specified in a file named with @FILE.
108
-EOF
109
-    exit $?
110
-    ;;
111
-  -v | --v*)
112
-    echo "$me, version $scriptversion"
113
-    exit $?
114
-    ;;
115
-esac
116
-
117
-if test $# -lt 3; then
118
-  func_error "you must specify a program, an action and an archive"
119
-fi
120
-
121
-AR=$1
122
-shift
123
-while :
124
-do
125
-  if test $# -lt 2; then
126
-    func_error "you must specify a program, an action and an archive"
127
-  fi
128
-  case $1 in
129
-    -lib | -LIB \
130
-    | -ltcg | -LTCG \
131
-    | -machine* | -MACHINE* \
132
-    | -subsystem* | -SUBSYSTEM* \
133
-    | -verbose | -VERBOSE \
134
-    | -wx* | -WX* )
135
-      AR="$AR $1"
136
-      shift
137
-      ;;
138
-    *)
139
-      action=$1
140
-      shift
141
-      break
142
-      ;;
143
-  esac
144
-done
145
-orig_archive=$1
146
-shift
147
-func_file_conv "$orig_archive"
148
-archive=$file
149
-
150
-# strip leading dash in $action
151
-action=${action#-}
152
-
153
-delete=
154
-extract=
155
-list=
156
-quick=
157
-replace=
158
-index=
159
-create=
160
-
161
-while test -n "$action"
162
-do
163
-  case $action in
164
-    d*) delete=yes  ;;
165
-    x*) extract=yes ;;
166
-    t*) list=yes    ;;
167
-    q*) quick=yes   ;;
168
-    r*) replace=yes ;;
169
-    s*) index=yes   ;;
170
-    S*)             ;; # the index is always updated implicitly
171
-    c*) create=yes  ;;
172
-    u*)             ;; # TODO: don't ignore the update modifier
173
-    v*)             ;; # TODO: don't ignore the verbose modifier
174
-    *)
175
-      func_error "unknown action specified"
176
-      ;;
177
-  esac
178
-  action=${action#?}
179
-done
180
-
181
-case $delete$extract$list$quick$replace,$index in
182
-  yes,* | ,yes)
183
-    ;;
184
-  yesyes*)
185
-    func_error "more than one action specified"
186
-    ;;
187
-  *)
188
-    func_error "no action specified"
189
-    ;;
190
-esac
191
-
192
-if test -n "$delete"; then
193
-  if test ! -f "$orig_archive"; then
194
-    func_error "archive not found"
195
-  fi
196
-  for member
197
-  do
198
-    case $1 in
199
-      @*)
200
-        func_at_file "${1#@}" -REMOVE "$archive"
201
-        ;;
202
-      *)
203
-        func_file_conv "$1"
204
-        $AR -NOLOGO -REMOVE:"$file" "$archive" || exit $?
205
-        ;;
206
-    esac
207
-  done
208
-
209
-elif test -n "$extract"; then
210
-  if test ! -f "$orig_archive"; then
211
-    func_error "archive not found"
212
-  fi
213
-  if test $# -gt 0; then
214
-    for member
215
-    do
216
-      case $1 in
217
-        @*)
218
-          func_at_file "${1#@}" -EXTRACT "$archive"
219
-          ;;
220
-        *)
221
-          func_file_conv "$1"
222
-          $AR -NOLOGO -EXTRACT:"$file" "$archive" || exit $?
223
-          ;;
224
-      esac
225
-    done
226
-  else
227
-    $AR -NOLOGO -LIST "$archive" | sed -e 's/\\/\\\\/g' | while read member
228
-    do
229
-      $AR -NOLOGO -EXTRACT:"$member" "$archive" || exit $?
230
-    done
231
-  fi
232
-
233
-elif test -n "$quick$replace"; then
234
-  if test ! -f "$orig_archive"; then
235
-    if test -z "$create"; then
236
-      echo "$me: creating $orig_archive"
237
-    fi
238
-    orig_archive=
239
-  else
240
-    orig_archive=$archive
241
-  fi
242
-
243
-  for member
244
-  do
245
-    case $1 in
246
-    @*)
247
-      func_file_conv "${1#@}"
248
-      set x "$@" "@$file"
249
-      ;;
250
-    *)
251
-      func_file_conv "$1"
252
-      set x "$@" "$file"
253
-      ;;
254
-    esac
255
-    shift
256
-    shift
257
-  done
258
-
259
-  if test -n "$orig_archive"; then
260
-    $AR -NOLOGO -OUT:"$archive" "$orig_archive" "$@" || exit $?
261
-  else
262
-    $AR -NOLOGO -OUT:"$archive" "$@" || exit $?
263
-  fi
264
-
265
-elif test -n "$list"; then
266
-  if test ! -f "$orig_archive"; then
267
-    func_error "archive not found"
268
-  fi
269
-  $AR -NOLOGO -LIST "$archive" || exit $?
270
-fi
271 1
deleted file mode 100755
... ...
@@ -1,342 +0,0 @@
1
-#! /bin/sh
2
-# Wrapper for compilers which do not understand '-c -o'.
3
-
4
-scriptversion=2012-03-05.13; # UTC
5
-
6
-# Copyright (C) 1999-2012 Free Software Foundation, Inc.
7
-# Written by Tom Tromey <tromey@cygnus.com>.
8
-#
9
-# This program is free software; you can redistribute it and/or modify
10
-# it under the terms of the GNU General Public License as published by
11
-# the Free Software Foundation; either version 2, or (at your option)
12
-# any later version.
13
-#
14
-# This program is distributed in the hope that it will be useful,
15
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
16
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
17
-# GNU General Public License for more details.
18
-#
19
-# You should have received a copy of the GNU General Public License
20
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
21
-
22
-# As a special exception to the GNU General Public License, if you
23
-# distribute this file as part of a program that contains a
24
-# configuration script generated by Autoconf, you may include it under
25
-# the same distribution terms that you use for the rest of that program.
26
-
27
-# This file is maintained in Automake, please report
28
-# bugs to <bug-automake@gnu.org> or send patches to
29
-# <automake-patches@gnu.org>.
30
-
31
-nl='
32
-'
33
-
34
-# We need space, tab and new line, in precisely that order.  Quoting is
35
-# there to prevent tools from complaining about whitespace usage.
36
-IFS=" ""	$nl"
37
-
38
-file_conv=
39
-
40
-# func_file_conv build_file lazy
41
-# Convert a $build file to $host form and store it in $file
42
-# Currently only supports Windows hosts. If the determined conversion
43
-# type is listed in (the comma separated) LAZY, no conversion will
44
-# take place.
45
-func_file_conv ()
46
-{
47
-  file=$1
48
-  case $file in
49
-    / | /[!/]*) # absolute file, and not a UNC file
50
-      if test -z "$file_conv"; then
51
-	# lazily determine how to convert abs files
52
-	case `uname -s` in
53
-	  MINGW*)
54
-	    file_conv=mingw
55
-	    ;;
56
-	  CYGWIN*)
57
-	    file_conv=cygwin
58
-	    ;;
59
-	  *)
60
-	    file_conv=wine
61
-	    ;;
62
-	esac
63
-      fi
64
-      case $file_conv/,$2, in
65
-	*,$file_conv,*)
66
-	  ;;
67
-	mingw/*)
68
-	  file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
69
-	  ;;
70
-	cygwin/*)
71
-	  file=`cygpath -m "$file" || echo "$file"`
72
-	  ;;
73
-	wine/*)
74
-	  file=`winepath -w "$file" || echo "$file"`
75
-	  ;;
76
-      esac
77
-      ;;
78
-  esac
79
-}
80
-
81
-# func_cl_dashL linkdir
82
-# Make cl look for libraries in LINKDIR
83
-func_cl_dashL ()
84
-{
85
-  func_file_conv "$1"
86
-  if test -z "$lib_path"; then
87
-    lib_path=$file
88
-  else
89
-    lib_path="$lib_path;$file"
90
-  fi
91
-  linker_opts="$linker_opts -LIBPATH:$file"
92
-}
93
-
94
-# func_cl_dashl library
95
-# Do a library search-path lookup for cl
96
-func_cl_dashl ()
97
-{
98
-  lib=$1
99
-  found=no
100
-  save_IFS=$IFS
101
-  IFS=';'
102
-  for dir in $lib_path $LIB
103
-  do
104
-    IFS=$save_IFS
105
-    if $shared && test -f "$dir/$lib.dll.lib"; then
106
-      found=yes
107
-      lib=$dir/$lib.dll.lib
108
-      break
109
-    fi
110
-    if test -f "$dir/$lib.lib"; then
111
-      found=yes
112
-      lib=$dir/$lib.lib
113
-      break
114
-    fi
115
-  done
116
-  IFS=$save_IFS
117
-
118
-  if test "$found" != yes; then
119
-    lib=$lib.lib
120
-  fi
121
-}
122
-
123
-# func_cl_wrapper cl arg...
124
-# Adjust compile command to suit cl
125
-func_cl_wrapper ()
126
-{
127
-  # Assume a capable shell
128
-  lib_path=
129
-  shared=:
130
-  linker_opts=
131
-  for arg
132
-  do
133
-    if test -n "$eat"; then
134
-      eat=
135
-    else
136
-      case $1 in
137
-	-o)
138
-	  # configure might choose to run compile as 'compile cc -o foo foo.c'.
139
-	  eat=1
140
-	  case $2 in
141
-	    *.o | *.[oO][bB][jJ])
142
-	      func_file_conv "$2"
143
-	      set x "$@" -Fo"$file"
144
-	      shift
145
-	      ;;
146
-	    *)
147
-	      func_file_conv "$2"
148
-	      set x "$@" -Fe"$file"
149
-	      shift
150
-	      ;;
151
-	  esac
152
-	  ;;
153
-	-I)
154
-	  eat=1
155
-	  func_file_conv "$2" mingw
156
-	  set x "$@" -I"$file"
157
-	  shift
158
-	  ;;
159
-	-I*)
160
-	  func_file_conv "${1#-I}" mingw
161
-	  set x "$@" -I"$file"
162
-	  shift
163
-	  ;;
164
-	-l)
165
-	  eat=1
166
-	  func_cl_dashl "$2"
167
-	  set x "$@" "$lib"
168
-	  shift
169
-	  ;;
170
-	-l*)
171
-	  func_cl_dashl "${1#-l}"
172
-	  set x "$@" "$lib"
173
-	  shift
174
-	  ;;
175
-	-L)
176
-	  eat=1
177
-	  func_cl_dashL "$2"
178
-	  ;;
179
-	-L*)
180
-	  func_cl_dashL "${1#-L}"
181
-	  ;;
182
-	-static)
183
-	  shared=false
184
-	  ;;
185
-	-Wl,*)
186
-	  arg=${1#-Wl,}
187
-	  save_ifs="$IFS"; IFS=','
188
-	  for flag in $arg; do
189
-	    IFS="$save_ifs"
190
-	    linker_opts="$linker_opts $flag"
191
-	  done
192
-	  IFS="$save_ifs"
193
-	  ;;
194
-	-Xlinker)
195
-	  eat=1
196
-	  linker_opts="$linker_opts $2"
197
-	  ;;
198
-	-*)
199
-	  set x "$@" "$1"
200
-	  shift
201
-	  ;;
202
-	*.cc | *.CC | *.cxx | *.CXX | *.[cC]++)
203
-	  func_file_conv "$1"
204
-	  set x "$@" -Tp"$file"
205
-	  shift
206
-	  ;;
207
-	*.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO])
208
-	  func_file_conv "$1" mingw
209
-	  set x "$@" "$file"
210
-	  shift
211
-	  ;;
212
-	*)
213
-	  set x "$@" "$1"
214
-	  shift
215
-	  ;;
216
-      esac
217
-    fi
218
-    shift
219
-  done
220
-  if test -n "$linker_opts"; then
221
-    linker_opts="-link$linker_opts"
222
-  fi
223
-  exec "$@" $linker_opts
224
-  exit 1
225
-}
226
-
227
-eat=
228
-
229
-case $1 in
230
-  '')
231
-     echo "$0: No command.  Try '$0 --help' for more information." 1>&2
232
-     exit 1;
233
-     ;;
234
-  -h | --h*)
235
-    cat <<\EOF
236
-Usage: compile [--help] [--version] PROGRAM [ARGS]
237
-
238
-Wrapper for compilers which do not understand '-c -o'.
239
-Remove '-o dest.o' from ARGS, run PROGRAM with the remaining
240
-arguments, and rename the output as expected.
241
-
242
-If you are trying to build a whole package this is not the
243
-right script to run: please start by reading the file 'INSTALL'.
244
-
245
-Report bugs to <bug-automake@gnu.org>.
246
-EOF
247
-    exit $?
248
-    ;;
249
-  -v | --v*)
250
-    echo "compile $scriptversion"
251
-    exit $?
252
-    ;;
253
-  cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
254
-    func_cl_wrapper "$@"      # Doesn't return...
255
-    ;;
256
-esac
257
-
258
-ofile=
259
-cfile=
260
-
261
-for arg
262
-do
263
-  if test -n "$eat"; then
264
-    eat=
265
-  else
266
-    case $1 in
267
-      -o)
268
-	# configure might choose to run compile as 'compile cc -o foo foo.c'.
269
-	# So we strip '-o arg' only if arg is an object.
270
-	eat=1
271
-	case $2 in
272
-	  *.o | *.obj)
273
-	    ofile=$2
274
-	    ;;
275
-	  *)
276
-	    set x "$@" -o "$2"
277
-	    shift
278
-	    ;;
279
-	esac
280
-	;;
281
-      *.c)
282
-	cfile=$1
283
-	set x "$@" "$1"
284
-	shift
285
-	;;
286
-      *)
287
-	set x "$@" "$1"
288
-	shift
289
-	;;
290
-    esac
291
-  fi
292
-  shift
293
-done
294
-
295
-if test -z "$ofile" || test -z "$cfile"; then
296
-  # If no '-o' option was seen then we might have been invoked from a
297
-  # pattern rule where we don't need one.  That is ok -- this is a
298
-  # normal compilation that the losing compiler can handle.  If no
299
-  # '.c' file was seen then we are probably linking.  That is also
300
-  # ok.
301
-  exec "$@"
302
-fi
303
-
304
-# Name of file we expect compiler to create.
305
-cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'`
306
-
307
-# Create the lock directory.
308
-# Note: use '[/\\:.-]' here to ensure that we don't use the same name
309
-# that we are using for the .o file.  Also, base the name on the expected
310
-# object file name, since that is what matters with a parallel build.
311
-lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d
312
-while true; do
313
-  if mkdir "$lockdir" >/dev/null 2>&1; then
314
-    break
315
-  fi
316
-  sleep 1
317
-done
318
-# FIXME: race condition here if user kills between mkdir and trap.
319
-trap "rmdir '$lockdir'; exit 1" 1 2 15
320
-
321
-# Run the compile.
322
-"$@"
323
-ret=$?
324
-
325
-if test -f "$cofile"; then
326
-  test "$cofile" = "$ofile" || mv "$cofile" "$ofile"
327
-elif test -f "${cofile}bj"; then
328
-  test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile"
329
-fi
330
-
331
-rmdir "$lockdir"
332
-exit $ret
333
-
334
-# Local Variables:
335
-# mode: shell-script
336
-# sh-indentation: 2
337
-# eval: (add-hook 'write-file-hooks 'time-stamp)
338
-# time-stamp-start: "scriptversion="
339
-# time-stamp-format: "%:y-%02m-%02d.%02H"
340
-# time-stamp-time-zone: "UTC"
341
-# time-stamp-end: "; # UTC"
342
-# End:
... ...
@@ -1,9 +1,10 @@
1 1
 #! /bin/sh
2 2
 # Attempt to guess a canonical system name.
3 3
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
4
-#   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
4
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
5
+#   Free Software Foundation, Inc.
5 6
 
6
-timestamp='2003-07-02'
7
+timestamp='2009-12-30'
7 8
 
8 9
 # This file is free software; you can redistribute it and/or modify it
9 10
 # under the terms of the GNU General Public License as published by
... ...
@@ -17,23 +18,25 @@ timestamp='2003-07-02'
17 17
 #
18 18
 # You should have received a copy of the GNU General Public License
19 19
 # along with this program; if not, write to the Free Software
20
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
20
+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
21
+# 02110-1301, USA.
21 22
 #
22 23
 # As a special exception to the GNU General Public License, if you
23 24
 # distribute this file as part of a program that contains a
24 25
 # configuration script generated by Autoconf, you may include it under
25 26
 # the same distribution terms that you use for the rest of that program.
26 27
 
27
-# Originally written by Per Bothner <per@bothner.com>.
28
-# Please send patches to <config-patches@gnu.org>.  Submit a context
29
-# diff and a properly formatted ChangeLog entry.
28
+
29
+# Originally written by Per Bothner.  Please send patches (context
30
+# diff format) to <config-patches@gnu.org> and include a ChangeLog
31
+# entry.
30 32
 #
31 33
 # This script attempts to guess a canonical system name similar to
32 34
 # config.sub.  If it succeeds, it prints the system name on stdout, and
33 35
 # exits with 0.  Otherwise, it exits with 1.
34 36
 #
35
-# The plan is that this can be called by configure scripts if you
36
-# don't specify an explicit build system type.
37
+# You can get the latest version of this script from:
38
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
37 39
 
38 40
 me=`echo "$0" | sed -e 's,.*/,,'`
39 41
 
... ...
@@ -53,8 +56,9 @@ version="\
53 53
 GNU config.guess ($timestamp)
54 54
 
55 55
 Originally written by Per Bothner.
56
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
57
-Free Software Foundation, Inc.
56
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
57
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
58
+Software Foundation, Inc.
58 59
 
59 60
 This is free software; see the source for copying conditions.  There is NO
60 61
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
... ...
@@ -66,11 +70,11 @@ Try \`$me --help' for more information."
66 66
 while test $# -gt 0 ; do
67 67
   case $1 in
68 68
     --time-stamp | --time* | -t )
69
-       echo "$timestamp" ; exit 0 ;;
69
+       echo "$timestamp" ; exit ;;
70 70
     --version | -v )
71
-       echo "$version" ; exit 0 ;;
71
+       echo "$version" ; exit ;;
72 72
     --help | --h* | -h )
73
-       echo "$usage"; exit 0 ;;
73
+       echo "$usage"; exit ;;
74 74
     -- )     # Stop option processing
75 75
        shift; break ;;
76 76
     - )	# Use stdin as input.
... ...
@@ -104,7 +108,7 @@ set_cc_for_build='
104 104
 trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
105 105
 trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
106 106
 : ${TMPDIR=/tmp} ;
107
- { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
107
+ { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
108 108
  { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
109 109
  { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
110 110
  { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
... ...
@@ -123,7 +127,7 @@ case $CC_FOR_BUILD,$HOST_CC,$CC in
123 123
 	;;
124 124
  ,,*)   CC_FOR_BUILD=$CC ;;
125 125
  ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
126
-esac ;'
126
+esac ; set_cc_for_build= ;'
127 127
 
128 128
 # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
129 129
 # (ghazi@noc.rutgers.edu 1994-08-24)
... ...
@@ -158,6 +162,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
158 158
 	    arm*) machine=arm-unknown ;;
159 159
 	    sh3el) machine=shl-unknown ;;
160 160
 	    sh3eb) machine=sh-unknown ;;
161
+	    sh5el) machine=sh5le-unknown ;;
161 162
 	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
162 163
 	esac
163 164
 	# The Operating System including object format, if it has switched
... ...
@@ -166,7 +171,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
166 166
 	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
167 167
 		eval $set_cc_for_build
168 168
 		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
169
-			| grep __ELF__ >/dev/null
169
+			| grep -q __ELF__
170 170
 		then
171 171
 		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
172 172
 		    # Return netbsd for either.  FIX?
... ...
@@ -196,50 +201,32 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
196 196
 	# contains redundant information, the shorter form:
197 197
 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
198 198
 	echo "${machine}-${os}${release}"
199
-	exit 0 ;;
200
-    amiga:OpenBSD:*:*)
201
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
202
-	exit 0 ;;
203
-    arc:OpenBSD:*:*)
204
-	echo mipsel-unknown-openbsd${UNAME_RELEASE}
205
-	exit 0 ;;
206
-    hp300:OpenBSD:*:*)
207
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
208
-	exit 0 ;;
209
-    mac68k:OpenBSD:*:*)
210
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
211
-	exit 0 ;;
212
-    macppc:OpenBSD:*:*)
213
-	echo powerpc-unknown-openbsd${UNAME_RELEASE}
214
-	exit 0 ;;
215
-    mvme68k:OpenBSD:*:*)
216
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
217
-	exit 0 ;;
218
-    mvme88k:OpenBSD:*:*)
219
-	echo m88k-unknown-openbsd${UNAME_RELEASE}
220
-	exit 0 ;;
221
-    mvmeppc:OpenBSD:*:*)
222
-	echo powerpc-unknown-openbsd${UNAME_RELEASE}
223
-	exit 0 ;;
224
-    pmax:OpenBSD:*:*)
225
-	echo mipsel-unknown-openbsd${UNAME_RELEASE}
226
-	exit 0 ;;
227
-    sgi:OpenBSD:*:*)
228
-	echo mipseb-unknown-openbsd${UNAME_RELEASE}
229
-	exit 0 ;;
230
-    sun3:OpenBSD:*:*)
231
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
232
-	exit 0 ;;
233
-    wgrisc:OpenBSD:*:*)
234
-	echo mipsel-unknown-openbsd${UNAME_RELEASE}
235
-	exit 0 ;;
199
+	exit ;;
236 200
     *:OpenBSD:*:*)
237
-	echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
238
-	exit 0 ;;
201
+	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
202
+	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
203
+	exit ;;
204
+    *:ekkoBSD:*:*)
205
+	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
206
+	exit ;;
207
+    *:SolidBSD:*:*)
208
+	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
209
+	exit ;;
210
+    macppc:MirBSD:*:*)
211
+	echo powerpc-unknown-mirbsd${UNAME_RELEASE}
212
+	exit ;;
213
+    *:MirBSD:*:*)
214
+	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
215
+	exit ;;
239 216
     alpha:OSF1:*:*)
240
-	if test $UNAME_RELEASE = "V4.0"; then
217
+	case $UNAME_RELEASE in
218
+	*4.0)
241 219
 		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
242
-	fi
220
+		;;
221
+	*5.*)
222
+	        UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
223
+		;;
224
+	esac
243 225
 	# According to Compaq, /usr/sbin/psrinfo has been available on
244 226
 	# OSF/1 and Tru64 systems produced since 1995.  I hope that
245 227
 	# covers most systems running today.  This code pipes the CPU
... ...
@@ -277,42 +264,49 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
277 277
 	    "EV7.9 (21364A)")
278 278
 		UNAME_MACHINE="alphaev79" ;;
279 279
 	esac
280
+	# A Pn.n version is a patched version.
280 281
 	# A Vn.n version is a released version.
281 282
 	# A Tn.n version is a released field test version.
282 283
 	# A Xn.n version is an unreleased experimental baselevel.
283 284
 	# 1.2 uses "1.2" for uname -r.
284
-	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
285
-	exit 0 ;;
286
-    Alpha*:OpenVMS:*:*)
287
-	echo alpha-hp-vms
288
-	exit 0 ;;
285
+	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
286
+	exit ;;
289 287
     Alpha\ *:Windows_NT*:*)
290 288
 	# How do we know it's Interix rather than the generic POSIX subsystem?
291 289
 	# Should we change UNAME_MACHINE based on the output of uname instead
292 290
 	# of the specific Alpha model?
293 291
 	echo alpha-pc-interix
294
-	exit 0 ;;
292
+	exit ;;
295 293
     21064:Windows_NT:50:3)
296 294
 	echo alpha-dec-winnt3.5
297
-	exit 0 ;;
295
+	exit ;;
298 296
     Amiga*:UNIX_System_V:4.0:*)
299 297
 	echo m68k-unknown-sysv4
300
-	exit 0;;
298
+	exit ;;
301 299
     *:[Aa]miga[Oo][Ss]:*:*)
302 300
 	echo ${UNAME_MACHINE}-unknown-amigaos
303
-	exit 0 ;;
301
+	exit ;;
304 302
     *:[Mm]orph[Oo][Ss]:*:*)
305 303
 	echo ${UNAME_MACHINE}-unknown-morphos
306
-	exit 0 ;;
304
+	exit ;;
307 305
     *:OS/390:*:*)
308 306
 	echo i370-ibm-openedition
309
-	exit 0 ;;
307
+	exit ;;
308
+    *:z/VM:*:*)
309
+	echo s390-ibm-zvmoe
310
+	exit ;;
311
+    *:OS400:*:*)
312
+        echo powerpc-ibm-os400
313
+	exit ;;
310 314
     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
311 315
 	echo arm-acorn-riscix${UNAME_RELEASE}
312
-	exit 0;;
316
+	exit ;;
317
+    arm:riscos:*:*|arm:RISCOS:*:*)
318
+	echo arm-unknown-riscos
319
+	exit ;;
313 320
     SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
314 321
 	echo hppa1.1-hitachi-hiuxmpp
315
-	exit 0;;
322
+	exit ;;
316 323
     Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
317 324
 	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
318 325
 	if test "`(/bin/universe) 2>/dev/null`" = att ; then
... ...
@@ -320,32 +314,51 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
320 320
 	else
321 321
 		echo pyramid-pyramid-bsd
322 322
 	fi
323
-	exit 0 ;;
323
+	exit ;;
324 324
     NILE*:*:*:dcosx)
325 325
 	echo pyramid-pyramid-svr4
326
-	exit 0 ;;
326
+	exit ;;
327 327
     DRS?6000:unix:4.0:6*)
328 328
 	echo sparc-icl-nx6
329
-	exit 0 ;;
330
-    DRS?6000:UNIX_SV:4.2*:7*)
329
+	exit ;;
330
+    DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
331 331
 	case `/usr/bin/uname -p` in
332
-	    sparc) echo sparc-icl-nx7 && exit 0 ;;
332
+	    sparc) echo sparc-icl-nx7; exit ;;
333 333
 	esac ;;
334
+    s390x:SunOS:*:*)
335
+	echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
336
+	exit ;;
334 337
     sun4H:SunOS:5.*:*)
335 338
 	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
336
-	exit 0 ;;
339
+	exit ;;
337 340
     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
338 341
 	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
339
-	exit 0 ;;
340
-    i86pc:SunOS:5.*:*)
341
-	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
342
-	exit 0 ;;
342
+	exit ;;
343
+    i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
344
+	echo i386-pc-auroraux${UNAME_RELEASE}
345
+	exit ;;
346
+    i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
347
+	eval $set_cc_for_build
348
+	SUN_ARCH="i386"
349
+	# If there is a compiler, see if it is configured for 64-bit objects.
350
+	# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
351
+	# This test works for both compilers.
352
+	if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
353
+	    if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
354
+		(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
355
+		grep IS_64BIT_ARCH >/dev/null
356
+	    then
357
+		SUN_ARCH="x86_64"
358
+	    fi
359
+	fi
360
+	echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
361
+	exit ;;
343 362
     sun4*:SunOS:6*:*)
344 363
 	# According to config.sub, this is the proper way to canonicalize
345 364
 	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
346 365
 	# it's likely to be more like Solaris than SunOS4.
347 366
 	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
348
-	exit 0 ;;
367
+	exit ;;
349 368
     sun4*:SunOS:*:*)
350 369
 	case "`/usr/bin/arch -k`" in
351 370
 	    Series*|S4*)
... ...
@@ -354,10 +367,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
354 354
 	esac
355 355
 	# Japanese Language versions have a version number like `4.1.3-JL'.
356 356
 	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
357
-	exit 0 ;;
357
+	exit ;;
358 358
     sun3*:SunOS:*:*)
359 359
 	echo m68k-sun-sunos${UNAME_RELEASE}
360
-	exit 0 ;;
360
+	exit ;;
361 361
     sun*:*:4.2BSD:*)
362 362
 	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
363 363
 	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
... ...
@@ -369,10 +382,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
369 369
 		echo sparc-sun-sunos${UNAME_RELEASE}
370 370
 		;;
371 371
 	esac
372
-	exit 0 ;;
372
+	exit ;;
373 373
     aushp:SunOS:*:*)
374 374
 	echo sparc-auspex-sunos${UNAME_RELEASE}
375
-	exit 0 ;;
375
+	exit ;;
376 376
     # The situation for MiNT is a little confusing.  The machine name
377 377
     # can be virtually everything (everything which is not
378 378
     # "atarist" or "atariste" at least should have a processor
... ...
@@ -383,37 +396,40 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
383 383
     # be no problem.
384 384
     atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
385 385
         echo m68k-atari-mint${UNAME_RELEASE}
386
-	exit 0 ;;
386
+	exit ;;
387 387
     atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
388 388
 	echo m68k-atari-mint${UNAME_RELEASE}
389
-        exit 0 ;;
389
+        exit ;;
390 390
     *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
391 391
         echo m68k-atari-mint${UNAME_RELEASE}
392
-	exit 0 ;;
392
+	exit ;;
393 393
     milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
394 394
         echo m68k-milan-mint${UNAME_RELEASE}
395
-        exit 0 ;;
395
+        exit ;;
396 396
     hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
397 397
         echo m68k-hades-mint${UNAME_RELEASE}
398
-        exit 0 ;;
398
+        exit ;;
399 399
     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
400 400
         echo m68k-unknown-mint${UNAME_RELEASE}
401
-        exit 0 ;;
401
+        exit ;;
402
+    m68k:machten:*:*)
403
+	echo m68k-apple-machten${UNAME_RELEASE}
404
+	exit ;;
402 405
     powerpc:machten:*:*)
403 406
 	echo powerpc-apple-machten${UNAME_RELEASE}
404
-	exit 0 ;;
407
+	exit ;;
405 408
     RISC*:Mach:*:*)
406 409
 	echo mips-dec-mach_bsd4.3
407
-	exit 0 ;;
410
+	exit ;;
408 411
     RISC*:ULTRIX:*:*)
409 412
 	echo mips-dec-ultrix${UNAME_RELEASE}
410
-	exit 0 ;;
413
+	exit ;;
411 414
     VAX*:ULTRIX*:*:*)
412 415
 	echo vax-dec-ultrix${UNAME_RELEASE}
413
-	exit 0 ;;
416
+	exit ;;
414 417
     2020:CLIX:*:* | 2430:CLIX:*:*)
415 418
 	echo clipper-intergraph-clix${UNAME_RELEASE}
416
-	exit 0 ;;
419
+	exit ;;
417 420
     mips:*:*:UMIPS | mips:*:*:RISCos)
418 421
 	eval $set_cc_for_build
419 422
 	sed 's/^	//' << EOF >$dummy.c
... ...
@@ -437,32 +453,33 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
437 437
 	  exit (-1);
438 438
 	}
439 439
 EOF
440
-	$CC_FOR_BUILD -o $dummy $dummy.c \
441
-	  && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
442
-	  && exit 0
440
+	$CC_FOR_BUILD -o $dummy $dummy.c &&
441
+	  dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
442
+	  SYSTEM_NAME=`$dummy $dummyarg` &&
443
+	    { echo "$SYSTEM_NAME"; exit; }
443 444
 	echo mips-mips-riscos${UNAME_RELEASE}
444
-	exit 0 ;;
445
+	exit ;;
445 446
     Motorola:PowerMAX_OS:*:*)
446 447
 	echo powerpc-motorola-powermax
447
-	exit 0 ;;
448
+	exit ;;
448 449
     Motorola:*:4.3:PL8-*)
449 450
 	echo powerpc-harris-powermax
450
-	exit 0 ;;
451
+	exit ;;
451 452
     Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
452 453
 	echo powerpc-harris-powermax
453
-	exit 0 ;;
454
+	exit ;;
454 455
     Night_Hawk:Power_UNIX:*:*)
455 456
 	echo powerpc-harris-powerunix
456
-	exit 0 ;;
457
+	exit ;;
457 458
     m88k:CX/UX:7*:*)
458 459
 	echo m88k-harris-cxux7
459
-	exit 0 ;;
460
+	exit ;;
460 461
     m88k:*:4*:R4*)
461 462
 	echo m88k-motorola-sysv4
462
-	exit 0 ;;
463
+	exit ;;
463 464
     m88k:*:3*:R3*)
464 465
 	echo m88k-motorola-sysv3
465
-	exit 0 ;;
466
+	exit ;;
466 467
     AViiON:dgux:*:*)
467 468
         # DG/UX returns AViiON for all architectures
468 469
         UNAME_PROCESSOR=`/usr/bin/uname -p`
... ...
@@ -478,29 +495,29 @@ EOF
478 478
 	else
479 479
 	    echo i586-dg-dgux${UNAME_RELEASE}
480 480
 	fi
481
- 	exit 0 ;;
481
+ 	exit ;;
482 482
     M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
483 483
 	echo m88k-dolphin-sysv3
484
-	exit 0 ;;
484
+	exit ;;
485 485
     M88*:*:R3*:*)
486 486
 	# Delta 88k system running SVR3
487 487
 	echo m88k-motorola-sysv3
488
-	exit 0 ;;
488
+	exit ;;
489 489
     XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
490 490
 	echo m88k-tektronix-sysv3
491
-	exit 0 ;;
491
+	exit ;;
492 492
     Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
493 493
 	echo m68k-tektronix-bsd
494
-	exit 0 ;;
494
+	exit ;;
495 495
     *:IRIX*:*:*)
496 496
 	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
497
-	exit 0 ;;
497
+	exit ;;
498 498
     ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
499
-	echo romp-ibm-aix      # uname -m gives an 8 hex-code CPU id
500
-	exit 0 ;;              # Note that: echo "'`uname -s`'" gives 'AIX '
499
+	echo romp-ibm-aix     # uname -m gives an 8 hex-code CPU id
500
+	exit ;;               # Note that: echo "'`uname -s`'" gives 'AIX '
501 501
     i*86:AIX:*:*)
502 502
 	echo i386-ibm-aix
503
-	exit 0 ;;
503
+	exit ;;
504 504
     ia64:AIX:*:*)
505 505
 	if [ -x /usr/bin/oslevel ] ; then
506 506
 		IBM_REV=`/usr/bin/oslevel`
... ...
@@ -508,7 +525,7 @@ EOF
508 508
 		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
509 509
 	fi
510 510
 	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
511
-	exit 0 ;;
511
+	exit ;;
512 512
     *:AIX:2:3)
513 513
 	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
514 514
 		eval $set_cc_for_build
... ...
@@ -523,15 +540,19 @@ EOF
523 523
 			exit(0);
524 524
 			}
525 525
 EOF
526
-		$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
527
-		echo rs6000-ibm-aix3.2.5
526
+		if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
527
+		then
528
+			echo "$SYSTEM_NAME"
529
+		else
530
+			echo rs6000-ibm-aix3.2.5
531
+		fi
528 532
 	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
529 533
 		echo rs6000-ibm-aix3.2.4
530 534
 	else
531 535
 		echo rs6000-ibm-aix3.2
532 536
 	fi
533
-	exit 0 ;;
534
-    *:AIX:*:[45])
537
+	exit ;;
538
+    *:AIX:*:[456])
535 539
 	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
536 540
 	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
537 541
 		IBM_ARCH=rs6000
... ...
@@ -544,28 +565,28 @@ EOF
544 544
 		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
545 545
 	fi
546 546
 	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
547
-	exit 0 ;;
547
+	exit ;;
548 548
     *:AIX:*:*)
549 549
 	echo rs6000-ibm-aix
550
-	exit 0 ;;
550
+	exit ;;
551 551
     ibmrt:4.4BSD:*|romp-ibm:BSD:*)
552 552
 	echo romp-ibm-bsd4.4
553
-	exit 0 ;;
553
+	exit ;;
554 554
     ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
555 555
 	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
556
-	exit 0 ;;                           # report: romp-ibm BSD 4.3
556
+	exit ;;                             # report: romp-ibm BSD 4.3
557 557
     *:BOSX:*:*)
558 558
 	echo rs6000-bull-bosx
559
-	exit 0 ;;
559
+	exit ;;
560 560
     DPX/2?00:B.O.S.:*:*)
561 561
 	echo m68k-bull-sysv3
562
-	exit 0 ;;
562
+	exit ;;
563 563
     9000/[34]??:4.3bsd:1.*:*)
564 564
 	echo m68k-hp-bsd
565
-	exit 0 ;;
565
+	exit ;;
566 566
     hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
567 567
 	echo m68k-hp-bsd4.4
568
-	exit 0 ;;
568
+	exit ;;
569 569
     9000/[34678]??:HP-UX:*:*)
570 570
 	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
571 571
 	case "${UNAME_MACHINE}" in
... ...
@@ -627,9 +648,19 @@ EOF
627 627
 	esac
628 628
 	if [ ${HP_ARCH} = "hppa2.0w" ]
629 629
 	then
630
-	    # avoid double evaluation of $set_cc_for_build
631
-	    test -n "$CC_FOR_BUILD" || eval $set_cc_for_build
632
-	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null
630
+	    eval $set_cc_for_build
631
+
632
+	    # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
633
+	    # 32-bit code.  hppa64-hp-hpux* has the same kernel and a compiler
634
+	    # generating 64-bit code.  GNU and HP use different nomenclature:
635
+	    #
636
+	    # $ CC_FOR_BUILD=cc ./config.guess
637
+	    # => hppa2.0w-hp-hpux11.23
638
+	    # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
639
+	    # => hppa64-hp-hpux11.23
640
+
641
+	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
642
+		grep -q __LP64__
633 643
 	    then
634 644
 		HP_ARCH="hppa2.0w"
635 645
 	    else
... ...
@@ -637,11 +668,11 @@ EOF
637 637
 	    fi
638 638
 	fi
639 639
 	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
640
-	exit 0 ;;
640
+	exit ;;
641 641
     ia64:HP-UX:*:*)
642 642
 	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
643 643
 	echo ia64-hp-hpux${HPUX_REV}
644
-	exit 0 ;;
644
+	exit ;;
645 645
     3050*:HI-UX:*:*)
646 646
 	eval $set_cc_for_build
647 647
 	sed 's/^	//' << EOF >$dummy.c
... ...
@@ -669,211 +700,248 @@ EOF
669 669
 	  exit (0);
670 670
 	}
671 671
 EOF
672
-	$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
672
+	$CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
673
+		{ echo "$SYSTEM_NAME"; exit; }
673 674
 	echo unknown-hitachi-hiuxwe2
674
-	exit 0 ;;
675
+	exit ;;
675 676
     9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
676 677
 	echo hppa1.1-hp-bsd
677
-	exit 0 ;;
678
+	exit ;;
678 679
     9000/8??:4.3bsd:*:*)
679 680
 	echo hppa1.0-hp-bsd
680
-	exit 0 ;;
681
+	exit ;;
681 682
     *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
682 683
 	echo hppa1.0-hp-mpeix
683
-	exit 0 ;;
684
+	exit ;;
684 685
     hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
685 686
 	echo hppa1.1-hp-osf
686
-	exit 0 ;;
687
+	exit ;;
687 688
     hp8??:OSF1:*:*)
688 689
 	echo hppa1.0-hp-osf
689
-	exit 0 ;;
690
+	exit ;;
690 691
     i*86:OSF1:*:*)
691 692
 	if [ -x /usr/sbin/sysversion ] ; then
692 693
 	    echo ${UNAME_MACHINE}-unknown-osf1mk
693 694
 	else
694 695
 	    echo ${UNAME_MACHINE}-unknown-osf1
695 696
 	fi
696
-	exit 0 ;;
697
+	exit ;;
697 698
     parisc*:Lites*:*:*)
698 699
 	echo hppa1.1-hp-lites
699
-	exit 0 ;;
700
+	exit ;;
700 701
     C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
701 702
 	echo c1-convex-bsd
702
-        exit 0 ;;
703
+        exit ;;
703 704
     C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
704 705
 	if getsysinfo -f scalar_acc
705 706
 	then echo c32-convex-bsd
706 707
 	else echo c2-convex-bsd
707 708
 	fi
708
-        exit 0 ;;
709
+        exit ;;
709 710
     C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
710 711
 	echo c34-convex-bsd
711
-        exit 0 ;;
712
+        exit ;;
712 713
     C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
713 714
 	echo c38-convex-bsd
714
-        exit 0 ;;
715
+        exit ;;
715 716
     C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
716 717
 	echo c4-convex-bsd
717
-        exit 0 ;;
718
+        exit ;;
718 719
     CRAY*Y-MP:*:*:*)
719 720
 	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
720
-	exit 0 ;;
721
+	exit ;;
721 722
     CRAY*[A-Z]90:*:*:*)
722 723
 	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
723 724
 	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
724 725
 	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
725 726
 	      -e 's/\.[^.]*$/.X/'
726
-	exit 0 ;;
727
+	exit ;;
727 728
     CRAY*TS:*:*:*)
728 729
 	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
729
-	exit 0 ;;
730
+	exit ;;
730 731
     CRAY*T3E:*:*:*)
731 732
 	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
732
-	exit 0 ;;
733
+	exit ;;
733 734
     CRAY*SV1:*:*:*)
734 735
 	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
735
-	exit 0 ;;
736
+	exit ;;
736 737
     *:UNICOS/mp:*:*)
737
-	echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' 
738
-	exit 0 ;;
738
+	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
739
+	exit ;;
739 740
     F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
740 741
 	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
741 742
         FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
742 743
         FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
743 744
         echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
744
-        exit 0 ;;
745
+        exit ;;
746
+    5000:UNIX_System_V:4.*:*)
747
+        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
748
+        FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
749
+        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
750
+	exit ;;
745 751
     i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
746 752
 	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
747
-	exit 0 ;;
753
+	exit ;;
748 754
     sparc*:BSD/OS:*:*)
749 755
 	echo sparc-unknown-bsdi${UNAME_RELEASE}
750
-	exit 0 ;;
756
+	exit ;;
751 757
     *:BSD/OS:*:*)
752 758
 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
753
-	exit 0 ;;
754
-    *:FreeBSD:*:*|*:GNU/FreeBSD:*:*)
755
-	# Determine whether the default compiler uses glibc.
756
-	eval $set_cc_for_build
757
-	sed 's/^	//' << EOF >$dummy.c
758
-	#include <features.h>
759
-	#if __GLIBC__ >= 2
760
-	LIBC=gnu
761
-	#else
762
-	LIBC=
763
-	#endif
764
-EOF
765
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
766
-	# GNU/FreeBSD systems have a "k" prefix to indicate we are using
767
-	# FreeBSD's kernel, but not the complete OS.
768
-	case ${LIBC} in gnu) kernel_only='k' ;; esac
769
-	echo ${UNAME_MACHINE}-unknown-${kernel_only}freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC}
770
-	exit 0 ;;
759
+	exit ;;
760
+    *:FreeBSD:*:*)
761
+	case ${UNAME_MACHINE} in
762
+	    pc98)
763
+		echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
764
+	    amd64)
765
+		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
766
+	    *)
767
+		echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
768
+	esac
769
+	exit ;;
771 770
     i*:CYGWIN*:*)
772 771
 	echo ${UNAME_MACHINE}-pc-cygwin
773
-	exit 0 ;;
774
-    i*:MINGW*:*)
772
+	exit ;;
773
+    *:MINGW*:*)
775 774
 	echo ${UNAME_MACHINE}-pc-mingw32
776
-	exit 0 ;;
775
+	exit ;;
776
+    i*:windows32*:*)
777
+    	# uname -m includes "-pc" on this system.
778
+    	echo ${UNAME_MACHINE}-mingw32
779
+	exit ;;
777 780
     i*:PW*:*)
778 781
 	echo ${UNAME_MACHINE}-pc-pw32
779
-	exit 0 ;;
780
-    x86:Interix*:[34]*)
781
-	echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
782
-	exit 0 ;;
782
+	exit ;;
783
+    *:Interix*:*)
784
+    	case ${UNAME_MACHINE} in
785
+	    x86)
786
+		echo i586-pc-interix${UNAME_RELEASE}
787
+		exit ;;
788
+	    authenticamd | genuineintel | EM64T)
789
+		echo x86_64-unknown-interix${UNAME_RELEASE}
790
+		exit ;;
791
+	    IA64)
792
+		echo ia64-unknown-interix${UNAME_RELEASE}
793
+		exit ;;
794
+	esac ;;
783 795
     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
784 796
 	echo i${UNAME_MACHINE}-pc-mks
785
-	exit 0 ;;
797
+	exit ;;
798
+    8664:Windows_NT:*)
799
+	echo x86_64-pc-mks
800
+	exit ;;
786 801
     i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
787 802
 	# How do we know it's Interix rather than the generic POSIX subsystem?
788 803
 	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
789 804
 	# UNAME_MACHINE based on the output of uname instead of i386?
790 805
 	echo i586-pc-interix
791
-	exit 0 ;;
806
+	exit ;;
792 807
     i*:UWIN*:*)
793 808
 	echo ${UNAME_MACHINE}-pc-uwin
794
-	exit 0 ;;
809
+	exit ;;
810
+    amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
811
+	echo x86_64-unknown-cygwin
812
+	exit ;;
795 813
     p*:CYGWIN*:*)
796 814
 	echo powerpcle-unknown-cygwin
797
-	exit 0 ;;
815
+	exit ;;
798 816
     prep*:SunOS:5.*:*)
799 817
 	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
800
-	exit 0 ;;
818
+	exit ;;
801 819
     *:GNU:*:*)
820
+	# the GNU system
802 821
 	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
803
-	exit 0 ;;
822
+	exit ;;
823
+    *:GNU/*:*:*)
824
+	# other systems with GNU libc and userland
825
+	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
826
+	exit ;;
804 827
     i*86:Minix:*:*)
805 828
 	echo ${UNAME_MACHINE}-pc-minix
806
-	exit 0 ;;
829
+	exit ;;
830
+    alpha:Linux:*:*)
831
+	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
832
+	  EV5)   UNAME_MACHINE=alphaev5 ;;
833
+	  EV56)  UNAME_MACHINE=alphaev56 ;;
834
+	  PCA56) UNAME_MACHINE=alphapca56 ;;
835
+	  PCA57) UNAME_MACHINE=alphapca56 ;;
836
+	  EV6)   UNAME_MACHINE=alphaev6 ;;
837
+	  EV67)  UNAME_MACHINE=alphaev67 ;;
838
+	  EV68*) UNAME_MACHINE=alphaev68 ;;
839
+        esac
840
+	objdump --private-headers /bin/sh | grep -q ld.so.1
841
+	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
842
+	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
843
+	exit ;;
807 844
     arm*:Linux:*:*)
845
+	eval $set_cc_for_build
846
+	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
847
+	    | grep -q __ARM_EABI__
848
+	then
849
+	    echo ${UNAME_MACHINE}-unknown-linux-gnu
850
+	else
851
+	    echo ${UNAME_MACHINE}-unknown-linux-gnueabi
852
+	fi
853
+	exit ;;
854
+    avr32*:Linux:*:*)
808 855
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
809
-	exit 0 ;;
856
+	exit ;;
810 857
     cris:Linux:*:*)
811 858
 	echo cris-axis-linux-gnu
812
-	exit 0 ;;
813
-    ia64:Linux:*:*)
814
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
815
-	exit 0 ;;
816
-    m68*:Linux:*:*)
817
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
818
-	exit 0 ;;
819
-    mips:Linux:*:*)
859
+	exit ;;
860
+    crisv32:Linux:*:*)
861
+	echo crisv32-axis-linux-gnu
862
+	exit ;;
863
+    frv:Linux:*:*)
864
+    	echo frv-unknown-linux-gnu
865
+	exit ;;
866
+    i*86:Linux:*:*)
867
+	LIBC=gnu
820 868
 	eval $set_cc_for_build
821 869
 	sed 's/^	//' << EOF >$dummy.c
822
-	#undef CPU
823
-	#undef mips
824
-	#undef mipsel
825
-	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
826
-	CPU=mipsel
827
-	#else
828
-	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
829
-	CPU=mips
830
-	#else
831
-	CPU=
832
-	#endif
870
+	#ifdef __dietlibc__
871
+	LIBC=dietlibc
833 872
 	#endif
834 873
 EOF
835
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
836
-	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
837
-	;;
838
-    mips64:Linux:*:*)
874
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
875
+	echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
876
+	exit ;;
877
+    ia64:Linux:*:*)
878
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
879
+	exit ;;
880
+    m32r*:Linux:*:*)
881
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
882
+	exit ;;
883
+    m68*:Linux:*:*)
884
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
885
+	exit ;;
886
+    mips:Linux:*:* | mips64:Linux:*:*)
839 887
 	eval $set_cc_for_build
840 888
 	sed 's/^	//' << EOF >$dummy.c
841 889
 	#undef CPU
842
-	#undef mips64
843
-	#undef mips64el
890
+	#undef ${UNAME_MACHINE}
891
+	#undef ${UNAME_MACHINE}el
844 892
 	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
845
-	CPU=mips64el
893
+	CPU=${UNAME_MACHINE}el
846 894
 	#else
847 895
 	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
848
-	CPU=mips64
896
+	CPU=${UNAME_MACHINE}
849 897
 	#else
850 898
 	CPU=
851 899
 	#endif
852 900
 	#endif
853 901
 EOF
854
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
855
-	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
902
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
903
+	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
856 904
 	;;
857
-    ppc:Linux:*:*)
858
-	echo powerpc-unknown-linux-gnu
859
-	exit 0 ;;
860
-    ppc64:Linux:*:*)
861
-	echo powerpc64-unknown-linux-gnu
862
-	exit 0 ;;
863
-    alpha:Linux:*:*)
864
-	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
865
-	  EV5)   UNAME_MACHINE=alphaev5 ;;
866
-	  EV56)  UNAME_MACHINE=alphaev56 ;;
867
-	  PCA56) UNAME_MACHINE=alphapca56 ;;
868
-	  PCA57) UNAME_MACHINE=alphapca56 ;;
869
-	  EV6)   UNAME_MACHINE=alphaev6 ;;
870
-	  EV67)  UNAME_MACHINE=alphaev67 ;;
871
-	  EV68*) UNAME_MACHINE=alphaev68 ;;
872
-        esac
873
-	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
874
-	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
875
-	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
876
-	exit 0 ;;
905
+    or32:Linux:*:*)
906
+	echo or32-unknown-linux-gnu
907
+	exit ;;
908
+    padre:Linux:*:*)
909
+	echo sparc-unknown-linux-gnu
910
+	exit ;;
911
+    parisc64:Linux:*:* | hppa64:Linux:*:*)
912
+	echo hppa64-unknown-linux-gnu
913
+	exit ;;
877 914
     parisc:Linux:*:* | hppa:Linux:*:*)
878 915
 	# Look for CPU level
879 916
 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
... ...
@@ -881,84 +949,40 @@ EOF
881 881
 	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
882 882
 	  *)    echo hppa-unknown-linux-gnu ;;
883 883
 	esac
884
-	exit 0 ;;
885
-    parisc64:Linux:*:* | hppa64:Linux:*:*)
886
-	echo hppa64-unknown-linux-gnu
887
-	exit 0 ;;
884
+	exit ;;
885
+    ppc64:Linux:*:*)
886
+	echo powerpc64-unknown-linux-gnu
887
+	exit ;;
888
+    ppc:Linux:*:*)
889
+	echo powerpc-unknown-linux-gnu
890
+	exit ;;
888 891
     s390:Linux:*:* | s390x:Linux:*:*)
889 892
 	echo ${UNAME_MACHINE}-ibm-linux
890
-	exit 0 ;;
893
+	exit ;;
891 894
     sh64*:Linux:*:*)
892 895
     	echo ${UNAME_MACHINE}-unknown-linux-gnu
893
-	exit 0 ;;
896
+	exit ;;
894 897
     sh*:Linux:*:*)
895 898
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
896
-	exit 0 ;;
899
+	exit ;;
897 900
     sparc:Linux:*:* | sparc64:Linux:*:*)
898 901
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
899
-	exit 0 ;;
902
+	exit ;;
903
+    vax:Linux:*:*)
904
+	echo ${UNAME_MACHINE}-dec-linux-gnu
905
+	exit ;;
900 906
     x86_64:Linux:*:*)
901 907
 	echo x86_64-unknown-linux-gnu
902
-	exit 0 ;;
903
-    i*86:Linux:*:*)
904
-	# The BFD linker knows what the default object file format is, so
905
-	# first see if it will tell us. cd to the root directory to prevent
906
-	# problems with other programs or directories called `ld' in the path.
907
-	# Set LC_ALL=C to ensure ld outputs messages in English.
908
-	ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
909
-			 | sed -ne '/supported targets:/!d
910
-				    s/[ 	][ 	]*/ /g
911
-				    s/.*supported targets: *//
912
-				    s/ .*//
913
-				    p'`
914
-        case "$ld_supported_targets" in
915
-	  elf32-i386)
916
-		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
917
-		;;
918
-	  a.out-i386-linux)
919
-		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
920
-		exit 0 ;;
921
-	  coff-i386)
922
-		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
923
-		exit 0 ;;
924
-	  "")
925
-		# Either a pre-BFD a.out linker (linux-gnuoldld) or
926
-		# one that does not give us useful --help.
927
-		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
928
-		exit 0 ;;
929
-	esac
930
-	# Determine whether the default compiler is a.out or elf
931
-	eval $set_cc_for_build
932
-	sed 's/^	//' << EOF >$dummy.c
933
-	#include <features.h>
934
-	#ifdef __ELF__
935
-	# ifdef __GLIBC__
936
-	#  if __GLIBC__ >= 2
937
-	LIBC=gnu
938
-	#  else
939
-	LIBC=gnulibc1
940
-	#  endif
941
-	# else
942
-	LIBC=gnulibc1
943
-	# endif
944
-	#else
945
-	#ifdef __INTEL_COMPILER
946
-	LIBC=gnu
947
-	#else
948
-	LIBC=gnuaout
949
-	#endif
950
-	#endif
951
-EOF
952
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
953
-	test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
954
-	test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
955
-	;;
908
+	exit ;;
909
+    xtensa*:Linux:*:*)
910
+    	echo ${UNAME_MACHINE}-unknown-linux-gnu
911
+	exit ;;
956 912
     i*86:DYNIX/ptx:4*:*)
957 913
 	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
958 914
 	# earlier versions are messed up and put the nodename in both
959 915
 	# sysname and nodename.
960 916
 	echo i386-sequent-sysv4
961
-	exit 0 ;;
917
+	exit ;;
962 918
     i*86:UNIX_SV:4.2MP:2.*)
963 919
         # Unixware is an offshoot of SVR4, but it has its own version
964 920
         # number series starting with 2...
... ...
@@ -966,24 +990,27 @@ EOF
966 966
 	# I just have to hope.  -- rms.
967 967
         # Use sysv4.2uw... so that sysv4* matches it.
968 968
 	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
969
-	exit 0 ;;
969
+	exit ;;
970 970
     i*86:OS/2:*:*)
971 971
 	# If we were able to find `uname', then EMX Unix compatibility
972 972
 	# is probably installed.
973 973
 	echo ${UNAME_MACHINE}-pc-os2-emx
974
-	exit 0 ;;
974
+	exit ;;
975 975
     i*86:XTS-300:*:STOP)
976 976
 	echo ${UNAME_MACHINE}-unknown-stop
977
-	exit 0 ;;
977
+	exit ;;
978 978
     i*86:atheos:*:*)
979 979
 	echo ${UNAME_MACHINE}-unknown-atheos
980
-	exit 0 ;;
981
-    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
980
+	exit ;;
981
+    i*86:syllable:*:*)
982
+	echo ${UNAME_MACHINE}-pc-syllable
983
+	exit ;;
984
+    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
982 985
 	echo i386-unknown-lynxos${UNAME_RELEASE}
983
-	exit 0 ;;
986
+	exit ;;
984 987
     i*86:*DOS:*:*)
985 988
 	echo ${UNAME_MACHINE}-pc-msdosdjgpp
986
-	exit 0 ;;
989
+	exit ;;
987 990
     i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
988 991
 	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
989 992
 	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
... ...
@@ -991,15 +1018,16 @@ EOF
991 991
 	else
992 992
 		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
993 993
 	fi
994
-	exit 0 ;;
995
-    i*86:*:5:[78]*)
994
+	exit ;;
995
+    i*86:*:5:[678]*)
996
+    	# UnixWare 7.x, OpenUNIX and OpenServer 6.
996 997
 	case `/bin/uname -X | grep "^Machine"` in
997 998
 	    *486*)	     UNAME_MACHINE=i486 ;;
998 999
 	    *Pentium)	     UNAME_MACHINE=i586 ;;
999 1000
 	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
1000 1001
 	esac
1001 1002
 	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
1002
-	exit 0 ;;
1003
+	exit ;;
1003 1004
     i*86:*:3.2:*)
1004 1005
 	if test -f /usr/options/cb.name; then
1005 1006
 		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
... ...
@@ -1017,73 +1045,86 @@ EOF
1017 1017
 	else
1018 1018
 		echo ${UNAME_MACHINE}-pc-sysv32
1019 1019
 	fi
1020
-	exit 0 ;;
1020
+	exit ;;
1021 1021
     pc:*:*:*)
1022 1022
 	# Left here for compatibility:
1023 1023
         # uname -m prints for DJGPP always 'pc', but it prints nothing about
1024
-        # the processor, so we play safe by assuming i386.
1025
-	echo i386-pc-msdosdjgpp
1026
-        exit 0 ;;
1024
+        # the processor, so we play safe by assuming i586.
1025
+	# Note: whatever this is, it MUST be the same as what config.sub
1026
+	# prints for the "djgpp" host, or else GDB configury will decide that
1027
+	# this is a cross-build.
1028
+	echo i586-pc-msdosdjgpp
1029
+        exit ;;
1027 1030
     Intel:Mach:3*:*)
1028 1031
 	echo i386-pc-mach3
1029
-	exit 0 ;;
1032
+	exit ;;
1030 1033
     paragon:*:*:*)
1031 1034
 	echo i860-intel-osf1
1032
-	exit 0 ;;
1035
+	exit ;;
1033 1036
     i860:*:4.*:*) # i860-SVR4
1034 1037
 	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
1035 1038
 	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
1036 1039
 	else # Add other i860-SVR4 vendors below as they are discovered.
1037 1040
 	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
1038 1041
 	fi
1039
-	exit 0 ;;
1042
+	exit ;;
1040 1043
     mini*:CTIX:SYS*5:*)
1041 1044
 	# "miniframe"
1042 1045
 	echo m68010-convergent-sysv
1043
-	exit 0 ;;
1046
+	exit ;;
1044 1047
     mc68k:UNIX:SYSTEM5:3.51m)
1045 1048
 	echo m68k-convergent-sysv
1046
-	exit 0 ;;
1049
+	exit ;;
1047 1050
     M680?0:D-NIX:5.3:*)
1048 1051
 	echo m68k-diab-dnix
1049
-	exit 0 ;;
1050
-    M68*:*:R3V[567]*:*)
1051
-	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
1052
-    3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0)
1052
+	exit ;;
1053
+    M68*:*:R3V[5678]*:*)
1054
+	test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
1055
+    3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
1053 1056
 	OS_REL=''
1054 1057
 	test -r /etc/.relid \
1055 1058
 	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
1056 1059
 	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
1057
-	  && echo i486-ncr-sysv4.3${OS_REL} && exit 0
1060
+	  && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
1058 1061
 	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
1059
-	  && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;;
1062
+	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
1060 1063
     3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
1061 1064
         /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
1062
-          && echo i486-ncr-sysv4 && exit 0 ;;
1065
+          && { echo i486-ncr-sysv4; exit; } ;;
1066
+    NCR*:*:4.2:* | MPRAS*:*:4.2:*)
1067
+	OS_REL='.3'
1068
+	test -r /etc/.relid \
1069
+	    && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
1070
+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
1071
+	    && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
1072
+	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
1073
+	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
1074
+	/bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
1075
+	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
1063 1076
     m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
1064 1077
 	echo m68k-unknown-lynxos${UNAME_RELEASE}
1065
-	exit 0 ;;
1078
+	exit ;;
1066 1079
     mc68030:UNIX_System_V:4.*:*)
1067 1080
 	echo m68k-atari-sysv4
1068
-	exit 0 ;;
1081
+	exit ;;
1069 1082
     TSUNAMI:LynxOS:2.*:*)
1070 1083
 	echo sparc-unknown-lynxos${UNAME_RELEASE}
1071
-	exit 0 ;;
1084
+	exit ;;
1072 1085
     rs6000:LynxOS:2.*:*)
1073 1086
 	echo rs6000-unknown-lynxos${UNAME_RELEASE}
1074
-	exit 0 ;;
1075
-    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
1087
+	exit ;;
1088
+    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
1076 1089
 	echo powerpc-unknown-lynxos${UNAME_RELEASE}
1077
-	exit 0 ;;
1090
+	exit ;;
1078 1091
     SM[BE]S:UNIX_SV:*:*)
1079 1092
 	echo mips-dde-sysv${UNAME_RELEASE}
1080
-	exit 0 ;;
1093
+	exit ;;
1081 1094
     RM*:ReliantUNIX-*:*:*)
1082 1095
 	echo mips-sni-sysv4
1083
-	exit 0 ;;
1096
+	exit ;;
1084 1097
     RM*:SINIX-*:*:*)
1085 1098
 	echo mips-sni-sysv4
1086
-	exit 0 ;;
1099
+	exit ;;
1087 1100
     *:SINIX-*:*:*)
1088 1101
 	if uname -p 2>/dev/null >/dev/null ; then
1089 1102
 		UNAME_MACHINE=`(uname -p) 2>/dev/null`
... ...
@@ -1091,68 +1132,94 @@ EOF
1091 1091
 	else
1092 1092
 		echo ns32k-sni-sysv
1093 1093
 	fi
1094
-	exit 0 ;;
1094
+	exit ;;
1095 1095
     PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
1096 1096
                       # says <Richard.M.Bartel@ccMail.Census.GOV>
1097 1097
         echo i586-unisys-sysv4
1098
-        exit 0 ;;
1098
+        exit ;;
1099 1099
     *:UNIX_System_V:4*:FTX*)
1100 1100
 	# From Gerald Hewes <hewes@openmarket.com>.
1101 1101
 	# How about differentiating between stratus architectures? -djm
1102 1102
 	echo hppa1.1-stratus-sysv4
1103
-	exit 0 ;;
1103
+	exit ;;
1104 1104
     *:*:*:FTX*)
1105 1105
 	# From seanf@swdc.stratus.com.
1106 1106
 	echo i860-stratus-sysv4
1107
-	exit 0 ;;
1107
+	exit ;;
1108
+    i*86:VOS:*:*)
1109
+	# From Paul.Green@stratus.com.
1110
+	echo ${UNAME_MACHINE}-stratus-vos
1111
+	exit ;;
1108 1112
     *:VOS:*:*)
1109 1113
 	# From Paul.Green@stratus.com.
1110 1114
 	echo hppa1.1-stratus-vos
1111
-	exit 0 ;;
1115
+	exit ;;
1112 1116
     mc68*:A/UX:*:*)
1113 1117
 	echo m68k-apple-aux${UNAME_RELEASE}
1114
-	exit 0 ;;
1118
+	exit ;;
1115 1119
     news*:NEWS-OS:6*:*)
1116 1120
 	echo mips-sony-newsos6
1117
-	exit 0 ;;
1121
+	exit ;;
1118 1122
     R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
1119 1123
 	if [ -d /usr/nec ]; then
1120 1124
 	        echo mips-nec-sysv${UNAME_RELEASE}
1121 1125
 	else
1122 1126
 	        echo mips-unknown-sysv${UNAME_RELEASE}
1123 1127
 	fi
1124
-        exit 0 ;;
1128
+        exit ;;
1125 1129
     BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
1126 1130
 	echo powerpc-be-beos
1127
-	exit 0 ;;
1131
+	exit ;;
1128 1132
     BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
1129 1133
 	echo powerpc-apple-beos
1130
-	exit 0 ;;
1134
+	exit ;;
1131 1135
     BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
1132 1136
 	echo i586-pc-beos
1133
-	exit 0 ;;
1137
+	exit ;;
1138
+    BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
1139
+	echo i586-pc-haiku
1140
+	exit ;;
1134 1141
     SX-4:SUPER-UX:*:*)
1135 1142
 	echo sx4-nec-superux${UNAME_RELEASE}
1136
-	exit 0 ;;
1143
+	exit ;;
1137 1144
     SX-5:SUPER-UX:*:*)
1138 1145
 	echo sx5-nec-superux${UNAME_RELEASE}
1139
-	exit 0 ;;
1146
+	exit ;;
1140 1147
     SX-6:SUPER-UX:*:*)
1141 1148
 	echo sx6-nec-superux${UNAME_RELEASE}
1142
-	exit 0 ;;
1149
+	exit ;;
1150
+    SX-7:SUPER-UX:*:*)
1151
+	echo sx7-nec-superux${UNAME_RELEASE}
1152
+	exit ;;
1153
+    SX-8:SUPER-UX:*:*)
1154
+	echo sx8-nec-superux${UNAME_RELEASE}
1155
+	exit ;;
1156
+    SX-8R:SUPER-UX:*:*)
1157
+	echo sx8r-nec-superux${UNAME_RELEASE}
1158
+	exit ;;
1143 1159
     Power*:Rhapsody:*:*)
1144 1160
 	echo powerpc-apple-rhapsody${UNAME_RELEASE}
1145
-	exit 0 ;;
1161
+	exit ;;
1146 1162
     *:Rhapsody:*:*)
1147 1163
 	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
1148
-	exit 0 ;;
1164
+	exit ;;
1149 1165
     *:Darwin:*:*)
1150
-	case `uname -p` in
1151
-	    *86) UNAME_PROCESSOR=i686 ;;
1152
-	    powerpc) UNAME_PROCESSOR=powerpc ;;
1166
+	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
1167
+	case $UNAME_PROCESSOR in
1168
+	    i386)
1169
+		eval $set_cc_for_build
1170
+		if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
1171
+		  if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
1172
+		      (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
1173
+		      grep IS_64BIT_ARCH >/dev/null
1174
+		  then
1175
+		      UNAME_PROCESSOR="x86_64"
1176
+		  fi
1177
+		fi ;;
1178
+	    unknown) UNAME_PROCESSOR=powerpc ;;
1153 1179
 	esac
1154 1180
 	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
1155
-	exit 0 ;;
1181
+	exit ;;
1156 1182
     *:procnto*:*:* | *:QNX:[0123456789]*:*)
1157 1183
 	UNAME_PROCESSOR=`uname -p`
1158 1184
 	if test "$UNAME_PROCESSOR" = "x86"; then
... ...
@@ -1160,22 +1227,25 @@ EOF
1160 1160
 		UNAME_MACHINE=pc
1161 1161
 	fi
1162 1162
 	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
1163
-	exit 0 ;;
1163
+	exit ;;
1164 1164
     *:QNX:*:4*)
1165 1165
 	echo i386-pc-qnx
1166
-	exit 0 ;;
1167
-    NSR-[DGKLNPTVW]:NONSTOP_KERNEL:*:*)
1166
+	exit ;;
1167
+    NSE-?:NONSTOP_KERNEL:*:*)
1168
+	echo nse-tandem-nsk${UNAME_RELEASE}
1169
+	exit ;;
1170
+    NSR-?:NONSTOP_KERNEL:*:*)
1168 1171
 	echo nsr-tandem-nsk${UNAME_RELEASE}
1169
-	exit 0 ;;
1172
+	exit ;;
1170 1173
     *:NonStop-UX:*:*)
1171 1174
 	echo mips-compaq-nonstopux
1172
-	exit 0 ;;
1175
+	exit ;;
1173 1176
     BS2000:POSIX*:*:*)
1174 1177
 	echo bs2000-siemens-sysv
1175
-	exit 0 ;;
1178
+	exit ;;
1176 1179
     DS/*:UNIX_System_V:*:*)
1177 1180
 	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
1178
-	exit 0 ;;
1181
+	exit ;;
1179 1182
     *:Plan9:*:*)
1180 1183
 	# "uname -m" is not consistent, so use $cputype instead. 386
1181 1184
 	# is converted to i386 for consistency with other x86
... ...
@@ -1186,28 +1256,50 @@ EOF
1186 1186
 	    UNAME_MACHINE="$cputype"
1187 1187
 	fi
1188 1188
 	echo ${UNAME_MACHINE}-unknown-plan9
1189
-	exit 0 ;;
1189
+	exit ;;
1190 1190
     *:TOPS-10:*:*)
1191 1191
 	echo pdp10-unknown-tops10
1192
-	exit 0 ;;
1192
+	exit ;;
1193 1193
     *:TENEX:*:*)
1194 1194
 	echo pdp10-unknown-tenex
1195
-	exit 0 ;;
1195
+	exit ;;
1196 1196
     KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
1197 1197
 	echo pdp10-dec-tops20
1198
-	exit 0 ;;
1198
+	exit ;;
1199 1199
     XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
1200 1200
 	echo pdp10-xkl-tops20
1201
-	exit 0 ;;
1201
+	exit ;;
1202 1202
     *:TOPS-20:*:*)
1203 1203
 	echo pdp10-unknown-tops20
1204
-	exit 0 ;;
1204
+	exit ;;
1205 1205
     *:ITS:*:*)
1206 1206
 	echo pdp10-unknown-its
1207
-	exit 0 ;;
1207
+	exit ;;
1208 1208
     SEI:*:*:SEIUX)
1209 1209
         echo mips-sei-seiux${UNAME_RELEASE}
1210
-	exit 0 ;;
1210
+	exit ;;
1211
+    *:DragonFly:*:*)
1212
+	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
1213
+	exit ;;
1214
+    *:*VMS:*:*)
1215
+    	UNAME_MACHINE=`(uname -p) 2>/dev/null`
1216
+	case "${UNAME_MACHINE}" in
1217
+	    A*) echo alpha-dec-vms ; exit ;;
1218
+	    I*) echo ia64-dec-vms ; exit ;;
1219
+	    V*) echo vax-dec-vms ; exit ;;
1220
+	esac ;;
1221
+    *:XENIX:*:SysV)
1222
+	echo i386-pc-xenix
1223
+	exit ;;
1224
+    i*86:skyos:*:*)
1225
+	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
1226
+	exit ;;
1227
+    i*86:rdos:*:*)
1228
+	echo ${UNAME_MACHINE}-pc-rdos
1229
+	exit ;;
1230
+    i*86:AROS:*:*)
1231
+	echo ${UNAME_MACHINE}-pc-aros
1232
+	exit ;;
1211 1233
 esac
1212 1234
 
1213 1235
 #echo '(No uname command or uname output not recognized.)' 1>&2
... ...
@@ -1239,7 +1331,7 @@ main ()
1239 1239
 #endif
1240 1240
 
1241 1241
 #if defined (__arm) && defined (__acorn) && defined (__unix)
1242
-  printf ("arm-acorn-riscix"); exit (0);
1242
+  printf ("arm-acorn-riscix\n"); exit (0);
1243 1243
 #endif
1244 1244
 
1245 1245
 #if defined (hp300) && !defined (hpux)
... ...
@@ -1328,11 +1420,12 @@ main ()
1328 1328
 }
1329 1329
 EOF
1330 1330
 
1331
-$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0
1331
+$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
1332
+	{ echo "$SYSTEM_NAME"; exit; }
1332 1333
 
1333 1334
 # Apollos put the system type in the environment.
1334 1335
 
1335
-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; }
1336
+test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
1336 1337
 
1337 1338
 # Convex versions that predate uname can use getsysinfo(1)
1338 1339
 
... ...
@@ -1341,22 +1434,22 @@ then
1341 1341
     case `getsysinfo -f cpu_type` in
1342 1342
     c1*)
1343 1343
 	echo c1-convex-bsd
1344
-	exit 0 ;;
1344
+	exit ;;
1345 1345
     c2*)
1346 1346
 	if getsysinfo -f scalar_acc
1347 1347
 	then echo c32-convex-bsd
1348 1348
 	else echo c2-convex-bsd
1349 1349
 	fi
1350
-	exit 0 ;;
1350
+	exit ;;
1351 1351
     c34*)
1352 1352
 	echo c34-convex-bsd
1353
-	exit 0 ;;
1353
+	exit ;;
1354 1354
     c38*)
1355 1355
 	echo c38-convex-bsd
1356
-	exit 0 ;;
1356
+	exit ;;
1357 1357
     c4*)
1358 1358
 	echo c4-convex-bsd
1359
-	exit 0 ;;
1359
+	exit ;;
1360 1360
     esac
1361 1361
 fi
1362 1362
 
... ...
@@ -1367,7 +1460,9 @@ This script, last modified $timestamp, has failed to recognize
1367 1367
 the operating system you are using. It is advised that you
1368 1368
 download the most up to date version of the config scripts from
1369 1369
 
1370
-    ftp://ftp.gnu.org/pub/gnu/config/
1370
+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
1371
+and
1372
+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
1371 1373
 
1372 1374
 If the version you run ($0) is already up to date, please
1373 1375
 send the following data and any information you think might be
... ...
@@ -1,9 +1,10 @@
1 1
 #! /bin/sh
2 2
 # Configuration validation subroutine script.
3 3
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
4
-#   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
4
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
5
+#   Free Software Foundation, Inc.
5 6
 
6
-timestamp='2003-07-04'
7
+timestamp='2010-01-22'
7 8
 
8 9
 # This file is (in principle) common to ALL GNU software.
9 10
 # The presence of a machine in this file suggests that SOME GNU software
... ...
@@ -21,22 +22,26 @@ timestamp='2003-07-04'
21 21
 #
22 22
 # You should have received a copy of the GNU General Public License
23 23
 # along with this program; if not, write to the Free Software
24
-# Foundation, Inc., 59 Temple Place - Suite 330,
25
-# Boston, MA 02111-1307, USA.
26
-
24
+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
25
+# 02110-1301, USA.
26
+#
27 27
 # As a special exception to the GNU General Public License, if you
28 28
 # distribute this file as part of a program that contains a
29 29
 # configuration script generated by Autoconf, you may include it under
30 30
 # the same distribution terms that you use for the rest of that program.
31 31
 
32
+
32 33
 # Please send patches to <config-patches@gnu.org>.  Submit a context
33
-# diff and a properly formatted ChangeLog entry.
34
+# diff and a properly formatted GNU ChangeLog entry.
34 35
 #
35 36
 # Configuration subroutine to validate and canonicalize a configuration type.
36 37
 # Supply the specified configuration type as an argument.
37 38
 # If it is invalid, we print an error message on stderr and exit with code 1.
38 39
 # Otherwise, we print the canonical config type on stdout and succeed.
39 40
 
41
+# You can get the latest version of this script from:
42
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
43
+
40 44
 # This file is supposed to be the same for all GNU packages
41 45
 # and recognize all the CPU types, system types and aliases
42 46
 # that are meaningful with *any* GNU software.
... ...
@@ -70,8 +75,9 @@ Report bugs and patches to <config-patches@gnu.org>."
70 70
 version="\
71 71
 GNU config.sub ($timestamp)
72 72
 
73
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
74
-Free Software Foundation, Inc.
73
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
74
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
75
+Software Foundation, Inc.
75 76
 
76 77
 This is free software; see the source for copying conditions.  There is NO
77 78
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
... ...
@@ -83,11 +89,11 @@ Try \`$me --help' for more information."
83 83
 while test $# -gt 0 ; do
84 84
   case $1 in
85 85
     --time-stamp | --time* | -t )
86
-       echo "$timestamp" ; exit 0 ;;
86
+       echo "$timestamp" ; exit ;;
87 87
     --version | -v )
88
-       echo "$version" ; exit 0 ;;
88
+       echo "$version" ; exit ;;
89 89
     --help | --h* | -h )
90
-       echo "$usage"; exit 0 ;;
90
+       echo "$usage"; exit ;;
91 91
     -- )     # Stop option processing
92 92
        shift; break ;;
93 93
     - )	# Use stdin as input.
... ...
@@ -99,7 +105,7 @@ while test $# -gt 0 ; do
99 99
     *local*)
100 100
        # First pass through any local machine types.
101 101
        echo $1
102
-       exit 0;;
102
+       exit ;;
103 103
 
104 104
     * )
105 105
        break ;;
... ...
@@ -118,7 +124,10 @@ esac
118 118
 # Here we must recognize all the valid KERNEL-OS combinations.
119 119
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
120 120
 case $maybe_os in
121
-  nto-qnx* | linux-gnu* | kfreebsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
121
+  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
122
+  uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
123
+  kopensolaris*-gnu* | \
124
+  storm-chaos* | os2-emx* | rtmk-nova*)
122 125
     os=-$maybe_os
123 126
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
124 127
     ;;
... ...
@@ -144,10 +153,13 @@ case $os in
144 144
 	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
145 145
 	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
146 146
 	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
147
-	-apple | -axis)
147
+	-apple | -axis | -knuth | -cray | -microblaze)
148 148
 		os=
149 149
 		basic_machine=$1
150 150
 		;;
151
+        -bluegene*)
152
+	        os=-cnk
153
+		;;
151 154
 	-sim | -cisco | -oki | -wec | -winbond)
152 155
 		os=
153 156
 		basic_machine=$1
... ...
@@ -169,6 +181,10 @@ case $os in
169 169
 	-hiux*)
170 170
 		os=-hiuxwe2
171 171
 		;;
172
+	-sco6)
173
+		os=-sco5v6
174
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
175
+		;;
172 176
 	-sco5)
173 177
 		os=-sco3.2v5
174 178
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
... ...
@@ -185,6 +201,10 @@ case $os in
185 185
 		# Don't forget version if it is 3.2v4 or newer.
186 186
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
187 187
 		;;
188
+	-sco5v6*)
189
+		# Don't forget version if it is 3.2v4 or newer.
190
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
191
+		;;
188 192
 	-sco*)
189 193
 		os=-sco3.2v2
190 194
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
... ...
@@ -228,53 +248,71 @@ case $basic_machine in
228 228
 	| a29k \
229 229
 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
230 230
 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
231
-	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
231
+	| am33_2.0 \
232
+	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
233
+	| bfin \
232 234
 	| c4x | clipper \
233 235
 	| d10v | d30v | dlx | dsp16xx \
234
-	| fr30 | frv \
236
+	| fido | fr30 | frv \
235 237
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
236 238
 	| i370 | i860 | i960 | ia64 \
237
-	| ip2k \
238
-	| m32r | m68000 | m68k | m88k | mcore \
239
+	| ip2k | iq2000 \
240
+	| lm32 \
241
+	| m32c | m32r | m32rle | m68000 | m68k | m88k \
242
+	| maxq | mb | microblaze | mcore | mep | metag \
239 243
 	| mips | mipsbe | mipseb | mipsel | mipsle \
240 244
 	| mips16 \
241 245
 	| mips64 | mips64el \
242
-	| mips64vr | mips64vrel \
246
+	| mips64octeon | mips64octeonel \
243 247
 	| mips64orion | mips64orionel \
248
+	| mips64r5900 | mips64r5900el \
249
+	| mips64vr | mips64vrel \
244 250
 	| mips64vr4100 | mips64vr4100el \
245 251
 	| mips64vr4300 | mips64vr4300el \
246 252
 	| mips64vr5000 | mips64vr5000el \
253
+	| mips64vr5900 | mips64vr5900el \
247 254
 	| mipsisa32 | mipsisa32el \
248 255
 	| mipsisa32r2 | mipsisa32r2el \
249 256
 	| mipsisa64 | mipsisa64el \
257
+	| mipsisa64r2 | mipsisa64r2el \
250 258
 	| mipsisa64sb1 | mipsisa64sb1el \
251 259
 	| mipsisa64sr71k | mipsisa64sr71kel \
252 260
 	| mipstx39 | mipstx39el \
253 261
 	| mn10200 | mn10300 \
262
+	| moxie \
263
+	| mt \
254 264
 	| msp430 \
265
+	| nios | nios2 \
255 266
 	| ns16k | ns32k \
256
-	| openrisc | or32 \
267
+	| or32 \
257 268
 	| pdp10 | pdp11 | pj | pjl \
258 269
 	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
259 270
 	| pyramid \
260
-	| sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
271
+	| rx \
272
+	| score \
273
+	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
261 274
 	| sh64 | sh64le \
262
-	| sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \
263
-	| strongarm \
275
+	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
276
+	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
277
+	| spu | strongarm \
264 278
 	| tahoe | thumb | tic4x | tic80 | tron \
279
+	| ubicom32 \
265 280
 	| v850 | v850e \
266 281
 	| we32k \
267
-	| x86 | xscale | xstormy16 | xtensa \
268
-	| z8k)
282
+	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
283
+	| z8k | z80)
269 284
 		basic_machine=$basic_machine-unknown
270 285
 		;;
271
-	m6811 | m68hc11 | m6812 | m68hc12)
286
+	m6811 | m68hc11 | m6812 | m68hc12 | picochip)
272 287
 		# Motorola 68HC11/12.
273 288
 		basic_machine=$basic_machine-unknown
274 289
 		os=-none
275 290
 		;;
276 291
 	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
277 292
 		;;
293
+	ms1)
294
+		basic_machine=mt-unknown
295
+		;;
278 296
 
279 297
 	# We use `pc' rather than `unknown'
280 298
 	# because (1) that's what they normally are, and
... ...
@@ -292,56 +330,71 @@ case $basic_machine in
292 292
 	| a29k-* \
293 293
 	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
294 294
 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
295
-	| alphapca5[67]-* | alpha64pca5[67]-* | amd64-* | arc-* \
295
+	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
296 296
 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
297
-	| avr-* \
298
-	| bs2000-* \
297
+	| avr-* | avr32-* \
298
+	| bfin-* | bs2000-* \
299 299
 	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
300
-	| clipper-* | cydra-* \
300
+	| clipper-* | craynv-* | cydra-* \
301 301
 	| d10v-* | d30v-* | dlx-* \
302 302
 	| elxsi-* \
303
-	| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
303
+	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
304 304
 	| h8300-* | h8500-* \
305 305
 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
306 306
 	| i*86-* | i860-* | i960-* | ia64-* \
307
-	| ip2k-* \
308
-	| m32r-* \
307
+	| ip2k-* | iq2000-* \
308
+	| lm32-* \
309
+	| m32c-* | m32r-* | m32rle-* \
309 310
 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
310
-	| m88110-* | m88k-* | mcore-* \
311
+	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
311 312
 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
312 313
 	| mips16-* \
313 314
 	| mips64-* | mips64el-* \
314
-	| mips64vr-* | mips64vrel-* \
315
+	| mips64octeon-* | mips64octeonel-* \
315 316
 	| mips64orion-* | mips64orionel-* \
317
+	| mips64r5900-* | mips64r5900el-* \
318
+	| mips64vr-* | mips64vrel-* \
316 319
 	| mips64vr4100-* | mips64vr4100el-* \
317 320
 	| mips64vr4300-* | mips64vr4300el-* \
318 321
 	| mips64vr5000-* | mips64vr5000el-* \
322
+	| mips64vr5900-* | mips64vr5900el-* \
319 323
 	| mipsisa32-* | mipsisa32el-* \
320 324
 	| mipsisa32r2-* | mipsisa32r2el-* \
321 325
 	| mipsisa64-* | mipsisa64el-* \
326
+	| mipsisa64r2-* | mipsisa64r2el-* \
322 327
 	| mipsisa64sb1-* | mipsisa64sb1el-* \
323 328
 	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
324 329
 	| mipstx39-* | mipstx39el-* \
330
+	| mmix-* \
331
+	| mt-* \
325 332
 	| msp430-* \
326
-	| none-* | np1-* | nv1-* | ns16k-* | ns32k-* \
333
+	| nios-* | nios2-* \
334
+	| none-* | np1-* | ns16k-* | ns32k-* \
327 335
 	| orion-* \
328 336
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
329 337
 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
330 338
 	| pyramid-* \
331
-	| romp-* | rs6000-* \
332
-	| sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
339
+	| romp-* | rs6000-* | rx-* \
340
+	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
333 341
 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
334
-	| sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
335
-	| sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
342
+	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
343
+	| sparclite-* \
344
+	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
336 345
 	| tahoe-* | thumb-* \
337 346
 	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
347
+	| tile-* | tilegx-* \
338 348
 	| tron-* \
349
+	| ubicom32-* \
339 350
 	| v850-* | v850e-* | vax-* \
340 351
 	| we32k-* \
341
-	| x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
342
-	| xtensa-* \
352
+	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
353
+	| xstormy16-* | xtensa*-* \
343 354
 	| ymp-* \
344
-	| z8k-*)
355
+	| z8k-* | z80-*)
356
+		;;
357
+	# Recognize the basic CPU types without company name, with glob match.
358
+	xtensa*)
359
+		basic_machine=$basic_machine-unknown
345 360
 		;;
346 361
 	# Recognize the various machine names and aliases which stand
347 362
 	# for a CPU type and a company and sometimes even an OS.
... ...
@@ -359,6 +412,9 @@ case $basic_machine in
359 359
 		basic_machine=a29k-amd
360 360
 		os=-udi
361 361
 		;;
362
+    	abacus)
363
+		basic_machine=abacus-unknown
364
+		;;
362 365
 	adobe68k)
363 366
 		basic_machine=m68010-adobe
364 367
 		os=-scout
... ...
@@ -376,6 +432,9 @@ case $basic_machine in
376 376
 	amd64)
377 377
 		basic_machine=x86_64-pc
378 378
 		;;
379
+	amd64-*)
380
+		basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
381
+		;;
379 382
 	amdahl)
380 383
 		basic_machine=580-amdahl
381 384
 		os=-sysv
... ...
@@ -399,6 +458,10 @@ case $basic_machine in
399 399
 		basic_machine=m68k-apollo
400 400
 		os=-bsd
401 401
 		;;
402
+	aros)
403
+		basic_machine=i386-pc
404
+		os=-aros
405
+		;;
402 406
 	aux)
403 407
 		basic_machine=m68k-apple
404 408
 		os=-aux
... ...
@@ -407,10 +470,26 @@ case $basic_machine in
407 407
 		basic_machine=ns32k-sequent
408 408
 		os=-dynix
409 409
 		;;
410
+	blackfin)
411
+		basic_machine=bfin-unknown
412
+		os=-linux
413
+		;;
414
+	blackfin-*)
415
+		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
416
+		os=-linux
417
+		;;
418
+	bluegene*)
419
+		basic_machine=powerpc-ibm
420
+		os=-cnk
421
+		;;
410 422
 	c90)
411 423
 		basic_machine=c90-cray
412 424
 		os=-unicos
413 425
 		;;
426
+        cegcc)
427
+		basic_machine=arm-unknown
428
+		os=-cegcc
429
+		;;
414 430
 	convex-c1)
415 431
 		basic_machine=c1-convex
416 432
 		os=-bsd
... ...
@@ -435,12 +514,27 @@ case $basic_machine in
435 435
 		basic_machine=j90-cray
436 436
 		os=-unicos
437 437
 		;;
438
+	craynv)
439
+		basic_machine=craynv-cray
440
+		os=-unicosmp
441
+		;;
442
+	cr16)
443
+		basic_machine=cr16-unknown
444
+		os=-elf
445
+		;;
438 446
 	crds | unos)
439 447
 		basic_machine=m68k-crds
440 448
 		;;
449
+	crisv32 | crisv32-* | etraxfs*)
450
+		basic_machine=crisv32-axis
451
+		;;
441 452
 	cris | cris-* | etrax*)
442 453
 		basic_machine=cris-axis
443 454
 		;;
455
+	crx)
456
+		basic_machine=crx-unknown
457
+		os=-elf
458
+		;;
444 459
 	da30 | da30-*)
445 460
 		basic_machine=m68k-da30
446 461
 		;;
... ...
@@ -463,6 +557,14 @@ case $basic_machine in
463 463
 		basic_machine=m88k-motorola
464 464
 		os=-sysv3
465 465
 		;;
466
+	dicos)
467
+		basic_machine=i686-pc
468
+		os=-dicos
469
+		;;
470
+	djgpp)
471
+		basic_machine=i586-pc
472
+		os=-msdosdjgpp
473
+		;;
466 474
 	dpx20 | dpx20-*)
467 475
 		basic_machine=rs6000-bull
468 476
 		os=-bosx
... ...
@@ -613,6 +715,14 @@ case $basic_machine in
613 613
 		basic_machine=m68k-isi
614 614
 		os=-sysv
615 615
 		;;
616
+	m68knommu)
617
+		basic_machine=m68k-unknown
618
+		os=-linux
619
+		;;
620
+	m68knommu-*)
621
+		basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
622
+		os=-linux
623
+		;;
616 624
 	m88k-omron*)
617 625
 		basic_machine=m88k-omron
618 626
 		;;
... ...
@@ -624,10 +734,17 @@ case $basic_machine in
624 624
 		basic_machine=ns32k-utek
625 625
 		os=-sysv
626 626
 		;;
627
+        microblaze)
628
+		basic_machine=microblaze-xilinx
629
+		;;
627 630
 	mingw32)
628 631
 		basic_machine=i386-pc
629 632
 		os=-mingw32
630 633
 		;;
634
+	mingw32ce)
635
+		basic_machine=arm-unknown
636
+		os=-mingw32ce
637
+		;;
631 638
 	miniframe)
632 639
 		basic_machine=m68000-convergent
633 640
 		;;
... ...
@@ -641,10 +758,6 @@ case $basic_machine in
641 641
 	mips3*)
642 642
 		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
643 643
 		;;
644
-	mmix*)
645
-		basic_machine=mmix-knuth
646
-		os=-mmixware
647
-		;;
648 644
 	monitor)
649 645
 		basic_machine=m68k-rom68k
650 646
 		os=-coff
... ...
@@ -657,6 +770,9 @@ case $basic_machine in
657 657
 		basic_machine=i386-pc
658 658
 		os=-msdos
659 659
 		;;
660
+	ms1-*)
661
+		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
662
+		;;
660 663
 	mvs)
661 664
 		basic_machine=i370-ibm
662 665
 		os=-mvs
... ...
@@ -725,10 +841,6 @@ case $basic_machine in
725 725
 	np1)
726 726
 		basic_machine=np1-gould
727 727
 		;;
728
-	nv1)
729
-		basic_machine=nv1-cray
730
-		os=-unicosmp
731
-		;;
732 728
 	nsr-tandem)
733 729
 		basic_machine=nsr-tandem
734 730
 		;;
... ...
@@ -736,9 +848,12 @@ case $basic_machine in
736 736
 		basic_machine=hppa1.1-oki
737 737
 		os=-proelf
738 738
 		;;
739
-	or32 | or32-*)
739
+	openrisc | openrisc-*)
740 740
 		basic_machine=or32-unknown
741
-		os=-coff
741
+		;;
742
+	os400)
743
+		basic_machine=powerpc-ibm
744
+		os=-os400
742 745
 		;;
743 746
 	OSE68000 | ose68000)
744 747
 		basic_machine=m68000-ericsson
... ...
@@ -756,6 +871,14 @@ case $basic_machine in
756 756
 		basic_machine=i860-intel
757 757
 		os=-osf
758 758
 		;;
759
+	parisc)
760
+		basic_machine=hppa-unknown
761
+		os=-linux
762
+		;;
763
+	parisc-*)
764
+		basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
765
+		os=-linux
766
+		;;
759 767
 	pbd)
760 768
 		basic_machine=sparc-tti
761 769
 		;;
... ...
@@ -765,6 +888,12 @@ case $basic_machine in
765 765
 	pc532 | pc532-*)
766 766
 		basic_machine=ns32k-pc532
767 767
 		;;
768
+	pc98)
769
+		basic_machine=i386-pc
770
+		;;
771
+	pc98-*)
772
+		basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
773
+		;;
768 774
 	pentium | p5 | k5 | k6 | nexgen | viac3)
769 775
 		basic_machine=i586-pc
770 776
 		;;
... ...
@@ -821,6 +950,10 @@ case $basic_machine in
821 821
 		basic_machine=i586-unknown
822 822
 		os=-pw32
823 823
 		;;
824
+	rdos)
825
+		basic_machine=i386-pc
826
+		os=-rdos
827
+		;;
824 828
 	rom68k)
825 829
 		basic_machine=m68k-rom68k
826 830
 		os=-coff
... ...
@@ -847,6 +980,10 @@ case $basic_machine in
847 847
 	sb1el)
848 848
 		basic_machine=mipsisa64sb1el-unknown
849 849
 		;;
850
+	sde)
851
+		basic_machine=mipsisa32-sde
852
+		os=-elf
853
+		;;
850 854
 	sei)
851 855
 		basic_machine=mips-sei
852 856
 		os=-seiux
... ...
@@ -858,6 +995,9 @@ case $basic_machine in
858 858
 		basic_machine=sh-hitachi
859 859
 		os=-hms
860 860
 		;;
861
+	sh5el)
862
+		basic_machine=sh5le-unknown
863
+		;;
861 864
 	sh64)
862 865
 		basic_machine=sh64-unknown
863 866
 		;;
... ...
@@ -947,6 +1087,15 @@ case $basic_machine in
947 947
 		basic_machine=tic6x-unknown
948 948
 		os=-coff
949 949
 		;;
950
+        # This must be matched before tile*.
951
+        tilegx*)
952
+		basic_machine=tilegx-unknown
953
+		os=-linux-gnu
954
+		;;
955
+	tile*)
956
+		basic_machine=tile-unknown
957
+		os=-linux-gnu
958
+		;;
950 959
 	tx39)
951 960
 		basic_machine=mipstx39-unknown
952 961
 		;;
... ...
@@ -960,6 +1109,10 @@ case $basic_machine in
960 960
 	tower | tower-32)
961 961
 		basic_machine=m68k-ncr
962 962
 		;;
963
+	tpf)
964
+		basic_machine=s390x-ibm
965
+		os=-tpf
966
+		;;
963 967
 	udi29k)
964 968
 		basic_machine=a29k-amd
965 969
 		os=-udi
... ...
@@ -1003,6 +1156,10 @@ case $basic_machine in
1003 1003
 		basic_machine=hppa1.1-winbond
1004 1004
 		os=-proelf
1005 1005
 		;;
1006
+	xbox)
1007
+		basic_machine=i686-pc
1008
+		os=-mingw32
1009
+		;;
1006 1010
 	xps | xps100)
1007 1011
 		basic_machine=xps100-honeywell
1008 1012
 		;;
... ...
@@ -1014,6 +1171,10 @@ case $basic_machine in
1014 1014
 		basic_machine=z8k-unknown
1015 1015
 		os=-sim
1016 1016
 		;;
1017
+	z80-*-coff)
1018
+		basic_machine=z80-unknown
1019
+		os=-sim
1020
+		;;
1017 1021
 	none)
1018 1022
 		basic_machine=none-none
1019 1023
 		os=-none
... ...
@@ -1033,6 +1194,9 @@ case $basic_machine in
1033 1033
 	romp)
1034 1034
 		basic_machine=romp-ibm
1035 1035
 		;;
1036
+	mmix)
1037
+		basic_machine=mmix-knuth
1038
+		;;
1036 1039
 	rs6000)
1037 1040
 		basic_machine=rs6000-ibm
1038 1041
 		;;
... ...
@@ -1049,13 +1213,10 @@ case $basic_machine in
1049 1049
 	we32k)
1050 1050
 		basic_machine=we32k-att
1051 1051
 		;;
1052
-	sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele)
1052
+	sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
1053 1053
 		basic_machine=sh-unknown
1054 1054
 		;;
1055
-	sh64)
1056
-		basic_machine=sh64-unknown
1057
-		;;
1058
-	sparc | sparcv9 | sparcv9b)
1055
+	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
1059 1056
 		basic_machine=sparc-sun
1060 1057
 		;;
1061 1058
 	cydra)
... ...
@@ -1102,6 +1263,9 @@ case $os in
1102 1102
         # First match some system type aliases
1103 1103
         # that might get confused with valid system types.
1104 1104
 	# -solaris* is a basic system type, with this one exception.
1105
+        -auroraux)
1106
+	        os=-auroraux
1107
+		;;
1105 1108
 	-solaris1 | -solaris1.*)
1106 1109
 		os=`echo $os | sed -e 's|solaris1|sunos4|'`
1107 1110
 		;;
... ...
@@ -1122,25 +1286,30 @@ case $os in
1122 1122
 	# Each alternative MUST END IN A *, to match a version number.
1123 1123
 	# -sysv* is not here because it comes later, after sysvr4.
1124 1124
 	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
1125
-	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
1126
-	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
1125
+	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
1126
+	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
1127
+	      | -sym* | -kopensolaris* \
1127 1128
 	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
1128
-	      | -aos* \
1129
+	      | -aos* | -aros* \
1129 1130
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
1130 1131
 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
1131
-	      | -hiux* | -386bsd* | -netbsd* | -openbsd* | -kfreebsd* | -freebsd* | -riscix* \
1132
-	      | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
1132
+	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
1133
+	      | -openbsd* | -solidbsd* \
1134
+	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
1135
+	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
1133 1136
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
1134 1137
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
1135
-	      | -chorusos* | -chorusrdb* \
1138
+	      | -chorusos* | -chorusrdb* | -cegcc* \
1136 1139
 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
1137
-	      | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
1140
+	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
1141
+	      | -uxpv* | -beos* | -mpeix* | -udk* \
1138 1142
 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
1139 1143
 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
1140 1144
 	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
1141 1145
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
1142 1146
 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
1143
-	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei*)
1147
+	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
1148
+	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
1144 1149
 	# Remember, each alternative MUST END IN *, to match a version number.
1145 1150
 		;;
1146 1151
 	-qnx*)
... ...
@@ -1158,12 +1327,15 @@ case $os in
1158 1158
 		os=`echo $os | sed -e 's|nto|nto-qnx|'`
1159 1159
 		;;
1160 1160
 	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
1161
-	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
1161
+	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
1162 1162
 	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
1163 1163
 		;;
1164 1164
 	-mac*)
1165 1165
 		os=`echo $os | sed -e 's|mac|macos|'`
1166 1166
 		;;
1167
+	-linux-dietlibc)
1168
+		os=-linux-dietlibc
1169
+		;;
1167 1170
 	-linux*)
1168 1171
 		os=`echo $os | sed -e 's|linux|linux-gnu|'`
1169 1172
 		;;
... ...
@@ -1176,6 +1348,9 @@ case $os in
1176 1176
 	-opened*)
1177 1177
 		os=-openedition
1178 1178
 		;;
1179
+        -os400*)
1180
+		os=-os400
1181
+		;;
1179 1182
 	-wince*)
1180 1183
 		os=-wince
1181 1184
 		;;
... ...
@@ -1197,6 +1372,9 @@ case $os in
1197 1197
 	-atheos*)
1198 1198
 		os=-atheos
1199 1199
 		;;
1200
+	-syllable*)
1201
+		os=-syllable
1202
+		;;
1200 1203
 	-386bsd)
1201 1204
 		os=-bsd
1202 1205
 		;;
... ...
@@ -1219,6 +1397,9 @@ case $os in
1219 1219
 	-sinix*)
1220 1220
 		os=-sysv4
1221 1221
 		;;
1222
+        -tpf*)
1223
+		os=-tpf
1224
+		;;
1222 1225
 	-triton*)
1223 1226
 		os=-sysv3
1224 1227
 		;;
... ...
@@ -1255,6 +1436,14 @@ case $os in
1255 1255
 	-kaos*)
1256 1256
 		os=-kaos
1257 1257
 		;;
1258
+	-zvmoe)
1259
+		os=-zvmoe
1260
+		;;
1261
+	-dicos*)
1262
+		os=-dicos
1263
+		;;
1264
+        -nacl*)
1265
+	        ;;
1258 1266
 	-none)
1259 1267
 		;;
1260 1268
 	*)
... ...
@@ -1277,6 +1466,12 @@ else
1277 1277
 # system, and we'll never get to this point.
1278 1278
 
1279 1279
 case $basic_machine in
1280
+        score-*)
1281
+		os=-elf
1282
+		;;
1283
+        spu-*)
1284
+		os=-elf
1285
+		;;
1280 1286
 	*-acorn)
1281 1287
 		os=-riscix1.2
1282 1288
 		;;
... ...
@@ -1286,9 +1481,9 @@ case $basic_machine in
1286 1286
 	arm*-semi)
1287 1287
 		os=-aout
1288 1288
 		;;
1289
-    c4x-* | tic4x-*)
1290
-        os=-coff
1291
-        ;;
1289
+        c4x-* | tic4x-*)
1290
+        	os=-coff
1291
+		;;
1292 1292
 	# This must come before the *-dec entry.
1293 1293
 	pdp10-*)
1294 1294
 		os=-tops20
... ...
@@ -1314,6 +1509,9 @@ case $basic_machine in
1314 1314
 	m68*-cisco)
1315 1315
 		os=-aout
1316 1316
 		;;
1317
+        mep-*)
1318
+		os=-elf
1319
+		;;
1317 1320
 	mips*-cisco)
1318 1321
 		os=-elf
1319 1322
 		;;
... ...
@@ -1332,9 +1530,15 @@ case $basic_machine in
1332 1332
 	*-be)
1333 1333
 		os=-beos
1334 1334
 		;;
1335
+	*-haiku)
1336
+		os=-haiku
1337
+		;;
1335 1338
 	*-ibm)
1336 1339
 		os=-aix
1337 1340
 		;;
1341
+    	*-knuth)
1342
+		os=-mmixware
1343
+		;;
1338 1344
 	*-wec)
1339 1345
 		os=-proelf
1340 1346
 		;;
... ...
@@ -1437,7 +1641,7 @@ case $basic_machine in
1437 1437
 			-sunos*)
1438 1438
 				vendor=sun
1439 1439
 				;;
1440
-			-aix*)
1440
+			-cnk*|-aix*)
1441 1441
 				vendor=ibm
1442 1442
 				;;
1443 1443
 			-beos*)
... ...
@@ -1467,9 +1671,15 @@ case $basic_machine in
1467 1467
 			-mvs* | -opened*)
1468 1468
 				vendor=ibm
1469 1469
 				;;
1470
+			-os400*)
1471
+				vendor=ibm
1472
+				;;
1470 1473
 			-ptx*)
1471 1474
 				vendor=sequent
1472 1475
 				;;
1476
+			-tpf*)
1477
+				vendor=ibm
1478
+				;;
1473 1479
 			-vxsim* | -vxworks* | -windiss*)
1474 1480
 				vendor=wrs
1475 1481
 				;;
... ...
@@ -1494,7 +1704,7 @@ case $basic_machine in
1494 1494
 esac
1495 1495
 
1496 1496
 echo $basic_machine$os
1497
-exit 0
1497
+exit
1498 1498
 
1499 1499
 # Local variables:
1500 1500
 # eval: (add-hook 'write-file-hooks 'time-stamp)
... ...
@@ -1,9 +1,10 @@
1 1
 #! /bin/sh
2 2
 # depcomp - compile a program generating dependencies as side-effects
3 3
 
4
-scriptversion=2012-07-12.20; # UTC
4
+scriptversion=2009-04-28.21; # UTC
5 5
 
6
-# Copyright (C) 1999-2012 Free Software Foundation, Inc.
6
+# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009 Free
7
+# Software Foundation, Inc.
7 8
 
8 9
 # This program is free software; you can redistribute it and/or modify
9 10
 # it under the terms of the GNU General Public License as published by
... ...
@@ -27,7 +28,7 @@ scriptversion=2012-07-12.20; # UTC
27 27
 
28 28
 case $1 in
29 29
   '')
30
-     echo "$0: No command.  Try '$0 --help' for more information." 1>&2
30
+     echo "$0: No command.  Try \`$0 --help' for more information." 1>&2
31 31
      exit 1;
32 32
      ;;
33 33
   -h | --h*)
... ...
@@ -39,11 +40,11 @@ as side-effects.
39 39
 
40 40
 Environment variables:
41 41
   depmode     Dependency tracking mode.
42
-  source      Source file read by 'PROGRAMS ARGS'.
43
-  object      Object file output by 'PROGRAMS ARGS'.
42
+  source      Source file read by `PROGRAMS ARGS'.
43
+  object      Object file output by `PROGRAMS ARGS'.
44 44
   DEPDIR      directory where to store dependencies.
45 45
   depfile     Dependency file to output.
46
-  tmpdepfile  Temporary file to use when outputting dependencies.
46
+  tmpdepfile  Temporary file to use when outputing dependencies.
47 47
   libtool     Whether libtool is used (yes/no).
48 48
 
49 49
 Report bugs to <bug-automake@gnu.org>.
... ...
@@ -56,12 +57,6 @@ EOF
56 56
     ;;
57 57
 esac
58 58
 
59
-# A tabulation character.
60
-tab='	'
61
-# A newline character.
62
-nl='
63
-'
64
-
65 59
 if test -z "$depmode" || test -z "$source" || test -z "$object"; then
66 60
   echo "depcomp: Variables source, object and depmode must be set" 1>&2
67 61
   exit 1
... ...
@@ -95,24 +90,10 @@ if test "$depmode" = msvcmsys; then
95 95
    # This is just like msvisualcpp but w/o cygpath translation.
96 96
    # Just convert the backslash-escaped backslashes to single forward
97 97
    # slashes to satisfy depend.m4
98
-   cygpath_u='sed s,\\\\,/,g'
98
+   cygpath_u="sed s,\\\\\\\\,/,g"
99 99
    depmode=msvisualcpp
100 100
 fi
101 101
 
102
-if test "$depmode" = msvc7msys; then
103
-   # This is just like msvc7 but w/o cygpath translation.
104
-   # Just convert the backslash-escaped backslashes to single forward
105
-   # slashes to satisfy depend.m4
106
-   cygpath_u='sed s,\\\\,/,g'
107
-   depmode=msvc7
108
-fi
109
-
110
-if test "$depmode" = xlc; then
111
-   # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency informations.
112
-   gccflag=-qmakedep=gcc,-MF
113
-   depmode=gcc
114
-fi
115
-
116 102
 case "$depmode" in
117 103
 gcc3)
118 104
 ## gcc 3 implements dependency tracking that does exactly what
... ...
@@ -167,21 +148,20 @@ gcc)
167 167
 ## The second -e expression handles DOS-style file names with drive letters.
168 168
   sed -e 's/^[^:]*: / /' \
169 169
       -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
170
-## This next piece of magic avoids the "deleted header file" problem.
170
+## This next piece of magic avoids the `deleted header file' problem.
171 171
 ## The problem is that when a header file which appears in a .P file
172 172
 ## is deleted, the dependency causes make to die (because there is
173 173
 ## typically no way to rebuild the header).  We avoid this by adding
174 174
 ## dummy dependencies for each header file.  Too bad gcc doesn't do
175 175
 ## this for us directly.
176
-  tr ' ' "$nl" < "$tmpdepfile" |
177
-## Some versions of gcc put a space before the ':'.  On the theory
176
+  tr ' ' '
177
+' < "$tmpdepfile" |
178
+## Some versions of gcc put a space before the `:'.  On the theory
178 179
 ## that the space means something, we add a space to the output as
179
-## well.  hp depmode also adds that space, but also prefixes the VPATH
180
-## to the object.  Take care to not repeat it in the output.
180
+## well.
181 181
 ## Some versions of the HPUX 10.20 sed can't process this invocation
182 182
 ## correctly.  Breaking it into two sed invocations is a workaround.
183
-    sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \
184
-      | sed -e 's/$/ :/' >> "$depfile"
183
+    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
185 184
   rm -f "$tmpdepfile"
186 185
   ;;
187 186
 
... ...
@@ -213,15 +193,18 @@ sgi)
213 213
     # clever and replace this with sed code, as IRIX sed won't handle
214 214
     # lines with more than a fixed number of characters (4096 in
215 215
     # IRIX 6.2 sed, 8192 in IRIX 6.5).  We also remove comment lines;
216
-    # the IRIX cc adds comments like '#:fec' to the end of the
216
+    # the IRIX cc adds comments like `#:fec' to the end of the
217 217
     # dependency line.
218
-    tr ' ' "$nl" < "$tmpdepfile" \
218
+    tr ' ' '
219
+' < "$tmpdepfile" \
219 220
     | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
220
-    tr "$nl" ' ' >> "$depfile"
221
+    tr '
222
+' ' ' >> "$depfile"
221 223
     echo >> "$depfile"
222 224
 
223 225
     # The second pass generates a dummy entry for each header file.
224
-    tr ' ' "$nl" < "$tmpdepfile" \
226
+    tr ' ' '
227
+' < "$tmpdepfile" \
225 228
    | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
226 229
    >> "$depfile"
227 230
   else
... ...
@@ -233,17 +216,10 @@ sgi)
233 233
   rm -f "$tmpdepfile"
234 234
   ;;
235 235
 
236
-xlc)
237
-  # This case exists only to let depend.m4 do its work.  It works by
238
-  # looking at the text of this script.  This case will never be run,
239
-  # since it is checked for above.
240
-  exit 1
241
-  ;;
242
-
243 236
 aix)
244 237
   # The C for AIX Compiler uses -M and outputs the dependencies
245 238
   # in a .u file.  In older versions, this file always lives in the
246
-  # current directory.  Also, the AIX compiler puts '$object:' at the
239
+  # current directory.  Also, the AIX compiler puts `$object:' at the
247 240
   # start of each line; $object doesn't have directory information.
248 241
   # Version 6 uses the directory in both cases.
249 242
   dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
... ...
@@ -273,11 +249,12 @@ aix)
273 273
     test -f "$tmpdepfile" && break
274 274
   done
275 275
   if test -f "$tmpdepfile"; then
276
-    # Each line is of the form 'foo.o: dependent.h'.
276
+    # Each line is of the form `foo.o: dependent.h'.
277 277
     # Do two passes, one to just change these to
278
-    # '$object: dependent.h' and one to simply 'dependent.h:'.
278
+    # `$object: dependent.h' and one to simply `dependent.h:'.
279 279
     sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
280
-    sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
280
+    # That's a tab and a space in the [].
281
+    sed -e 's,^.*\.[a-z]*:[	 ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
281 282
   else
282 283
     # The sourcefile does not contain any dependencies, so just
283 284
     # store a dummy comment line, to avoid errors with the Makefile
... ...
@@ -288,26 +265,23 @@ aix)
288 288
   ;;
289 289
 
290 290
 icc)
291
-  # Intel's C compiler anf tcc (Tiny C Compiler) understand '-MD -MF file'.
292
-  # However on
293
-  #    $CC -MD -MF foo.d -c -o sub/foo.o sub/foo.c
291
+  # Intel's C compiler understands `-MD -MF file'.  However on
292
+  #    icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c
294 293
   # ICC 7.0 will fill foo.d with something like
295 294
   #    foo.o: sub/foo.c
296 295
   #    foo.o: sub/foo.h
297
-  # which is wrong.  We want
296
+  # which is wrong.  We want:
298 297
   #    sub/foo.o: sub/foo.c
299 298
   #    sub/foo.o: sub/foo.h
300 299
   #    sub/foo.c:
301 300
   #    sub/foo.h:
302 301
   # ICC 7.1 will output
303 302
   #    foo.o: sub/foo.c sub/foo.h
304
-  # and will wrap long lines using '\':
303
+  # and will wrap long lines using \ :
305 304
   #    foo.o: sub/foo.c ... \
306 305
   #     sub/foo.h ... \
307 306
   #     ...
308
-  # tcc 0.9.26 (FIXME still under development at the moment of writing)
309
-  # will emit a similar output, but also prepend the continuation lines
310
-  # with horizontal tabulation characters.
307
+
311 308
   "$@" -MD -MF "$tmpdepfile"
312 309
   stat=$?
313 310
   if test $stat -eq 0; then :
... ...
@@ -316,85 +290,6 @@ icc)
316 316
     exit $stat
317 317
   fi
318 318
   rm -f "$depfile"
319
-  # Each line is of the form 'foo.o: dependent.h',
320
-  # or 'foo.o: dep1.h dep2.h \', or ' dep3.h dep4.h \'.
321
-  # Do two passes, one to just change these to
322
-  # '$object: dependent.h' and one to simply 'dependent.h:'.
323
-  sed -e "s/^[ $tab][ $tab]*/  /" -e "s,^[^:]*:,$object :," \
324
-    < "$tmpdepfile" > "$depfile"
325
-  sed '
326
-    s/[ '"$tab"'][ '"$tab"']*/ /g
327
-    s/^ *//
328
-    s/ *\\*$//
329
-    s/^[^:]*: *//
330
-    /^$/d
331
-    /:$/d
332
-    s/$/ :/
333
-  ' < "$tmpdepfile" >> "$depfile"
334
-  rm -f "$tmpdepfile"
335
-  ;;
336
-
337
-## The order of this option in the case statement is important, since the
338
-## shell code in configure will try each of these formats in the order
339
-## listed in this file.  A plain '-MD' option would be understood by many
340
-## compilers, so we must ensure this comes after the gcc and icc options.
341
-pgcc)
342
-  # Portland's C compiler understands '-MD'.
343
-  # Will always output deps to 'file.d' where file is the root name of the
344
-  # source file under compilation, even if file resides in a subdirectory.
345
-  # The object file name does not affect the name of the '.d' file.
346
-  # pgcc 10.2 will output
347
-  #    foo.o: sub/foo.c sub/foo.h
348
-  # and will wrap long lines using '\' :
349
-  #    foo.o: sub/foo.c ... \
350
-  #     sub/foo.h ... \
351
-  #     ...
352
-  dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
353
-  test "x$dir" = "x$object" && dir=
354
-  # Use the source, not the object, to determine the base name, since
355
-  # that's sadly what pgcc will do too.
356
-  base=`echo "$source" | sed -e 's|^.*/||' -e 's/\.[-_a-zA-Z0-9]*$//'`
357
-  tmpdepfile="$base.d"
358
-
359
-  # For projects that build the same source file twice into different object
360
-  # files, the pgcc approach of using the *source* file root name can cause
361
-  # problems in parallel builds.  Use a locking strategy to avoid stomping on
362
-  # the same $tmpdepfile.
363
-  lockdir="$base.d-lock"
364
-  trap "echo '$0: caught signal, cleaning up...' >&2; rm -rf $lockdir" 1 2 13 15
365
-  numtries=100
366
-  i=$numtries
367
-  while test $i -gt 0 ; do
368
-    # mkdir is a portable test-and-set.
369
-    if mkdir $lockdir 2>/dev/null; then
370
-      # This process acquired the lock.
371
-      "$@" -MD
372
-      stat=$?
373
-      # Release the lock.
374
-      rm -rf $lockdir
375
-      break
376
-    else
377
-      ## the lock is being held by a different process,
378
-      ## wait until the winning process is done or we timeout
379
-      while test -d $lockdir && test $i -gt 0; do
380
-        sleep 1
381
-        i=`expr $i - 1`
382
-      done
383
-    fi
384
-    i=`expr $i - 1`
385
-  done
386
-  trap - 1 2 13 15
387
-  if test $i -le 0; then
388
-    echo "$0: failed to acquire lock after $numtries attempts" >&2
389
-    echo "$0: check lockdir '$lockdir'" >&2
390
-    exit 1
391
-  fi
392
-
393
-  if test $stat -ne 0; then
394
-    rm -f "$tmpdepfile"
395
-    exit $stat
396
-  fi
397
-  rm -f "$depfile"
398 319
   # Each line is of the form `foo.o: dependent.h',
399 320
   # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'.
400 321
   # Do two passes, one to just change these to
... ...
@@ -439,7 +334,7 @@ hp2)
439 439
   done
440 440
   if test -f "$tmpdepfile"; then
441 441
     sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile"
442
-    # Add 'dependent.h:' lines.
442
+    # Add `dependent.h:' lines.
443 443
     sed -ne '2,${
444 444
 	       s/^ *//
445 445
 	       s/ \\*$//
... ...
@@ -454,9 +349,9 @@ hp2)
454 454
 
455 455
 tru64)
456 456
    # The Tru64 compiler uses -MD to generate dependencies as a side
457
-   # effect.  'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'.
457
+   # effect.  `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
458 458
    # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
459
-   # dependencies in 'foo.d' instead, so we check for that too.
459
+   # dependencies in `foo.d' instead, so we check for that too.
460 460
    # Subdirectories are respected.
461 461
    dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
462 462
    test "x$dir" = "x$object" && dir=
... ...
@@ -502,59 +397,14 @@ tru64)
502 502
    done
503 503
    if test -f "$tmpdepfile"; then
504 504
       sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
505
-      sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
505
+      # That's a tab and a space in the [].
506
+      sed -e 's,^.*\.[a-z]*:[	 ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
506 507
    else
507 508
       echo "#dummy" > "$depfile"
508 509
    fi
509 510
    rm -f "$tmpdepfile"
510 511
    ;;
511 512
 
512
-msvc7)
513
-  if test "$libtool" = yes; then
514
-    showIncludes=-Wc,-showIncludes
515
-  else
516
-    showIncludes=-showIncludes
517
-  fi
518
-  "$@" $showIncludes > "$tmpdepfile"
519
-  stat=$?
520
-  grep -v '^Note: including file: ' "$tmpdepfile"
521
-  if test "$stat" = 0; then :
522
-  else
523
-    rm -f "$tmpdepfile"
524
-    exit $stat
525
-  fi
526
-  rm -f "$depfile"
527
-  echo "$object : \\" > "$depfile"
528
-  # The first sed program below extracts the file names and escapes
529
-  # backslashes for cygpath.  The second sed program outputs the file
530
-  # name when reading, but also accumulates all include files in the
531
-  # hold buffer in order to output them again at the end.  This only
532
-  # works with sed implementations that can handle large buffers.
533
-  sed < "$tmpdepfile" -n '
534
-/^Note: including file:  *\(.*\)/ {
535
-  s//\1/
536
-  s/\\/\\\\/g
537
-  p
538
-}' | $cygpath_u | sort -u | sed -n '
539
-s/ /\\ /g
540
-s/\(.*\)/'"$tab"'\1 \\/p
541
-s/.\(.*\) \\/\1:/
542
-H
543
-$ {
544
-  s/.*/'"$tab"'/
545
-  G
546
-  p
547
-}' >> "$depfile"
548
-  rm -f "$tmpdepfile"
549
-  ;;
550
-
551
-msvc7msys)
552
-  # This case exists only to let depend.m4 do its work.  It works by
553
-  # looking at the text of this script.  This case will never be run,
554
-  # since it is checked for above.
555
-  exit 1
556
-  ;;
557
-
558 513
 #nosideeffect)
559 514
   # This comment above is used by automake to tell side-effect
560 515
   # dependency tracking mechanisms from slower ones.
... ...
@@ -572,7 +422,7 @@ dashmstdout)
572 572
     shift
573 573
   fi
574 574
 
575
-  # Remove '-o $object'.
575
+  # Remove `-o $object'.
576 576
   IFS=" "
577 577
   for arg
578 578
   do
... ...
@@ -592,14 +442,15 @@ dashmstdout)
592 592
   done
593 593
 
594 594
   test -z "$dashmflag" && dashmflag=-M
595
-  # Require at least two characters before searching for ':'
595
+  # Require at least two characters before searching for `:'
596 596
   # in the target name.  This is to cope with DOS-style filenames:
597
-  # a dependency such as 'c:/foo/bar' could be seen as target 'c' otherwise.
597
+  # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise.
598 598
   "$@" $dashmflag |
599
-    sed 's:^['"$tab"' ]*[^:'"$tab"' ][^:][^:]*\:['"$tab"' ]*:'"$object"'\: :' > "$tmpdepfile"
599
+    sed 's:^[  ]*[^: ][^:][^:]*\:[    ]*:'"$object"'\: :' > "$tmpdepfile"
600 600
   rm -f "$depfile"
601 601
   cat < "$tmpdepfile" > "$depfile"
602
-  tr ' ' "$nl" < "$tmpdepfile" | \
602
+  tr ' ' '
603
+' < "$tmpdepfile" | \
603 604
 ## Some versions of the HPUX 10.20 sed can't process this invocation
604 605
 ## correctly.  Breaking it into two sed invocations is a workaround.
605 606
     sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
... ...
@@ -652,10 +503,9 @@ makedepend)
652 652
   touch "$tmpdepfile"
653 653
   ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
654 654
   rm -f "$depfile"
655
-  # makedepend may prepend the VPATH from the source file name to the object.
656
-  # No need to regex-escape $object, excess matching of '.' is harmless.
657
-  sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile"
658
-  sed '1,2d' "$tmpdepfile" | tr ' ' "$nl" | \
655
+  cat < "$tmpdepfile" > "$depfile"
656
+  sed '1,2d' "$tmpdepfile" | tr ' ' '
657
+' | \
659 658
 ## Some versions of the HPUX 10.20 sed can't process this invocation
660 659
 ## correctly.  Breaking it into two sed invocations is a workaround.
661 660
     sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
... ...
@@ -675,7 +525,7 @@ cpp)
675 675
     shift
676 676
   fi
677 677
 
678
-  # Remove '-o $object'.
678
+  # Remove `-o $object'.
679 679
   IFS=" "
680 680
   for arg
681 681
   do
... ...
@@ -744,8 +594,8 @@ msvisualcpp)
744 744
   sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile"
745 745
   rm -f "$depfile"
746 746
   echo "$object : \\" > "$depfile"
747
-  sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::'"$tab"'\1 \\:p' >> "$depfile"
748
-  echo "$tab" >> "$depfile"
747
+  sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::	\1 \\:p' >> "$depfile"
748
+  echo "	" >> "$depfile"
749 749
   sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile"
750 750
   rm -f "$tmpdepfile"
751 751
   ;;
... ...
@@ -1,7 +1,7 @@
1 1
 #!/bin/sh
2 2
 # install - install a program, script, or datafile
3 3
 
4
-scriptversion=2011-11-20.07; # UTC
4
+scriptversion=2009-04-28.21; # UTC
5 5
 
6 6
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
7 7
 # later released in X11R6 (xc/config/util/install.sh) with the
... ...
@@ -35,7 +35,7 @@ scriptversion=2011-11-20.07; # UTC
35 35
 # FSF changes to this file are in the public domain.
36 36
 #
37 37
 # Calling this script install-sh is preferred over install.sh, to prevent
38
-# 'make' implicit rules from creating a file called install from it
38
+# `make' implicit rules from creating a file called install from it
39 39
 # when there is no Makefile.
40 40
 #
41 41
 # This script is compatible with the BSD install script, but was written
... ...
@@ -156,10 +156,6 @@ while test $# -ne 0; do
156 156
     -s) stripcmd=$stripprog;;
157 157
 
158 158
     -t) dst_arg=$2
159
-	# Protect names problematic for 'test' and other utilities.
160
-	case $dst_arg in
161
-	  -* | [=\(\)!]) dst_arg=./$dst_arg;;
162
-	esac
163 159
 	shift;;
164 160
 
165 161
     -T) no_target_directory=true;;
... ...
@@ -190,10 +186,6 @@ if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
190 190
     fi
191 191
     shift # arg
192 192
     dst_arg=$arg
193
-    # Protect names problematic for 'test' and other utilities.
194
-    case $dst_arg in
195
-      -* | [=\(\)!]) dst_arg=./$dst_arg;;
196
-    esac
197 193
   done
198 194
 fi
199 195
 
... ...
@@ -202,17 +194,13 @@ if test $# -eq 0; then
202 202
     echo "$0: no input file specified." >&2
203 203
     exit 1
204 204
   fi
205
-  # It's OK to call 'install-sh -d' without argument.
205
+  # It's OK to call `install-sh -d' without argument.
206 206
   # This can happen when creating conditional directories.
207 207
   exit 0
208 208
 fi
209 209
 
210 210
 if test -z "$dir_arg"; then
211
-  do_exit='(exit $ret); exit $ret'
212
-  trap "ret=129; $do_exit" 1
213
-  trap "ret=130; $do_exit" 2
214
-  trap "ret=141; $do_exit" 13
215
-  trap "ret=143; $do_exit" 15
211
+  trap '(exit $?); exit' 1 2 13 15
216 212
 
217 213
   # Set umask so as not to create temps with too-generous modes.
218 214
   # However, 'strip' requires both read and write access to temps.
... ...
@@ -240,9 +228,9 @@ fi
240 240
 
241 241
 for src
242 242
 do
243
-  # Protect names problematic for 'test' and other utilities.
243
+  # Protect names starting with `-'.
244 244
   case $src in
245
-    -* | [=\(\)!]) src=./$src;;
245
+    -*) src=./$src;;
246 246
   esac
247 247
 
248 248
   if test -n "$dir_arg"; then
... ...
@@ -264,7 +252,12 @@ do
264 264
       echo "$0: no destination specified." >&2
265 265
       exit 1
266 266
     fi
267
+
267 268
     dst=$dst_arg
269
+    # Protect names starting with `-'.
270
+    case $dst in
271
+      -*) dst=./$dst;;
272
+    esac
268 273
 
269 274
     # If destination is a directory, append the input filename; won't work
270 275
     # if double slashes aren't ignored.
... ...
@@ -354,7 +347,7 @@ do
354 354
 	      if test -z "$dir_arg" || {
355 355
 		   # Check for POSIX incompatibilities with -m.
356 356
 		   # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
357
-		   # other-writable bit of parent directory when it shouldn't.
357
+		   # other-writeable bit of parent directory when it shouldn't.
358 358
 		   # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
359 359
 		   ls_ld_tmpdir=`ls -ld "$tmpdir"`
360 360
 		   case $ls_ld_tmpdir in
... ...
@@ -392,7 +385,7 @@ do
392 392
 
393 393
       case $dstdir in
394 394
 	/*) prefix='/';;
395
-	[-=\(\)!]*) prefix='./';;
395
+	-*) prefix='./';;
396 396
 	*)  prefix='';;
397 397
       esac
398 398
 
... ...
@@ -410,7 +403,7 @@ do
410 410
 
411 411
       for d
412 412
       do
413
-	test X"$d" = X && continue
413
+	test -z "$d" && continue
414 414
 
415 415
 	prefix=$prefix$d
416 416
 	if test -d "$prefix"; then
... ...
@@ -70,7 +70,7 @@
70 70
 #         compiler:		$LTCC
71 71
 #         compiler flags:		$LTCFLAGS
72 72
 #         linker:		$LD (gnu? $with_gnu_ld)
73
-#         $progname:	(GNU libtool) 2.4.2
73
+#         $progname:	(GNU libtool) 2.4.2 Debian-2.4.2-1ubuntu1
74 74
 #         automake:	$automake_version
75 75
 #         autoconf:	$autoconf_version
76 76
 #
... ...
@@ -80,7 +80,7 @@
80 80
 
81 81
 PROGRAM=libtool
82 82
 PACKAGE=libtool
83
-VERSION=2.4.2
83
+VERSION="2.4.2 Debian-2.4.2-1ubuntu1"
84 84
 TIMESTAMP=""
85 85
 package_revision=1.3337
86 86
 
... ...
@@ -1375,21 +1375,6 @@ func_replace_sysroot ()
1375 1375
 func_infer_tag ()
1376 1376
 {
1377 1377
     $opt_debug
1378
-
1379
-    # FreeBSD-specific: where we install compilers with non-standard names
1380
-    tag_compilers_CC="*cc cc* *gcc gcc* clang"
1381
-    tag_compilers_CXX="*c++ c++* *g++ g++* clang++"
1382
-    base_compiler=`set -- "$@"; echo $1`
1383
-
1384
-    # If $tagname isn't set, then try to infer if the default "CC" tag applies
1385
-    if test -z "$tagname"; then
1386
-      for zp in $tag_compilers_CC; do
1387
-        case $base_compiler in
1388
-	 $zp) tagname="CC"; break;;
1389
-	esac
1390
-      done
1391
-    fi
1392
-
1393 1378
     if test -n "$available_tags" && test -z "$tagname"; then
1394 1379
       CC_quoted=
1395 1380
       for arg in $CC; do
... ...
@@ -1426,22 +1411,7 @@ func_infer_tag ()
1426 1426
 	      break
1427 1427
 	      ;;
1428 1428
 	    esac
1429
-
1430
-	    # FreeBSD-specific: try compilers based on inferred tag
1431
-	    if test -z "$tagname"; then
1432
-	      eval "tag_compilers=\$tag_compilers_${z}"
1433
-	      if test -n "$tag_compilers"; then
1434
-		for zp in $tag_compilers; do
1435
-		  case $base_compiler in   
1436
-		    $zp) tagname=$z; break;;
1437
-		  esac
1438
-		done
1439
-		if test -n "$tagname"; then
1440
-		  break
1441
-		fi
1442
-	      fi
1443
-            fi
1444
-          fi
1429
+	  fi
1445 1430
 	done
1446 1431
 	# If $tagname still isn't set, then no tagged configuration
1447 1432
 	# was found and let the user know that the "--tag" command
... ...
@@ -3547,9 +3517,6 @@ static const void *lt_preloaded_setup() {
3547 3547
 	  ;;
3548 3548
 	esac
3549 3549
 	;;
3550
-      *-*-freebsd*)
3551
-	# FreeBSD doesn't need this...
3552
-	;;
3553 3550
       *)
3554 3551
 	func_fatal_error "unknown suffix for \`$my_dlsyms'"
3555 3552
 	;;
... ...
@@ -5628,7 +5595,6 @@ func_mode_link ()
5628 5628
 	  esac
5629 5629
 	  ;;
5630 5630
 	esac
5631
-	deplibs="$deplibs $arg"
5632 5631
 	continue
5633 5632
 	;;
5634 5633
 
... ...
@@ -6158,7 +6124,10 @@ func_mode_link ()
6158 6158
 	case $pass in
6159 6159
 	dlopen) libs="$dlfiles" ;;
6160 6160
 	dlpreopen) libs="$dlprefiles" ;;
6161
-	link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
6161
+	link)
6162
+	  libs="$deplibs %DEPLIBS%"
6163
+	  test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
6164
+	  ;;
6162 6165
 	esac
6163 6166
       fi
6164 6167
       if test "$linkmode,$pass" = "lib,dlpreopen"; then
... ...
@@ -6201,30 +6170,13 @@ func_mode_link ()
6201 6201
 	    finalize_deplibs="$deplib $finalize_deplibs"
6202 6202
 	  else
6203 6203
 	    func_append compiler_flags " $deplib"
6204
-	  fi
6205
-
6206
-	  case $linkmode in
6207
-	  lib)
6208
-	    deplibs="$deplib $deplibs"
6209
-	    test "$pass" = conv && continue
6210
-	    newdependency_libs="$deplib $newdependency_libs"
6211
-	    ;;
6212
-	  prog)
6213
-	    if test "$pass" = conv; then
6214
-	      deplibs="$deplib $deplibs"
6215
-	      continue
6216
-	    fi
6217
-	    if test "$pass" = scan; then
6218
-	      deplibs="$deplib $deplibs"
6219
-	    else
6220
-	      compile_deplibs="$deplib $compile_deplibs"
6221
-	      finalize_deplibs="$deplib $finalize_deplibs"
6204
+	    if test "$linkmode" = lib ; then
6205
+		case "$new_inherited_linker_flags " in
6206
+		    *" $deplib "*) ;;
6207
+		    * ) func_append new_inherited_linker_flags " $deplib" ;;
6208
+		esac
6222 6209
 	    fi
6223
-	    ;;
6224
-	  *)
6225
-	    ;;
6226
-	  esac # linkmode
6227
-
6210
+	  fi
6228 6211
 	  continue
6229 6212
 	  ;;
6230 6213
 	-l*)
... ...
@@ -6495,19 +6447,19 @@ func_mode_link ()
6495 6495
 	    # It is a libtool convenience library, so add in its objects.
6496 6496
 	    func_append convenience " $ladir/$objdir/$old_library"
6497 6497
 	    func_append old_convenience " $ladir/$objdir/$old_library"
6498
+	    tmp_libs=
6499
+	    for deplib in $dependency_libs; do
6500
+	      deplibs="$deplib $deplibs"
6501
+	      if $opt_preserve_dup_deps ; then
6502
+		case "$tmp_libs " in
6503
+		*" $deplib "*) func_append specialdeplibs " $deplib" ;;
6504
+		esac
6505
+	      fi
6506
+	      func_append tmp_libs " $deplib"
6507
+	    done
6498 6508
 	  elif test "$linkmode" != prog && test "$linkmode" != lib; then
6499 6509
 	    func_fatal_error "\`$lib' is not a convenience library"
6500 6510
 	  fi
6501
-	  tmp_libs=
6502
-	  for deplib in $dependency_libs; do
6503
-	    deplibs="$deplib $deplibs"
6504
-	    if $opt_preserve_dup_deps ; then
6505
-	      case "$tmp_libs " in
6506
-	      *" $deplib "*) func_append specialdeplibs " $deplib" ;;
6507
-	      esac
6508
-	    fi
6509
-	    func_append tmp_libs " $deplib"
6510
-	  done
6511 6511
 	  continue
6512 6512
 	fi # $pass = conv
6513 6513
 
... ...
@@ -7400,6 +7352,9 @@ func_mode_link ()
7400 7400
 	    revision="$number_minor"
7401 7401
 	    lt_irix_increment=no
7402 7402
 	    ;;
7403
+	  *)
7404
+	    func_fatal_configuration "$modename: unknown library version type \`$version_type'"
7405
+	    ;;
7403 7406
 	  esac
7404 7407
 	  ;;
7405 7408
 	no)
... ...
@@ -1,9 +1,10 @@
1 1
 #! /bin/sh
2 2
 # Common stub for a few missing GNU programs while installing.
3 3
 
4
-scriptversion=2012-01-06.18; # UTC
4
+scriptversion=2009-04-28.21; # UTC
5 5
 
6
-# Copyright (C) 1996-2012 Free Software Foundation, Inc.
6
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
7
+# 2008, 2009 Free Software Foundation, Inc.
7 8
 # Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
8 9
 
9 10
 # This program is free software; you can redistribute it and/or modify
... ...
@@ -25,7 +26,7 @@ scriptversion=2012-01-06.18; # UTC
25 25
 # the same distribution terms that you use for the rest of that program.
26 26
 
27 27
 if test $# -eq 0; then
28
-  echo 1>&2 "Try '$0 --help' for more information"
28
+  echo 1>&2 "Try \`$0 --help' for more information"
29 29
   exit 1
30 30
 fi
31 31
 
... ...
@@ -33,7 +34,7 @@ run=:
33 33
 sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
34 34
 sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
35 35
 
36
-# In the cases where this matters, 'missing' is being run in the
36
+# In the cases where this matters, `missing' is being run in the
37 37
 # srcdir already.
38 38
 if test -f configure.ac; then
39 39
   configure_ac=configure.ac
... ...
@@ -64,7 +65,7 @@ case $1 in
64 64
     echo "\
65 65
 $0 [OPTION]... PROGRAM [ARGUMENT]...
66 66
 
67
-Handle 'PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
67
+Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
68 68
 error status if there is no known handling for PROGRAM.
69 69
 
70 70
 Options:
... ...
@@ -73,20 +74,21 @@ Options:
73 73
   --run           try to run the given command, and emulate it if it fails
74 74
 
75 75
 Supported PROGRAM values:
76
-  aclocal      touch file 'aclocal.m4'
77
-  autoconf     touch file 'configure'
78
-  autoheader   touch file 'config.h.in'
76
+  aclocal      touch file \`aclocal.m4'
77
+  autoconf     touch file \`configure'
78
+  autoheader   touch file \`config.h.in'
79 79
   autom4te     touch the output file, or create a stub one
80
-  automake     touch all 'Makefile.in' files
81
-  bison        create 'y.tab.[ch]', if possible, from existing .[ch]
82
-  flex         create 'lex.yy.c', if possible, from existing .c
80
+  automake     touch all \`Makefile.in' files
81
+  bison        create \`y.tab.[ch]', if possible, from existing .[ch]
82
+  flex         create \`lex.yy.c', if possible, from existing .c
83 83
   help2man     touch the output file
84
-  lex          create 'lex.yy.c', if possible, from existing .c
84
+  lex          create \`lex.yy.c', if possible, from existing .c
85 85
   makeinfo     touch the output file
86
-  yacc         create 'y.tab.[ch]', if possible, from existing .[ch]
86
+  tar          try tar, gnutar, gtar, then tar without non-portable flags
87
+  yacc         create \`y.tab.[ch]', if possible, from existing .[ch]
87 88
 
88
-Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and
89
-'g' are ignored when checking the name.
89
+Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
90
+\`g' are ignored when checking the name.
90 91
 
91 92
 Send bug reports to <bug-automake@gnu.org>."
92 93
     exit $?
... ...
@@ -98,8 +100,8 @@ Send bug reports to <bug-automake@gnu.org>."
98 98
     ;;
99 99
 
100 100
   -*)
101
-    echo 1>&2 "$0: Unknown '$1' option"
102
-    echo 1>&2 "Try '$0 --help' for more information"
101
+    echo 1>&2 "$0: Unknown \`$1' option"
102
+    echo 1>&2 "Try \`$0 --help' for more information"
103 103
     exit 1
104 104
     ;;
105 105
 
... ...
@@ -120,13 +122,22 @@ case $1 in
120 120
     # Not GNU programs, they don't have --version.
121 121
     ;;
122 122
 
123
+  tar*)
124
+    if test -n "$run"; then
125
+       echo 1>&2 "ERROR: \`tar' requires --run"
126
+       exit 1
127
+    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
128
+       exit 1
129
+    fi
130
+    ;;
131
+
123 132
   *)
124 133
     if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
125 134
        # We have it, but it failed.
126 135
        exit 1
127 136
     elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
128 137
        # Could not run --version or --help.  This is probably someone
129
-       # running '$TOOL --version' or '$TOOL --help' to check whether
138
+       # running `$TOOL --version' or `$TOOL --help' to check whether
130 139
        # $TOOL exists and not knowing $TOOL uses missing.
131 140
        exit 1
132 141
     fi
... ...
@@ -138,27 +149,27 @@ esac
138 138
 case $program in
139 139
   aclocal*)
140 140
     echo 1>&2 "\
141
-WARNING: '$1' is $msg.  You should only need it if
142
-         you modified 'acinclude.m4' or '${configure_ac}'.  You might want
143
-         to install the Automake and Perl packages.  Grab them from
141
+WARNING: \`$1' is $msg.  You should only need it if
142
+         you modified \`acinclude.m4' or \`${configure_ac}'.  You might want
143
+         to install the \`Automake' and \`Perl' packages.  Grab them from
144 144
          any GNU archive site."
145 145
     touch aclocal.m4
146 146
     ;;
147 147
 
148 148
   autoconf*)
149 149
     echo 1>&2 "\
150
-WARNING: '$1' is $msg.  You should only need it if
151
-         you modified '${configure_ac}'.  You might want to install the
152
-         Autoconf and GNU m4 packages.  Grab them from any GNU
150
+WARNING: \`$1' is $msg.  You should only need it if
151
+         you modified \`${configure_ac}'.  You might want to install the
152
+         \`Autoconf' and \`GNU m4' packages.  Grab them from any GNU
153 153
          archive site."
154 154
     touch configure
155 155
     ;;
156 156
 
157 157
   autoheader*)
158 158
     echo 1>&2 "\
159
-WARNING: '$1' is $msg.  You should only need it if
160
-         you modified 'acconfig.h' or '${configure_ac}'.  You might want
161
-         to install the Autoconf and GNU m4 packages.  Grab them
159
+WARNING: \`$1' is $msg.  You should only need it if
160
+         you modified \`acconfig.h' or \`${configure_ac}'.  You might want
161
+         to install the \`Autoconf' and \`GNU m4' packages.  Grab them
162 162
          from any GNU archive site."
163 163
     files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}`
164 164
     test -z "$files" && files="config.h"
... ...
@@ -175,9 +186,9 @@ WARNING: '$1' is $msg.  You should only need it if
175 175
 
176 176
   automake*)
177 177
     echo 1>&2 "\
178
-WARNING: '$1' is $msg.  You should only need it if
179
-         you modified 'Makefile.am', 'acinclude.m4' or '${configure_ac}'.
180
-         You might want to install the Automake and Perl packages.
178
+WARNING: \`$1' is $msg.  You should only need it if
179
+         you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
180
+         You might want to install the \`Automake' and \`Perl' packages.
181 181
          Grab them from any GNU archive site."
182 182
     find . -type f -name Makefile.am -print |
183 183
 	   sed 's/\.am$/.in/' |
... ...
@@ -186,10 +197,10 @@ WARNING: '$1' is $msg.  You should only need it if
186 186
 
187 187
   autom4te*)
188 188
     echo 1>&2 "\
189
-WARNING: '$1' is needed, but is $msg.
189
+WARNING: \`$1' is needed, but is $msg.
190 190
          You might have modified some files without having the
191 191
          proper tools for further handling them.
192
-         You can get '$1' as part of Autoconf from any GNU
192
+         You can get \`$1' as part of \`Autoconf' from any GNU
193 193
          archive site."
194 194
 
195 195
     file=`echo "$*" | sed -n "$sed_output"`
... ...
@@ -209,13 +220,13 @@ WARNING: '$1' is needed, but is $msg.
209 209
 
210 210
   bison*|yacc*)
211 211
     echo 1>&2 "\
212
-WARNING: '$1' $msg.  You should only need it if
213
-         you modified a '.y' file.  You may need the Bison package
212
+WARNING: \`$1' $msg.  You should only need it if
213
+         you modified a \`.y' file.  You may need the \`Bison' package
214 214
          in order for those modifications to take effect.  You can get
215
-         Bison from any GNU archive site."
215
+         \`Bison' from any GNU archive site."
216 216
     rm -f y.tab.c y.tab.h
217 217
     if test $# -ne 1; then
218
-        eval LASTARG=\${$#}
218
+        eval LASTARG="\${$#}"
219 219
 	case $LASTARG in
220 220
 	*.y)
221 221
 	    SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
... ...
@@ -239,13 +250,13 @@ WARNING: '$1' $msg.  You should only need it if
239 239
 
240 240
   lex*|flex*)
241 241
     echo 1>&2 "\
242
-WARNING: '$1' is $msg.  You should only need it if
243
-         you modified a '.l' file.  You may need the Flex package
242
+WARNING: \`$1' is $msg.  You should only need it if
243
+         you modified a \`.l' file.  You may need the \`Flex' package
244 244
          in order for those modifications to take effect.  You can get
245
-         Flex from any GNU archive site."
245
+         \`Flex' from any GNU archive site."
246 246
     rm -f lex.yy.c
247 247
     if test $# -ne 1; then
248
-        eval LASTARG=\${$#}
248
+        eval LASTARG="\${$#}"
249 249
 	case $LASTARG in
250 250
 	*.l)
251 251
 	    SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
... ...
@@ -262,10 +273,10 @@ WARNING: '$1' is $msg.  You should only need it if
262 262
 
263 263
   help2man*)
264 264
     echo 1>&2 "\
265
-WARNING: '$1' is $msg.  You should only need it if
265
+WARNING: \`$1' is $msg.  You should only need it if
266 266
 	 you modified a dependency of a manual page.  You may need the
267
-	 Help2man package in order for those modifications to take
268
-	 effect.  You can get Help2man from any GNU archive site."
267
+	 \`Help2man' package in order for those modifications to take
268
+	 effect.  You can get \`Help2man' from any GNU archive site."
269 269
 
270 270
     file=`echo "$*" | sed -n "$sed_output"`
271 271
     test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
... ...
@@ -280,12 +291,12 @@ WARNING: '$1' is $msg.  You should only need it if
280 280
 
281 281
   makeinfo*)
282 282
     echo 1>&2 "\
283
-WARNING: '$1' is $msg.  You should only need it if
284
-         you modified a '.texi' or '.texinfo' file, or any other file
283
+WARNING: \`$1' is $msg.  You should only need it if
284
+         you modified a \`.texi' or \`.texinfo' file, or any other file
285 285
          indirectly affecting the aspect of the manual.  The spurious
286
-         call might also be the consequence of using a buggy 'make' (AIX,
287
-         DU, IRIX).  You might want to install the Texinfo package or
288
-         the GNU make package.  Grab either from any GNU archive site."
286
+         call might also be the consequence of using a buggy \`make' (AIX,
287
+         DU, IRIX).  You might want to install the \`Texinfo' package or
288
+         the \`GNU make' package.  Grab either from any GNU archive site."
289 289
     # The file to touch is that specified with -o ...
290 290
     file=`echo "$*" | sed -n "$sed_output"`
291 291
     test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
... ...
@@ -307,14 +318,49 @@ WARNING: '$1' is $msg.  You should only need it if
307 307
     touch $file
308 308
     ;;
309 309
 
310
+  tar*)
311
+    shift
312
+
313
+    # We have already tried tar in the generic part.
314
+    # Look for gnutar/gtar before invocation to avoid ugly error
315
+    # messages.
316
+    if (gnutar --version > /dev/null 2>&1); then
317
+       gnutar "$@" && exit 0
318
+    fi
319
+    if (gtar --version > /dev/null 2>&1); then
320
+       gtar "$@" && exit 0
321
+    fi
322
+    firstarg="$1"
323
+    if shift; then
324
+	case $firstarg in
325
+	*o*)
326
+	    firstarg=`echo "$firstarg" | sed s/o//`
327
+	    tar "$firstarg" "$@" && exit 0
328
+	    ;;
329
+	esac
330
+	case $firstarg in
331
+	*h*)
332
+	    firstarg=`echo "$firstarg" | sed s/h//`
333
+	    tar "$firstarg" "$@" && exit 0
334
+	    ;;
335
+	esac
336
+    fi
337
+
338
+    echo 1>&2 "\
339
+WARNING: I can't seem to be able to run \`tar' with the given arguments.
340
+         You may want to install GNU tar or Free paxutils, or check the
341
+         command line arguments."
342
+    exit 1
343
+    ;;
344
+
310 345
   *)
311 346
     echo 1>&2 "\
312
-WARNING: '$1' is needed, and is $msg.
347
+WARNING: \`$1' is needed, and is $msg.
313 348
          You might have modified some files without having the
314
-         proper tools for further handling them.  Check the 'README' file,
349
+         proper tools for further handling them.  Check the \`README' file,
315 350
          it often tells you about the needed prerequisites for installing
316 351
          this package.  You may also peek at any GNU archive site, in case
317
-         some other package would contain this missing '$1' program."
352
+         some other package would contain this missing \`$1' program."
318 353
     exit 1
319 354
     ;;
320 355
 esac
... ...
@@ -665,6 +665,8 @@ NMEDIT
665 665
 DSYMUTIL
666 666
 MANIFEST_TOOL
667 667
 RANLIB
668
+ac_ct_AR
669
+AR
668 670
 DLLTOOL
669 671
 OBJDUMP
670 672
 LN_S
... ...
@@ -681,15 +683,15 @@ MAINTAINER_MODE_TRUE
681 681
 EGREP
682 682
 GREP
683 683
 CPP
684
-am__fastdepCXX_FALSE
685
-am__fastdepCXX_TRUE
686
-CXXDEPMODE
687
-ac_ct_CXX
688
-CXXFLAGS
689
-CXX
690 684
 am__fastdepCC_FALSE
691 685
 am__fastdepCC_TRUE
692 686
 CCDEPMODE
687
+ac_ct_CC
688
+CFLAGS
689
+CC
690
+am__fastdepCXX_FALSE
691
+am__fastdepCXX_TRUE
692
+CXXDEPMODE
693 693
 am__nodep
694 694
 AMDEPBACKSLASH
695 695
 AMDEP_FALSE
... ...
@@ -699,13 +701,11 @@ am__include
699 699
 DEPDIR
700 700
 OBJEXT
701 701
 EXEEXT
702
-ac_ct_CC
702
+ac_ct_CXX
703 703
 CPPFLAGS
704 704
 LDFLAGS
705
-CFLAGS
706
-CC
707
-ac_ct_AR
708
-AR
705
+CXXFLAGS
706
+CXX
709 707
 AM_BACKSLASH
710 708
 AM_DEFAULT_VERBOSITY
711 709
 AM_DEFAULT_V
... ...
@@ -804,14 +804,14 @@ enable_all_jit_targets
804 804
       ac_precious_vars='build_alias
805 805
 host_alias
806 806
 target_alias
807
-CC
808
-CFLAGS
807
+CXX
808
+CXXFLAGS
809 809
 LDFLAGS
810 810
 LIBS
811 811
 CPPFLAGS
812
-CXX
813
-CXXFLAGS
814 812
 CCC
813
+CC
814
+CFLAGS
815 815
 CPP
816 816
 CXXCPP'
817 817
 ac_subdirs_all='llvm'
... ...
@@ -1433,15 +1433,12 @@ Optional Features:
1433 1433
   --disable-option-checking  ignore unrecognized --enable/--with options
1434 1434
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
1435 1435
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
1436
-  --enable-silent-rules   less verbose build output (undo: "make V=1")
1437
-  --disable-silent-rules  verbose build output (undo: "make V=0")
1438
-  --enable-dependency-tracking
1439
-                          do not reject slow dependency extractors
1440
-  --disable-dependency-tracking
1441
-                          speeds up one-time build
1442
-  --enable-maintainer-mode
1443
-                          enable make rules and dependencies not useful (and
1444
-                          sometimes confusing) to the casual installer
1436
+  --enable-silent-rules          less verbose build output (undo: `make V=1')
1437
+  --disable-silent-rules         verbose build output (undo: `make V=0')
1438
+  --disable-dependency-tracking  speeds up one-time build
1439
+  --enable-dependency-tracking   do not reject slow dependency extractors
1440
+  --enable-maintainer-mode  enable make rules and dependencies not useful
1441
+			  (and sometimes confusing) to the casual installer
1445 1442
   --enable-static[=PKGS]  build static libraries [default=no]
1446 1443
   --enable-shared[=PKGS]  build shared libraries [default=yes]
1447 1444
   --enable-fast-install[=PKGS]
... ...
@@ -1464,15 +1461,15 @@ Optional Packages:
1464 1464
                           path to llvm-config
1465 1465
 
1466 1466
 Some influential environment variables:
1467
-  CC          C compiler command
1468
-  CFLAGS      C compiler flags
1467
+  CXX         C++ compiler command
1468
+  CXXFLAGS    C++ compiler flags
1469 1469
   LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
1470 1470
               nonstandard directory <lib dir>
1471 1471
   LIBS        libraries to pass to the linker, e.g. -l<library>
1472 1472
   CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
1473 1473
               you have headers in a nonstandard directory <include dir>
1474
-  CXX         C++ compiler command
1475
-  CXXFLAGS    C++ compiler flags
1474
+  CC          C compiler command
1475
+  CFLAGS      C compiler flags
1476 1476
   CPP         C preprocessor
1477 1477
   CXXCPP      C++ preprocessor
1478 1478
 
... ...
@@ -1556,10 +1553,10 @@ fi
1556 1556
 ## Autoconf initialization. ##
1557 1557
 ## ------------------------ ##
1558 1558
 
1559
-# ac_fn_c_try_compile LINENO
1560
-# --------------------------
1559
+# ac_fn_cxx_try_compile LINENO
1560
+# ----------------------------
1561 1561
 # Try to compile conftest.$ac_ext, and return whether this succeeded.
1562
-ac_fn_c_try_compile ()
1562
+ac_fn_cxx_try_compile ()
1563 1563
 {
1564 1564
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
1565 1565
   rm -f conftest.$ac_objext
... ...
@@ -1579,7 +1576,7 @@ $as_echo "$ac_try_echo"; } >&5
1579 1579
   fi
1580 1580
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
1581 1581
   test $ac_status = 0; } && {
1582
-	 test -z "$ac_c_werror_flag" ||
1582
+	 test -z "$ac_cxx_werror_flag" ||
1583 1583
 	 test ! -s conftest.err
1584 1584
        } && test -s conftest.$ac_objext; then :
1585 1585
   ac_retval=0
... ...
@@ -1592,12 +1589,12 @@ fi
1592 1592
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
1593 1593
   as_fn_set_status $ac_retval
1594 1594
 
1595
-} # ac_fn_c_try_compile
1595
+} # ac_fn_cxx_try_compile
1596 1596
 
1597
-# ac_fn_cxx_try_compile LINENO
1598
-# ----------------------------
1597
+# ac_fn_c_try_compile LINENO
1598
+# --------------------------
1599 1599
 # Try to compile conftest.$ac_ext, and return whether this succeeded.
1600
-ac_fn_cxx_try_compile ()
1600
+ac_fn_c_try_compile ()
1601 1601
 {
1602 1602
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
1603 1603
   rm -f conftest.$ac_objext
... ...
@@ -1617,7 +1614,7 @@ $as_echo "$ac_try_echo"; } >&5
1617 1617
   fi
1618 1618
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
1619 1619
   test $ac_status = 0; } && {
1620
-	 test -z "$ac_cxx_werror_flag" ||
1620
+	 test -z "$ac_c_werror_flag" ||
1621 1621
 	 test ! -s conftest.err
1622 1622
        } && test -s conftest.$ac_objext; then :
1623 1623
   ac_retval=0
... ...
@@ -1630,7 +1627,7 @@ fi
1630 1630
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
1631 1631
   as_fn_set_status $ac_retval
1632 1632
 
1633
-} # ac_fn_cxx_try_compile
1633
+} # ac_fn_c_try_compile
1634 1634
 
1635 1635
 # ac_fn_c_try_run LINENO
1636 1636
 # ----------------------
... ...
@@ -2474,7 +2471,7 @@ test -n "$target_alias" &&
2474 2474
   test "$program_prefix$program_suffix$program_transform_name" = \
2475 2475
     NONENONEs,x,x, &&
2476 2476
   program_prefix=${target_alias}-
2477
-am__api_version='1.12'
2477
+am__api_version='1.11'
2478 2478
 
2479 2479
 # Find a good install program.  We prefer a C program (faster),
2480 2480
 # so one script is as good as another.  But avoid the broken or
... ...
@@ -2571,6 +2568,9 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
2571 2571
 
2572 2572
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
2573 2573
 $as_echo_n "checking whether build environment is sane... " >&6; }
2574
+# Just in case
2575
+sleep 1
2576
+echo timestamp > conftest.file
2574 2577
 # Reject unsafe characters in $srcdir or the absolute working directory
2575 2578
 # name.  Accept space and tab only in the latter.
2576 2579
 am_lf='
... ...
@@ -2581,40 +2581,32 @@ case `pwd` in
2581 2581
 esac
2582 2582
 case $srcdir in
2583 2583
   *[\\\"\#\$\&\'\`$am_lf\ \	]*)
2584
-    as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;;
2584
+    as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
2585 2585
 esac
2586 2586
 
2587
-# Do 'set' in a subshell so we don't clobber the current shell's
2587
+# Do `set' in a subshell so we don't clobber the current shell's
2588 2588
 # arguments.  Must try -L first in case configure is actually a
2589 2589
 # symlink; some systems play weird games with the mod time of symlinks
2590 2590
 # (eg FreeBSD returns the mod time of the symlink's containing
2591 2591
 # directory).
2592 2592
 if (
2593
-   am_has_slept=no
2594
-   for am_try in 1 2; do
2595
-     echo "timestamp, slept: $am_has_slept" > conftest.file
2596
-     set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
2597
-     if test "$*" = "X"; then
2598
-	# -L didn't work.
2599
-	set X `ls -t "$srcdir/configure" conftest.file`
2600
-     fi
2601
-     if test "$*" != "X $srcdir/configure conftest.file" \
2602
-	&& test "$*" != "X conftest.file $srcdir/configure"; then
2603
-
2604
-	# If neither matched, then we have a broken ls.  This can happen
2605
-	# if, for instance, CONFIG_SHELL is bash and it inherits a
2606
-	# broken ls alias from the environment.  This has actually
2607
-	# happened.  Such a system could not be considered "sane".
2608
-	as_fn_error $? "ls -t appears to fail.  Make sure there is not a broken
2609
-  alias in your environment" "$LINENO" 5
2610
-     fi
2611
-     if test "$2" = conftest.file || test $am_try -eq 2; then
2612
-       break
2613
-     fi
2614
-     # Just in case.
2615
-     sleep 1
2616
-     am_has_slept=yes
2617
-   done
2593
+   set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
2594
+   if test "$*" = "X"; then
2595
+      # -L didn't work.
2596
+      set X `ls -t "$srcdir/configure" conftest.file`
2597
+   fi
2598
+   rm -f conftest.file
2599
+   if test "$*" != "X $srcdir/configure conftest.file" \
2600
+      && test "$*" != "X conftest.file $srcdir/configure"; then
2601
+
2602
+      # If neither matched, then we have a broken ls.  This can happen
2603
+      # if, for instance, CONFIG_SHELL is bash and it inherits a
2604
+      # broken ls alias from the environment.  This has actually
2605
+      # happened.  Such a system could not be considered "sane".
2606
+      as_fn_error $? "ls -t appears to fail.  Make sure there is not a broken
2607
+alias in your environment" "$LINENO" 5
2608
+   fi
2609
+
2618 2610
    test "$2" = conftest.file
2619 2611
    )
2620 2612
 then
... ...
@@ -2626,16 +2618,6 @@ Check your system clock" "$LINENO" 5
2626 2626
 fi
2627 2627
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
2628 2628
 $as_echo "yes" >&6; }
2629
-# If we didn't sleep, we still need to ensure time stamps of config.status and
2630
-# generated files are strictly newer.
2631
-am_sleep_pid=
2632
-if grep 'slept: no' conftest.file >/dev/null 2>&1; then
2633
-  ( sleep 1 ) &
2634
-  am_sleep_pid=$!
2635
-fi
2636
-
2637
-rm -f conftest.file
2638
-
2639 2629
 test "$program_prefix" != NONE &&
2640 2630
   program_transform_name="s&^&$program_prefix&;$program_transform_name"
2641 2631
 # Use a double $ so make ignores it.
... ...
@@ -2662,8 +2644,8 @@ if eval "$MISSING --run true"; then
2662 2662
   am_missing_run="$MISSING --run "
2663 2663
 else
2664 2664
   am_missing_run=
2665
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5
2666
-$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
2665
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5
2666
+$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
2667 2667
 fi
2668 2668
 
2669 2669
 if test x"${install_sh}" != xset; then
... ...
@@ -2675,10 +2657,10 @@ if test x"${install_sh}" != xset; then
2675 2675
   esac
2676 2676
 fi
2677 2677
 
2678
-# Installed binaries are usually stripped using 'strip' when the user
2679
-# run "make install-strip".  However 'strip' might not be the right
2678
+# Installed binaries are usually stripped using `strip' when the user
2679
+# run `make install-strip'.  However `strip' might not be the right
2680 2680
 # tool to use in cross-compilation environments, therefore Automake
2681
-# will honor the 'STRIP' environment variable to overrule this program.
2681
+# will honor the `STRIP' environment variable to overrule this program.
2682 2682
 if test "$cross_compiling" != no; then
2683 2683
   if test -n "$ac_tool_prefix"; then
2684 2684
   # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
... ...
@@ -2817,6 +2799,12 @@ fi
2817 2817
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
2818 2818
 $as_echo "$MKDIR_P" >&6; }
2819 2819
 
2820
+mkdir_p="$MKDIR_P"
2821
+case $mkdir_p in
2822
+  [\\/$]* | ?:[\\/]*) ;;
2823
+  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
2824
+esac
2825
+
2820 2826
 for ac_prog in gawk mawk nawk awk
2821 2827
 do
2822 2828
   # Extract the first word of "$ac_prog", so it can be a program name with args.
... ...
@@ -2940,12 +2928,6 @@ AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
2940 2940
 
2941 2941
 MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
2942 2942
 
2943
-# For better backward compatibility.  To be removed once Automake 1.9.x
2944
-# dies out for good.  For more background, see:
2945
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
2946
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
2947
-mkdir_p='$(MKDIR_P)'
2948
-
2949 2943
 # We need awk for the "check" target.  The system "awk" is bad on
2950 2944
 # some platforms.
2951 2945
 # Always define AMTAR for backward compatibility.  Yes, it's still used
... ...
@@ -2959,7 +2941,7 @@ $as_echo_n "checking how to create a pax tar archive... " >&6; }
2959 2959
 _am_tools='gnutar  pax cpio none'
2960 2960
 _am_tools=${am_cv_prog_tar_pax-$_am_tools}
2961 2961
 # Do not fold the above two line into one, because Tru64 sh and
2962
-# Solaris sh will not grok spaces in the rhs of '-'.
2962
+# Solaris sh will not grok spaces in the rhs of `-'.
2963 2963
 for _am_tool in $_am_tools
2964 2964
 do
2965 2965
   case $_am_tool in
... ...
@@ -3044,10 +3026,10 @@ if test "${enable_silent_rules+set}" = set; then :
3044 3044
   enableval=$enable_silent_rules;
3045 3045
 fi
3046 3046
 
3047
-case $enable_silent_rules in # (((
3048
-  yes) AM_DEFAULT_VERBOSITY=0;;
3049
-   no) AM_DEFAULT_VERBOSITY=1;;
3050
-    *) AM_DEFAULT_VERBOSITY=0;;
3047
+case $enable_silent_rules in
3048
+yes) AM_DEFAULT_VERBOSITY=0;;
3049
+no)  AM_DEFAULT_VERBOSITY=1;;
3050
+*)   AM_DEFAULT_VERBOSITY=0;;
3051 3051
 esac
3052 3052
 am_make=${MAKE-make}
3053 3053
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
... ...
@@ -3078,276 +3060,29 @@ else
3078 3078
 fi
3079 3079
 AM_BACKSLASH='\'
3080 3080
 
3081
-DEPDIR="${am__leading_dot}deps"
3082
-
3083
-ac_config_commands="$ac_config_commands depfiles"
3084
-
3085
-
3086
-am_make=${MAKE-make}
3087
-cat > confinc << 'END'
3088
-am__doit:
3089
-	@echo this is the am__doit target
3090
-.PHONY: am__doit
3091
-END
3092
-# If we don't find an include directive, just comment out the code.
3093
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5
3094
-$as_echo_n "checking for style of include used by $am_make... " >&6; }
3095
-am__include="#"
3096
-am__quote=
3097
-_am_result=none
3098
-# First try GNU make style include.
3099
-echo "include confinc" > confmf
3100
-# Ignore all kinds of additional output from 'make'.
3101
-case `$am_make -s -f confmf 2> /dev/null` in #(
3102
-*the\ am__doit\ target*)
3103
-  am__include=include
3104
-  am__quote=
3105
-  _am_result=GNU
3106
-  ;;
3107
-esac
3108
-# Now try BSD make style include.
3109
-if test "$am__include" = "#"; then
3110
-   echo '.include "confinc"' > confmf
3111
-   case `$am_make -s -f confmf 2> /dev/null` in #(
3112
-   *the\ am__doit\ target*)
3113
-     am__include=.include
3114
-     am__quote="\""
3115
-     _am_result=BSD
3116
-     ;;
3117
-   esac
3118
-fi
3119
-
3120
-
3121
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5
3122
-$as_echo "$_am_result" >&6; }
3123
-rm -f confinc confmf
3124
-
3125
-# Check whether --enable-dependency-tracking was given.
3126
-if test "${enable_dependency_tracking+set}" = set; then :
3127
-  enableval=$enable_dependency_tracking;
3128
-fi
3129
-
3130
-if test "x$enable_dependency_tracking" != xno; then
3131
-  am_depcomp="$ac_aux_dir/depcomp"
3132
-  AMDEPBACKSLASH='\'
3133
-  am__nodep='_no'
3134
-fi
3135
- if test "x$enable_dependency_tracking" != xno; then
3136
-  AMDEP_TRUE=
3137
-  AMDEP_FALSE='#'
3138
-else
3139
-  AMDEP_TRUE='#'
3140
-  AMDEP_FALSE=
3141
-fi
3142
-
3143
-
3144
-ac_ext=c
3145
-ac_cpp='$CPP $CPPFLAGS'
3146
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
3147
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
3148
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
3149
-if test -n "$ac_tool_prefix"; then
3150
-  # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
3151
-set dummy ${ac_tool_prefix}gcc; ac_word=$2
3152
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
3153
-$as_echo_n "checking for $ac_word... " >&6; }
3154
-if ${ac_cv_prog_CC+:} false; then :
3155
-  $as_echo_n "(cached) " >&6
3156
-else
3157
-  if test -n "$CC"; then
3158
-  ac_cv_prog_CC="$CC" # Let the user override the test.
3159
-else
3160
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
3161
-for as_dir in $PATH
3162
-do
3163
-  IFS=$as_save_IFS
3164
-  test -z "$as_dir" && as_dir=.
3165
-    for ac_exec_ext in '' $ac_executable_extensions; do
3166
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
3167
-    ac_cv_prog_CC="${ac_tool_prefix}gcc"
3168
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
3169
-    break 2
3170
-  fi
3171
-done
3172
-  done
3173
-IFS=$as_save_IFS
3174
-
3175
-fi
3176
-fi
3177
-CC=$ac_cv_prog_CC
3178
-if test -n "$CC"; then
3179
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
3180
-$as_echo "$CC" >&6; }
3181
-else
3182
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
3183
-$as_echo "no" >&6; }
3184
-fi
3185
-
3186
-
3187
-fi
3188
-if test -z "$ac_cv_prog_CC"; then
3189
-  ac_ct_CC=$CC
3190
-  # Extract the first word of "gcc", so it can be a program name with args.
3191
-set dummy gcc; ac_word=$2
3192
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
3193
-$as_echo_n "checking for $ac_word... " >&6; }
3194
-if ${ac_cv_prog_ac_ct_CC+:} false; then :
3195
-  $as_echo_n "(cached) " >&6
3196
-else
3197
-  if test -n "$ac_ct_CC"; then
3198
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
3199
-else
3200
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
3201
-for as_dir in $PATH
3202
-do
3203
-  IFS=$as_save_IFS
3204
-  test -z "$as_dir" && as_dir=.
3205
-    for ac_exec_ext in '' $ac_executable_extensions; do
3206
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
3207
-    ac_cv_prog_ac_ct_CC="gcc"
3208
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
3209
-    break 2
3210
-  fi
3211
-done
3212
-  done
3213
-IFS=$as_save_IFS
3214
-
3215
-fi
3216
-fi
3217
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
3218
-if test -n "$ac_ct_CC"; then
3219
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
3220
-$as_echo "$ac_ct_CC" >&6; }
3221
-else
3222
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
3223
-$as_echo "no" >&6; }
3224
-fi
3225 3081
 
3226
-  if test "x$ac_ct_CC" = x; then
3227
-    CC=""
3082
+cxxset=${CXXFLAGS+set}
3083
+ac_ext=cpp
3084
+ac_cpp='$CXXCPP $CPPFLAGS'
3085
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
3086
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
3087
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
3088
+if test -z "$CXX"; then
3089
+  if test -n "$CCC"; then
3090
+    CXX=$CCC
3228 3091
   else
3229
-    case $cross_compiling:$ac_tool_warned in
3230
-yes:)
3231
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
3232
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
3233
-ac_tool_warned=yes ;;
3234
-esac
3235
-    CC=$ac_ct_CC
3236
-  fi
3237
-else
3238
-  CC="$ac_cv_prog_CC"
3239
-fi
3240
-
3241
-if test -z "$CC"; then
3242
-          if test -n "$ac_tool_prefix"; then
3243
-    # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
3244
-set dummy ${ac_tool_prefix}cc; ac_word=$2
3245
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
3246
-$as_echo_n "checking for $ac_word... " >&6; }
3247
-if ${ac_cv_prog_CC+:} false; then :
3248
-  $as_echo_n "(cached) " >&6
3249
-else
3250
-  if test -n "$CC"; then
3251
-  ac_cv_prog_CC="$CC" # Let the user override the test.
3252
-else
3253
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
3254
-for as_dir in $PATH
3255
-do
3256
-  IFS=$as_save_IFS
3257
-  test -z "$as_dir" && as_dir=.
3258
-    for ac_exec_ext in '' $ac_executable_extensions; do
3259
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
3260
-    ac_cv_prog_CC="${ac_tool_prefix}cc"
3261
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
3262
-    break 2
3263
-  fi
3264
-done
3265
-  done
3266
-IFS=$as_save_IFS
3267
-
3268
-fi
3269
-fi
3270
-CC=$ac_cv_prog_CC
3271
-if test -n "$CC"; then
3272
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
3273
-$as_echo "$CC" >&6; }
3274
-else
3275
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
3276
-$as_echo "no" >&6; }
3277
-fi
3278
-
3279
-
3280
-  fi
3281
-fi
3282
-if test -z "$CC"; then
3283
-  # Extract the first word of "cc", so it can be a program name with args.
3284
-set dummy cc; ac_word=$2
3285
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
3286
-$as_echo_n "checking for $ac_word... " >&6; }
3287
-if ${ac_cv_prog_CC+:} false; then :
3288
-  $as_echo_n "(cached) " >&6
3289
-else
3290
-  if test -n "$CC"; then
3291
-  ac_cv_prog_CC="$CC" # Let the user override the test.
3292
-else
3293
-  ac_prog_rejected=no
3294
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
3295
-for as_dir in $PATH
3296
-do
3297
-  IFS=$as_save_IFS
3298
-  test -z "$as_dir" && as_dir=.
3299
-    for ac_exec_ext in '' $ac_executable_extensions; do
3300
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
3301
-    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
3302
-       ac_prog_rejected=yes
3303
-       continue
3304
-     fi
3305
-    ac_cv_prog_CC="cc"
3306
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
3307
-    break 2
3308
-  fi
3309
-done
3310
-  done
3311
-IFS=$as_save_IFS
3312
-
3313
-if test $ac_prog_rejected = yes; then
3314
-  # We found a bogon in the path, so make sure we never use it.
3315
-  set dummy $ac_cv_prog_CC
3316
-  shift
3317
-  if test $# != 0; then
3318
-    # We chose a different compiler from the bogus one.
3319
-    # However, it has the same basename, so the bogon will be chosen
3320
-    # first if we set CC to just the basename; use the full file name.
3321
-    shift
3322
-    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
3323
-  fi
3324
-fi
3325
-fi
3326
-fi
3327
-CC=$ac_cv_prog_CC
3328
-if test -n "$CC"; then
3329
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
3330
-$as_echo "$CC" >&6; }
3331
-else
3332
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
3333
-$as_echo "no" >&6; }
3334
-fi
3335
-
3336
-
3337
-fi
3338
-if test -z "$CC"; then
3339
-  if test -n "$ac_tool_prefix"; then
3340
-  for ac_prog in cl.exe
3092
+    if test -n "$ac_tool_prefix"; then
3093
+  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
3341 3094
   do
3342 3095
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
3343 3096
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
3344 3097
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
3345 3098
 $as_echo_n "checking for $ac_word... " >&6; }
3346
-if ${ac_cv_prog_CC+:} false; then :
3099
+if ${ac_cv_prog_CXX+:} false; then :
3347 3100
   $as_echo_n "(cached) " >&6
3348 3101
 else
3349
-  if test -n "$CC"; then
3350
-  ac_cv_prog_CC="$CC" # Let the user override the test.
3102
+  if test -n "$CXX"; then
3103
+  ac_cv_prog_CXX="$CXX" # Let the user override the test.
3351 3104
 else
3352 3105
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
3353 3106
 for as_dir in $PATH
... ...
@@ -3356,7 +3091,7 @@ do
3356 3356
   test -z "$as_dir" && as_dir=.
3357 3357
     for ac_exec_ext in '' $ac_executable_extensions; do
3358 3358
   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
3359
-    ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
3359
+    ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
3360 3360
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
3361 3361
     break 2
3362 3362
   fi
... ...
@@ -3366,32 +3101,32 @@ IFS=$as_save_IFS
3366 3366
 
3367 3367
 fi
3368 3368
 fi
3369
-CC=$ac_cv_prog_CC
3370
-if test -n "$CC"; then
3371
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
3372
-$as_echo "$CC" >&6; }
3369
+CXX=$ac_cv_prog_CXX
3370
+if test -n "$CXX"; then
3371
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5
3372
+$as_echo "$CXX" >&6; }
3373 3373
 else
3374 3374
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
3375 3375
 $as_echo "no" >&6; }
3376 3376
 fi
3377 3377
 
3378 3378
 
3379
-    test -n "$CC" && break
3379
+    test -n "$CXX" && break
3380 3380
   done
3381 3381
 fi
3382
-if test -z "$CC"; then
3383
-  ac_ct_CC=$CC
3384
-  for ac_prog in cl.exe
3382
+if test -z "$CXX"; then
3383
+  ac_ct_CXX=$CXX
3384
+  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
3385 3385
 do
3386 3386
   # Extract the first word of "$ac_prog", so it can be a program name with args.
3387 3387
 set dummy $ac_prog; ac_word=$2
3388 3388
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
3389 3389
 $as_echo_n "checking for $ac_word... " >&6; }
3390
-if ${ac_cv_prog_ac_ct_CC+:} false; then :
3390
+if ${ac_cv_prog_ac_ct_CXX+:} false; then :
3391 3391
   $as_echo_n "(cached) " >&6
3392 3392
 else
3393
-  if test -n "$ac_ct_CC"; then
3394
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
3393
+  if test -n "$ac_ct_CXX"; then
3394
+  ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
3395 3395
 else
3396 3396
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
3397 3397
 for as_dir in $PATH
... ...
@@ -3400,7 +3135,7 @@ do
3400 3400
   test -z "$as_dir" && as_dir=.
3401 3401
     for ac_exec_ext in '' $ac_executable_extensions; do
3402 3402
   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
3403
-    ac_cv_prog_ac_ct_CC="$ac_prog"
3403
+    ac_cv_prog_ac_ct_CXX="$ac_prog"
3404 3404
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
3405 3405
     break 2
3406 3406
   fi
... ...
@@ -3410,21 +3145,21 @@ IFS=$as_save_IFS
3410 3410
 
3411 3411
 fi
3412 3412
 fi
3413
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
3414
-if test -n "$ac_ct_CC"; then
3415
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
3416
-$as_echo "$ac_ct_CC" >&6; }
3413
+ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
3414
+if test -n "$ac_ct_CXX"; then
3415
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5
3416
+$as_echo "$ac_ct_CXX" >&6; }
3417 3417
 else
3418 3418
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
3419 3419
 $as_echo "no" >&6; }
3420 3420
 fi
3421 3421
 
3422 3422
 
3423
-  test -n "$ac_ct_CC" && break
3423
+  test -n "$ac_ct_CXX" && break
3424 3424
 done
3425 3425
 
3426
-  if test "x$ac_ct_CC" = x; then
3427
-    CC=""
3426
+  if test "x$ac_ct_CXX" = x; then
3427
+    CXX="g++"
3428 3428
   else
3429 3429
     case $cross_compiling:$ac_tool_warned in
3430 3430
 yes:)
... ...
@@ -3432,20 +3167,14 @@ yes:)
3432 3432
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
3433 3433
 ac_tool_warned=yes ;;
3434 3434
 esac
3435
-    CC=$ac_ct_CC
3435
+    CXX=$ac_ct_CXX
3436 3436
   fi
3437 3437
 fi
3438 3438
 
3439
+  fi
3439 3440
 fi
3440
-
3441
-
3442
-test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
3443
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
3444
-as_fn_error $? "no acceptable C compiler found in \$PATH
3445
-See \`config.log' for more details" "$LINENO" 5; }
3446
-
3447 3441
 # Provide some information about the compiler.
3448
-$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
3442
+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5
3449 3443
 set X $ac_compile
3450 3444
 ac_compiler=$2
3451 3445
 for ac_option in --version -v -V -qversion; do
... ...
@@ -3485,8 +3214,8 @@ ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
3485 3485
 # Try to create an executable without -o first, disregard a.out.
3486 3486
 # It will help us diagnose broken compilers, and finding out an intuition
3487 3487
 # of exeext.
3488
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
3489
-$as_echo_n "checking whether the C compiler works... " >&6; }
3488
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C++ compiler works" >&5
3489
+$as_echo_n "checking whether the C++ compiler works... " >&6; }
3490 3490
 ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
3491 3491
 
3492 3492
 # The possible output files:
... ...
@@ -3556,14 +3285,14 @@ sed 's/^/| /' conftest.$ac_ext >&5
3556 3556
 
3557 3557
 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
3558 3558
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
3559
-as_fn_error 77 "C compiler cannot create executables
3559
+as_fn_error 77 "C++ compiler cannot create executables
3560 3560
 See \`config.log' for more details" "$LINENO" 5; }
3561 3561
 else
3562 3562
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
3563 3563
 $as_echo "yes" >&6; }
3564 3564
 fi
3565
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
3566
-$as_echo_n "checking for C compiler default output file name... " >&6; }
3565
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler default output file name" >&5
3566
+$as_echo_n "checking for C++ compiler default output file name... " >&6; }
3567 3567
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
3568 3568
 $as_echo "$ac_file" >&6; }
3569 3569
 ac_exeext=$ac_cv_exeext
... ...
@@ -3657,7 +3386,7 @@ $as_echo "$ac_try_echo"; } >&5
3657 3657
     else
3658 3658
 	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
3659 3659
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
3660
-as_fn_error $? "cannot run C compiled programs.
3660
+as_fn_error $? "cannot run C++ compiled programs.
3661 3661
 If you meant to cross compile, use \`--host'.
3662 3662
 See \`config.log' for more details" "$LINENO" 5; }
3663 3663
     fi
... ...
@@ -3719,9 +3448,9 @@ fi
3719 3719
 $as_echo "$ac_cv_objext" >&6; }
3720 3720
 OBJEXT=$ac_cv_objext
3721 3721
 ac_objext=$OBJEXT
3722
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
3723
-$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
3724
-if ${ac_cv_c_compiler_gnu+:} false; then :
3722
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5
3723
+$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
3724
+if ${ac_cv_cxx_compiler_gnu+:} false; then :
3725 3725
   $as_echo_n "(cached) " >&6
3726 3726
 else
3727 3727
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
... ...
@@ -3738,33 +3467,33 @@ main ()
3738 3738
   return 0;
3739 3739
 }
3740 3740
 _ACEOF
3741
-if ac_fn_c_try_compile "$LINENO"; then :
3741
+if ac_fn_cxx_try_compile "$LINENO"; then :
3742 3742
   ac_compiler_gnu=yes
3743 3743
 else
3744 3744
   ac_compiler_gnu=no
3745 3745
 fi
3746 3746
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
3747
-ac_cv_c_compiler_gnu=$ac_compiler_gnu
3747
+ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
3748 3748
 
3749 3749
 fi
3750
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
3751
-$as_echo "$ac_cv_c_compiler_gnu" >&6; }
3750
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5
3751
+$as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
3752 3752
 if test $ac_compiler_gnu = yes; then
3753
-  GCC=yes
3753
+  GXX=yes
3754 3754
 else
3755
-  GCC=
3755
+  GXX=
3756 3756
 fi
3757
-ac_test_CFLAGS=${CFLAGS+set}
3758
-ac_save_CFLAGS=$CFLAGS
3759
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
3760
-$as_echo_n "checking whether $CC accepts -g... " >&6; }
3761
-if ${ac_cv_prog_cc_g+:} false; then :
3757
+ac_test_CXXFLAGS=${CXXFLAGS+set}
3758
+ac_save_CXXFLAGS=$CXXFLAGS
3759
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
3760
+$as_echo_n "checking whether $CXX accepts -g... " >&6; }
3761
+if ${ac_cv_prog_cxx_g+:} false; then :
3762 3762
   $as_echo_n "(cached) " >&6
3763 3763
 else
3764
-  ac_save_c_werror_flag=$ac_c_werror_flag
3765
-   ac_c_werror_flag=yes
3766
-   ac_cv_prog_cc_g=no
3767
-   CFLAGS="-g"
3764
+  ac_save_cxx_werror_flag=$ac_cxx_werror_flag
3765
+   ac_cxx_werror_flag=yes
3766
+   ac_cv_prog_cxx_g=no
3767
+   CXXFLAGS="-g"
3768 3768
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
3769 3769
 /* end confdefs.h.  */
3770 3770
 
... ...
@@ -3776,10 +3505,10 @@ main ()
3776 3776
   return 0;
3777 3777
 }
3778 3778
 _ACEOF
3779
-if ac_fn_c_try_compile "$LINENO"; then :
3780
-  ac_cv_prog_cc_g=yes
3779
+if ac_fn_cxx_try_compile "$LINENO"; then :
3780
+  ac_cv_prog_cxx_g=yes
3781 3781
 else
3782
-  CFLAGS=""
3782
+  CXXFLAGS=""
3783 3783
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
3784 3784
 /* end confdefs.h.  */
3785 3785
 
... ...
@@ -3791,11 +3520,11 @@ main ()
3791 3791
   return 0;
3792 3792
 }
3793 3793
 _ACEOF
3794
-if ac_fn_c_try_compile "$LINENO"; then :
3794
+if ac_fn_cxx_try_compile "$LINENO"; then :
3795 3795
 
3796 3796
 else
3797
-  ac_c_werror_flag=$ac_save_c_werror_flag
3798
-	 CFLAGS="-g"
3797
+  ac_cxx_werror_flag=$ac_save_cxx_werror_flag
3798
+	 CXXFLAGS="-g"
3799 3799
 	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
3800 3800
 /* end confdefs.h.  */
3801 3801
 
... ...
@@ -3807,142 +3536,115 @@ main ()
3807 3807
   return 0;
3808 3808
 }
3809 3809
 _ACEOF
3810
-if ac_fn_c_try_compile "$LINENO"; then :
3811
-  ac_cv_prog_cc_g=yes
3810
+if ac_fn_cxx_try_compile "$LINENO"; then :
3811
+  ac_cv_prog_cxx_g=yes
3812 3812
 fi
3813 3813
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
3814 3814
 fi
3815 3815
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
3816 3816
 fi
3817 3817
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
3818
-   ac_c_werror_flag=$ac_save_c_werror_flag
3818
+   ac_cxx_werror_flag=$ac_save_cxx_werror_flag
3819 3819
 fi
3820
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
3821
-$as_echo "$ac_cv_prog_cc_g" >&6; }
3822
-if test "$ac_test_CFLAGS" = set; then
3823
-  CFLAGS=$ac_save_CFLAGS
3824
-elif test $ac_cv_prog_cc_g = yes; then
3825
-  if test "$GCC" = yes; then
3826
-    CFLAGS="-g -O2"
3820
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5
3821
+$as_echo "$ac_cv_prog_cxx_g" >&6; }
3822
+if test "$ac_test_CXXFLAGS" = set; then
3823
+  CXXFLAGS=$ac_save_CXXFLAGS
3824
+elif test $ac_cv_prog_cxx_g = yes; then
3825
+  if test "$GXX" = yes; then
3826
+    CXXFLAGS="-g -O2"
3827 3827
   else
3828
-    CFLAGS="-g"
3828
+    CXXFLAGS="-g"
3829 3829
   fi
3830 3830
 else
3831
-  if test "$GCC" = yes; then
3832
-    CFLAGS="-O2"
3831
+  if test "$GXX" = yes; then
3832
+    CXXFLAGS="-O2"
3833 3833
   else
3834
-    CFLAGS=
3834
+    CXXFLAGS=
3835 3835
   fi
3836 3836
 fi
3837
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
3838
-$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
3839
-if ${ac_cv_prog_cc_c89+:} false; then :
3840
-  $as_echo_n "(cached) " >&6
3841
-else
3842
-  ac_cv_prog_cc_c89=no
3843
-ac_save_CC=$CC
3844
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
3845
-/* end confdefs.h.  */
3846
-#include <stdarg.h>
3847
-#include <stdio.h>
3848
-struct stat;
3849
-/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
3850
-struct buf { int x; };
3851
-FILE * (*rcsopen) (struct buf *, struct stat *, int);
3852
-static char *e (p, i)
3853
-     char **p;
3854
-     int i;
3855
-{
3856
-  return p[i];
3857
-}
3858
-static char *f (char * (*g) (char **, int), char **p, ...)
3859
-{
3860
-  char *s;
3861
-  va_list v;
3862
-  va_start (v,p);
3863
-  s = g (p, va_arg (v,int));
3864
-  va_end (v);
3865
-  return s;
3866
-}
3837
+ac_ext=c
3838
+ac_cpp='$CPP $CPPFLAGS'
3839
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
3840
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
3841
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
3842
+DEPDIR="${am__leading_dot}deps"
3867 3843
 
3868
-/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
3869
-   function prototypes and stuff, but not '\xHH' hex character constants.
3870
-   These don't provoke an error unfortunately, instead are silently treated
3871
-   as 'x'.  The following induces an error, until -std is added to get
3872
-   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
3873
-   array size at least.  It's necessary to write '\x00'==0 to get something
3874
-   that's true only with -std.  */
3875
-int osf4_cc_array ['\x00' == 0 ? 1 : -1];
3844
+ac_config_commands="$ac_config_commands depfiles"
3876 3845
 
3877
-/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
3878
-   inside strings and character constants.  */
3879
-#define FOO(x) 'x'
3880
-int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
3881 3846
 
3882
-int test (int i, double x);
3883
-struct s1 {int (*f) (int a);};
3884
-struct s2 {int (*f) (double a);};
3885
-int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
3886
-int argc;
3887
-char **argv;
3888
-int
3889
-main ()
3890
-{
3891
-return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
3892
-  ;
3893
-  return 0;
3894
-}
3895
-_ACEOF
3896
-for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
3897
-	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
3898
-do
3899
-  CC="$ac_save_CC $ac_arg"
3900
-  if ac_fn_c_try_compile "$LINENO"; then :
3901
-  ac_cv_prog_cc_c89=$ac_arg
3847
+am_make=${MAKE-make}
3848
+cat > confinc << 'END'
3849
+am__doit:
3850
+	@echo this is the am__doit target
3851
+.PHONY: am__doit
3852
+END
3853
+# If we don't find an include directive, just comment out the code.
3854
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5
3855
+$as_echo_n "checking for style of include used by $am_make... " >&6; }
3856
+am__include="#"
3857
+am__quote=
3858
+_am_result=none
3859
+# First try GNU make style include.
3860
+echo "include confinc" > confmf
3861
+# Ignore all kinds of additional output from `make'.
3862
+case `$am_make -s -f confmf 2> /dev/null` in #(
3863
+*the\ am__doit\ target*)
3864
+  am__include=include
3865
+  am__quote=
3866
+  _am_result=GNU
3867
+  ;;
3868
+esac
3869
+# Now try BSD make style include.
3870
+if test "$am__include" = "#"; then
3871
+   echo '.include "confinc"' > confmf
3872
+   case `$am_make -s -f confmf 2> /dev/null` in #(
3873
+   *the\ am__doit\ target*)
3874
+     am__include=.include
3875
+     am__quote="\""
3876
+     _am_result=BSD
3877
+     ;;
3878
+   esac
3902 3879
 fi
3903
-rm -f core conftest.err conftest.$ac_objext
3904
-  test "x$ac_cv_prog_cc_c89" != "xno" && break
3905
-done
3906
-rm -f conftest.$ac_ext
3907
-CC=$ac_save_CC
3908 3880
 
3881
+
3882
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5
3883
+$as_echo "$_am_result" >&6; }
3884
+rm -f confinc confmf
3885
+
3886
+# Check whether --enable-dependency-tracking was given.
3887
+if test "${enable_dependency_tracking+set}" = set; then :
3888
+  enableval=$enable_dependency_tracking;
3909 3889
 fi
3910
-# AC_CACHE_VAL
3911
-case "x$ac_cv_prog_cc_c89" in
3912
-  x)
3913
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
3914
-$as_echo "none needed" >&6; } ;;
3915
-  xno)
3916
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
3917
-$as_echo "unsupported" >&6; } ;;
3918
-  *)
3919
-    CC="$CC $ac_cv_prog_cc_c89"
3920
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
3921
-$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
3922
-esac
3923
-if test "x$ac_cv_prog_cc_c89" != xno; then :
3924 3890
 
3891
+if test "x$enable_dependency_tracking" != xno; then
3892
+  am_depcomp="$ac_aux_dir/depcomp"
3893
+  AMDEPBACKSLASH='\'
3894
+  am__nodep='_no'
3895
+fi
3896
+ if test "x$enable_dependency_tracking" != xno; then
3897
+  AMDEP_TRUE=
3898
+  AMDEP_FALSE='#'
3899
+else
3900
+  AMDEP_TRUE='#'
3901
+  AMDEP_FALSE=
3925 3902
 fi
3926 3903
 
3927
-ac_ext=c
3928
-ac_cpp='$CPP $CPPFLAGS'
3929
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
3930
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
3931
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
3932 3904
 
3933
-depcc="$CC"   am_compiler_list=
3905
+
3906
+depcc="$CXX"  am_compiler_list=
3934 3907
 
3935 3908
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
3936 3909
 $as_echo_n "checking dependency style of $depcc... " >&6; }
3937
-if ${am_cv_CC_dependencies_compiler_type+:} false; then :
3910
+if ${am_cv_CXX_dependencies_compiler_type+:} false; then :
3938 3911
   $as_echo_n "(cached) " >&6
3939 3912
 else
3940 3913
   if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
3941 3914
   # We make a subdir and do the tests there.  Otherwise we can end up
3942 3915
   # making bogus files that we don't know about and never remove.  For
3943 3916
   # instance it was reported that on HP-UX the gcc test will end up
3944
-  # making a dummy file named 'D' -- because '-MD' means "put the output
3945
-  # in D".
3917
+  # making a dummy file named `D' -- because `-MD' means `put the output
3918
+  # in D'.
3946 3919
   rm -rf conftest.dir
3947 3920
   mkdir conftest.dir
3948 3921
   # Copy depcomp to subdir because otherwise we won't find it if we're
... ...
@@ -3957,7 +3659,7 @@ else
3957 3957
   # directory.
3958 3958
   mkdir sub
3959 3959
 
3960
-  am_cv_CC_dependencies_compiler_type=none
3960
+  am_cv_CXX_dependencies_compiler_type=none
3961 3961
   if test "$am_compiler_list" = ""; then
3962 3962
      am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
3963 3963
   fi
... ...
@@ -3977,16 +3679,16 @@ else
3977 3977
     : > sub/conftest.c
3978 3978
     for i in 1 2 3 4 5 6; do
3979 3979
       echo '#include "conftst'$i'.h"' >> sub/conftest.c
3980
-      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
3981
-      # Solaris 10 /bin/sh.
3982
-      echo '/* dummy */' > sub/conftst$i.h
3980
+      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
3981
+      # Solaris 8's {/usr,}/bin/sh.
3982
+      touch sub/conftst$i.h
3983 3983
     done
3984 3984
     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
3985 3985
 
3986
-    # We check with '-c' and '-o' for the sake of the "dashmstdout"
3986
+    # We check with `-c' and `-o' for the sake of the "dashmstdout"
3987 3987
     # mode.  It turns out that the SunPro C++ compiler does not properly
3988
-    # handle '-M -o', and we need to detect this.  Also, some Intel
3989
-    # versions had trouble with output in subdirs.
3988
+    # handle `-M -o', and we need to detect this.  Also, some Intel
3989
+    # versions had trouble with output in subdirs
3990 3990
     am__obj=sub/conftest.${OBJEXT-o}
3991 3991
     am__minus_obj="-o $am__obj"
3992 3992
     case $depmode in
... ...
@@ -3995,8 +3697,8 @@ else
3995 3995
       test "$am__universal" = false || continue
3996 3996
       ;;
3997 3997
     nosideeffect)
3998
-      # After this tag, mechanisms are not by side-effect, so they'll
3999
-      # only be used when explicitly requested.
3998
+      # after this tag, mechanisms are not by side-effect, so they'll
3999
+      # only be used when explicitly requested
4000 4000
       if test "x$enable_dependency_tracking" = xyes; then
4001 4001
 	continue
4002 4002
       else
... ...
@@ -4004,7 +3706,7 @@ else
4004 4004
       fi
4005 4005
       ;;
4006 4006
     msvc7 | msvc7msys | msvisualcpp | msvcmsys)
4007
-      # This compiler won't grok '-c -o', but also, the minuso test has
4007
+      # This compiler won't grok `-c -o', but also, the minuso test has
4008 4008
       # not run yet.  These depmodes are late enough in the game, and
4009 4009
       # so weak that their functioning should not be impacted.
4010 4010
       am__obj=conftest.${OBJEXT-o}
... ...
@@ -4030,7 +3732,7 @@ else
4030 4030
       #   icc: Command line remark: option '-MP' not supported
4031 4031
       if (grep 'ignoring option' conftest.err ||
4032 4032
           grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
4033
-        am_cv_CC_dependencies_compiler_type=$depmode
4033
+        am_cv_CXX_dependencies_compiler_type=$depmode
4034 4034
         break
4035 4035
       fi
4036 4036
     fi
... ...
@@ -4039,38 +3741,40 @@ else
4039 4039
   cd ..
4040 4040
   rm -rf conftest.dir
4041 4041
 else
4042
-  am_cv_CC_dependencies_compiler_type=none
4042
+  am_cv_CXX_dependencies_compiler_type=none
4043 4043
 fi
4044 4044
 
4045 4045
 fi
4046
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
4047
-$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
4048
-CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
4046
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CXX_dependencies_compiler_type" >&5
4047
+$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; }
4048
+CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
4049 4049
 
4050 4050
  if
4051 4051
   test "x$enable_dependency_tracking" != xno \
4052
-  && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
4053
-  am__fastdepCC_TRUE=
4054
-  am__fastdepCC_FALSE='#'
4052
+  && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then
4053
+  am__fastdepCXX_TRUE=
4054
+  am__fastdepCXX_FALSE='#'
4055 4055
 else
4056
-  am__fastdepCC_TRUE='#'
4057
-  am__fastdepCC_FALSE=
4056
+  am__fastdepCXX_TRUE='#'
4057
+  am__fastdepCXX_FALSE=
4058 4058
 fi
4059 4059
 
4060 4060
 
4061
-
4061
+ac_ext=c
4062
+ac_cpp='$CPP $CPPFLAGS'
4063
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
4064
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
4065
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
4062 4066
 if test -n "$ac_tool_prefix"; then
4063
-  for ac_prog in ar lib "link -lib"
4064
-  do
4065
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
4066
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
4067
+  # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
4068
+set dummy ${ac_tool_prefix}gcc; ac_word=$2
4067 4069
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4068 4070
 $as_echo_n "checking for $ac_word... " >&6; }
4069
-if ${ac_cv_prog_AR+:} false; then :
4071
+if ${ac_cv_prog_CC+:} false; then :
4070 4072
   $as_echo_n "(cached) " >&6
4071 4073
 else
4072
-  if test -n "$AR"; then
4073
-  ac_cv_prog_AR="$AR" # Let the user override the test.
4074
+  if test -n "$CC"; then
4075
+  ac_cv_prog_CC="$CC" # Let the user override the test.
4074 4076
 else
4075 4077
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
4076 4078
 for as_dir in $PATH
... ...
@@ -4079,7 +3783,7 @@ do
4079 4079
   test -z "$as_dir" && as_dir=.
4080 4080
     for ac_exec_ext in '' $ac_executable_extensions; do
4081 4081
   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
4082
-    ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
4082
+    ac_cv_prog_CC="${ac_tool_prefix}gcc"
4083 4083
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4084 4084
     break 2
4085 4085
   fi
... ...
@@ -4089,32 +3793,28 @@ IFS=$as_save_IFS
4089 4089
 
4090 4090
 fi
4091 4091
 fi
4092
-AR=$ac_cv_prog_AR
4093
-if test -n "$AR"; then
4094
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
4095
-$as_echo "$AR" >&6; }
4092
+CC=$ac_cv_prog_CC
4093
+if test -n "$CC"; then
4094
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
4095
+$as_echo "$CC" >&6; }
4096 4096
 else
4097 4097
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4098 4098
 $as_echo "no" >&6; }
4099 4099
 fi
4100 4100
 
4101 4101
 
4102
-    test -n "$AR" && break
4103
-  done
4104 4102
 fi
4105
-if test -z "$AR"; then
4106
-  ac_ct_AR=$AR
4107
-  for ac_prog in ar lib "link -lib"
4108
-do
4109
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
4110
-set dummy $ac_prog; ac_word=$2
4103
+if test -z "$ac_cv_prog_CC"; then
4104
+  ac_ct_CC=$CC
4105
+  # Extract the first word of "gcc", so it can be a program name with args.
4106
+set dummy gcc; ac_word=$2
4111 4107
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4112 4108
 $as_echo_n "checking for $ac_word... " >&6; }
4113
-if ${ac_cv_prog_ac_ct_AR+:} false; then :
4109
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
4114 4110
   $as_echo_n "(cached) " >&6
4115 4111
 else
4116
-  if test -n "$ac_ct_AR"; then
4117
-  ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
4112
+  if test -n "$ac_ct_CC"; then
4113
+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
4118 4114
 else
4119 4115
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
4120 4116
 for as_dir in $PATH
... ...
@@ -4123,7 +3823,7 @@ do
4123 4123
   test -z "$as_dir" && as_dir=.
4124 4124
     for ac_exec_ext in '' $ac_executable_extensions; do
4125 4125
   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
4126
-    ac_cv_prog_ac_ct_AR="$ac_prog"
4126
+    ac_cv_prog_ac_ct_CC="gcc"
4127 4127
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4128 4128
     break 2
4129 4129
   fi
... ...
@@ -4133,21 +3833,17 @@ IFS=$as_save_IFS
4133 4133
 
4134 4134
 fi
4135 4135
 fi
4136
-ac_ct_AR=$ac_cv_prog_ac_ct_AR
4137
-if test -n "$ac_ct_AR"; then
4138
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
4139
-$as_echo "$ac_ct_AR" >&6; }
4136
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
4137
+if test -n "$ac_ct_CC"; then
4138
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
4139
+$as_echo "$ac_ct_CC" >&6; }
4140 4140
 else
4141 4141
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4142 4142
 $as_echo "no" >&6; }
4143 4143
 fi
4144 4144
 
4145
-
4146
-  test -n "$ac_ct_AR" && break
4147
-done
4148
-
4149
-  if test "x$ac_ct_AR" = x; then
4150
-    AR="false"
4145
+  if test "x$ac_ct_CC" = x; then
4146
+    CC=""
4151 4147
   else
4152 4148
     case $cross_compiling:$ac_tool_warned in
4153 4149
 yes:)
... ...
@@ -4155,219 +3851,122 @@ yes:)
4155 4155
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
4156 4156
 ac_tool_warned=yes ;;
4157 4157
 esac
4158
-    AR=$ac_ct_AR
4158
+    CC=$ac_ct_CC
4159 4159
   fi
4160
+else
4161
+  CC="$ac_cv_prog_CC"
4160 4162
 fi
4161 4163
 
4162
-: ${AR=ar}
4163
-
4164
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the archiver ($AR) interface" >&5
4165
-$as_echo_n "checking the archiver ($AR) interface... " >&6; }
4166
-if ${am_cv_ar_interface+:} false; then :
4164
+if test -z "$CC"; then
4165
+          if test -n "$ac_tool_prefix"; then
4166
+    # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
4167
+set dummy ${ac_tool_prefix}cc; ac_word=$2
4168
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4169
+$as_echo_n "checking for $ac_word... " >&6; }
4170
+if ${ac_cv_prog_CC+:} false; then :
4167 4171
   $as_echo_n "(cached) " >&6
4168 4172
 else
4169
-  am_cv_ar_interface=ar
4170
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
4171
-/* end confdefs.h.  */
4172
-int some_variable = 0;
4173
-_ACEOF
4174
-if ac_fn_c_try_compile "$LINENO"; then :
4175
-  am_ar_try='$AR cru libconftest.a conftest.$ac_objext >&5'
4176
-      { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$am_ar_try\""; } >&5
4177
-  (eval $am_ar_try) 2>&5
4178
-  ac_status=$?
4179
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
4180
-  test $ac_status = 0; }
4181
-      if test "$ac_status" -eq 0; then
4182
-        am_cv_ar_interface=ar
4183
-      else
4184
-        am_ar_try='$AR -NOLOGO -OUT:conftest.lib conftest.$ac_objext >&5'
4185
-        { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$am_ar_try\""; } >&5
4186
-  (eval $am_ar_try) 2>&5
4187
-  ac_status=$?
4188
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
4189
-  test $ac_status = 0; }
4190
-        if test "$ac_status" -eq 0; then
4191
-          am_cv_ar_interface=lib
4192
-        else
4193
-          am_cv_ar_interface=unknown
4194
-        fi
4195
-      fi
4196
-      rm -f conftest.lib libconftest.a
4173
+  if test -n "$CC"; then
4174
+  ac_cv_prog_CC="$CC" # Let the user override the test.
4175
+else
4176
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
4177
+for as_dir in $PATH
4178
+do
4179
+  IFS=$as_save_IFS
4180
+  test -z "$as_dir" && as_dir=.
4181
+    for ac_exec_ext in '' $ac_executable_extensions; do
4182
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
4183
+    ac_cv_prog_CC="${ac_tool_prefix}cc"
4184
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4185
+    break 2
4186
+  fi
4187
+done
4188
+  done
4189
+IFS=$as_save_IFS
4197 4190
 
4198 4191
 fi
4199
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
4200
-
4201 4192
 fi
4202
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_ar_interface" >&5
4203
-$as_echo "$am_cv_ar_interface" >&6; }
4193
+CC=$ac_cv_prog_CC
4194
+if test -n "$CC"; then
4195
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
4196
+$as_echo "$CC" >&6; }
4197
+else
4198
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4199
+$as_echo "no" >&6; }
4200
+fi
4204 4201
 
4205
-case $am_cv_ar_interface in
4206
-ar)
4207
-  ;;
4208
-lib)
4209
-  # Microsoft lib, so override with the ar-lib wrapper script.
4210
-  # FIXME: It is wrong to rewrite AR.
4211
-  # But if we don't then we get into trouble of one sort or another.
4212
-  # A longer-term fix would be to have automake use am__AR in this case,
4213
-  # and then we could set am__AR="$am_aux_dir/ar-lib \$(AR)" or something
4214
-  # similar.
4215
-  AR="$am_aux_dir/ar-lib $AR"
4216
-  ;;
4217
-unknown)
4218
-  as_fn_error $? "could not determine $AR interface" "$LINENO" 5
4219
-  ;;
4220
-esac
4221 4202
 
4222
-if test "x$CC" != xcc; then
4223
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC and cc understand -c and -o together" >&5
4224
-$as_echo_n "checking whether $CC and cc understand -c and -o together... " >&6; }
4225
-else
4226
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cc understands -c and -o together" >&5
4227
-$as_echo_n "checking whether cc understands -c and -o together... " >&6; }
4203
+  fi
4228 4204
 fi
4229
-set dummy $CC; ac_cc=`$as_echo "$2" |
4230
-		      sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
4231
-if eval \${ac_cv_prog_cc_${ac_cc}_c_o+:} false; then :
4205
+if test -z "$CC"; then
4206
+  # Extract the first word of "cc", so it can be a program name with args.
4207
+set dummy cc; ac_word=$2
4208
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4209
+$as_echo_n "checking for $ac_word... " >&6; }
4210
+if ${ac_cv_prog_CC+:} false; then :
4232 4211
   $as_echo_n "(cached) " >&6
4233 4212
 else
4234
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
4235
-/* end confdefs.h.  */
4236
-
4237
-int
4238
-main ()
4239
-{
4213
+  if test -n "$CC"; then
4214
+  ac_cv_prog_CC="$CC" # Let the user override the test.
4215
+else
4216
+  ac_prog_rejected=no
4217
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
4218
+for as_dir in $PATH
4219
+do
4220
+  IFS=$as_save_IFS
4221
+  test -z "$as_dir" && as_dir=.
4222
+    for ac_exec_ext in '' $ac_executable_extensions; do
4223
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
4224
+    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
4225
+       ac_prog_rejected=yes
4226
+       continue
4227
+     fi
4228
+    ac_cv_prog_CC="cc"
4229
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4230
+    break 2
4231
+  fi
4232
+done
4233
+  done
4234
+IFS=$as_save_IFS
4240 4235
 
4241
-  ;
4242
-  return 0;
4243
-}
4244
-_ACEOF
4245
-# Make sure it works both with $CC and with simple cc.
4246
-# We do the test twice because some compilers refuse to overwrite an
4247
-# existing .o file with -o, though they will create one.
4248
-ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
4249
-rm -f conftest2.*
4250
-if { { case "(($ac_try" in
4251
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
4252
-  *) ac_try_echo=$ac_try;;
4253
-esac
4254
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
4255
-$as_echo "$ac_try_echo"; } >&5
4256
-  (eval "$ac_try") 2>&5
4257
-  ac_status=$?
4258
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
4259
-  test $ac_status = 0; } &&
4260
-   test -f conftest2.$ac_objext && { { case "(($ac_try" in
4261
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
4262
-  *) ac_try_echo=$ac_try;;
4263
-esac
4264
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
4265
-$as_echo "$ac_try_echo"; } >&5
4266
-  (eval "$ac_try") 2>&5
4267
-  ac_status=$?
4268
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
4269
-  test $ac_status = 0; };
4270
-then
4271
-  eval ac_cv_prog_cc_${ac_cc}_c_o=yes
4272
-  if test "x$CC" != xcc; then
4273
-    # Test first that cc exists at all.
4274
-    if { ac_try='cc -c conftest.$ac_ext >&5'
4275
-  { { case "(($ac_try" in
4276
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
4277
-  *) ac_try_echo=$ac_try;;
4278
-esac
4279
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
4280
-$as_echo "$ac_try_echo"; } >&5
4281
-  (eval "$ac_try") 2>&5
4282
-  ac_status=$?
4283
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
4284
-  test $ac_status = 0; }; }; then
4285
-      ac_try='cc -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
4286
-      rm -f conftest2.*
4287
-      if { { case "(($ac_try" in
4288
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
4289
-  *) ac_try_echo=$ac_try;;
4290
-esac
4291
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
4292
-$as_echo "$ac_try_echo"; } >&5
4293
-  (eval "$ac_try") 2>&5
4294
-  ac_status=$?
4295
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
4296
-  test $ac_status = 0; } &&
4297
-	 test -f conftest2.$ac_objext && { { case "(($ac_try" in
4298
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
4299
-  *) ac_try_echo=$ac_try;;
4300
-esac
4301
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
4302
-$as_echo "$ac_try_echo"; } >&5
4303
-  (eval "$ac_try") 2>&5
4304
-  ac_status=$?
4305
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
4306
-  test $ac_status = 0; };
4307
-      then
4308
-	# cc works too.
4309
-	:
4310
-      else
4311
-	# cc exists but doesn't like -o.
4312
-	eval ac_cv_prog_cc_${ac_cc}_c_o=no
4313
-      fi
4314
-    fi
4236
+if test $ac_prog_rejected = yes; then
4237
+  # We found a bogon in the path, so make sure we never use it.
4238
+  set dummy $ac_cv_prog_CC
4239
+  shift
4240
+  if test $# != 0; then
4241
+    # We chose a different compiler from the bogus one.
4242
+    # However, it has the same basename, so the bogon will be chosen
4243
+    # first if we set CC to just the basename; use the full file name.
4244
+    shift
4245
+    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
4315 4246
   fi
4316
-else
4317
-  eval ac_cv_prog_cc_${ac_cc}_c_o=no
4318 4247
 fi
4319
-rm -f core conftest*
4320
-
4321 4248
 fi
4322
-if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then
4323
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
4324
-$as_echo "yes" >&6; }
4249
+fi
4250
+CC=$ac_cv_prog_CC
4251
+if test -n "$CC"; then
4252
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
4253
+$as_echo "$CC" >&6; }
4325 4254
 else
4326 4255
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4327 4256
 $as_echo "no" >&6; }
4328
-
4329
-$as_echo "#define NO_MINUS_C_MINUS_O 1" >>confdefs.h
4330
-
4331
-fi
4332
-
4333
-# FIXME: we rely on the cache variable name because
4334
-# there is no other way.
4335
-set dummy $CC
4336
-am_cc=`echo $2 | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
4337
-eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o
4338
-if test "$am_t" != yes; then
4339
-   # Losing compiler, so override with the script.
4340
-   # FIXME: It is wrong to rewrite CC.
4341
-   # But if we don't then we get into trouble of one sort or another.
4342
-   # A longer-term fix would be to have automake use am__CC in this case,
4343
-   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
4344
-   CC="$am_aux_dir/compile $CC"
4345 4257
 fi
4346 4258
 
4347 4259
 
4348
-
4349
-cxxset=${CXXFLAGS+set}
4350
-ac_ext=cpp
4351
-ac_cpp='$CXXCPP $CPPFLAGS'
4352
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
4353
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
4354
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
4355
-if test -z "$CXX"; then
4356
-  if test -n "$CCC"; then
4357
-    CXX=$CCC
4358
-  else
4359
-    if test -n "$ac_tool_prefix"; then
4360
-  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
4260
+fi
4261
+if test -z "$CC"; then
4262
+  if test -n "$ac_tool_prefix"; then
4263
+  for ac_prog in cl.exe
4361 4264
   do
4362 4265
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
4363 4266
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
4364 4267
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4365 4268
 $as_echo_n "checking for $ac_word... " >&6; }
4366
-if ${ac_cv_prog_CXX+:} false; then :
4269
+if ${ac_cv_prog_CC+:} false; then :
4367 4270
   $as_echo_n "(cached) " >&6
4368 4271
 else
4369
-  if test -n "$CXX"; then
4370
-  ac_cv_prog_CXX="$CXX" # Let the user override the test.
4272
+  if test -n "$CC"; then
4273
+  ac_cv_prog_CC="$CC" # Let the user override the test.
4371 4274
 else
4372 4275
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
4373 4276
 for as_dir in $PATH
... ...
@@ -4376,7 +3975,7 @@ do
4376 4376
   test -z "$as_dir" && as_dir=.
4377 4377
     for ac_exec_ext in '' $ac_executable_extensions; do
4378 4378
   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
4379
-    ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
4379
+    ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
4380 4380
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4381 4381
     break 2
4382 4382
   fi
... ...
@@ -4386,32 +3985,32 @@ IFS=$as_save_IFS
4386 4386
 
4387 4387
 fi
4388 4388
 fi
4389
-CXX=$ac_cv_prog_CXX
4390
-if test -n "$CXX"; then
4391
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5
4392
-$as_echo "$CXX" >&6; }
4389
+CC=$ac_cv_prog_CC
4390
+if test -n "$CC"; then
4391
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
4392
+$as_echo "$CC" >&6; }
4393 4393
 else
4394 4394
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4395 4395
 $as_echo "no" >&6; }
4396 4396
 fi
4397 4397
 
4398 4398
 
4399
-    test -n "$CXX" && break
4399
+    test -n "$CC" && break
4400 4400
   done
4401 4401
 fi
4402
-if test -z "$CXX"; then
4403
-  ac_ct_CXX=$CXX
4404
-  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
4402
+if test -z "$CC"; then
4403
+  ac_ct_CC=$CC
4404
+  for ac_prog in cl.exe
4405 4405
 do
4406 4406
   # Extract the first word of "$ac_prog", so it can be a program name with args.
4407 4407
 set dummy $ac_prog; ac_word=$2
4408 4408
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4409 4409
 $as_echo_n "checking for $ac_word... " >&6; }
4410
-if ${ac_cv_prog_ac_ct_CXX+:} false; then :
4410
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
4411 4411
   $as_echo_n "(cached) " >&6
4412 4412
 else
4413
-  if test -n "$ac_ct_CXX"; then
4414
-  ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
4413
+  if test -n "$ac_ct_CC"; then
4414
+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
4415 4415
 else
4416 4416
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
4417 4417
 for as_dir in $PATH
... ...
@@ -4420,7 +4019,7 @@ do
4420 4420
   test -z "$as_dir" && as_dir=.
4421 4421
     for ac_exec_ext in '' $ac_executable_extensions; do
4422 4422
   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
4423
-    ac_cv_prog_ac_ct_CXX="$ac_prog"
4423
+    ac_cv_prog_ac_ct_CC="$ac_prog"
4424 4424
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4425 4425
     break 2
4426 4426
   fi
... ...
@@ -4430,21 +4029,21 @@ IFS=$as_save_IFS
4430 4430
 
4431 4431
 fi
4432 4432
 fi
4433
-ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
4434
-if test -n "$ac_ct_CXX"; then
4435
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5
4436
-$as_echo "$ac_ct_CXX" >&6; }
4433
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
4434
+if test -n "$ac_ct_CC"; then
4435
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
4436
+$as_echo "$ac_ct_CC" >&6; }
4437 4437
 else
4438 4438
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4439 4439
 $as_echo "no" >&6; }
4440 4440
 fi
4441 4441
 
4442 4442
 
4443
-  test -n "$ac_ct_CXX" && break
4443
+  test -n "$ac_ct_CC" && break
4444 4444
 done
4445 4445
 
4446
-  if test "x$ac_ct_CXX" = x; then
4447
-    CXX="g++"
4446
+  if test "x$ac_ct_CC" = x; then
4447
+    CC=""
4448 4448
   else
4449 4449
     case $cross_compiling:$ac_tool_warned in
4450 4450
 yes:)
... ...
@@ -4452,14 +4051,20 @@ yes:)
4452 4452
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
4453 4453
 ac_tool_warned=yes ;;
4454 4454
 esac
4455
-    CXX=$ac_ct_CXX
4455
+    CC=$ac_ct_CC
4456 4456
   fi
4457 4457
 fi
4458 4458
 
4459
-  fi
4460 4459
 fi
4460
+
4461
+
4462
+test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
4463
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
4464
+as_fn_error $? "no acceptable C compiler found in \$PATH
4465
+See \`config.log' for more details" "$LINENO" 5; }
4466
+
4461 4467
 # Provide some information about the compiler.
4462
-$as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5
4468
+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
4463 4469
 set X $ac_compile
4464 4470
 ac_compiler=$2
4465 4471
 for ac_option in --version -v -V -qversion; do
... ...
@@ -4483,9 +4088,9 @@ $as_echo "$ac_try_echo"; } >&5
4483 4483
   test $ac_status = 0; }
4484 4484
 done
4485 4485
 
4486
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5
4487
-$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
4488
-if ${ac_cv_cxx_compiler_gnu+:} false; then :
4486
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
4487
+$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
4488
+if ${ac_cv_c_compiler_gnu+:} false; then :
4489 4489
   $as_echo_n "(cached) " >&6
4490 4490
 else
4491 4491
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
... ...
@@ -4502,33 +4107,33 @@ main ()
4502 4502
   return 0;
4503 4503
 }
4504 4504
 _ACEOF
4505
-if ac_fn_cxx_try_compile "$LINENO"; then :
4505
+if ac_fn_c_try_compile "$LINENO"; then :
4506 4506
   ac_compiler_gnu=yes
4507 4507
 else
4508 4508
   ac_compiler_gnu=no
4509 4509
 fi
4510 4510
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
4511
-ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
4511
+ac_cv_c_compiler_gnu=$ac_compiler_gnu
4512 4512
 
4513 4513
 fi
4514
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5
4515
-$as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
4514
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
4515
+$as_echo "$ac_cv_c_compiler_gnu" >&6; }
4516 4516
 if test $ac_compiler_gnu = yes; then
4517
-  GXX=yes
4517
+  GCC=yes
4518 4518
 else
4519
-  GXX=
4519
+  GCC=
4520 4520
 fi
4521
-ac_test_CXXFLAGS=${CXXFLAGS+set}
4522
-ac_save_CXXFLAGS=$CXXFLAGS
4523
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
4524
-$as_echo_n "checking whether $CXX accepts -g... " >&6; }
4525
-if ${ac_cv_prog_cxx_g+:} false; then :
4521
+ac_test_CFLAGS=${CFLAGS+set}
4522
+ac_save_CFLAGS=$CFLAGS
4523
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
4524
+$as_echo_n "checking whether $CC accepts -g... " >&6; }
4525
+if ${ac_cv_prog_cc_g+:} false; then :
4526 4526
   $as_echo_n "(cached) " >&6
4527 4527
 else
4528
-  ac_save_cxx_werror_flag=$ac_cxx_werror_flag
4529
-   ac_cxx_werror_flag=yes
4530
-   ac_cv_prog_cxx_g=no
4531
-   CXXFLAGS="-g"
4528
+  ac_save_c_werror_flag=$ac_c_werror_flag
4529
+   ac_c_werror_flag=yes
4530
+   ac_cv_prog_cc_g=no
4531
+   CFLAGS="-g"
4532 4532
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
4533 4533
 /* end confdefs.h.  */
4534 4534
 
... ...
@@ -4540,10 +4145,10 @@ main ()
4540 4540
   return 0;
4541 4541
 }
4542 4542
 _ACEOF
4543
-if ac_fn_cxx_try_compile "$LINENO"; then :
4544
-  ac_cv_prog_cxx_g=yes
4543
+if ac_fn_c_try_compile "$LINENO"; then :
4544
+  ac_cv_prog_cc_g=yes
4545 4545
 else
4546
-  CXXFLAGS=""
4546
+  CFLAGS=""
4547 4547
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
4548 4548
 /* end confdefs.h.  */
4549 4549
 
... ...
@@ -4555,11 +4160,11 @@ main ()
4555 4555
   return 0;
4556 4556
 }
4557 4557
 _ACEOF
4558
-if ac_fn_cxx_try_compile "$LINENO"; then :
4558
+if ac_fn_c_try_compile "$LINENO"; then :
4559 4559
 
4560 4560
 else
4561
-  ac_cxx_werror_flag=$ac_save_cxx_werror_flag
4562
-	 CXXFLAGS="-g"
4561
+  ac_c_werror_flag=$ac_save_c_werror_flag
4562
+	 CFLAGS="-g"
4563 4563
 	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
4564 4564
 /* end confdefs.h.  */
4565 4565
 
... ...
@@ -4571,52 +4176,142 @@ main ()
4571 4571
   return 0;
4572 4572
 }
4573 4573
 _ACEOF
4574
-if ac_fn_cxx_try_compile "$LINENO"; then :
4575
-  ac_cv_prog_cxx_g=yes
4574
+if ac_fn_c_try_compile "$LINENO"; then :
4575
+  ac_cv_prog_cc_g=yes
4576 4576
 fi
4577 4577
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
4578 4578
 fi
4579 4579
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
4580 4580
 fi
4581 4581
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
4582
-   ac_cxx_werror_flag=$ac_save_cxx_werror_flag
4582
+   ac_c_werror_flag=$ac_save_c_werror_flag
4583 4583
 fi
4584
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5
4585
-$as_echo "$ac_cv_prog_cxx_g" >&6; }
4586
-if test "$ac_test_CXXFLAGS" = set; then
4587
-  CXXFLAGS=$ac_save_CXXFLAGS
4588
-elif test $ac_cv_prog_cxx_g = yes; then
4589
-  if test "$GXX" = yes; then
4590
-    CXXFLAGS="-g -O2"
4584
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
4585
+$as_echo "$ac_cv_prog_cc_g" >&6; }
4586
+if test "$ac_test_CFLAGS" = set; then
4587
+  CFLAGS=$ac_save_CFLAGS
4588
+elif test $ac_cv_prog_cc_g = yes; then
4589
+  if test "$GCC" = yes; then
4590
+    CFLAGS="-g -O2"
4591 4591
   else
4592
-    CXXFLAGS="-g"
4592
+    CFLAGS="-g"
4593 4593
   fi
4594 4594
 else
4595
-  if test "$GXX" = yes; then
4596
-    CXXFLAGS="-O2"
4595
+  if test "$GCC" = yes; then
4596
+    CFLAGS="-O2"
4597 4597
   else
4598
-    CXXFLAGS=
4598
+    CFLAGS=
4599 4599
   fi
4600 4600
 fi
4601
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
4602
+$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
4603
+if ${ac_cv_prog_cc_c89+:} false; then :
4604
+  $as_echo_n "(cached) " >&6
4605
+else
4606
+  ac_cv_prog_cc_c89=no
4607
+ac_save_CC=$CC
4608
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
4609
+/* end confdefs.h.  */
4610
+#include <stdarg.h>
4611
+#include <stdio.h>
4612
+struct stat;
4613
+/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
4614
+struct buf { int x; };
4615
+FILE * (*rcsopen) (struct buf *, struct stat *, int);
4616
+static char *e (p, i)
4617
+     char **p;
4618
+     int i;
4619
+{
4620
+  return p[i];
4621
+}
4622
+static char *f (char * (*g) (char **, int), char **p, ...)
4623
+{
4624
+  char *s;
4625
+  va_list v;
4626
+  va_start (v,p);
4627
+  s = g (p, va_arg (v,int));
4628
+  va_end (v);
4629
+  return s;
4630
+}
4631
+
4632
+/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
4633
+   function prototypes and stuff, but not '\xHH' hex character constants.
4634
+   These don't provoke an error unfortunately, instead are silently treated
4635
+   as 'x'.  The following induces an error, until -std is added to get
4636
+   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
4637
+   array size at least.  It's necessary to write '\x00'==0 to get something
4638
+   that's true only with -std.  */
4639
+int osf4_cc_array ['\x00' == 0 ? 1 : -1];
4640
+
4641
+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
4642
+   inside strings and character constants.  */
4643
+#define FOO(x) 'x'
4644
+int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
4645
+
4646
+int test (int i, double x);
4647
+struct s1 {int (*f) (int a);};
4648
+struct s2 {int (*f) (double a);};
4649
+int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
4650
+int argc;
4651
+char **argv;
4652
+int
4653
+main ()
4654
+{
4655
+return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
4656
+  ;
4657
+  return 0;
4658
+}
4659
+_ACEOF
4660
+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
4661
+	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
4662
+do
4663
+  CC="$ac_save_CC $ac_arg"
4664
+  if ac_fn_c_try_compile "$LINENO"; then :
4665
+  ac_cv_prog_cc_c89=$ac_arg
4666
+fi
4667
+rm -f core conftest.err conftest.$ac_objext
4668
+  test "x$ac_cv_prog_cc_c89" != "xno" && break
4669
+done
4670
+rm -f conftest.$ac_ext
4671
+CC=$ac_save_CC
4672
+
4673
+fi
4674
+# AC_CACHE_VAL
4675
+case "x$ac_cv_prog_cc_c89" in
4676
+  x)
4677
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
4678
+$as_echo "none needed" >&6; } ;;
4679
+  xno)
4680
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
4681
+$as_echo "unsupported" >&6; } ;;
4682
+  *)
4683
+    CC="$CC $ac_cv_prog_cc_c89"
4684
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
4685
+$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
4686
+esac
4687
+if test "x$ac_cv_prog_cc_c89" != xno; then :
4688
+
4689
+fi
4690
+
4601 4691
 ac_ext=c
4602 4692
 ac_cpp='$CPP $CPPFLAGS'
4603 4693
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
4604 4694
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
4605 4695
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
4606 4696
 
4607
-depcc="$CXX"  am_compiler_list=
4697
+depcc="$CC"   am_compiler_list=
4608 4698
 
4609 4699
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
4610 4700
 $as_echo_n "checking dependency style of $depcc... " >&6; }
4611
-if ${am_cv_CXX_dependencies_compiler_type+:} false; then :
4701
+if ${am_cv_CC_dependencies_compiler_type+:} false; then :
4612 4702
   $as_echo_n "(cached) " >&6
4613 4703
 else
4614 4704
   if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
4615 4705
   # We make a subdir and do the tests there.  Otherwise we can end up
4616 4706
   # making bogus files that we don't know about and never remove.  For
4617 4707
   # instance it was reported that on HP-UX the gcc test will end up
4618
-  # making a dummy file named 'D' -- because '-MD' means "put the output
4619
-  # in D".
4708
+  # making a dummy file named `D' -- because `-MD' means `put the output
4709
+  # in D'.
4620 4710
   rm -rf conftest.dir
4621 4711
   mkdir conftest.dir
4622 4712
   # Copy depcomp to subdir because otherwise we won't find it if we're
... ...
@@ -4631,7 +4326,7 @@ else
4631 4631
   # directory.
4632 4632
   mkdir sub
4633 4633
 
4634
-  am_cv_CXX_dependencies_compiler_type=none
4634
+  am_cv_CC_dependencies_compiler_type=none
4635 4635
   if test "$am_compiler_list" = ""; then
4636 4636
      am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
4637 4637
   fi
... ...
@@ -4651,16 +4346,16 @@ else
4651 4651
     : > sub/conftest.c
4652 4652
     for i in 1 2 3 4 5 6; do
4653 4653
       echo '#include "conftst'$i'.h"' >> sub/conftest.c
4654
-      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
4655
-      # Solaris 10 /bin/sh.
4656
-      echo '/* dummy */' > sub/conftst$i.h
4654
+      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
4655
+      # Solaris 8's {/usr,}/bin/sh.
4656
+      touch sub/conftst$i.h
4657 4657
     done
4658 4658
     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
4659 4659
 
4660
-    # We check with '-c' and '-o' for the sake of the "dashmstdout"
4660
+    # We check with `-c' and `-o' for the sake of the "dashmstdout"
4661 4661
     # mode.  It turns out that the SunPro C++ compiler does not properly
4662
-    # handle '-M -o', and we need to detect this.  Also, some Intel
4663
-    # versions had trouble with output in subdirs.
4662
+    # handle `-M -o', and we need to detect this.  Also, some Intel
4663
+    # versions had trouble with output in subdirs
4664 4664
     am__obj=sub/conftest.${OBJEXT-o}
4665 4665
     am__minus_obj="-o $am__obj"
4666 4666
     case $depmode in
... ...
@@ -4669,8 +4364,8 @@ else
4669 4669
       test "$am__universal" = false || continue
4670 4670
       ;;
4671 4671
     nosideeffect)
4672
-      # After this tag, mechanisms are not by side-effect, so they'll
4673
-      # only be used when explicitly requested.
4672
+      # after this tag, mechanisms are not by side-effect, so they'll
4673
+      # only be used when explicitly requested
4674 4674
       if test "x$enable_dependency_tracking" = xyes; then
4675 4675
 	continue
4676 4676
       else
... ...
@@ -4678,7 +4373,7 @@ else
4678 4678
       fi
4679 4679
       ;;
4680 4680
     msvc7 | msvc7msys | msvisualcpp | msvcmsys)
4681
-      # This compiler won't grok '-c -o', but also, the minuso test has
4681
+      # This compiler won't grok `-c -o', but also, the minuso test has
4682 4682
       # not run yet.  These depmodes are late enough in the game, and
4683 4683
       # so weak that their functioning should not be impacted.
4684 4684
       am__obj=conftest.${OBJEXT-o}
... ...
@@ -4704,7 +4399,7 @@ else
4704 4704
       #   icc: Command line remark: option '-MP' not supported
4705 4705
       if (grep 'ignoring option' conftest.err ||
4706 4706
           grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
4707
-        am_cv_CXX_dependencies_compiler_type=$depmode
4707
+        am_cv_CC_dependencies_compiler_type=$depmode
4708 4708
         break
4709 4709
       fi
4710 4710
     fi
... ...
@@ -4713,25 +4408,26 @@ else
4713 4713
   cd ..
4714 4714
   rm -rf conftest.dir
4715 4715
 else
4716
-  am_cv_CXX_dependencies_compiler_type=none
4716
+  am_cv_CC_dependencies_compiler_type=none
4717 4717
 fi
4718 4718
 
4719 4719
 fi
4720
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CXX_dependencies_compiler_type" >&5
4721
-$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; }
4722
-CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
4720
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
4721
+$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
4722
+CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
4723 4723
 
4724 4724
  if
4725 4725
   test "x$enable_dependency_tracking" != xno \
4726
-  && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then
4727
-  am__fastdepCXX_TRUE=
4728
-  am__fastdepCXX_FALSE='#'
4726
+  && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
4727
+  am__fastdepCC_TRUE=
4728
+  am__fastdepCC_FALSE='#'
4729 4729
 else
4730
-  am__fastdepCXX_TRUE='#'
4731
-  am__fastdepCXX_FALSE=
4730
+  am__fastdepCC_TRUE='#'
4731
+  am__fastdepCC_FALSE=
4732 4732
 fi
4733 4733
 
4734 4734
 
4735
+
4735 4736
 ac_ext=c
4736 4737
 ac_cpp='$CPP $CPPFLAGS'
4737 4738
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
... ...
@@ -6520,7 +6216,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
6520 6520
   lt_cv_deplibs_check_method=pass_all
6521 6521
   ;;
6522 6522
 
6523
-netbsd*)
6523
+netbsd* | netbsdelf*-gnu)
6524 6524
   if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
6525 6525
     lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
6526 6526
   else
... ...
@@ -9663,6 +9359,9 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
9663 9663
   openbsd*)
9664 9664
     with_gnu_ld=no
9665 9665
     ;;
9666
+  linux* | k*bsd*-gnu | gnu*)
9667
+    link_all_deplibs=no
9668
+    ;;
9666 9669
   esac
9667 9670
 
9668 9671
   ld_shlibs=yes
... ...
@@ -9884,7 +9583,7 @@ _LT_EOF
9884 9884
       fi
9885 9885
       ;;
9886 9886
 
9887
-    netbsd*)
9887
+    netbsd* | netbsdelf*-gnu)
9888 9888
       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
9889 9889
 	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
9890 9890
 	wlarc=
... ...
@@ -10061,6 +9760,7 @@ _LT_EOF
10061 10061
 	if test "$aix_use_runtimelinking" = yes; then
10062 10062
 	  shared_flag="$shared_flag "'${wl}-G'
10063 10063
 	fi
10064
+	link_all_deplibs=no
10064 10065
       else
10065 10066
 	# not using gcc
10066 10067
 	if test "$host_cpu" = ia64; then
... ...
@@ -10514,7 +10214,7 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; }
10514 10514
       link_all_deplibs=yes
10515 10515
       ;;
10516 10516
 
10517
-    netbsd*)
10517
+    netbsd* | netbsdelf*-gnu)
10518 10518
       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
10519 10519
 	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
10520 10520
       else
... ...
@@ -11542,6 +11242,18 @@ fi
11542 11542
   dynamic_linker='GNU/Linux ld.so'
11543 11543
   ;;
11544 11544
 
11545
+netbsdelf*-gnu)
11546
+  version_type=linux
11547
+  need_lib_prefix=no
11548
+  need_version=no
11549
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
11550
+  soname_spec='${libname}${release}${shared_ext}$major'
11551
+  shlibpath_var=LD_LIBRARY_PATH
11552
+  shlibpath_overrides_runpath=no
11553
+  hardcode_into_libs=yes
11554
+  dynamic_linker='NetBSD ld.elf_so'
11555
+  ;;
11556
+
11545 11557
 netbsd*)
11546 11558
   version_type=sunos
11547 11559
   need_lib_prefix=no
... ...
@@ -14377,7 +14089,7 @@ lt_prog_compiler_static_CXX=
14377 14377
 	    ;;
14378 14378
 	esac
14379 14379
 	;;
14380
-      netbsd*)
14380
+      netbsd* | netbsdelf*-gnu)
14381 14381
 	;;
14382 14382
       *qnx* | *nto*)
14383 14383
         # QNX uses GNU C++, but need to define -shared option too, otherwise
... ...
@@ -14748,6 +14460,9 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
14748 14748
       ;;
14749 14749
     esac
14750 14750
     ;;
14751
+  linux* | k*bsd*-gnu | gnu*)
14752
+    link_all_deplibs_CXX=no
14753
+    ;;
14751 14754
   *)
14752 14755
     export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
14753 14756
     ;;
... ...
@@ -15373,6 +15088,18 @@ fi
15373 15373
   dynamic_linker='GNU/Linux ld.so'
15374 15374
   ;;
15375 15375
 
15376
+netbsdelf*-gnu)
15377
+  version_type=linux
15378
+  need_lib_prefix=no
15379
+  need_version=no
15380
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
15381
+  soname_spec='${libname}${release}${shared_ext}$major'
15382
+  shlibpath_var=LD_LIBRARY_PATH
15383
+  shlibpath_overrides_runpath=no
15384
+  hardcode_into_libs=yes
15385
+  dynamic_linker='NetBSD ld.elf_so'
15386
+  ;;
15387
+
15376 15388
 netbsd*)
15377 15389
   version_type=sunos
15378 15390
   need_lib_prefix=no
... ...
@@ -16125,14 +15852,6 @@ LIBOBJS=$ac_libobjs
16125 16125
 LTLIBOBJS=$ac_ltlibobjs
16126 16126
 
16127 16127
 
16128
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5
16129
-$as_echo_n "checking that generated files are newer than configure... " >&6; }
16130
-   if test -n "$am_sleep_pid"; then
16131
-     # Hide warnings about reused PIDs.
16132
-     wait $am_sleep_pid 2>/dev/null
16133
-   fi
16134
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5
16135
-$as_echo "done" >&6; }
16136 16128
  if test -n "$EXEEXT"; then
16137 16129
   am__EXEEXT_TRUE=
16138 16130
   am__EXEEXT_FALSE='#'
... ...
@@ -16145,14 +15864,14 @@ if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
16145 16145
   as_fn_error $? "conditional \"AMDEP\" was never defined.
16146 16146
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
16147 16147
 fi
16148
-if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
16149
-  as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
16150
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
16151
-fi
16152 16148
 if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
16153 16149
   as_fn_error $? "conditional \"am__fastdepCXX\" was never defined.
16154 16150
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
16155 16151
 fi
16152
+if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
16153
+  as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
16154
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
16155
+fi
16156 16156
 
16157 16157
 if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
16158 16158
   as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined.
... ...
@@ -17758,7 +17477,7 @@ $as_echo "$as_me: executing $ac_file commands" >&6;}
17758 17758
     # Strip MF so we end up with the name of the file.
17759 17759
     mf=`echo "$mf" | sed -e 's/:.*$//'`
17760 17760
     # Check whether this is an Automake generated Makefile or not.
17761
-    # We used to match only the files named 'Makefile.in', but
17761
+    # We used to match only the files named `Makefile.in', but
17762 17762
     # some people rename them; so instead we look at the file content.
17763 17763
     # Grep'ing the first line is not enough: some people post-process
17764 17764
     # each Makefile.in and add a new line on top of each file to say so.
... ...
@@ -17792,19 +17511,21 @@ $as_echo X"$mf" |
17792 17792
       continue
17793 17793
     fi
17794 17794
     # Extract the definition of DEPDIR, am__include, and am__quote
17795
-    # from the Makefile without running 'make'.
17795
+    # from the Makefile without running `make'.
17796 17796
     DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
17797 17797
     test -z "$DEPDIR" && continue
17798 17798
     am__include=`sed -n 's/^am__include = //p' < "$mf"`
17799 17799
     test -z "am__include" && continue
17800 17800
     am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
17801
+    # When using ansi2knr, U may be empty or an underscore; expand it
17802
+    U=`sed -n 's/^U = //p' < "$mf"`
17801 17803
     # Find all dependency output files, they are included files with
17802 17804
     # $(DEPDIR) in their names.  We invoke sed twice because it is the
17803 17805
     # simplest approach to changing $(DEPDIR) to its actual value in the
17804 17806
     # expansion.
17805 17807
     for file in `sed -n "
17806 17808
       s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
17807
-	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
17809
+	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
17808 17810
       # Make sure the directory exists.
17809 17811
       test -f "$dirpart/$file" && continue
17810 17812
       fdir=`$as_dirname -- "$file" ||
... ...
@@ -22,8 +22,6 @@ AC_CONFIG_HEADER([clamavcxx-config.h])
22 22
 AC_CANONICAL_TARGET
23 23
 AM_INIT_AUTOMAKE([1.9 -Wall -Wportability -Werror foreign no-define color-tests tar-pax])
24 24
 AM_SILENT_RULES([yes])
25
-AM_PROG_AR
26
-AM_PROG_CC_C_O
27 25
 
28 26
 cxxset=${CXXFLAGS+set}
29 27
 AC_PROG_CXX
... ...
@@ -2684,6 +2684,18 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
2684 2684
   dynamic_linker='GNU/Linux ld.so'
2685 2685
   ;;
2686 2686
 
2687
+netbsdelf*-gnu)
2688
+  version_type=linux
2689
+  need_lib_prefix=no
2690
+  need_version=no
2691
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
2692
+  soname_spec='${libname}${release}${shared_ext}$major'
2693
+  shlibpath_var=LD_LIBRARY_PATH
2694
+  shlibpath_overrides_runpath=no
2695
+  hardcode_into_libs=yes
2696
+  dynamic_linker='NetBSD ld.elf_so'
2697
+  ;;
2698
+
2687 2699
 netbsd*)
2688 2700
   version_type=sunos
2689 2701
   need_lib_prefix=no
... ...
@@ -3289,7 +3301,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
3289 3289
   lt_cv_deplibs_check_method=pass_all
3290 3290
   ;;
3291 3291
 
3292
-netbsd*)
3292
+netbsd* | netbsdelf*-gnu)
3293 3293
   if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
3294 3294
     lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
3295 3295
   else
... ...
@@ -4101,7 +4113,7 @@ m4_if([$1], [CXX], [
4101 4101
 	    ;;
4102 4102
 	esac
4103 4103
 	;;
4104
-      netbsd*)
4104
+      netbsd* | netbsdelf*-gnu)
4105 4105
 	;;
4106 4106
       *qnx* | *nto*)
4107 4107
         # QNX uses GNU C++, but need to define -shared option too, otherwise
... ...
@@ -4578,6 +4590,9 @@ m4_if([$1], [CXX], [
4578 4578
       ;;
4579 4579
     esac
4580 4580
     ;;
4581
+  linux* | k*bsd*-gnu | gnu*)
4582
+    _LT_TAGVAR(link_all_deplibs, $1)=no
4583
+    ;;
4581 4584
   *)
4582 4585
     _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
4583 4586
     ;;
... ...
@@ -4640,6 +4655,9 @@ dnl Note also adjust exclude_expsyms for C++ above.
4640 4640
   openbsd*)
4641 4641
     with_gnu_ld=no
4642 4642
     ;;
4643
+  linux* | k*bsd*-gnu | gnu*)
4644
+    _LT_TAGVAR(link_all_deplibs, $1)=no
4645
+    ;;
4643 4646
   esac
4644 4647
 
4645 4648
   _LT_TAGVAR(ld_shlibs, $1)=yes
... ...
@@ -4861,7 +4879,7 @@ _LT_EOF
4861 4861
       fi
4862 4862
       ;;
4863 4863
 
4864
-    netbsd*)
4864
+    netbsd* | netbsdelf*-gnu)
4865 4865
       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
4866 4866
 	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
4867 4867
 	wlarc=
... ...
@@ -5038,6 +5056,7 @@ _LT_EOF
5038 5038
 	if test "$aix_use_runtimelinking" = yes; then
5039 5039
 	  shared_flag="$shared_flag "'${wl}-G'
5040 5040
 	fi
5041
+	_LT_TAGVAR(link_all_deplibs, $1)=no
5041 5042
       else
5042 5043
 	# not using gcc
5043 5044
 	if test "$host_cpu" = ia64; then
... ...
@@ -5342,7 +5361,7 @@ _LT_EOF
5342 5342
       _LT_TAGVAR(link_all_deplibs, $1)=yes
5343 5343
       ;;
5344 5344
 
5345
-    netbsd*)
5345
+    netbsd* | netbsdelf*-gnu)
5346 5346
       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
5347 5347
 	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
5348 5348
       else
... ...
@@ -137,6 +137,12 @@ CLEANFILES		       += libltdl.la \
137 137
 CLEANFILES	       += $(ltdl_LIBOBJS) $(ltdl_LTLIBOBJS)
138 138
 
139 139
 EXTRA_DIST	       += COPYING.LIB \
140
+			   \
141
+			   \
142
+			   \
143
+			   \
144
+			   \
145
+			   \
140 146
 			  README
141 147
 
142 148
 ## --------------------------- ##
... ...
@@ -151,7 +157,6 @@ EXTRA_DIST	+= argz_.h \
151 151
 # doesn't have one that works with the given compiler.
152 152
 all-local $(lib_OBJECTS): $(ARGZ_H)
153 153
 argz.h: argz_.h
154
-	$(mkinstalldirs) . 
155 154
 	cp $(srcdir)/argz_.h $@-t
156 155
 	mv $@-t $@
157 156
 MOSTLYCLEANFILES += argz.h \
... ...
@@ -1,8 +1,9 @@
1
-# Makefile.in generated by automake 1.12.4 from Makefile.am.
1
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
2 2
 # @configure_input@
3 3
 
4
-# Copyright (C) 1994-2012 Free Software Foundation, Inc.
5
-
4
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
5
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
6
+# Foundation, Inc.
6 7
 # This Makefile.in is free software; the Free Software Foundation
7 8
 # gives unlimited permission to copy and/or distribute it,
8 9
 # with or without modifications, as long as this notice is preserved.
... ...
@@ -60,7 +61,7 @@ target_triplet = @target@
60 60
 subdir = libltdl
61 61
 DIST_COMMON = README $(am__include_HEADERS_DIST) \
62 62
 	$(am__ltdlinclude_HEADERS_DIST) $(srcdir)/Makefile.am \
63
-	$(srcdir)/Makefile.in $(top_srcdir)/config/depcomp COPYING.LIB
63
+	$(srcdir)/Makefile.in COPYING.LIB
64 64
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
65 65
 am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
66 66
 	$(top_srcdir)/m4/argz.m4 \
... ...
@@ -115,7 +116,6 @@ dld_link_la_OBJECTS = $(am_dld_link_la_OBJECTS)
115 115
 AM_V_lt = $(am__v_lt_@AM_V@)
116 116
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
117 117
 am__v_lt_0 = --silent
118
-am__v_lt_1 = 
119 118
 dld_link_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
120 119
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
121 120
 	$(dld_link_la_LDFLAGS) $(LDFLAGS) -o $@
... ...
@@ -170,18 +170,6 @@ shl_load_la_OBJECTS = $(am_shl_load_la_OBJECTS)
170 170
 shl_load_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
171 171
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
172 172
 	$(shl_load_la_LDFLAGS) $(LDFLAGS) -o $@
173
-AM_V_P = $(am__v_P_@AM_V@)
174
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
175
-am__v_P_0 = false
176
-am__v_P_1 = :
177
-AM_V_GEN = $(am__v_GEN_@AM_V@)
178
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
179
-am__v_GEN_0 = @echo "  GEN     " $@;
180
-am__v_GEN_1 = 
181
-AM_V_at = $(am__v_at_@AM_V@)
182
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
183
-am__v_at_0 = @
184
-am__v_at_1 = 
185 173
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
186 174
 depcomp = $(SHELL) $(top_srcdir)/config/depcomp
187 175
 am__depfiles_maybe = depfiles
... ...
@@ -194,16 +182,20 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
194 194
 	$(AM_CFLAGS) $(CFLAGS)
195 195
 AM_V_CC = $(am__v_CC_@AM_V@)
196 196
 am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
197
-am__v_CC_0 = @echo "  CC      " $@;
198
-am__v_CC_1 = 
197
+am__v_CC_0 = @echo "  CC    " $@;
198
+AM_V_at = $(am__v_at_@AM_V@)
199
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
200
+am__v_at_0 = @
199 201
 CCLD = $(CC)
200 202
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
201 203
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
202 204
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
203 205
 AM_V_CCLD = $(am__v_CCLD_@AM_V@)
204 206
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
205
-am__v_CCLD_0 = @echo "  CCLD    " $@;
206
-am__v_CCLD_1 = 
207
+am__v_CCLD_0 = @echo "  CCLD  " $@;
208
+AM_V_GEN = $(am__v_GEN_@AM_V@)
209
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
210
+am__v_GEN_0 = @echo "  GEN   " $@;
207 211
 SOURCES = $(dld_link_la_SOURCES) $(dlopen_la_SOURCES) \
208 212
 	$(dyld_la_SOURCES) $(libltdl_la_SOURCES) \
209 213
 	$(libltdlc_la_SOURCES) $(load_add_on_la_SOURCES) \
... ...
@@ -515,25 +507,21 @@ uninstall-libLTLIBRARIES:
515 515
 
516 516
 clean-libLTLIBRARIES:
517 517
 	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
518
-	@list='$(lib_LTLIBRARIES)'; \
519
-	locs=`for p in $$list; do echo $$p; done | \
520
-	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
521
-	      sort -u`; \
522
-	test -z "$$locs" || { \
523
-	  echo rm -f $${locs}; \
524
-	  rm -f $${locs}; \
525
-	}
518
+	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
519
+	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
520
+	  test "$$dir" != "$$p" || dir=.; \
521
+	  echo "rm -f \"$${dir}/so_locations\""; \
522
+	  rm -f "$${dir}/so_locations"; \
523
+	done
526 524
 
527 525
 clean-noinstLTLIBRARIES:
528 526
 	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
529
-	@list='$(noinst_LTLIBRARIES)'; \
530
-	locs=`for p in $$list; do echo $$p; done | \
531
-	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
532
-	      sort -u`; \
533
-	test -z "$$locs" || { \
534
-	  echo rm -f $${locs}; \
535
-	  rm -f $${locs}; \
536
-	}
527
+	@list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
528
+	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
529
+	  test "$$dir" != "$$p" || dir=.; \
530
+	  echo "rm -f \"$${dir}/so_locations\""; \
531
+	  rm -f "$${dir}/so_locations"; \
532
+	done
537 533
 dld_link.la: $(dld_link_la_OBJECTS) $(dld_link_la_DEPENDENCIES) $(EXTRA_dld_link_la_DEPENDENCIES) 
538 534
 	$(AM_V_CCLD)$(dld_link_la_LINK)  $(dld_link_la_OBJECTS) $(dld_link_la_LIBADD) $(LIBS)
539 535
 dlopen.la: $(dlopen_la_OBJECTS) $(dlopen_la_DEPENDENCIES) $(EXTRA_dlopen_la_DEPENDENCIES) 
... ...
@@ -820,20 +808,6 @@ GTAGS:
820 820
 	  && $(am__cd) $(top_srcdir) \
821 821
 	  && gtags -i $(GTAGS_ARGS) "$$here"
822 822
 
823
-cscopelist:  $(HEADERS) $(SOURCES) $(LISP)
824
-	list='$(SOURCES) $(HEADERS) $(LISP)'; \
825
-	case "$(srcdir)" in \
826
-	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
827
-	  *) sdir=$(subdir)/$(srcdir) ;; \
828
-	esac; \
829
-	for i in $$list; do \
830
-	  if test -f "$$i"; then \
831
-	    echo "$(subdir)/$$i"; \
832
-	  else \
833
-	    echo "$$sdir/$$i"; \
834
-	  fi; \
835
-	done >> $(top_builddir)/cscope.files
836
-
837 823
 distclean-tags:
838 824
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
839 825
 
... ...
@@ -985,7 +959,7 @@ uninstall-am: uninstall-includeHEADERS uninstall-libLTLIBRARIES \
985 985
 
986 986
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
987 987
 	clean-libLTLIBRARIES clean-libtool clean-noinstLTLIBRARIES \
988
-	cscopelist ctags distclean distclean-compile distclean-generic \
988
+	ctags distclean distclean-compile distclean-generic \
989 989
 	distclean-libtool distclean-tags distdir dvi dvi-am html \
990 990
 	html-am info info-am install install-am install-data \
991 991
 	install-data-am install-dvi install-dvi-am install-exec \
... ...
@@ -1005,7 +979,6 @@ uninstall-am: uninstall-includeHEADERS uninstall-libLTLIBRARIES \
1005 1005
 # doesn't have one that works with the given compiler.
1006 1006
 all-local $(lib_OBJECTS): $(ARGZ_H)
1007 1007
 argz.h: argz_.h
1008
-	$(mkinstalldirs) . 
1009 1008
 	cp $(srcdir)/argz_.h $@-t
1010 1009
 	mv $@-t $@
1011 1010
 
... ...
@@ -2684,6 +2684,18 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
2684 2684
   dynamic_linker='GNU/Linux ld.so'
2685 2685
   ;;
2686 2686
 
2687
+netbsdelf*-gnu)
2688
+  version_type=linux
2689
+  need_lib_prefix=no
2690
+  need_version=no
2691
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
2692
+  soname_spec='${libname}${release}${shared_ext}$major'
2693
+  shlibpath_var=LD_LIBRARY_PATH
2694
+  shlibpath_overrides_runpath=no
2695
+  hardcode_into_libs=yes
2696
+  dynamic_linker='NetBSD ld.elf_so'
2697
+  ;;
2698
+
2687 2699
 netbsd*)
2688 2700
   version_type=sunos
2689 2701
   need_lib_prefix=no
... ...
@@ -3289,7 +3301,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
3289 3289
   lt_cv_deplibs_check_method=pass_all
3290 3290
   ;;
3291 3291
 
3292
-netbsd*)
3292
+netbsd* | netbsdelf*-gnu)
3293 3293
   if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
3294 3294
     lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
3295 3295
   else
... ...
@@ -4101,7 +4113,7 @@ m4_if([$1], [CXX], [
4101 4101
 	    ;;
4102 4102
 	esac
4103 4103
 	;;
4104
-      netbsd*)
4104
+      netbsd* | netbsdelf*-gnu)
4105 4105
 	;;
4106 4106
       *qnx* | *nto*)
4107 4107
         # QNX uses GNU C++, but need to define -shared option too, otherwise
... ...
@@ -4578,6 +4590,9 @@ m4_if([$1], [CXX], [
4578 4578
       ;;
4579 4579
     esac
4580 4580
     ;;
4581
+  linux* | k*bsd*-gnu | gnu*)
4582
+    _LT_TAGVAR(link_all_deplibs, $1)=no
4583
+    ;;
4581 4584
   *)
4582 4585
     _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
4583 4586
     ;;
... ...
@@ -4640,6 +4655,9 @@ dnl Note also adjust exclude_expsyms for C++ above.
4640 4640
   openbsd*)
4641 4641
     with_gnu_ld=no
4642 4642
     ;;
4643
+  linux* | k*bsd*-gnu | gnu*)
4644
+    _LT_TAGVAR(link_all_deplibs, $1)=no
4645
+    ;;
4643 4646
   esac
4644 4647
 
4645 4648
   _LT_TAGVAR(ld_shlibs, $1)=yes
... ...
@@ -4861,7 +4879,7 @@ _LT_EOF
4861 4861
       fi
4862 4862
       ;;
4863 4863
 
4864
-    netbsd*)
4864
+    netbsd* | netbsdelf*-gnu)
4865 4865
       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
4866 4866
 	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
4867 4867
 	wlarc=
... ...
@@ -5038,6 +5056,7 @@ _LT_EOF
5038 5038
 	if test "$aix_use_runtimelinking" = yes; then
5039 5039
 	  shared_flag="$shared_flag "'${wl}-G'
5040 5040
 	fi
5041
+	_LT_TAGVAR(link_all_deplibs, $1)=no
5041 5042
       else
5042 5043
 	# not using gcc
5043 5044
 	if test "$host_cpu" = ia64; then
... ...
@@ -5342,7 +5361,7 @@ _LT_EOF
5342 5342
       _LT_TAGVAR(link_all_deplibs, $1)=yes
5343 5343
       ;;
5344 5344
 
5345
-    netbsd*)
5345
+    netbsd* | netbsdelf*-gnu)
5346 5346
       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
5347 5347
 	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
5348 5348
       else
... ...
@@ -493,7 +493,7 @@ AC_CACHE_CHECK([whether deplibs are loaded by dlopen],
493 493
     # at 6.2 and later dlopen does load deplibs.
494 494
     lt_cv_sys_dlopen_deplibs=yes
495 495
     ;;
496
-  netbsd*)
496
+  netbsd* | netbsdelf*-gnu)
497 497
     lt_cv_sys_dlopen_deplibs=yes
498 498
     ;;
499 499
   openbsd*)
... ...
@@ -1,8 +1,9 @@
1
-# Makefile.in generated by automake 1.12.4 from Makefile.am.
1
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
2 2
 # @configure_input@
3 3
 
4
-# Copyright (C) 1994-2012 Free Software Foundation, Inc.
5
-
4
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
5
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
6
+# Foundation, Inc.
6 7
 # This Makefile.in is free software; the Free Software Foundation
7 8
 # gives unlimited permission to copy and/or distribute it,
8 9
 # with or without modifications, as long as this notice is preserved.
... ...
@@ -71,8 +72,7 @@ host_triplet = @host@
71 71
 target_triplet = @target@
72 72
 bin_PROGRAMS = sigtool$(EXEEXT)
73 73
 subdir = sigtool
74
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
75
-	$(top_srcdir)/config/depcomp
74
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
76 75
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
77 76
 am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
78 77
 	$(top_srcdir)/m4/argz.m4 \
... ...
@@ -101,19 +101,6 @@ sigtool_LDADD = $(LDADD)
101 101
 AM_V_lt = $(am__v_lt_@AM_V@)
102 102
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
103 103
 am__v_lt_0 = --silent
104
-am__v_lt_1 = 
105
-AM_V_P = $(am__v_P_@AM_V@)
106
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
107
-am__v_P_0 = false
108
-am__v_P_1 = :
109
-AM_V_GEN = $(am__v_GEN_@AM_V@)
110
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
111
-am__v_GEN_0 = @echo "  GEN     " $@;
112
-am__v_GEN_1 = 
113
-AM_V_at = $(am__v_at_@AM_V@)
114
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
115
-am__v_at_0 = @
116
-am__v_at_1 = 
117 104
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
118 105
 depcomp = $(SHELL) $(top_srcdir)/config/depcomp
119 106
 am__depfiles_maybe = depfiles
... ...
@@ -126,16 +113,20 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
126 126
 	$(AM_CFLAGS) $(CFLAGS)
127 127
 AM_V_CC = $(am__v_CC_@AM_V@)
128 128
 am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
129
-am__v_CC_0 = @echo "  CC      " $@;
130
-am__v_CC_1 = 
129
+am__v_CC_0 = @echo "  CC    " $@;
130
+AM_V_at = $(am__v_at_@AM_V@)
131
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
132
+am__v_at_0 = @
131 133
 CCLD = $(CC)
132 134
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
133 135
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
134 136
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
135 137
 AM_V_CCLD = $(am__v_CCLD_@AM_V@)
136 138
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
137
-am__v_CCLD_0 = @echo "  CCLD    " $@;
138
-am__v_CCLD_1 = 
139
+am__v_CCLD_0 = @echo "  CCLD  " $@;
140
+AM_V_GEN = $(am__v_GEN_@AM_V@)
141
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
142
+am__v_GEN_0 = @echo "  GEN   " $@;
139 143
 SOURCES = $(sigtool_SOURCES)
140 144
 DIST_SOURCES = $(sigtool_SOURCES)
141 145
 am__can_run_installinfo = \
... ...
@@ -606,20 +597,6 @@ GTAGS:
606 606
 	  && $(am__cd) $(top_srcdir) \
607 607
 	  && gtags -i $(GTAGS_ARGS) "$$here"
608 608
 
609
-cscopelist:  $(HEADERS) $(SOURCES) $(LISP)
610
-	list='$(SOURCES) $(HEADERS) $(LISP)'; \
611
-	case "$(srcdir)" in \
612
-	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
613
-	  *) sdir=$(subdir)/$(srcdir) ;; \
614
-	esac; \
615
-	for i in $$list; do \
616
-	  if test -f "$$i"; then \
617
-	    echo "$(subdir)/$$i"; \
618
-	  else \
619
-	    echo "$$sdir/$$i"; \
620
-	  fi; \
621
-	done >> $(top_builddir)/cscope.files
622
-
623 609
 distclean-tags:
624 610
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
625 611
 
... ...
@@ -764,19 +741,18 @@ uninstall-am: uninstall-binPROGRAMS
764 764
 .MAKE: install-am install-strip
765 765
 
766 766
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
767
-	clean-generic clean-libtool cscopelist ctags distclean \
768
-	distclean-compile distclean-generic distclean-libtool \
769
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
770
-	install install-am install-binPROGRAMS install-data \
771
-	install-data-am install-dvi install-dvi-am install-exec \
772
-	install-exec-am install-html install-html-am install-info \
773
-	install-info-am install-man install-pdf install-pdf-am \
774
-	install-ps install-ps-am install-strip installcheck \
775
-	installcheck-am installcheck-binPROGRAMS installdirs \
776
-	maintainer-clean maintainer-clean-generic mostlyclean \
777
-	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
778
-	pdf pdf-am ps ps-am tags uninstall uninstall-am \
779
-	uninstall-binPROGRAMS
767
+	clean-generic clean-libtool ctags distclean distclean-compile \
768
+	distclean-generic distclean-libtool distclean-tags distdir dvi \
769
+	dvi-am html html-am info info-am install install-am \
770
+	install-binPROGRAMS install-data install-data-am install-dvi \
771
+	install-dvi-am install-exec install-exec-am install-html \
772
+	install-html-am install-info install-info-am install-man \
773
+	install-pdf install-pdf-am install-ps install-ps-am \
774
+	install-strip installcheck installcheck-am \
775
+	installcheck-binPROGRAMS installdirs maintainer-clean \
776
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
777
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
778
+	tags uninstall uninstall-am uninstall-binPROGRAMS
780 779
 
781 780
 
782 781
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
... ...
@@ -1,8 +1,9 @@
1
-# Makefile.in generated by automake 1.12.4 from Makefile.am.
1
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
2 2
 # @configure_input@
3 3
 
4
-# Copyright (C) 1994-2012 Free Software Foundation, Inc.
5
-
4
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
5
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
6
+# Foundation, Inc.
6 7
 # This Makefile.in is free software; the Free Software Foundation
7 8
 # gives unlimited permission to copy and/or distribute it,
8 9
 # with or without modifications, as long as this notice is preserved.
... ...
@@ -70,18 +71,12 @@ mkinstalldirs = $(install_sh) -d
70 70
 CONFIG_HEADER = $(top_builddir)/clamav-config.h
71 71
 CONFIG_CLEAN_FILES =
72 72
 CONFIG_CLEAN_VPATH_FILES =
73
-AM_V_P = $(am__v_P_@AM_V@)
74
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
75
-am__v_P_0 = false
76
-am__v_P_1 = :
77 73
 AM_V_GEN = $(am__v_GEN_@AM_V@)
78 74
 am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
79
-am__v_GEN_0 = @echo "  GEN     " $@;
80
-am__v_GEN_1 = 
75
+am__v_GEN_0 = @echo "  GEN   " $@;
81 76
 AM_V_at = $(am__v_at_@AM_V@)
82 77
 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
83 78
 am__v_at_0 = @
84
-am__v_at_1 = 
85 79
 SOURCES =
86 80
 DIST_SOURCES =
87 81
 am__can_run_installinfo = \
... ...
@@ -313,8 +308,6 @@ TAGS:
313 313
 ctags: CTAGS
314 314
 CTAGS:
315 315
 
316
-cscope cscopelist:
317
-
318 316
 
319 317
 distdir: $(DISTFILES)
320 318
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
... ...
@@ -1,8 +1,9 @@
1
-# Makefile.in generated by automake 1.12.4 from Makefile.am.
1
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
2 2
 # @configure_input@
3 3
 
4
-# Copyright (C) 1994-2012 Free Software Foundation, Inc.
5
-
4
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
5
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
6
+# Foundation, Inc.
6 7
 # This Makefile.in is free software; the Free Software Foundation
7 8
 # gives unlimited permission to copy and/or distribute it,
8 9
 # with or without modifications, as long as this notice is preserved.
... ...
@@ -54,8 +55,7 @@ target_triplet = @target@
54 54
 TESTS = $(am__EXEEXT_1) $(scripts)
55 55
 check_PROGRAMS = $(am__EXEEXT_1) check_clamd$(EXEEXT)
56 56
 subdir = unit_tests
57
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
58
-	$(top_srcdir)/config/depcomp $(top_srcdir)/config/test-driver
57
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
59 58
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
60 59
 am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
61 60
 	$(top_srcdir)/m4/argz.m4 \
... ...
@@ -98,7 +98,6 @@ check_clamav_OBJECTS = $(am_check_clamav_OBJECTS)
98 98
 AM_V_lt = $(am__v_lt_@AM_V@)
99 99
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
100 100
 am__v_lt_0 = --silent
101
-am__v_lt_1 = 
102 101
 am__check_clamd_SOURCES_DIST = check_clamav_skip.c check_clamd.c \
103 102
 	checks_common.h
104 103
 @HAVE_LIBCHECK_FALSE@am_check_clamd_OBJECTS =  \
... ...
@@ -107,18 +106,6 @@ am__check_clamd_SOURCES_DIST = check_clamav_skip.c check_clamd.c \
107 107
 @HAVE_LIBCHECK_TRUE@	check_clamd-check_clamd.$(OBJEXT)
108 108
 check_clamd_OBJECTS = $(am_check_clamd_OBJECTS)
109 109
 check_clamd_DEPENDENCIES =
110
-AM_V_P = $(am__v_P_@AM_V@)
111
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
112
-am__v_P_0 = false
113
-am__v_P_1 = :
114
-AM_V_GEN = $(am__v_GEN_@AM_V@)
115
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
116
-am__v_GEN_0 = @echo "  GEN     " $@;
117
-am__v_GEN_1 = 
118
-AM_V_at = $(am__v_at_@AM_V@)
119
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
120
-am__v_at_0 = @
121
-am__v_at_1 = 
122 110
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
123 111
 depcomp = $(SHELL) $(top_srcdir)/config/depcomp
124 112
 am__depfiles_maybe = depfiles
... ...
@@ -131,16 +118,20 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
131 131
 	$(AM_CFLAGS) $(CFLAGS)
132 132
 AM_V_CC = $(am__v_CC_@AM_V@)
133 133
 am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
134
-am__v_CC_0 = @echo "  CC      " $@;
135
-am__v_CC_1 = 
134
+am__v_CC_0 = @echo "  CC    " $@;
135
+AM_V_at = $(am__v_at_@AM_V@)
136
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
137
+am__v_at_0 = @
136 138
 CCLD = $(CC)
137 139
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
138 140
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
139 141
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
140 142
 AM_V_CCLD = $(am__v_CCLD_@AM_V@)
141 143
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
142
-am__v_CCLD_0 = @echo "  CCLD    " $@;
143
-am__v_CCLD_1 = 
144
+am__v_CCLD_0 = @echo "  CCLD  " $@;
145
+AM_V_GEN = $(am__v_GEN_@AM_V@)
146
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
147
+am__v_GEN_0 = @echo "  GEN   " $@;
144 148
 SOURCES = $(check_clamav_SOURCES) $(check_clamd_SOURCES)
145 149
 DIST_SOURCES = $(am__check_clamav_SOURCES_DIST) \
146 150
 	$(am__check_clamd_SOURCES_DIST)
... ...
@@ -151,27 +142,20 @@ am__can_run_installinfo = \
151 151
   esac
152 152
 ETAGS = etags
153 153
 CTAGS = ctags
154
-am__tty_colors_dummy = \
155
-  mgn= red= grn= lgn= blu= brg= std=; \
156
-  am__color_tests=no
157
-am__tty_colors = { \
158
-  $(am__tty_colors_dummy); \
159
-  if test "X$(AM_COLOR_TESTS)" = Xno; then \
160
-    am__color_tests=no; \
161
-  elif test "X$(AM_COLOR_TESTS)" = Xalways; then \
162
-    am__color_tests=yes; \
163
-  elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \
164
-    am__color_tests=yes; \
165
-  fi; \
166
-  if test $$am__color_tests = yes; then \
167
-    red=''; \
168
-    grn=''; \
169
-    lgn=''; \
170
-    blu=''; \
171
-    mgn=''; \
172
-    brg=''; \
173
-    std=''; \
174
-  fi; \
154
+# If stdout is a non-dumb tty, use colors.  If test -t is not supported,
155
+# then this fails; a conservative approach.  Of course do not redirect
156
+# stdout here, just stderr.
157
+am__tty_colors = \
158
+red=; grn=; lgn=; blu=; std=; \
159
+test "X$(AM_COLOR_TESTS)" != Xno \
160
+&& test "X$$TERM" != Xdumb \
161
+&& { test "X$(AM_COLOR_TESTS)" = Xalways || test -t 1 2>/dev/null; } \
162
+&& { \
163
+  red=''; \
164
+  grn=''; \
165
+  lgn=''; \
166
+  blu=''; \
167
+  std=''; \
175 168
 }
176 169
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
177 170
 am__vpath_adj = case $$p in \
... ...
@@ -200,161 +184,91 @@ am__uninstall_files_from_dir = { \
200 200
     || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
201 201
          $(am__cd) "$$dir" && rm -f $$files; }; \
202 202
   }
203
-am__recheck_rx = ^[ 	]*:recheck:[ 	]*
204
-am__global_test_result_rx = ^[ 	]*:global-test-result:[ 	]*
205
-am__copy_in_global_log_rx = ^[ 	]*:copy-in-global-log:[ 	]*
206
-# A command that, given a newline-separated list of test names on the
207
-# standard input, print the name of the tests that are to be re-run
208
-# upon "make recheck".
209
-am__list_recheck_tests = $(AWK) '{ \
210
-  recheck = 1; \
211
-  while ((rc = (getline line < ($$0 ".trs"))) != 0) \
212
-    { \
213
-      if (rc < 0) \
214
-        { \
215
-          if ((getline line2 < ($$0 ".log")) < 0) \
216
-	    recheck = 0; \
217
-          break; \
218
-        } \
219
-      else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \
220
-        { \
221
-          recheck = 0; \
222
-          break; \
223
-        } \
224
-      else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \
225
-        { \
226
-          break; \
227
-        } \
228
-    }; \
229
-  if (recheck) \
230
-    print $$0; \
231
-  close ($$0 ".trs"); \
232
-  close ($$0 ".log"); \
233
-}'
234
-# A command that, given a newline-separated list of test names on the
235
-# standard input, create the global log from their .trs and .log files.
236
-am__create_global_log = $(AWK) ' \
237
-function fatal(msg) \
238
-{ \
239
-  print "fatal: making $@: " msg | "cat >&2"; \
240
-  exit 1; \
241
-} \
242
-function rst_section(header) \
243
-{ \
244
-  print header; \
245
-  len = length(header); \
246
-  for (i = 1; i <= len; i = i + 1) \
247
-    printf "="; \
248
-  printf "\n\n"; \
249
-} \
250
-{ \
251
-  copy_in_global_log = 1; \
252
-  global_test_result = "RUN"; \
253
-  while ((rc = (getline line < ($$0 ".trs"))) != 0) \
254
-    { \
255
-      if (rc < 0) \
256
-         fatal("failed to read from " $$0 ".trs"); \
257
-      if (line ~ /$(am__global_test_result_rx)/) \
258
-        { \
259
-          sub("$(am__global_test_result_rx)", "", line); \
260
-          sub("[ 	]*$$", "", line); \
261
-          global_test_result = line; \
262
-        } \
263
-      else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \
264
-        copy_in_global_log = 0; \
265
-    }; \
266
-  if (copy_in_global_log) \
267
-    { \
268
-      rst_section(global_test_result ": " $$0); \
269
-      while ((rc = (getline line < ($$0 ".log"))) != 0) \
270
-      { \
271
-        if (rc < 0) \
272
-          fatal("failed to read from " $$0 ".log"); \
273
-        print line; \
274
-      }; \
275
-      printf "\n"; \
276
-    }; \
277
-  close ($$0 ".trs"); \
278
-  close ($$0 ".log"); \
203
+# Restructured Text title and section.
204
+am__rst_title = sed 's/.*/   &   /;h;s/./=/g;p;x;p;g;p;s/.*//'
205
+am__rst_section = sed 'p;s/./=/g;p;g'
206
+# Put stdin (possibly several lines separated by ".  ") in a box.
207
+# Prefix each line by 'col' and terminate each with 'std', for coloring.
208
+# Multi line coloring is problematic with "less -R", so we really need
209
+# to color each line individually.
210
+am__text_box = $(AWK) '{			\
211
+  n = split($$0, lines, "\\.  "); max = 0;	\
212
+  for (i = 1; i <= n; ++i)			\
213
+    if (max < length(lines[i]))			\
214
+      max = length(lines[i]);			\
215
+  for (i = 0; i < max; ++i)			\
216
+    line = line "=";				\
217
+  print col line std;				\
218
+  for (i = 1; i <= n; ++i)			\
219
+    if (lines[i])				\
220
+      print col lines[i] std;			\
221
+  print col line std;				\
279 222
 }'
280
-# Restructured Text title.
281
-am__rst_title = { sed 's/.*/   &   /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; }
282 223
 # Solaris 10 'make', and several other traditional 'make' implementations,
283 224
 # pass "-e" to $(SHELL), and POSIX 2008 even requires this.  Work around it
284 225
 # by disabling -e (using the XSI extension "set +e") if it's set.
285 226
 am__sh_e_setup = case $$- in *e*) set +e;; esac
286
-# Default flags passed to test drivers.
287
-am__common_driver_flags = \
288
-  --color-tests "$$am__color_tests" \
289
-  --enable-hard-errors "$$am__enable_hard_errors" \
290
-  --expect-failure "$$am__expect_failure"
291 227
 # To be inserted before the command running the test.  Creates the
292 228
 # directory for the log if needed.  Stores in $dir the directory
293
-# containing $f, in $tst the test, in $log the log.  Executes the
294
-# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and
295
-# passes TESTS_ENVIRONMENT.  Set up options for the wrapper that
296
-# will run the test scripts (or their associated LOG_COMPILER, if
297
-# thy have one).
229
+# containing $f, in $tst the test, in $log the log, and passes
230
+# TESTS_ENVIRONMENT.  Save and restore TERM around use of
231
+# TESTS_ENVIRONMENT, in case that unsets it.
298 232
 am__check_pre = \
299 233
 $(am__sh_e_setup);					\
300 234
 $(am__vpath_adj_setup) $(am__vpath_adj)			\
301
-$(am__tty_colors);					\
302 235
 srcdir=$(srcdir); export srcdir;			\
303
-case "$@" in						\
304
-  */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;;	\
305
-    *) am__odir=.;; 					\
306
-esac;							\
307
-test "x$$am__odir" = x"." || test -d "$$am__odir" 	\
308
-  || $(MKDIR_P) "$$am__odir" || exit $$?;		\
236
+rm -f $@-t;						\
237
+am__trap='rm -f '\''$(abs_builddir)/$@-t'\''; (exit $$st); exit $$st'; \
238
+trap "st=129; $$am__trap" 1; trap "st=130; $$am__trap" 2;	\
239
+trap "st=141; $$am__trap" 13; trap "st=143; $$am__trap" 15; \
240
+am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;		\
241
+test "x$$am__odir" = x. || $(MKDIR_P) "$$am__odir" || exit $$?;	\
309 242
 if test -f "./$$f"; then dir=./;			\
310 243
 elif test -f "$$f"; then dir=;				\
311 244
 else dir="$(srcdir)/"; fi;				\
312
-tst=$$dir$$f; log='$@'; 				\
313
-if test -n '$(DISABLE_HARD_ERRORS)'; then		\
314
-  am__enable_hard_errors=no; 				\
315
-else							\
316
-  am__enable_hard_errors=yes; 				\
317
-fi; 							\
245
+tst=$$dir$$f; log='$@'; __SAVED_TERM=$$TERM;		\
246
+$(TESTS_ENVIRONMENT)
247
+# To be appended to the command running the test.  Handle the stdout
248
+# and stderr redirection, and catch the exit status.
249
+am__check_post = \
250
+>$@-t 2>&1;						\
251
+estatus=$$?;						\
252
+if test -n '$(DISABLE_HARD_ERRORS)'			\
253
+   && test $$estatus -eq 99; then			\
254
+  estatus=1;						\
255
+fi;							\
256
+TERM=$$__SAVED_TERM; export TERM;			\
257
+$(am__tty_colors);					\
258
+xfailed=PASS;						\
318 259
 case " $(XFAIL_TESTS) " in				\
319 260
   *[\ \	]$$f[\ \	]* | *[\ \	]$$dir$$f[\ \	]*) \
320
-    am__expect_failure=yes;;				\
321
-  *)							\
322
-    am__expect_failure=no;;				\
323
-esac; 							\
324
-$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT)
325
-# A shell command to get the names of the tests scripts with any registered
326
-# extension removed (i.e., equivalently, the names of the test logs, with
327
-# the '.log' extension removed).  The result is saved in the shell variable
328
-# '$bases'.  This honors runtime overriding of TESTS and TEST_LOGS.  Sadly,
329
-# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)",
330
-# since that might cause problem with VPATH rewrites for suffix-less tests.
331
-# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'.
332
-am__set_TESTS_bases = \
333
-  bases='$(TEST_LOGS)'; \
334
-  bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \
335
-  bases=`echo $$bases`
261
+    xfailed=XFAIL;;					\
262
+esac;							\
263
+case $$estatus.$$xfailed in				\
264
+    0.XFAIL) col=$$red; res=XPASS;;			\
265
+    0.*)     col=$$grn; res=PASS ;;			\
266
+    77.*)    col=$$blu; res=SKIP ;;			\
267
+    99.*)    col=$$red; res=FAIL ;;			\
268
+    *.XFAIL) col=$$lgn; res=XFAIL;;			\
269
+    *.*)     col=$$red; res=FAIL ;;			\
270
+esac;							\
271
+echo "$${col}$$res$${std}: $$f";			\
272
+echo "$$res: $$f (exit: $$estatus)" |			\
273
+  $(am__rst_section) >$@;				\
274
+cat $@-t >>$@;						\
275
+rm -f $@-t
336 276
 RECHECK_LOGS = $(TEST_LOGS)
337
-AM_RECURSIVE_TARGETS = check recheck
277
+AM_RECURSIVE_TARGETS = check recheck check-html recheck-html
278
+TEST_SUITE_HTML = $(TEST_SUITE_LOG:.log=.html)
338 279
 TEST_SUITE_LOG = test-suite.log
339 280
 TEST_EXTENSIONS = @EXEEXT@ .test
340
-LOG_DRIVER = $(SHELL) $(top_srcdir)/config/test-driver
341 281
 LOG_COMPILE = $(LOG_COMPILER) $(AM_LOG_FLAGS) $(LOG_FLAGS)
342
-am__set_b = \
343
-  case '$@' in \
344
-    */*) \
345
-      case '$*' in \
346
-        */*) b='$*';; \
347
-          *) b=`echo '$@' | sed 's/\.log$$//'`; \
348
-       esac;; \
349
-    *) \
350
-      b='$*';; \
351
-  esac
352 282
 am__test_logs1 = $(TESTS:=.log)
353 283
 am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log)
354 284
 TEST_LOGS = $(am__test_logs2:.test.log=.log)
355
-TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/config/test-driver
356 285
 TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \
357 286
 	$(TEST_LOG_FLAGS)
287
+TEST_LOGS_TMP = $(TEST_LOGS:.log=.log-t)
358 288
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
359 289
 ACLOCAL = @ACLOCAL@
360 290
 AMTAR = @AMTAR@
... ...
@@ -554,7 +468,7 @@ EXTRA_DIST = .split $(srcdir)/*.ref input test-freshclam.conf valgrind.supp viru
554 554
 all: all-am
555 555
 
556 556
 .SUFFIXES:
557
-.SUFFIXES: .c .lo .log .o .obj .test .test$(EXEEXT) .trs
557
+.SUFFIXES: .c .html .lo .log .o .obj .test .test$(EXEEXT)
558 558
 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
559 559
 	@for dep in $?; do \
560 560
 	  case '$(am__configure_deps)' in \
... ...
@@ -864,269 +778,165 @@ GTAGS:
864 864
 	  && $(am__cd) $(top_srcdir) \
865 865
 	  && gtags -i $(GTAGS_ARGS) "$$here"
866 866
 
867
-cscopelist:  $(HEADERS) $(SOURCES) $(LISP)
868
-	list='$(SOURCES) $(HEADERS) $(LISP)'; \
869
-	case "$(srcdir)" in \
870
-	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
871
-	  *) sdir=$(subdir)/$(srcdir) ;; \
872
-	esac; \
873
-	for i in $$list; do \
874
-	  if test -f "$$i"; then \
875
-	    echo "$(subdir)/$$i"; \
876
-	  else \
877
-	    echo "$$sdir/$$i"; \
878
-	  fi; \
879
-	done >> $(top_builddir)/cscope.files
880
-
881 867
 distclean-tags:
882 868
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
883 869
 
884
-# Recover from deleted '.trs' file; this should ensure that
885
-# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create
886
-# both 'foo.log' and 'foo.trs'.  Break the recipe in two subshells
887
-# to avoid problems with "make -n".
888
-.log.trs:
889
-	rm -f $< $@
890
-	$(MAKE) $(AM_MAKEFLAGS) $<
891
-
892
-# Leading 'am--fnord' is there to ensure the list of targets does not
893
-# exand to empty, as could happen e.g. with make check TESTS=''.
894
-am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck)
895
-am--force-recheck:
896
-	@:
897
-
898 870
 $(TEST_SUITE_LOG): $(TEST_LOGS)
899
-	@$(am__set_TESTS_bases); \
900
-	am__f_ok () { test -f "$$1" && test -r "$$1"; }; \
901
-	redo_bases=`for i in $$bases; do \
902
-	              am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \
903
-	            done`; \
904
-	if test -n "$$redo_bases"; then \
905
-	  redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \
906
-	  redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \
907
-	  if $(am__make_dryrun); then :; else \
908
-	    rm -f $$redo_logs && rm -f $$redo_results || exit 1; \
909
-	  fi; \
910
-	fi; \
911
-	if test -n "$$am__remaking_logs"; then \
912
-	  echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \
913
-	       "recursion detected" >&2; \
914
-	else \
915
-	  am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \
916
-	fi; \
917
-	if $(am__make_dryrun); then :; else \
918
-	  st=0;  \
919
-	  errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \
920
-	  for i in $$redo_bases; do \
921
-	    test -f $$i.trs && test -r $$i.trs \
922
-	      || { echo "$$errmsg $$i.trs" >&2; st=1; }; \
923
-	    test -f $$i.log && test -r $$i.log \
924
-	      || { echo "$$errmsg $$i.log" >&2; st=1; }; \
925
-	  done; \
926
-	  test $$st -eq 0 || exit 1; \
927
-	fi
928
-	@$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \
929
-	ws='[ 	]'; \
930
-	results=`for b in $$bases; do echo $$b.trs; done`; \
931
-	test -n "$$results" || results=/dev/null; \
932
-	all=`  grep "^$$ws*:test-result:"           $$results | wc -l`; \
933
-	pass=` grep "^$$ws*:test-result:$$ws*PASS"  $$results | wc -l`; \
934
-	fail=` grep "^$$ws*:test-result:$$ws*FAIL"  $$results | wc -l`; \
935
-	skip=` grep "^$$ws*:test-result:$$ws*SKIP"  $$results | wc -l`; \
936
-	xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \
937
-	xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \
938
-	error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \
939
-	if test `expr $$fail + $$xpass + $$error` -eq 0; then \
940
-	  success=true; \
941
-	else \
942
-	  success=false; \
943
-	fi; \
944
-	br='==================='; br=$$br$$br$$br$$br; \
945
-	result_count () \
946
-	{ \
947
-	    if test x"$$1" = x"--maybe-color"; then \
948
-	      maybe_colorize=yes; \
949
-	    elif test x"$$1" = x"--no-color"; then \
950
-	      maybe_colorize=no; \
951
-	    else \
952
-	      echo "$@: invalid 'result_count' usage" >&2; exit 4; \
953
-	    fi; \
954
-	    shift; \
955
-	    desc=$$1 count=$$2; \
956
-	    if test $$maybe_colorize = yes && test $$count -gt 0; then \
957
-	      color_start=$$3 color_end=$$std; \
958
-	    else \
959
-	      color_start= color_end=; \
960
-	    fi; \
961
-	    echo "$${color_start}# $$desc $$count$${color_end}"; \
962
-	}; \
963
-	create_testsuite_report () \
964
-	{ \
965
-	  result_count $$1 "TOTAL:" $$all   "$$brg"; \
966
-	  result_count $$1 "PASS: " $$pass  "$$grn"; \
967
-	  result_count $$1 "SKIP: " $$skip  "$$blu"; \
968
-	  result_count $$1 "XFAIL:" $$xfail "$$lgn"; \
969
-	  result_count $$1 "FAIL: " $$fail  "$$red"; \
970
-	  result_count $$1 "XPASS:" $$xpass "$$red"; \
971
-	  result_count $$1 "ERROR:" $$error "$$mgn"; \
972
-	}; \
871
+	@$(am__sh_e_setup);						\
872
+	list='$(TEST_LOGS)';						\
873
+	results=`for f in $$list; do					\
874
+		   test -r $$f && read line < $$f && echo "$$line"	\
875
+		     || echo FAIL;					\
876
+		 done`;							\
877
+	all=`echo "$$results" | sed '/^$$/d' | wc -l | sed -e 's/^[	 ]*//'`; \
878
+	fail=`echo "$$results" | grep -c '^FAIL'`;			\
879
+	pass=`echo "$$results" | grep -c '^PASS'`;			\
880
+	skip=`echo "$$results" | grep -c '^SKIP'`;			\
881
+	xfail=`echo "$$results" | grep -c '^XFAIL'`;			\
882
+	xpass=`echo "$$results" | grep -c '^XPASS'`;			\
883
+	failures=`expr $$fail + $$xpass`;				\
884
+	all=`expr $$all - $$skip`;					\
885
+	if test "$$all" -eq 1; then tests=test; All=;			\
886
+	else tests=tests; All="All "; fi;				\
887
+	case fail=$$fail:xpass=$$xpass:xfail=$$xfail in			\
888
+	  fail=0:xpass=0:xfail=0)					\
889
+	    msg="$$All$$all $$tests passed.  ";				\
890
+	    exit=true;;							\
891
+	  fail=0:xpass=0:xfail=*)					\
892
+	    msg="$$All$$all $$tests behaved as expected";		\
893
+	    if test "$$xfail" -eq 1; then xfailures=failure;		\
894
+	    else xfailures=failures; fi;				\
895
+	    msg="$$msg ($$xfail expected $$xfailures).  ";		\
896
+	    exit=true;;							\
897
+	  fail=*:xpass=0:xfail=*)					\
898
+	    msg="$$fail of $$all $$tests failed.  ";			\
899
+	    exit=false;;						\
900
+	  fail=*:xpass=*:xfail=*)					\
901
+	    msg="$$failures of $$all $$tests did not behave as expected"; \
902
+	    if test "$$xpass" -eq 1; then xpasses=pass;			\
903
+	    else xpasses=passes; fi;					\
904
+	    msg="$$msg ($$xpass unexpected $$xpasses).  ";		\
905
+	    exit=false;;						\
906
+	  *)								\
907
+	    echo >&2 "incorrect case"; exit 4;;				\
908
+	esac;								\
909
+	if test "$$skip" -ne 0; then					\
910
+	  if test "$$skip" -eq 1; then					\
911
+	    msg="$$msg($$skip test was not run).  ";			\
912
+	  else								\
913
+	    msg="$$msg($$skip tests were not run).  ";			\
914
+	  fi;								\
915
+	fi;								\
973 916
 	{								\
974 917
 	  echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" |	\
975 918
 	    $(am__rst_title);						\
976
-	  create_testsuite_report --no-color;				\
919
+	  echo "$$msg";							\
977 920
 	  echo;								\
978 921
 	  echo ".. contents:: :depth: 2";				\
979 922
 	  echo;								\
980
-	  for b in $$bases; do echo $$b; done				\
981
-	    | $(am__create_global_log);					\
982
-	} >$(TEST_SUITE_LOG).tmp || exit 1;				\
923
+	  for f in $$list; do						\
924
+	    test -r $$f && read line < $$f || line=;			\
925
+	    case $$line in						\
926
+	      PASS:*|XFAIL:*);;						\
927
+	      *) echo; cat $$f;;					\
928
+	    esac;							\
929
+	  done;								\
930
+	} >$(TEST_SUITE_LOG).tmp;					\
983 931
 	mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG);			\
984
-	if $$success; then						\
932
+	if test "$$failures" -ne 0; then				\
933
+	  msg="$${msg}See $(subdir)/$(TEST_SUITE_LOG).  ";		\
934
+	  if test -n "$(PACKAGE_BUGREPORT)"; then			\
935
+	    msg="$${msg}Please report to $(PACKAGE_BUGREPORT).  ";	\
936
+	  fi;								\
937
+	fi;								\
938
+	test x"$$VERBOSE" = x || $$exit || cat $(TEST_SUITE_LOG);	\
939
+	$(am__tty_colors);						\
940
+	if $$exit; then							\
985 941
 	  col="$$grn";							\
986 942
 	 else								\
987 943
 	  col="$$red";							\
988
-	  test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG);		\
989
-	fi;								\
990
-	echo "$${col}$$br$${std}"; 					\
991
-	echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}";	\
992
-	echo "$${col}$$br$${std}"; 					\
993
-	create_testsuite_report --maybe-color;				\
994
-	echo "$$col$$br$$std";						\
995
-	if $$success; then :; else					\
996
-	  echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}";		\
997
-	  if test -n "$(PACKAGE_BUGREPORT)"; then			\
998
-	    echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}";	\
999
-	  fi;								\
1000
-	  echo "$$col$$br$$std";					\
1001 944
 	fi;								\
1002
-	$$success || exit 1
945
+	echo "$$msg" | $(am__text_box) "col=$$col" "std=$$std";		\
946
+	$$exit || exit 1
1003 947
 
1004
-check-TESTS:
1005
-	@list='$(RECHECK_LOGS)';           test -z "$$list" || rm -f $$list
1006
-	@list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list
1007
-	@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
1008
-	@set +e; $(am__set_TESTS_bases); \
1009
-	log_list=`for i in $$bases; do echo $$i.log; done`; \
1010
-	trs_list=`for i in $$bases; do echo $$i.trs; done`; \
1011
-	log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \
1012
-	$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \
1013
-	exit $$?;
1014
-recheck: all $(check_PROGRAMS) $(check_SCRIPTS)
948
+check-TESTS recheck:
949
+	@if test $@ != recheck; then \
950
+	   list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list; \
951
+	 fi
1015 952
 	@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
1016
-	@set +e; $(am__set_TESTS_bases); \
1017
-	bases=`for i in $$bases; do echo $$i; done \
1018
-	         | $(am__list_recheck_tests)` || exit 1; \
1019
-	log_list=`for i in $$bases; do echo $$i.log; done`; \
1020
-	log_list=`echo $$log_list`; \
1021
-	$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \
1022
-	        am__force_recheck=am--force-recheck \
1023
-	        TEST_LOGS="$$log_list"; \
1024
-	exit $$?
953
+	@list='' list2='$(TEST_LOGS)'; for f in $$list2; do \
954
+	  test .log = $$f && continue; \
955
+	  if test $@ = recheck; then \
956
+	    test -f $$f || continue; \
957
+	    if test -r $$f && read line < $$f; then \
958
+	      case $$line in FAIL*|XPASS*) : ;; *) continue;; esac; \
959
+	    fi; \
960
+	  fi; \
961
+	  if test -z "$$list"; then list=$$f; else list="$$list $$f"; fi; \
962
+	done; \
963
+	if test $@ = recheck && test -n "$$list"; then \
964
+	  $(am__make_dryrun) || rm -f $$list || exit 1; \
965
+	fi; \
966
+	$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$list"
967
+recheck: $(check_PROGRAMS) $(check_SCRIPTS)
968
+
969
+am--mostlyclean-test-html:
970
+	list='$(TEST_LOGS:.log=.html)'; test -z "$$list" || rm -f $$list
971
+	rm -f $(TEST_SUITE_HTML)
972
+
973
+.log.html:
974
+	@list='$(RST2HTML) $$RST2HTML rst2html rst2html.py';		\
975
+	for r2h in $$list; do						\
976
+	  if ($$r2h --version) >/dev/null 2>&1; then			\
977
+	    R2H=$$r2h;							\
978
+	  fi;								\
979
+	done;								\
980
+	if test -z "$$R2H"; then					\
981
+	  echo >&2 "cannot find rst2html, cannot create $@";		\
982
+	  exit 2;							\
983
+	fi;								\
984
+	$$R2H $< >$@.tmp
985
+	@mv $@.tmp $@
986
+
987
+# Be sure to run check first, and then to convert the result.
988
+# Beware of concurrent executions.  Run "check" not "check-TESTS", as
989
+# check-SCRIPTS and other dependencies are rebuilt by the former only.
990
+# And expect check to fail.
991
+check-html recheck-html:
992
+	@target=`echo $@ | sed 's/-html$$//'`; \
993
+	rv=0; $(MAKE) $(AM_MAKEFLAGS) $$target || rv=$$?; \
994
+	$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_HTML) TEST_LOGS= || exit 4; \
995
+	exit $$rv
1025 996
 check_clamav.log: check_clamav$(EXEEXT)
1026
-	@p='check_clamav$(EXEEXT)'; \
1027
-	b='check_clamav'; \
1028
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
1029
-	--log-file $$b.log --trs-file $$b.trs \
1030
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
1031
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
997
+	@p='check_clamav$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
1032 998
 check_freshclam.sh.log: check_freshclam.sh
1033
-	@p='check_freshclam.sh'; \
1034
-	b='check_freshclam.sh'; \
1035
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
1036
-	--log-file $$b.log --trs-file $$b.trs \
1037
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
1038
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
999
+	@p='check_freshclam.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
1039 1000
 check_sigtool.sh.log: check_sigtool.sh
1040
-	@p='check_sigtool.sh'; \
1041
-	b='check_sigtool.sh'; \
1042
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
1043
-	--log-file $$b.log --trs-file $$b.trs \
1044
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
1045
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
1001
+	@p='check_sigtool.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
1046 1002
 check_unit_vg.sh.log: check_unit_vg.sh
1047
-	@p='check_unit_vg.sh'; \
1048
-	b='check_unit_vg.sh'; \
1049
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
1050
-	--log-file $$b.log --trs-file $$b.trs \
1051
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
1052
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
1003
+	@p='check_unit_vg.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
1053 1004
 check1_clamscan.sh.log: check1_clamscan.sh
1054
-	@p='check1_clamscan.sh'; \
1055
-	b='check1_clamscan.sh'; \
1056
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
1057
-	--log-file $$b.log --trs-file $$b.trs \
1058
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
1059
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
1005
+	@p='check1_clamscan.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
1060 1006
 check2_clamd.sh.log: check2_clamd.sh
1061
-	@p='check2_clamd.sh'; \
1062
-	b='check2_clamd.sh'; \
1063
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
1064
-	--log-file $$b.log --trs-file $$b.trs \
1065
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
1066
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
1007
+	@p='check2_clamd.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
1067 1008
 check3_clamd.sh.log: check3_clamd.sh
1068
-	@p='check3_clamd.sh'; \
1069
-	b='check3_clamd.sh'; \
1070
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
1071
-	--log-file $$b.log --trs-file $$b.trs \
1072
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
1073
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
1009
+	@p='check3_clamd.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
1074 1010
 check4_clamd.sh.log: check4_clamd.sh
1075
-	@p='check4_clamd.sh'; \
1076
-	b='check4_clamd.sh'; \
1077
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
1078
-	--log-file $$b.log --trs-file $$b.trs \
1079
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
1080
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
1011
+	@p='check4_clamd.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
1081 1012
 check5_clamd_vg.sh.log: check5_clamd_vg.sh
1082
-	@p='check5_clamd_vg.sh'; \
1083
-	b='check5_clamd_vg.sh'; \
1084
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
1085
-	--log-file $$b.log --trs-file $$b.trs \
1086
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
1087
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
1013
+	@p='check5_clamd_vg.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
1088 1014
 check6_clamd_vg.sh.log: check6_clamd_vg.sh
1089
-	@p='check6_clamd_vg.sh'; \
1090
-	b='check6_clamd_vg.sh'; \
1091
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
1092
-	--log-file $$b.log --trs-file $$b.trs \
1093
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
1094
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
1015
+	@p='check6_clamd_vg.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
1095 1016
 check7_clamd_hg.sh.log: check7_clamd_hg.sh
1096
-	@p='check7_clamd_hg.sh'; \
1097
-	b='check7_clamd_hg.sh'; \
1098
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
1099
-	--log-file $$b.log --trs-file $$b.trs \
1100
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
1101
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
1017
+	@p='check7_clamd_hg.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
1102 1018
 check8_clamd_hg.sh.log: check8_clamd_hg.sh
1103
-	@p='check8_clamd_hg.sh'; \
1104
-	b='check8_clamd_hg.sh'; \
1105
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
1106
-	--log-file $$b.log --trs-file $$b.trs \
1107
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
1108
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
1019
+	@p='check8_clamd_hg.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
1109 1020
 check9_clamscan_vg.sh.log: check9_clamscan_vg.sh
1110
-	@p='check9_clamscan_vg.sh'; \
1111
-	b='check9_clamscan_vg.sh'; \
1112
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
1113
-	--log-file $$b.log --trs-file $$b.trs \
1114
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
1115
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
1021
+	@p='check9_clamscan_vg.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
1116 1022
 .test.log:
1117
-	@p='$<'; \
1118
-	$(am__set_b); \
1119
-	$(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \
1120
-	--log-file $$b.log --trs-file $$b.trs \
1121
-	$(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
1122
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
1023
+	@p='$<'; $(am__check_pre) $(TEST_LOG_COMPILE) "$$tst" $(am__check_post)
1123 1024
 @am__EXEEXT_TRUE@.test$(EXEEXT).log:
1124
-@am__EXEEXT_TRUE@	@p='$<'; \
1125
-@am__EXEEXT_TRUE@	$(am__set_b); \
1126
-@am__EXEEXT_TRUE@	$(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \
1127
-@am__EXEEXT_TRUE@	--log-file $$b.log --trs-file $$b.trs \
1128
-@am__EXEEXT_TRUE@	$(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
1129
-@am__EXEEXT_TRUE@	"$$tst" $(AM_TESTS_FD_REDIRECT)
1025
+@am__EXEEXT_TRUE@	@p='$<'; $(am__check_pre) $(TEST_LOG_COMPILE) "$$tst" $(am__check_post)
1130 1026
 
1131 1027
 distdir: $(DISTFILES)
1132 1028
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
... ...
@@ -1185,7 +995,7 @@ install-strip:
1185 1185
 	fi
1186 1186
 mostlyclean-generic:
1187 1187
 	-test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS)
1188
-	-test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs)
1188
+	-test -z "$(TEST_LOGS_TMP)" || rm -f $(TEST_LOGS_TMP)
1189 1189
 	-test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
1190 1190
 
1191 1191
 clean-generic:
... ...
@@ -1257,8 +1067,8 @@ maintainer-clean-am: distclean-am maintainer-clean-generic
1257 1257
 
1258 1258
 mostlyclean: mostlyclean-am
1259 1259
 
1260
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
1261
-	mostlyclean-libtool
1260
+mostlyclean-am: am--mostlyclean-test-html mostlyclean-compile \
1261
+	mostlyclean-generic mostlyclean-libtool
1262 1262
 
1263 1263
 pdf: pdf-am
1264 1264
 
... ...
@@ -1270,21 +1080,22 @@ ps-am:
1270 1270
 
1271 1271
 uninstall-am:
1272 1272
 
1273
-.MAKE: check-am install-am install-strip
1274
-
1275
-.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
1276
-	clean-checkPROGRAMS clean-generic clean-libtool clean-local \
1277
-	cscopelist ctags distclean distclean-compile distclean-generic \
1278
-	distclean-libtool distclean-tags distdir dvi dvi-am html \
1279
-	html-am info info-am install install-am install-data \
1280
-	install-data-am install-dvi install-dvi-am install-exec \
1281
-	install-exec-am install-html install-html-am install-info \
1282
-	install-info-am install-man install-pdf install-pdf-am \
1283
-	install-ps install-ps-am install-strip installcheck \
1284
-	installcheck-am installdirs maintainer-clean \
1285
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
1286
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
1287
-	recheck tags uninstall uninstall-am
1273
+.MAKE: check-am check-html install-am install-strip recheck-html
1274
+
1275
+.PHONY: CTAGS GTAGS all all-am am--mostlyclean-test-html check \
1276
+	check-TESTS check-am check-html clean clean-checkPROGRAMS \
1277
+	clean-generic clean-libtool clean-local ctags distclean \
1278
+	distclean-compile distclean-generic distclean-libtool \
1279
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
1280
+	install install-am install-data install-data-am install-dvi \
1281
+	install-dvi-am install-exec install-exec-am install-html \
1282
+	install-html-am install-info install-info-am install-man \
1283
+	install-pdf install-pdf-am install-ps install-ps-am \
1284
+	install-strip installcheck installcheck-am installdirs \
1285
+	maintainer-clean maintainer-clean-generic mostlyclean \
1286
+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
1287
+	pdf pdf-am ps ps-am recheck recheck-html tags uninstall \
1288
+	uninstall-am
1288 1289
 
1289 1290
 
1290 1291
 check_unit_vg.sh: $(FILES)