1. clamav-devel
  2. Commit 5e86023e699c60f1fcb540e96186c21637e67bb5
Browse code

change preclass to libjson in configure output message.

Conflicts:
configure
configure.ac

Steven Morgan authored on 2014/09/18 11:28:55
Showing 24 changed files
Makefile.in
History View file @ 5e86023
... ... 
@@ -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 @ 5e86023
... ... 
@@ -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 @ 5e86023
... ... 
@@ -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 @ 5e86023
... ... 
@@ -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 @ 5e86023
... ... 
@@ -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 @ 5e86023
... ... 
@@ -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 @ 5e86023
... ... 
@@ -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 @ 5e86023
... ... 
@@ -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 @ 5e86023
... ... 
@@ -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 @ 5e86023
... ... 
@@ -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.
configure
History View file @ 5e86023
... ... 
@@ -28040,9 +28040,10 @@ else
28040 28040 
   $as_echo "$want_unrar ($want_unrar)"
28041 28041 
 fi
28042 28042
28043 
+if test "x$LIBJSON_HOME" != "x"; then
28043 28044
28044 28045
28045 
-   $as_echo_n "              preclass    : "
28046 
+   $as_echo_n "              libjson     : "
28046 28047 
    if test "x$have_json" = "xno"; then :
28047 28048 
   $as_echo "$LIBJSON_HOME (disabled)"
28048 28049 
 elif test "x$have_json" = "xyes"; then :
... ... 
@@ -28053,6 +28054,36 @@ else
28053 28053 
   $as_echo "$LIBJSON_HOME ($have_json)"
28054 28054 
 fi
28055 28055
28056 
+fi
28057 
+if test "x$PCRE_HOME" = "x"; then
28058 
+
28059 
+
28060 
+   $as_echo_n "              pcre        : "
28061 
+   if test "x$have_pcre" = "xno"; then :
28062 
+  $as_echo "no (disabled)"
28063 
+elif test "x$have_pcre" = "xyes"; then :
28064 
+  $as_echo "no"
28065 
+elif test "x$have_pcre" = "x"; then :
28066 
+  $as_echo "no"
28067 
+else
28068 
+  $as_echo "no ($have_pcre)"
28069 
+fi
28070 
+
28071 
+else
28072 
+
28073 
+
28074 
+   $as_echo_n "              pcre        : "
28075 
+   if test "x$have_pcre" = "xno"; then :
28076 
+  $as_echo "$PCRE_HOME (disabled)"
28077 
+elif test "x$have_pcre" = "xyes"; then :
28078 
+  $as_echo "$PCRE_HOME"
28079 
+elif test "x$have_pcre" = "x"; then :
28080 
+  $as_echo "$PCRE_HOME"
28081 
+else
28082 
+  $as_echo "$PCRE_HOME ($have_pcre)"
28083 
+fi
28084 
+
28085 
+fi
28056 28086 
 if test "x$XML_LIBS" = "x"; then
28057 28087
28058 28088
configure.ac
History View file @ 5e86023
... ... 
@@ -222,7 +222,14 @@ AC_MSG_NOTICE([Summary of engine detection features])
222 222 
 CL_MSG_STATUS([bzip2       ],[$bzip_check],[$want_bzip2])
223 223 
 CL_MSG_STATUS([zlib        ],[$ZLIB_HOME],[yes])
224 224 
 CL_MSG_STATUS([unrar       ],[$want_unrar],[$want_unrar])
225 
-CL_MSG_STATUS([preclass    ],[$LIBJSON_HOME],[$have_json])
225 
+if test "x$LIBJSON_HOME" != "x"; then
226 
+    CL_MSG_STATUS([libjson     ],[$LIBJSON_HOME],[$have_json])
227 
+fi
228 
+if test "x$PCRE_HOME" = "x"; then
229 
+    CL_MSG_STATUS([pcre        ],[no],[$have_pcre])
230 
+else
231 
+    CL_MSG_STATUS([pcre        ],[$PCRE_HOME],[$have_pcre])
232 
+fi
226 233 
 if test "x$XML_LIBS" = "x"; then
227 234 
     CL_MSG_STATUS([dmg and xar ],[no],[])
228 235 
 else
database/Makefile.in
History View file @ 5e86023
... ... 
@@ -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 @ 5e86023
... ... 
@@ -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 @ 5e86023
... ... 
@@ -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 @ 5e86023
... ... 
@@ -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 @ 5e86023
... ... 
@@ -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 @ 5e86023
... ... 
@@ -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.
... ... 
@@ -5657,9 +5657,10 @@ distcheck: dist
5657 5657 
 	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
5658 5658 
 	  && am__cwd=`pwd` \
5659 5659 
 	  && $(am__cd) $(distdir)/_build \
5660 
-	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
5660 
+	  && ../configure \
5661 5661 
 	    $(AM_DISTCHECK_CONFIGURE_FLAGS) \
5662 5662 
 	    $(DISTCHECK_CONFIGURE_FLAGS) \
5663 
+	    --srcdir=.. --prefix="$$dc_install_base" \
5663 5664 
 	  && $(MAKE) $(AM_MAKEFLAGS) \
5664 5665 
 	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
5665 5666 
 	  && $(MAKE) $(AM_MAKEFLAGS) check \
libclamav/c++/aclocal.m4
History View file @ 5e86023
... ... 
@@ -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]))])
libltdl/Makefile.am
History View file @ 5e86023
... ... 
@@ -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 \
libltdl/Makefile.in
History View file @ 5e86023
... ... 
@@ -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.
... ... 
@@ -1127,7 +1127,6 @@ uninstall-am: uninstall-includeHEADERS uninstall-libLTLIBRARIES \
1127 1127 
 # doesn't have one that works with the given compiler.
1128 1128 
 all-local $(lib_OBJECTS): $(ARGZ_H)
1129 1129 
 argz.h: argz_.h
1130 
-	$(mkinstalldirs) .
1131 1130 
 	cp $(srcdir)/argz_.h $@-t
1132 1131 
 	mv $@-t $@
1133 1132
sigtool/Makefile.in
History View file @ 5e86023
... ... 
@@ -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 @ 5e86023
... ... 
@@ -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 @ 5e86023
... ... 
@@ -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.