Browse code

autojunk'd

Kevin Lin authored on 2014/11/20 08:18:58
Showing 21 changed files
... ...
@@ -1,4 +1,4 @@
1
-# Makefile.in generated by automake 1.14 from Makefile.am.
1
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
2 2
 # @configure_input@
3 3
 
4 4
 # Copyright (C) 1994-2013 Free Software Foundation, Inc.
... ...
@@ -955,9 +955,10 @@ distcheck: dist
955 955
 	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
956 956
 	  && am__cwd=`pwd` \
957 957
 	  && $(am__cd) $(distdir)/_build \
958
-	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
958
+	  && ../configure \
959 959
 	    $(AM_DISTCHECK_CONFIGURE_FLAGS) \
960 960
 	    $(DISTCHECK_CONFIGURE_FLAGS) \
961
+	    --srcdir=.. --prefix="$$dc_install_base" \
961 962
 	  && $(MAKE) $(AM_MAKEFLAGS) \
962 963
 	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
963 964
 	  && $(MAKE) $(AM_MAKEFLAGS) check \
... ...
@@ -1,4 +1,4 @@
1
-# generated automatically by aclocal 1.14 -*- Autoconf -*-
1
+# generated automatically by aclocal 1.14.1 -*- Autoconf -*-
2 2
 
3 3
 # Copyright (C) 1996-2013 Free Software Foundation, Inc.
4 4
 
... ...
@@ -35,7 +35,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
35 35
 [am__api_version='1.14'
36 36
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
37 37
 dnl require some minimum version.  Point them to the right macro.
38
-m4_if([$1], [1.14], [],
38
+m4_if([$1], [1.14.1], [],
39 39
       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
40 40
 ])
41 41
 
... ...
@@ -51,7 +51,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
51 51
 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
52 52
 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
53 53
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
54
-[AM_AUTOMAKE_VERSION([1.14])dnl
54
+[AM_AUTOMAKE_VERSION([1.14.1])dnl
55 55
 m4_ifndef([AC_AUTOCONF_VERSION],
56 56
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
57 57
 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
... ...
@@ -1,4 +1,4 @@
1
-# Makefile.in generated by automake 1.14 from Makefile.am.
1
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
2 2
 # @configure_input@
3 3
 
4 4
 # Copyright (C) 1994-2013 Free Software Foundation, Inc.
... ...
@@ -1,4 +1,4 @@
1
-# Makefile.in generated by automake 1.14 from Makefile.am.
1
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
2 2
 # @configure_input@
3 3
 
4 4
 # Copyright (C) 1994-2013 Free Software Foundation, Inc.
... ...
@@ -1,4 +1,4 @@
1
-# Makefile.in generated by automake 1.14 from Makefile.am.
1
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
2 2
 # @configure_input@
3 3
 
4 4
 # Copyright (C) 1994-2013 Free Software Foundation, Inc.
... ...
@@ -1,4 +1,4 @@
1
-# Makefile.in generated by automake 1.14 from Makefile.am.
1
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
2 2
 # @configure_input@
3 3
 
4 4
 # Copyright (C) 1994-2013 Free Software Foundation, Inc.
... ...
@@ -1,4 +1,4 @@
1
-# Makefile.in generated by automake 1.14 from Makefile.am.
1
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
2 2
 # @configure_input@
3 3
 
4 4
 # Copyright (C) 1994-2013 Free Software Foundation, Inc.
... ...
@@ -1,4 +1,4 @@
1
-# Makefile.in generated by automake 1.14 from Makefile.am.
1
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
2 2
 # @configure_input@
3 3
 
4 4
 # Copyright (C) 1994-2013 Free Software Foundation, Inc.
... ...
@@ -1,4 +1,4 @@
1
-# Makefile.in generated by automake 1.14 from Makefile.am.
1
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
2 2
 # @configure_input@
3 3
 
4 4
 # Copyright (C) 1994-2013 Free Software Foundation, Inc.
... ...
@@ -1,4 +1,4 @@
1
-# Makefile.in generated by automake 1.14 from Makefile.am.
1
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
2 2
 # @configure_input@
3 3
 
4 4
 # Copyright (C) 1994-2013 Free Software Foundation, Inc.
... ...
@@ -1,4 +1,4 @@
1
-# Makefile.in generated by automake 1.14 from Makefile.am.
1
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
2 2
 # @configure_input@
3 3
 
4 4
 # Copyright (C) 1994-2013 Free Software Foundation, Inc.
... ...
@@ -1,4 +1,4 @@
1
-# Makefile.in generated by automake 1.14 from Makefile.am.
1
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
2 2
 # @configure_input@
3 3
 
4 4
 # Copyright (C) 1994-2013 Free Software Foundation, Inc.
... ...
@@ -1,4 +1,4 @@
1
-# Makefile.in generated by automake 1.14 from Makefile.am.
1
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
2 2
 # @configure_input@
3 3
 
4 4
 # Copyright (C) 1994-2013 Free Software Foundation, Inc.
... ...
@@ -1,4 +1,4 @@
1
-# Makefile.in generated by automake 1.14 from Makefile.am.
1
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
2 2
 # @configure_input@
3 3
 
4 4
 # Copyright (C) 1994-2013 Free Software Foundation, Inc.
... ...
@@ -1,4 +1,4 @@
1
-# Makefile.in generated by automake 1.14 from Makefile.am.
1
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
2 2
 # @configure_input@
3 3
 
4 4
 # Copyright (C) 1994-2013 Free Software Foundation, Inc.
... ...
@@ -3420,7 +3420,11 @@ version.h: version.h.tmp
3420 3420
 		cp version.h.static version.h;\
3421 3421
 	elif ! diff $@ version.h.tmp >/dev/null 2>/dev/null; then\
3422 3422
 		cp version.h.tmp $@;\
3423
-	fi
3423
+	fi;\
3424
+	if test -f $(top_srcdir)/libclamav/version.h &&\
3425
+           ! diff $(top_srcdir)/libclamav/version.h version.h.tmp >/dev/null 2>/dev/null; then\
3426
+                cp version.h.tmp $(top_srcdir)/libclamav/version.h;\
3427
+        fi
3424 3428
 
3425 3429
 version.h.tmp:
3426 3430
 	$(AM_V_GEN) test -f version.h || touch version.h;\
... ...
@@ -1,4 +1,4 @@
1
-# Makefile.in generated by automake 1.14 from Makefile.am.
1
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
2 2
 # @configure_input@
3 3
 
4 4
 # Copyright (C) 1994-2013 Free Software Foundation, Inc.
... ...
@@ -5653,9 +5653,10 @@ distcheck: dist
5653 5653
 	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
5654 5654
 	  && am__cwd=`pwd` \
5655 5655
 	  && $(am__cd) $(distdir)/_build \
5656
-	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
5656
+	  && ../configure \
5657 5657
 	    $(AM_DISTCHECK_CONFIGURE_FLAGS) \
5658 5658
 	    $(DISTCHECK_CONFIGURE_FLAGS) \
5659
+	    --srcdir=.. --prefix="$$dc_install_base" \
5659 5660
 	  && $(MAKE) $(AM_MAKEFLAGS) \
5660 5661
 	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
5661 5662
 	  && $(MAKE) $(AM_MAKEFLAGS) check \
... ...
@@ -5745,8 +5746,8 @@ maintainer-clean-generic:
5745 5745
 	@echo "This command is intended for maintainers to use"
5746 5746
 	@echo "it deletes files that may require special tools to rebuild."
5747 5747
 	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
5748
-@BUILD_EXTERNAL_LLVM_TRUE@distclean-local:
5749 5748
 @BUILD_EXTERNAL_LLVM_TRUE@clean-local:
5749
+@BUILD_EXTERNAL_LLVM_TRUE@distclean-local:
5750 5750
 clean: clean-am
5751 5751
 
5752 5752
 clean-am: clean-generic clean-libtool clean-local \
... ...
@@ -1,4 +1,4 @@
1
-# generated automatically by aclocal 1.14 -*- Autoconf -*-
1
+# generated automatically by aclocal 1.14.1 -*- Autoconf -*-
2 2
 
3 3
 # Copyright (C) 1996-2013 Free Software Foundation, Inc.
4 4
 
... ...
@@ -35,7 +35,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
35 35
 [am__api_version='1.14'
36 36
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
37 37
 dnl require some minimum version.  Point them to the right macro.
38
-m4_if([$1], [1.14], [],
38
+m4_if([$1], [1.14.1], [],
39 39
       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
40 40
 ])
41 41
 
... ...
@@ -51,7 +51,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
51 51
 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
52 52
 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
53 53
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
54
-[AM_AUTOMAKE_VERSION([1.14])dnl
54
+[AM_AUTOMAKE_VERSION([1.14.1])dnl
55 55
 m4_ifndef([AC_AUTOCONF_VERSION],
56 56
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
57 57
 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
... ...
@@ -1,4 +1,4 @@
1
-# Makefile.in generated by automake 1.14 from Makefile.am.
1
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
2 2
 # @configure_input@
3 3
 
4 4
 # Copyright (C) 1994-2013 Free Software Foundation, Inc.
... ...
@@ -1,4 +1,4 @@
1
-# Makefile.in generated by automake 1.14 from Makefile.am.
1
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
2 2
 # @configure_input@
3 3
 
4 4
 # Copyright (C) 1994-2013 Free Software Foundation, Inc.
... ...
@@ -1,4 +1,4 @@
1
-# Makefile.in generated by automake 1.14 from Makefile.am.
1
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
2 2
 # @configure_input@
3 3
 
4 4
 # Copyright (C) 1994-2013 Free Software Foundation, Inc.
... ...
@@ -1,4 +1,4 @@
1
-# Makefile.in generated by automake 1.14 from Makefile.am.
1
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
2 2
 # @configure_input@
3 3
 
4 4
 # Copyright (C) 1994-2013 Free Software Foundation, Inc.