1. clamav-devel
  2. Commit ad353d8e7e742600c522e231b327c769b93cdfcc
Browse code

autojunk'd

Kevin Lin authored on 2014/11/07 09:20:51
Showing 22 changed files
Makefile.in
History View file @ ad353d8
... ... 
@@ -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.
... ... 
@@ -947,9 +947,10 @@ distcheck: dist
947 947 
 	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
948 948 
 	  && am__cwd=`pwd` \
949 949 
 	  && $(am__cd) $(distdir)/_build \
950 
-	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
950 
+	  && ../configure \
951 951 
 	    $(AM_DISTCHECK_CONFIGURE_FLAGS) \
952 952 
 	    $(DISTCHECK_CONFIGURE_FLAGS) \
953 
+	    --srcdir=.. --prefix="$$dc_install_base" \
953 954 
 	  && $(MAKE) $(AM_MAKEFLAGS) \
954 955 
 	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
955 956 
 	  && $(MAKE) $(AM_MAKEFLAGS) check \
aclocal.m4
History View file @ ad353d8
... ... 
@@ -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]))])
clamav-milter/Makefile.in
History View file @ ad353d8
... ... 
@@ -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.
clambc/Makefile.in
History View file @ ad353d8
... ... 
@@ -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.
clamconf/Makefile.in
History View file @ ad353d8
... ... 
@@ -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.
clamd/Makefile.in
History View file @ ad353d8
... ... 
@@ -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.
clamdscan/Makefile.in
History View file @ ad353d8
... ... 
@@ -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.
clamdtop/Makefile.in
History View file @ ad353d8
... ... 
@@ -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.
clamscan/Makefile.in
History View file @ ad353d8
... ... 
@@ -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.
clamsubmit/Makefile.in
History View file @ ad353d8
... ... 
@@ -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.
database/Makefile.in
History View file @ ad353d8
... ... 
@@ -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.
docs/Makefile.in
History View file @ ad353d8
... ... 
@@ -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.
etc/Makefile.in
History View file @ ad353d8
... ... 
@@ -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.
freshclam/Makefile.in
History View file @ ad353d8
... ... 
@@ -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.
libclamav/Makefile.in
History View file @ ad353d8
... ... 
@@ -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.
libclamav/c++/Makefile.in
History View file @ ad353d8
... ... 
@@ -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 \
libclamav/c++/aclocal.m4
History View file @ ad353d8
... ... 
@@ -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]))])
libclamav/c++/configure
History View file @ ad353d8
... ... 
@@ -649,11 +649,11 @@ THREAD_LIBS
649 649 
 DEBUG_BUILD_FALSE
650 650 
 DEBUG_BUILD_TRUE
651 651 
 LLVM_VERSION
652 
-subdirs
653 652 
 LLVMCONFIG_LIBFILES
654 653 
 LLVMCONFIG_LIBS
655 654 
 LLVMCONFIG_LDFLAGS
656 655 
 LLVMCONFIG_CXXFLAGS
656 
+subdirs
657 657 
 GMAKE
658 658 
 ifGNUmake
659 659 
 CXXCPP
... ... 
@@ -15621,22 +15621,8 @@ if test "${with_system_llvm+set}" = set; then :
15621 15621 
  if test "x$llvmconfig" != "x"; then
15622 15622 
      llvmver=`$llvmconfig --version`
15623 15623
15624 
-     LLVMCONFIG_CXXFLAGS=`$llvmconfig --cxxflags`
15625 
-
15626 
-     LLVMCONFIG_LDFLAGS=`$llvmconfig --ldflags`
15627 
-
15628 
-     LLVMCONFIG_LIBS=`$llvmconfig --libs jit nativecodegen scalaropts ipo`
15629 
-
15630 
-     LLVMCONFIG_LIBFILES=`$llvmconfig --libfiles jit nativecodegen scalaropts ipo`
15631 
-
15632 15624 
      { $as_echo "$as_me:${as_lineno-$LINENO}: Using external LLVM" >&5
15633 15625 
 $as_echo "$as_me: Using external LLVM" >&6;}
15634 
-     { $as_echo "$as_me:${as_lineno-$LINENO}: CXXFLAGS from llvm-config: $LLVMCONFIG_CXXFLAGS" >&5
15635 
-$as_echo "$as_me: CXXFLAGS from llvm-config: $LLVMCONFIG_CXXFLAGS" >&6;}
15636 
-     { $as_echo "$as_me:${as_lineno-$LINENO}: LDFLAGS from llvm-config: $LLVMCONFIG_LDFLAGS" >&5
15637 
-$as_echo "$as_me: LDFLAGS from llvm-config: $LLVMCONFIG_LDFLAGS" >&6;}
15638 
-     { $as_echo "$as_me:${as_lineno-$LINENO}: LIBS from llvm-config: $LLVMCONFIG_LIBS" >&5
15639 
-$as_echo "$as_me: LIBS from llvm-config: $LLVMCONFIG_LIBS" >&6;}
15640 15626 
  fi
15641 15627
15642 15628 
 fi
... ... 
@@ -15679,6 +15665,29 @@ else
15679 15679 
 $as_echo "ok ($llvmver)" >&6; }
15680 15680 
 fi
15681 15681
15682 
+if test "x$llvmconfig" != "x"; then
15683 
+    LLVMCONFIG_CXXFLAGS=`$llvmconfig --cxxflags`
15684 
+
15685 
+    if test $llvmver_test -ge 350; then
15686 
+                ldflags=`$llvmconfig --ldflags`
15687 
+        syslibs=`$llvmconfig --system-libs`
15688 
+        LLVMCONFIG_LDFLAGS="$ldflags $syslibs"
15689 
+
15690 
+    else
15691 
+        LLVMCONFIG_LDFLAGS=`$llvmconfig --ldflags`
15692 
+
15693 
+    fi
15694 
+    LLVMCONFIG_LIBS=`$llvmconfig --libs jit nativecodegen scalaropts ipo`
15695 
+
15696 
+    LLVMCONFIG_LIBFILES=`$llvmconfig --libfiles jit nativecodegen scalaropts ipo`
15697 
+
15698 
+    { $as_echo "$as_me:${as_lineno-$LINENO}: CXXFLAGS from llvm-config: $LLVMCONFIG_CXXFLAGS" >&5
15699 
+$as_echo "$as_me: CXXFLAGS from llvm-config: $LLVMCONFIG_CXXFLAGS" >&6;}
15700 
+    { $as_echo "$as_me:${as_lineno-$LINENO}: LDFLAGS from llvm-config: $LLVMCONFIG_LDFLAGS" >&5
15701 
+$as_echo "$as_me: LDFLAGS from llvm-config: $LLVMCONFIG_LDFLAGS" >&6;}
15702 
+    { $as_echo "$as_me:${as_lineno-$LINENO}: LIBS from llvm-config: $LLVMCONFIG_LIBS" >&5
15703 
+$as_echo "$as_me: LIBS from llvm-config: $LLVMCONFIG_LIBS" >&6;}
15704 
+fi
15682 15705 
 llvmver_int=${llvmver_major}${llvmver_minor}
15683 15706
15684 15707 
 LLVM_VERSION=$llvmver_int
libltdl/Makefile.in
History View file @ ad353d8
... ... 
@@ -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.
sigtool/Makefile.in
History View file @ ad353d8
... ... 
@@ -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.
test/Makefile.in
History View file @ ad353d8
... ... 
@@ -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.
unit_tests/Makefile.in
History View file @ ad353d8
... ... 
@@ -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.