Browse code

autoreconf

Steven Morgan authored on 2015/11/05 06:33:34
Showing 23 changed files
... ...
@@ -267,6 +267,7 @@ CC = @CC@
267 267
 CCDEPMODE = @CCDEPMODE@
268 268
 CFGDIR = @CFGDIR@
269 269
 CFLAGS = @CFLAGS@
270
+CHECK_CFLAGS = @CHECK_CFLAGS@
270 271
 CHECK_CPPFLAGS = @CHECK_CPPFLAGS@
271 272
 CHECK_LIBS = @CHECK_LIBS@
272 273
 CLAMAVGROUP = @CLAMAVGROUP@
... ...
@@ -374,6 +375,9 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
374 374
 PATH_SEPARATOR = @PATH_SEPARATOR@
375 375
 PCRE_CPPFLAGS = @PCRE_CPPFLAGS@
376 376
 PCRE_LIBS = @PCRE_LIBS@
377
+PKG_CONFIG = @PKG_CONFIG@
378
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
379
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
377 380
 RANLIB = @RANLIB@
378 381
 SED = @SED@
379 382
 SET_MAKE = @SET_MAKE@
... ...
@@ -20,6 +20,166 @@ You have another version of autoconf.  It may work, but is not guaranteed to.
20 20
 If you have problems, you may need to regenerate the build system entirely.
21 21
 To do so, use the procedure documented by the package, typically `autoreconf'.])])
22 22
 
23
+# pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-
24
+# serial 1 (pkg-config-0.24)
25
+# 
26
+# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
27
+#
28
+# This program is free software; you can redistribute it and/or modify
29
+# it under the terms of the GNU General Public License as published by
30
+# the Free Software Foundation; either version 2 of the License, or
31
+# (at your option) any later version.
32
+#
33
+# This program is distributed in the hope that it will be useful, but
34
+# WITHOUT ANY WARRANTY; without even the implied warranty of
35
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
36
+# General Public License for more details.
37
+#
38
+# You should have received a copy of the GNU General Public License
39
+# along with this program; if not, write to the Free Software
40
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
41
+#
42
+# As a special exception to the GNU General Public License, if you
43
+# distribute this file as part of a program that contains a
44
+# configuration script generated by Autoconf, you may include it under
45
+# the same distribution terms that you use for the rest of that program.
46
+
47
+# PKG_PROG_PKG_CONFIG([MIN-VERSION])
48
+# ----------------------------------
49
+AC_DEFUN([PKG_PROG_PKG_CONFIG],
50
+[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
51
+m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
52
+m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$])
53
+AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
54
+AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
55
+AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
56
+
57
+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
58
+	AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
59
+fi
60
+if test -n "$PKG_CONFIG"; then
61
+	_pkg_min_version=m4_default([$1], [0.9.0])
62
+	AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
63
+	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
64
+		AC_MSG_RESULT([yes])
65
+	else
66
+		AC_MSG_RESULT([no])
67
+		PKG_CONFIG=""
68
+	fi
69
+fi[]dnl
70
+])# PKG_PROG_PKG_CONFIG
71
+
72
+# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
73
+#
74
+# Check to see whether a particular set of modules exists.  Similar
75
+# to PKG_CHECK_MODULES(), but does not set variables or print errors.
76
+#
77
+# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
78
+# only at the first occurence in configure.ac, so if the first place
79
+# it's called might be skipped (such as if it is within an "if", you
80
+# have to call PKG_CHECK_EXISTS manually
81
+# --------------------------------------------------------------
82
+AC_DEFUN([PKG_CHECK_EXISTS],
83
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
84
+if test -n "$PKG_CONFIG" && \
85
+    AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
86
+  m4_default([$2], [:])
87
+m4_ifvaln([$3], [else
88
+  $3])dnl
89
+fi])
90
+
91
+# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
92
+# ---------------------------------------------
93
+m4_define([_PKG_CONFIG],
94
+[if test -n "$$1"; then
95
+    pkg_cv_[]$1="$$1"
96
+ elif test -n "$PKG_CONFIG"; then
97
+    PKG_CHECK_EXISTS([$3],
98
+                     [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`
99
+		      test "x$?" != "x0" && pkg_failed=yes ],
100
+		     [pkg_failed=yes])
101
+ else
102
+    pkg_failed=untried
103
+fi[]dnl
104
+])# _PKG_CONFIG
105
+
106
+# _PKG_SHORT_ERRORS_SUPPORTED
107
+# -----------------------------
108
+AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
109
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
110
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
111
+        _pkg_short_errors_supported=yes
112
+else
113
+        _pkg_short_errors_supported=no
114
+fi[]dnl
115
+])# _PKG_SHORT_ERRORS_SUPPORTED
116
+
117
+
118
+# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
119
+# [ACTION-IF-NOT-FOUND])
120
+#
121
+#
122
+# Note that if there is a possibility the first call to
123
+# PKG_CHECK_MODULES might not happen, you should be sure to include an
124
+# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
125
+#
126
+#
127
+# --------------------------------------------------------------
128
+AC_DEFUN([PKG_CHECK_MODULES],
129
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
130
+AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
131
+AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
132
+
133
+pkg_failed=no
134
+AC_MSG_CHECKING([for $1])
135
+
136
+_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
137
+_PKG_CONFIG([$1][_LIBS], [libs], [$2])
138
+
139
+m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
140
+and $1[]_LIBS to avoid the need to call pkg-config.
141
+See the pkg-config man page for more details.])
142
+
143
+if test $pkg_failed = yes; then
144
+   	AC_MSG_RESULT([no])
145
+        _PKG_SHORT_ERRORS_SUPPORTED
146
+        if test $_pkg_short_errors_supported = yes; then
147
+	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
148
+        else 
149
+	        $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
150
+        fi
151
+	# Put the nasty error message in config.log where it belongs
152
+	echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
153
+
154
+	m4_default([$4], [AC_MSG_ERROR(
155
+[Package requirements ($2) were not met:
156
+
157
+$$1_PKG_ERRORS
158
+
159
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
160
+installed software in a non-standard prefix.
161
+
162
+_PKG_TEXT])[]dnl
163
+        ])
164
+elif test $pkg_failed = untried; then
165
+     	AC_MSG_RESULT([no])
166
+	m4_default([$4], [AC_MSG_FAILURE(
167
+[The pkg-config script could not be found or is too old.  Make sure it
168
+is in your PATH or set the PKG_CONFIG environment variable to the full
169
+path to pkg-config.
170
+
171
+_PKG_TEXT
172
+
173
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl
174
+        ])
175
+else
176
+	$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
177
+	$1[]_LIBS=$pkg_cv_[]$1[]_LIBS
178
+        AC_MSG_RESULT([yes])
179
+	$3
180
+fi[]dnl
181
+])# PKG_CHECK_MODULES
182
+
23 183
 # Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software
24 184
 # Foundation, Inc.
25 185
 #
... ...
@@ -231,6 +231,7 @@ CC = @CC@
231 231
 CCDEPMODE = @CCDEPMODE@
232 232
 CFGDIR = @CFGDIR@
233 233
 CFLAGS = @CFLAGS@
234
+CHECK_CFLAGS = @CHECK_CFLAGS@
234 235
 CHECK_CPPFLAGS = @CHECK_CPPFLAGS@
235 236
 CHECK_LIBS = @CHECK_LIBS@
236 237
 CLAMAVGROUP = @CLAMAVGROUP@
... ...
@@ -338,6 +339,9 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
338 338
 PATH_SEPARATOR = @PATH_SEPARATOR@
339 339
 PCRE_CPPFLAGS = @PCRE_CPPFLAGS@
340 340
 PCRE_LIBS = @PCRE_LIBS@
341
+PKG_CONFIG = @PKG_CONFIG@
342
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
343
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
341 344
 RANLIB = @RANLIB@
342 345
 SED = @SED@
343 346
 SET_MAKE = @SET_MAKE@
... ...
@@ -167,6 +167,7 @@ CC = @CC@
167 167
 CCDEPMODE = @CCDEPMODE@
168 168
 CFGDIR = @CFGDIR@
169 169
 CFLAGS = @CFLAGS@
170
+CHECK_CFLAGS = @CHECK_CFLAGS@
170 171
 CHECK_CPPFLAGS = @CHECK_CPPFLAGS@
171 172
 CHECK_LIBS = @CHECK_LIBS@
172 173
 CLAMAVGROUP = @CLAMAVGROUP@
... ...
@@ -274,6 +275,9 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
274 274
 PATH_SEPARATOR = @PATH_SEPARATOR@
275 275
 PCRE_CPPFLAGS = @PCRE_CPPFLAGS@
276 276
 PCRE_LIBS = @PCRE_LIBS@
277
+PKG_CONFIG = @PKG_CONFIG@
278
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
279
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
277 280
 RANLIB = @RANLIB@
278 281
 SED = @SED@
279 282
 SET_MAKE = @SET_MAKE@
... ...
@@ -185,6 +185,7 @@ CC = @CC@
185 185
 CCDEPMODE = @CCDEPMODE@
186 186
 CFGDIR = @CFGDIR@
187 187
 CFLAGS = @CFLAGS@
188
+CHECK_CFLAGS = @CHECK_CFLAGS@
188 189
 CHECK_CPPFLAGS = @CHECK_CPPFLAGS@
189 190
 CHECK_LIBS = @CHECK_LIBS@
190 191
 CLAMAVGROUP = @CLAMAVGROUP@
... ...
@@ -292,6 +293,9 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
292 292
 PATH_SEPARATOR = @PATH_SEPARATOR@
293 293
 PCRE_CPPFLAGS = @PCRE_CPPFLAGS@
294 294
 PCRE_LIBS = @PCRE_LIBS@
295
+PKG_CONFIG = @PKG_CONFIG@
296
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
297
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
295 298
 RANLIB = @RANLIB@
296 299
 SED = @SED@
297 300
 SET_MAKE = @SET_MAKE@
... ...
@@ -203,6 +203,7 @@ CC = @CC@
203 203
 CCDEPMODE = @CCDEPMODE@
204 204
 CFGDIR = @CFGDIR@
205 205
 CFLAGS = @CFLAGS@
206
+CHECK_CFLAGS = @CHECK_CFLAGS@
206 207
 CHECK_CPPFLAGS = @CHECK_CPPFLAGS@
207 208
 CHECK_LIBS = @CHECK_LIBS@
208 209
 CLAMAVGROUP = @CLAMAVGROUP@
... ...
@@ -310,6 +311,9 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
310 310
 PATH_SEPARATOR = @PATH_SEPARATOR@
311 311
 PCRE_CPPFLAGS = @PCRE_CPPFLAGS@
312 312
 PCRE_LIBS = @PCRE_LIBS@
313
+PKG_CONFIG = @PKG_CONFIG@
314
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
315
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
313 316
 RANLIB = @RANLIB@
314 317
 SED = @SED@
315 318
 SET_MAKE = @SET_MAKE@
... ...
@@ -196,6 +196,7 @@ CC = @CC@
196 196
 CCDEPMODE = @CCDEPMODE@
197 197
 CFGDIR = @CFGDIR@
198 198
 CFLAGS = @CFLAGS@
199
+CHECK_CFLAGS = @CHECK_CFLAGS@
199 200
 CHECK_CPPFLAGS = @CHECK_CPPFLAGS@
200 201
 CHECK_LIBS = @CHECK_LIBS@
201 202
 CLAMAVGROUP = @CLAMAVGROUP@
... ...
@@ -303,6 +304,9 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
303 303
 PATH_SEPARATOR = @PATH_SEPARATOR@
304 304
 PCRE_CPPFLAGS = @PCRE_CPPFLAGS@
305 305
 PCRE_LIBS = @PCRE_LIBS@
306
+PKG_CONFIG = @PKG_CONFIG@
307
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
308
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
306 309
 RANLIB = @RANLIB@
307 310
 SED = @SED@
308 311
 SET_MAKE = @SET_MAKE@
... ...
@@ -202,6 +202,7 @@ CC = @CC@
202 202
 CCDEPMODE = @CCDEPMODE@
203 203
 CFGDIR = @CFGDIR@
204 204
 CFLAGS = @CFLAGS@
205
+CHECK_CFLAGS = @CHECK_CFLAGS@
205 206
 CHECK_CPPFLAGS = @CHECK_CPPFLAGS@
206 207
 CHECK_LIBS = @CHECK_LIBS@
207 208
 CLAMAVGROUP = @CLAMAVGROUP@
... ...
@@ -309,6 +310,9 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
309 309
 PATH_SEPARATOR = @PATH_SEPARATOR@
310 310
 PCRE_CPPFLAGS = @PCRE_CPPFLAGS@
311 311
 PCRE_LIBS = @PCRE_LIBS@
312
+PKG_CONFIG = @PKG_CONFIG@
313
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
314
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
312 315
 RANLIB = @RANLIB@
313 316
 SED = @SED@
314 317
 SET_MAKE = @SET_MAKE@
... ...
@@ -187,6 +187,7 @@ CC = @CC@
187 187
 CCDEPMODE = @CCDEPMODE@
188 188
 CFGDIR = @CFGDIR@
189 189
 CFLAGS = @CFLAGS@
190
+CHECK_CFLAGS = @CHECK_CFLAGS@
190 191
 CHECK_CPPFLAGS = @CHECK_CPPFLAGS@
191 192
 CHECK_LIBS = @CHECK_LIBS@
192 193
 CLAMAVGROUP = @CLAMAVGROUP@
... ...
@@ -294,6 +295,9 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
294 294
 PATH_SEPARATOR = @PATH_SEPARATOR@
295 295
 PCRE_CPPFLAGS = @PCRE_CPPFLAGS@
296 296
 PCRE_LIBS = @PCRE_LIBS@
297
+PKG_CONFIG = @PKG_CONFIG@
298
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
299
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
297 300
 RANLIB = @RANLIB@
298 301
 SED = @SED@
299 302
 SET_MAKE = @SET_MAKE@
... ...
@@ -185,6 +185,7 @@ CC = @CC@
185 185
 CCDEPMODE = @CCDEPMODE@
186 186
 CFGDIR = @CFGDIR@
187 187
 CFLAGS = @CFLAGS@
188
+CHECK_CFLAGS = @CHECK_CFLAGS@
188 189
 CHECK_CPPFLAGS = @CHECK_CPPFLAGS@
189 190
 CHECK_LIBS = @CHECK_LIBS@
190 191
 CLAMAVGROUP = @CLAMAVGROUP@
... ...
@@ -292,6 +293,9 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
292 292
 PATH_SEPARATOR = @PATH_SEPARATOR@
293 293
 PCRE_CPPFLAGS = @PCRE_CPPFLAGS@
294 294
 PCRE_LIBS = @PCRE_LIBS@
295
+PKG_CONFIG = @PKG_CONFIG@
296
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
297
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
295 298
 RANLIB = @RANLIB@
296 299
 SED = @SED@
297 300
 SET_MAKE = @SET_MAKE@
... ...
@@ -1,6 +1,6 @@
1 1
 #! /bin/sh
2 2
 # Guess values for system-dependent variables and create Makefiles.
3
-# Generated by GNU Autoconf 2.68 for ClamAV 0.99-rc1.
3
+# Generated by GNU Autoconf 2.68 for ClamAV 0.99-rc2.
4 4
 #
5 5
 # Report bugs to <http://bugs.clamav.net/>.
6 6
 #
... ...
@@ -572,8 +572,8 @@ MAKEFLAGS=
572 572
 # Identity of this package.
573 573
 PACKAGE_NAME='ClamAV'
574 574
 PACKAGE_TARNAME='clamav'
575
-PACKAGE_VERSION='0.99-rc1'
576
-PACKAGE_STRING='ClamAV 0.99-rc1'
575
+PACKAGE_VERSION='0.99-rc2'
576
+PACKAGE_STRING='ClamAV 0.99-rc2'
577 577
 PACKAGE_BUGREPORT='http://bugs.clamav.net/'
578 578
 PACKAGE_URL='http://www.clamav.net/'
579 579
 
... ...
@@ -699,8 +699,12 @@ LCOV
699 699
 GCOV
700 700
 HAVE_LIBCHECK_FALSE
701 701
 HAVE_LIBCHECK_TRUE
702
-CHECK_LIBS
703 702
 CHECK_CPPFLAGS
703
+CHECK_LIBS
704
+CHECK_CFLAGS
705
+PKG_CONFIG_LIBDIR
706
+PKG_CONFIG_PATH
707
+PKG_CONFIG
704 708
 BUILD_CONFIGURE_FLAGS
705 709
 VERSIONSCRIPT_FALSE
706 710
 VERSIONSCRIPT_TRUE
... ...
@@ -921,7 +925,12 @@ LIBS
921 921
 CPPFLAGS
922 922
 CPP
923 923
 YACC
924
-YFLAGS'
924
+YFLAGS
925
+PKG_CONFIG
926
+PKG_CONFIG_PATH
927
+PKG_CONFIG_LIBDIR
928
+CHECK_CFLAGS
929
+CHECK_LIBS'
925 930
 ac_subdirs_all='
926 931
 libclamav/c++'
927 932
 
... ...
@@ -1465,7 +1474,7 @@ if test "$ac_init_help" = "long"; then
1465 1465
   # Omit some internal or obsolete options to make the list less imposing.
1466 1466
   # This message is too long to be a string in the A/UX 3.1 sh.
1467 1467
   cat <<_ACEOF
1468
-\`configure' configures ClamAV 0.99-rc1 to adapt to many kinds of systems.
1468
+\`configure' configures ClamAV 0.99-rc2 to adapt to many kinds of systems.
1469 1469
 
1470 1470
 Usage: $0 [OPTION]... [VAR=VALUE]...
1471 1471
 
... ...
@@ -1536,7 +1545,7 @@ fi
1536 1536
 
1537 1537
 if test -n "$ac_init_help"; then
1538 1538
   case $ac_init_help in
1539
-     short | recursive ) echo "Configuration of ClamAV 0.99-rc1:";;
1539
+     short | recursive ) echo "Configuration of ClamAV 0.99-rc2:";;
1540 1540
    esac
1541 1541
   cat <<\_ACEOF
1542 1542
 
... ...
@@ -1655,6 +1664,14 @@ Some influential environment variables:
1655 1655
   YFLAGS      The list of arguments that will be passed by default to $YACC.
1656 1656
               This script will default YFLAGS to the empty string to avoid a
1657 1657
               default value of `-d' given by some make applications.
1658
+  PKG_CONFIG  path to pkg-config utility
1659
+  PKG_CONFIG_PATH
1660
+              directories to add to pkg-config's search path
1661
+  PKG_CONFIG_LIBDIR
1662
+              path overriding pkg-config's built-in search path
1663
+  CHECK_CFLAGS
1664
+              C compiler flags for CHECK, overriding pkg-config
1665
+  CHECK_LIBS  linker flags for CHECK, overriding pkg-config
1658 1666
 
1659 1667
 Use these variables to override the choices made by `configure' or to help
1660 1668
 it to find libraries and programs with nonstandard names/locations.
... ...
@@ -1723,7 +1740,7 @@ fi
1723 1723
 test -n "$ac_init_help" && exit $ac_status
1724 1724
 if $ac_init_version; then
1725 1725
   cat <<\_ACEOF
1726
-ClamAV configure 0.99-rc1
1726
+ClamAV configure 0.99-rc2
1727 1727
 generated by GNU Autoconf 2.68
1728 1728
 
1729 1729
 Copyright (C) 2010 Free Software Foundation, Inc.
... ...
@@ -2192,7 +2209,7 @@ cat >config.log <<_ACEOF
2192 2192
 This file contains any messages produced by compilers while
2193 2193
 running configure, to aid debugging if configure makes a mistake.
2194 2194
 
2195
-It was created by ClamAV $as_me 0.99-rc1, which was
2195
+It was created by ClamAV $as_me 0.99-rc2, which was
2196 2196
 generated by GNU Autoconf 2.68.  Invocation command line was
2197 2197
 
2198 2198
   $ $0 $@
... ...
@@ -3313,7 +3330,7 @@ fi
3313 3313
 
3314 3314
 # Define the identity of the package.
3315 3315
  PACKAGE='clamav'
3316
- VERSION='0.99-rc1'
3316
+ VERSION='0.99-rc2'
3317 3317
 
3318 3318
 
3319 3319
 # Some tools Automake needs.
... ...
@@ -4909,7 +4926,7 @@ $as_echo "$ac_cv_safe_to_define___extensions__" >&6; }
4909 4909
 
4910 4910
 
4911 4911
 
4912
-VERSION="0.99-rc1"
4912
+VERSION="0.99-rc2"
4913 4913
 
4914 4914
 LC_CURRENT=8
4915 4915
 LC_REVISION=1
... ...
@@ -8019,7 +8036,7 @@ $as_echo "$lt_cv_ld_force_load" >&6; }
8019 8019
       case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
8020 8020
 	10.0,*86*-darwin8*|10.0,*-darwin[91]*)
8021 8021
 	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
8022
-	10.[012][,.]*)
8022
+	10.[012]*)
8023 8023
 	  _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
8024 8024
 	10.*)
8025 8025
 	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
... ...
@@ -15835,6 +15852,203 @@ fi
15835 15835
 
15836 15836
 
15837 15837
 if test "$enable_check_ut" != "no" ; then
15838
+
15839
+
15840
+
15841
+
15842
+
15843
+
15844
+
15845
+
15846
+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
15847
+	if test -n "$ac_tool_prefix"; then
15848
+  # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
15849
+set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
15850
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
15851
+$as_echo_n "checking for $ac_word... " >&6; }
15852
+if ${ac_cv_path_PKG_CONFIG+:} false; then :
15853
+  $as_echo_n "(cached) " >&6
15854
+else
15855
+  case $PKG_CONFIG in
15856
+  [\\/]* | ?:[\\/]*)
15857
+  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
15858
+  ;;
15859
+  *)
15860
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
15861
+for as_dir in $PATH
15862
+do
15863
+  IFS=$as_save_IFS
15864
+  test -z "$as_dir" && as_dir=.
15865
+    for ac_exec_ext in '' $ac_executable_extensions; do
15866
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
15867
+    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
15868
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
15869
+    break 2
15870
+  fi
15871
+done
15872
+  done
15873
+IFS=$as_save_IFS
15874
+
15875
+  ;;
15876
+esac
15877
+fi
15878
+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
15879
+if test -n "$PKG_CONFIG"; then
15880
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
15881
+$as_echo "$PKG_CONFIG" >&6; }
15882
+else
15883
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
15884
+$as_echo "no" >&6; }
15885
+fi
15886
+
15887
+
15888
+fi
15889
+if test -z "$ac_cv_path_PKG_CONFIG"; then
15890
+  ac_pt_PKG_CONFIG=$PKG_CONFIG
15891
+  # Extract the first word of "pkg-config", so it can be a program name with args.
15892
+set dummy pkg-config; ac_word=$2
15893
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
15894
+$as_echo_n "checking for $ac_word... " >&6; }
15895
+if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :
15896
+  $as_echo_n "(cached) " >&6
15897
+else
15898
+  case $ac_pt_PKG_CONFIG in
15899
+  [\\/]* | ?:[\\/]*)
15900
+  ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
15901
+  ;;
15902
+  *)
15903
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
15904
+for as_dir in $PATH
15905
+do
15906
+  IFS=$as_save_IFS
15907
+  test -z "$as_dir" && as_dir=.
15908
+    for ac_exec_ext in '' $ac_executable_extensions; do
15909
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
15910
+    ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
15911
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
15912
+    break 2
15913
+  fi
15914
+done
15915
+  done
15916
+IFS=$as_save_IFS
15917
+
15918
+  ;;
15919
+esac
15920
+fi
15921
+ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
15922
+if test -n "$ac_pt_PKG_CONFIG"; then
15923
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
15924
+$as_echo "$ac_pt_PKG_CONFIG" >&6; }
15925
+else
15926
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
15927
+$as_echo "no" >&6; }
15928
+fi
15929
+
15930
+  if test "x$ac_pt_PKG_CONFIG" = x; then
15931
+    PKG_CONFIG=""
15932
+  else
15933
+    case $cross_compiling:$ac_tool_warned in
15934
+yes:)
15935
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
15936
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
15937
+ac_tool_warned=yes ;;
15938
+esac
15939
+    PKG_CONFIG=$ac_pt_PKG_CONFIG
15940
+  fi
15941
+else
15942
+  PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
15943
+fi
15944
+
15945
+fi
15946
+if test -n "$PKG_CONFIG"; then
15947
+	_pkg_min_version=0.9.0
15948
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
15949
+$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
15950
+	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
15951
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
15952
+$as_echo "yes" >&6; }
15953
+	else
15954
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
15955
+$as_echo "no" >&6; }
15956
+		PKG_CONFIG=""
15957
+	fi
15958
+fi
15959
+
15960
+pkg_failed=no
15961
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CHECK" >&5
15962
+$as_echo_n "checking for CHECK... " >&6; }
15963
+
15964
+if test -n "$CHECK_CFLAGS"; then
15965
+    pkg_cv_CHECK_CFLAGS="$CHECK_CFLAGS"
15966
+ elif test -n "$PKG_CONFIG"; then
15967
+    if test -n "$PKG_CONFIG" && \
15968
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"check\""; } >&5
15969
+  ($PKG_CONFIG --exists --print-errors "check") 2>&5
15970
+  ac_status=$?
15971
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
15972
+  test $ac_status = 0; }; then
15973
+  pkg_cv_CHECK_CFLAGS=`$PKG_CONFIG --cflags "check" 2>/dev/null`
15974
+		      test "x$?" != "x0" && pkg_failed=yes
15975
+else
15976
+  pkg_failed=yes
15977
+fi
15978
+ else
15979
+    pkg_failed=untried
15980
+fi
15981
+if test -n "$CHECK_LIBS"; then
15982
+    pkg_cv_CHECK_LIBS="$CHECK_LIBS"
15983
+ elif test -n "$PKG_CONFIG"; then
15984
+    if test -n "$PKG_CONFIG" && \
15985
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"check\""; } >&5
15986
+  ($PKG_CONFIG --exists --print-errors "check") 2>&5
15987
+  ac_status=$?
15988
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
15989
+  test $ac_status = 0; }; then
15990
+  pkg_cv_CHECK_LIBS=`$PKG_CONFIG --libs "check" 2>/dev/null`
15991
+		      test "x$?" != "x0" && pkg_failed=yes
15992
+else
15993
+  pkg_failed=yes
15994
+fi
15995
+ else
15996
+    pkg_failed=untried
15997
+fi
15998
+
15999
+
16000
+
16001
+if test $pkg_failed = yes; then
16002
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
16003
+$as_echo "no" >&6; }
16004
+
16005
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
16006
+        _pkg_short_errors_supported=yes
16007
+else
16008
+        _pkg_short_errors_supported=no
16009
+fi
16010
+        if test $_pkg_short_errors_supported = yes; then
16011
+	        CHECK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "check" 2>&1`
16012
+        else
16013
+	        CHECK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "check" 2>&1`
16014
+        fi
16015
+	# Put the nasty error message in config.log where it belongs
16016
+	echo "$CHECK_PKG_ERRORS" >&5
16017
+
16018
+	HAVE_LIBCHECK=no
16019
+elif test $pkg_failed = untried; then
16020
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
16021
+$as_echo "no" >&6; }
16022
+	HAVE_LIBCHECK=no
16023
+else
16024
+	CHECK_CFLAGS=$pkg_cv_CHECK_CFLAGS
16025
+	CHECK_LIBS=$pkg_cv_CHECK_LIBS
16026
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
16027
+$as_echo "yes" >&6; }
16028
+	HAVE_LIBCHECK=yes
16029
+fi
16030
+
16031
+if test "X$HAVE_LIBCHECK" == "Xyes"; then
16032
+    CHECK_CPPFLAGS=$CHECK_CFLAGS
16033
+else
16034
+
15838 16035
 case "$host_os" in
15839 16036
     *linux*)
15840 16037
         save_LDFLAGS="$LDFLAGS"
... ...
@@ -16537,6 +16751,8 @@ case "$host_os" in
16537 16537
 esac
16538 16538
 
16539 16539
 fi
16540
+fi
16541
+
16540 16542
 
16541 16543
 
16542 16544
  if test "X$HAVE_LIBCHECK" = "Xyes"; then
... ...
@@ -16806,7 +17022,7 @@ if ${ac_cv_lib_xml2_xmlTextReaderRead+:} false; then :
16806 16806
   $as_echo_n "(cached) " >&6
16807 16807
 else
16808 16808
   ac_check_lib_save_LIBS=$LIBS
16809
-LIBS="-lxml2  $LIBS"
16809
+LIBS="-lxml2 $XML_LIBS $LIBS"
16810 16810
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
16811 16811
 /* end confdefs.h.  */
16812 16812
 
... ...
@@ -16914,7 +17130,7 @@ save_LDFLAGS="$LDFLAGS"
16914 16914
 save_CFLAGS="$CFLAGS"
16915 16915
 save_LIBS="$LIBS"
16916 16916
 
16917
-SSL_LIBS="-lssl -lcrypto"
16917
+SSL_LIBS="-lssl -lcrypto -lz"
16918 16918
 
16919 16919
 if test "$LIBSSL_HOME" != "/usr"; then
16920 16920
     SSL_LDFLAGS="-L$LIBSSL_HOME/lib"
... ...
@@ -16935,7 +17151,7 @@ if ${ac_cv_lib_ssl_SSL_library_init+:} false; then :
16935 16935
   $as_echo_n "(cached) " >&6
16936 16936
 else
16937 16937
   ac_check_lib_save_LIBS=$LIBS
16938
-LIBS="-lssl -lcrypto $LIBS"
16938
+LIBS="-lssl -lcrypto -lz $LIBS"
16939 16939
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
16940 16940
 /* end confdefs.h.  */
16941 16941
 
... ...
@@ -16978,7 +17194,7 @@ if ${ac_cv_lib_crypto_EVP_EncryptInit+:} false; then :
16978 16978
   $as_echo_n "(cached) " >&6
16979 16979
 else
16980 16980
   ac_check_lib_save_LIBS=$LIBS
16981
-LIBS="-lcrypto  $LIBS"
16981
+LIBS="-lcrypto -lcrypto -lz $LIBS"
16982 16982
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
16983 16983
 /* end confdefs.h.  */
16984 16984
 
... ...
@@ -17021,7 +17237,7 @@ if ${ac_cv_lib_ssl_X509_VERIFY_PARAM_new+:} false; then :
17021 17021
   $as_echo_n "(cached) " >&6
17022 17022
 else
17023 17023
   ac_check_lib_save_LIBS=$LIBS
17024
-LIBS="-lssl -lcrypto $LIBS"
17024
+LIBS="-lssl -lcrypto -lz $LIBS"
17025 17025
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
17026 17026
 /* end confdefs.h.  */
17027 17027
 
... ...
@@ -22692,7 +22908,7 @@ if ${ac_cv_lib_curl_curl_easy_init+:} false; then :
22692 22692
   $as_echo_n "(cached) " >&6
22693 22693
 else
22694 22694
   ac_check_lib_save_LIBS=$LIBS
22695
-LIBS="-lcurl  $LIBS"
22695
+LIBS="-lcurl $CURL_LDFLAGS $LIBS"
22696 22696
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
22697 22697
 /* end confdefs.h.  */
22698 22698
 
... ...
@@ -23393,7 +23609,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
23393 23393
 # report actual input values of CONFIG_FILES etc. instead of their
23394 23394
 # values after options handling.
23395 23395
 ac_log="
23396
-This file was extended by ClamAV $as_me 0.99-rc1, which was
23396
+This file was extended by ClamAV $as_me 0.99-rc2, which was
23397 23397
 generated by GNU Autoconf 2.68.  Invocation command line was
23398 23398
 
23399 23399
   CONFIG_FILES    = $CONFIG_FILES
... ...
@@ -23460,7 +23676,7 @@ _ACEOF
23460 23460
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
23461 23461
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
23462 23462
 ac_cs_version="\\
23463
-ClamAV config.status 0.99-rc1
23463
+ClamAV config.status 0.99-rc2
23464 23464
 configured by $0, generated by GNU Autoconf 2.68,
23465 23465
   with options \\"\$ac_cs_config\\"
23466 23466
 
... ...
@@ -26057,7 +26273,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
26057 26057
 # report actual input values of CONFIG_FILES etc. instead of their
26058 26058
 # values after options handling.
26059 26059
 ac_log="
26060
-This file was extended by ClamAV $as_me 0.99-rc1, which was
26060
+This file was extended by ClamAV $as_me 0.99-rc2, which was
26061 26061
 generated by GNU Autoconf 2.68.  Invocation command line was
26062 26062
 
26063 26063
   CONFIG_FILES    = $CONFIG_FILES
... ...
@@ -26124,7 +26340,7 @@ _ACEOF
26124 26124
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
26125 26125
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
26126 26126
 ac_cs_version="\\
26127
-ClamAV config.status 0.99-rc1
26127
+ClamAV config.status 0.99-rc2
26128 26128
 configured by $0, generated by GNU Autoconf 2.68,
26129 26129
   with options \\"\$ac_cs_config\\"
26130 26130
 
... ...
@@ -153,6 +153,7 @@ CC = @CC@
153 153
 CCDEPMODE = @CCDEPMODE@
154 154
 CFGDIR = @CFGDIR@
155 155
 CFLAGS = @CFLAGS@
156
+CHECK_CFLAGS = @CHECK_CFLAGS@
156 157
 CHECK_CPPFLAGS = @CHECK_CPPFLAGS@
157 158
 CHECK_LIBS = @CHECK_LIBS@
158 159
 CLAMAVGROUP = @CLAMAVGROUP@
... ...
@@ -260,6 +261,9 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
260 260
 PATH_SEPARATOR = @PATH_SEPARATOR@
261 261
 PCRE_CPPFLAGS = @PCRE_CPPFLAGS@
262 262
 PCRE_LIBS = @PCRE_LIBS@
263
+PKG_CONFIG = @PKG_CONFIG@
264
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
265
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
263 266
 RANLIB = @RANLIB@
264 267
 SED = @SED@
265 268
 SET_MAKE = @SET_MAKE@
... ...
@@ -187,6 +187,7 @@ CC = @CC@
187 187
 CCDEPMODE = @CCDEPMODE@
188 188
 CFGDIR = @CFGDIR@
189 189
 CFLAGS = @CFLAGS@
190
+CHECK_CFLAGS = @CHECK_CFLAGS@
190 191
 CHECK_CPPFLAGS = @CHECK_CPPFLAGS@
191 192
 CHECK_LIBS = @CHECK_LIBS@
192 193
 CLAMAVGROUP = @CLAMAVGROUP@
... ...
@@ -294,6 +295,9 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
294 294
 PATH_SEPARATOR = @PATH_SEPARATOR@
295 295
 PCRE_CPPFLAGS = @PCRE_CPPFLAGS@
296 296
 PCRE_LIBS = @PCRE_LIBS@
297
+PKG_CONFIG = @PKG_CONFIG@
298
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
299
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
297 300
 RANLIB = @RANLIB@
298 301
 SED = @SED@
299 302
 SET_MAKE = @SET_MAKE@
... ...
@@ -183,6 +183,7 @@ CC = @CC@
183 183
 CCDEPMODE = @CCDEPMODE@
184 184
 CFGDIR = @CFGDIR@
185 185
 CFLAGS = @CFLAGS@
186
+CHECK_CFLAGS = @CHECK_CFLAGS@
186 187
 CHECK_CPPFLAGS = @CHECK_CPPFLAGS@
187 188
 CHECK_LIBS = @CHECK_LIBS@
188 189
 CLAMAVGROUP = @CLAMAVGROUP@
... ...
@@ -290,6 +291,9 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
290 290
 PATH_SEPARATOR = @PATH_SEPARATOR@
291 291
 PCRE_CPPFLAGS = @PCRE_CPPFLAGS@
292 292
 PCRE_LIBS = @PCRE_LIBS@
293
+PKG_CONFIG = @PKG_CONFIG@
294
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
295
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
293 296
 RANLIB = @RANLIB@
294 297
 SED = @SED@
295 298
 SET_MAKE = @SET_MAKE@
... ...
@@ -189,6 +189,7 @@ CC = @CC@
189 189
 CCDEPMODE = @CCDEPMODE@
190 190
 CFGDIR = @CFGDIR@
191 191
 CFLAGS = @CFLAGS@
192
+CHECK_CFLAGS = @CHECK_CFLAGS@
192 193
 CHECK_CPPFLAGS = @CHECK_CPPFLAGS@
193 194
 CHECK_LIBS = @CHECK_LIBS@
194 195
 CLAMAVGROUP = @CLAMAVGROUP@
... ...
@@ -296,6 +297,9 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
296 296
 PATH_SEPARATOR = @PATH_SEPARATOR@
297 297
 PCRE_CPPFLAGS = @PCRE_CPPFLAGS@
298 298
 PCRE_LIBS = @PCRE_LIBS@
299
+PKG_CONFIG = @PKG_CONFIG@
300
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
301
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
299 302
 RANLIB = @RANLIB@
300 303
 SED = @SED@
301 304
 SET_MAKE = @SET_MAKE@
... ...
@@ -632,6 +632,7 @@ CC = @CC@
632 632
 CCDEPMODE = @CCDEPMODE@
633 633
 CFGDIR = @CFGDIR@
634 634
 CFLAGS = @CFLAGS@
635
+CHECK_CFLAGS = @CHECK_CFLAGS@
635 636
 CHECK_CPPFLAGS = @CHECK_CPPFLAGS@
636 637
 CHECK_LIBS = @CHECK_LIBS@
637 638
 CLAMAVGROUP = @CLAMAVGROUP@
... ...
@@ -739,6 +740,9 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
739 739
 PATH_SEPARATOR = @PATH_SEPARATOR@
740 740
 PCRE_CPPFLAGS = @PCRE_CPPFLAGS@
741 741
 PCRE_LIBS = @PCRE_LIBS@
742
+PKG_CONFIG = @PKG_CONFIG@
743
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
744
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
742 745
 RANLIB = @RANLIB@
743 746
 SED = @SED@
744 747
 SET_MAKE = @SET_MAKE@
... ...
@@ -73,6 +73,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/check_gnu_make.m4 \
73 73
 	$(top_srcdir)/m4/cxx_flag_check.m4 $(top_srcdir)/m4/libtool.m4 \
74 74
 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
75 75
 	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
76
+	$(top_srcdir)/../../m4/reorganization/libs/openssl.m4 \
76 77
 	$(top_srcdir)/configure.ac
77 78
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
78 79
 	$(ACLOCAL_M4)
... ...
@@ -904,6 +905,9 @@ RANLIB = @RANLIB@
904 904
 SED = @SED@
905 905
 SET_MAKE = @SET_MAKE@
906 906
 SHELL = @SHELL@
907
+SSL_CPPFLAGS = @SSL_CPPFLAGS@
908
+SSL_LDFLAGS = @SSL_LDFLAGS@
909
+SSL_LIBS = @SSL_LIBS@
907 910
 STRIP = @STRIP@
908 911
 THREAD_LIBS = @THREAD_LIBS@
909 912
 VERSION = @VERSION@
... ...
@@ -971,8 +975,9 @@ LLVM_INCLUDES = -I$(top_srcdir)/llvm/include -I$(top_builddir)/llvm/include
971 971
 # keep it like this while I'm testing LLVM
972 972
 # TODO: HP-UX should have -D_REENTRANT -D_HPUX_SOURCE
973 973
 LLVM_DEFS = -D__STDC_LIMIT_MACROS -D__STDC_CONSTANT_MACROS -D_DEBUG -D_GNU_SOURCE
974
-AM_CPPFLAGS = -I$(top_srcdir)/../.. -I$(top_srcdir)/.. \
974
+AM_CPPFLAGS = @SSL_CPPFLAGS@ -I$(top_srcdir)/../.. -I$(top_srcdir)/.. \
975 975
 	-I$(top_builddir)/../../ $(am__append_2)
976
+AM_LDFLAGS = @SSL_LDFLAGS@
976 977
 AM_CXXFLAGS = $(LLVM_CXXFLAGS) -fno-exceptions
977 978
 ACLOCAL_AMFLAGS = -I m4
978 979
 libclamavcxx_la_SOURCES = bytecode2llvm.cpp ClamBCRTChecks.cpp \
... ...
@@ -984,13 +989,13 @@ libclamavcxx_la_SOURCES = bytecode2llvm.cpp ClamBCRTChecks.cpp \
984 984
 # $(shell ...)
985 985
 #LLVM_DEPS=$(shell $(LLVM_CONFIG) --libfiles jit nativecodegen)
986 986
 @BUILD_EXTERNAL_LLVM_TRUE@libclamavcxx_la_CXXFLAGS = $(AM_CPPFLAGS) @LLVMCONFIG_CXXFLAGS@ -fexceptions -DLLVM_VERSION=${LLVM_VERSION}
987
-@BUILD_EXTERNAL_LLVM_FALSE@libclamavcxx_la_LDFLAGS = -no-undefined
988
-@BUILD_EXTERNAL_LLVM_TRUE@libclamavcxx_la_LDFLAGS = @LLVMCONFIG_LDFLAGS@ @LLVMCONFIG_LIBS@ @LLVMCONFIG_LDFLAGS@
989
-@BUILD_EXTERNAL_LLVM_FALSE@libclamavcxx_la_DEPENDENCIES =  \
987
+@BUILD_EXTERNAL_LLVM_FALSE@libclamavcxx_la_LDFLAGS = $(AM_LDFLAGS) -no-undefined
988
+@BUILD_EXTERNAL_LLVM_TRUE@libclamavcxx_la_LDFLAGS = $(AM_LDFLAGS) @LLVMCONFIG_LDFLAGS@ @LLVMCONFIG_LIBS@ @LLVMCONFIG_LDFLAGS@
989
+@BUILD_EXTERNAL_LLVM_FALSE@libclamavcxx_la_DEPENDENCIES = @SSL_LIBS@ \
990 990
 @BUILD_EXTERNAL_LLVM_FALSE@	libllvmjit.la libllvmcodegen.la \
991 991
 @BUILD_EXTERNAL_LLVM_FALSE@	libllvmsystem.la $(am__append_4) \
992 992
 @BUILD_EXTERNAL_LLVM_FALSE@	$(am__append_7)
993
-@BUILD_EXTERNAL_LLVM_TRUE@libclamavcxx_la_DEPENDENCIES =  \
993
+@BUILD_EXTERNAL_LLVM_TRUE@libclamavcxx_la_DEPENDENCIES = @SSL_LIBS@ \
994 994
 @BUILD_EXTERNAL_LLVM_TRUE@	@LLVMCONFIG_LIBFILES@ \
995 995
 @BUILD_EXTERNAL_LLVM_TRUE@	$(am__append_4) $(am__append_7)
996 996
 @BUILD_EXTERNAL_LLVM_FALSE@noinst_LTLIBRARIES = libclamavcxx.la \
... ...
@@ -9,6 +9,9 @@
9 9
 /* Define to 1 if you have the <inttypes.h> header file. */
10 10
 #undef HAVE_INTTYPES_H
11 11
 
12
+/* Define to 1 if you have the `ssl' library (-lssl). */
13
+#undef HAVE_LIBSSL
14
+
12 15
 /* Define to 1 if you have the <memory.h> header file. */
13 16
 #undef HAVE_MEMORY_H
14 17
 
... ...
@@ -658,6 +658,9 @@ LIBTOOL
658 658
 MAINT
659 659
 MAINTAINER_MODE_FALSE
660 660
 MAINTAINER_MODE_TRUE
661
+SSL_LIBS
662
+SSL_LDFLAGS
663
+SSL_CPPFLAGS
661 664
 EGREP
662 665
 GREP
663 666
 CPP
... ...
@@ -766,6 +769,7 @@ ac_user_opts='
766 766
 enable_option_checking
767 767
 enable_silent_rules
768 768
 enable_dependency_tracking
769
+with_openssl
769 770
 enable_maintainer_mode
770 771
 enable_static
771 772
 enable_shared
... ...
@@ -1433,6 +1437,9 @@ Optional Features:
1433 1433
 Optional Packages:
1434 1434
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
1435 1435
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
1436
+  --with-openssl[=DIR]    path to directory containing openssl
1437
+                          [default=/usr/local or /usr if not found in
1438
+                          /usr/local]
1436 1439
   --with-pic[=PKGS]       try to use only PIC/non-PIC objects [default=use
1437 1440
                           both]
1438 1441
   --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
... ...
@@ -5046,6 +5053,199 @@ $as_echo "$as_me: Building on Solaris" >&6;}
5046 5046
   ;;
5047 5047
 esac
5048 5048
 
5049
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for OpenSSL installation" >&5
5050
+$as_echo_n "checking for OpenSSL installation... " >&6; }
5051
+
5052
+
5053
+# Check whether --with-openssl was given.
5054
+if test "${with_openssl+set}" = set; then :
5055
+  withval=$with_openssl;
5056
+if test "$withval"; then
5057
+    LIBSSL_HOME="$withval"
5058
+fi
5059
+
5060
+else
5061
+
5062
+LIBSSL_HOME=/usr/local
5063
+if test ! -f "$LIBSSL_HOME/include/openssl/ssl.h"
5064
+then
5065
+    LIBSSL_HOME=/usr
5066
+fi
5067
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBSSL_HOME" >&5
5068
+$as_echo "$LIBSSL_HOME" >&6; }
5069
+
5070
+fi
5071
+
5072
+
5073
+if test ! -f "$LIBSSL_HOME/include/openssl/ssl.h"
5074
+then
5075
+    as_fn_error $? "OpenSSL not found." "$LINENO" 5
5076
+fi
5077
+
5078
+save_LDFLAGS="$LDFLAGS"
5079
+save_CFLAGS="$CFLAGS"
5080
+save_LIBS="$LIBS"
5081
+
5082
+SSL_LIBS="-lssl -lcrypto -lz"
5083
+
5084
+if test "$LIBSSL_HOME" != "/usr"; then
5085
+    SSL_LDFLAGS="-L$LIBSSL_HOME/lib"
5086
+    SSL_CPPFLAGS="-I$LIBSSL_HOME/include"
5087
+    LDFLAGS="-L$LIBSSL_HOME/lib $SSL_LIBS"
5088
+    CFLAGS="$SSL_CPPFLAGS"
5089
+else
5090
+    SSL_LDFLAGS=""
5091
+    SSL_CPPFLAGS=""
5092
+fi
5093
+
5094
+have_ssl="no"
5095
+have_crypto="no"
5096
+
5097
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL_library_init in -lssl" >&5
5098
+$as_echo_n "checking for SSL_library_init in -lssl... " >&6; }
5099
+if ${ac_cv_lib_ssl_SSL_library_init+:} false; then :
5100
+  $as_echo_n "(cached) " >&6
5101
+else
5102
+  ac_check_lib_save_LIBS=$LIBS
5103
+LIBS="-lssl -lcrypto -lz $LIBS"
5104
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
5105
+/* end confdefs.h.  */
5106
+
5107
+/* Override any GCC internal prototype to avoid an error.
5108
+   Use char because int might match the return type of a GCC
5109
+   builtin and then its argument prototype would still apply.  */
5110
+#ifdef __cplusplus
5111
+extern "C"
5112
+#endif
5113
+char SSL_library_init ();
5114
+int
5115
+main ()
5116
+{
5117
+return SSL_library_init ();
5118
+  ;
5119
+  return 0;
5120
+}
5121
+_ACEOF
5122
+if ac_fn_c_try_link "$LINENO"; then :
5123
+  ac_cv_lib_ssl_SSL_library_init=yes
5124
+else
5125
+  ac_cv_lib_ssl_SSL_library_init=no
5126
+fi
5127
+rm -f core conftest.err conftest.$ac_objext \
5128
+    conftest$ac_exeext conftest.$ac_ext
5129
+LIBS=$ac_check_lib_save_LIBS
5130
+fi
5131
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ssl_SSL_library_init" >&5
5132
+$as_echo "$ac_cv_lib_ssl_SSL_library_init" >&6; }
5133
+if test "x$ac_cv_lib_ssl_SSL_library_init" = xyes; then :
5134
+  have_ssl="yes"
5135
+else
5136
+  as_fn_error $? "Your OpenSSL installation is misconfigured or missing" "$LINENO" 5
5137
+fi
5138
+
5139
+
5140
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for EVP_EncryptInit in -lcrypto" >&5
5141
+$as_echo_n "checking for EVP_EncryptInit in -lcrypto... " >&6; }
5142
+if ${ac_cv_lib_crypto_EVP_EncryptInit+:} false; then :
5143
+  $as_echo_n "(cached) " >&6
5144
+else
5145
+  ac_check_lib_save_LIBS=$LIBS
5146
+LIBS="-lcrypto -lcrypto -lz $LIBS"
5147
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
5148
+/* end confdefs.h.  */
5149
+
5150
+/* Override any GCC internal prototype to avoid an error.
5151
+   Use char because int might match the return type of a GCC
5152
+   builtin and then its argument prototype would still apply.  */
5153
+#ifdef __cplusplus
5154
+extern "C"
5155
+#endif
5156
+char EVP_EncryptInit ();
5157
+int
5158
+main ()
5159
+{
5160
+return EVP_EncryptInit ();
5161
+  ;
5162
+  return 0;
5163
+}
5164
+_ACEOF
5165
+if ac_fn_c_try_link "$LINENO"; then :
5166
+  ac_cv_lib_crypto_EVP_EncryptInit=yes
5167
+else
5168
+  ac_cv_lib_crypto_EVP_EncryptInit=no
5169
+fi
5170
+rm -f core conftest.err conftest.$ac_objext \
5171
+    conftest$ac_exeext conftest.$ac_ext
5172
+LIBS=$ac_check_lib_save_LIBS
5173
+fi
5174
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypto_EVP_EncryptInit" >&5
5175
+$as_echo "$ac_cv_lib_crypto_EVP_EncryptInit" >&6; }
5176
+if test "x$ac_cv_lib_crypto_EVP_EncryptInit" = xyes; then :
5177
+  have_crypto="yes"
5178
+else
5179
+  as_fn_error $? "Your OpenSSL installation is misconfigured or missing" "$LINENO" 5
5180
+fi
5181
+
5182
+
5183
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for X509_VERIFY_PARAM_new in -lssl" >&5
5184
+$as_echo_n "checking for X509_VERIFY_PARAM_new in -lssl... " >&6; }
5185
+if ${ac_cv_lib_ssl_X509_VERIFY_PARAM_new+:} false; then :
5186
+  $as_echo_n "(cached) " >&6
5187
+else
5188
+  ac_check_lib_save_LIBS=$LIBS
5189
+LIBS="-lssl -lcrypto -lz $LIBS"
5190
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
5191
+/* end confdefs.h.  */
5192
+
5193
+/* Override any GCC internal prototype to avoid an error.
5194
+   Use char because int might match the return type of a GCC
5195
+   builtin and then its argument prototype would still apply.  */
5196
+#ifdef __cplusplus
5197
+extern "C"
5198
+#endif
5199
+char X509_VERIFY_PARAM_new ();
5200
+int
5201
+main ()
5202
+{
5203
+return X509_VERIFY_PARAM_new ();
5204
+  ;
5205
+  return 0;
5206
+}
5207
+_ACEOF
5208
+if ac_fn_c_try_link "$LINENO"; then :
5209
+  ac_cv_lib_ssl_X509_VERIFY_PARAM_new=yes
5210
+else
5211
+  ac_cv_lib_ssl_X509_VERIFY_PARAM_new=no
5212
+fi
5213
+rm -f core conftest.err conftest.$ac_objext \
5214
+    conftest$ac_exeext conftest.$ac_ext
5215
+LIBS=$ac_check_lib_save_LIBS
5216
+fi
5217
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ssl_X509_VERIFY_PARAM_new" >&5
5218
+$as_echo "$ac_cv_lib_ssl_X509_VERIFY_PARAM_new" >&6; }
5219
+if test "x$ac_cv_lib_ssl_X509_VERIFY_PARAM_new" = xyes; then :
5220
+  cat >>confdefs.h <<_ACEOF
5221
+#define HAVE_LIBSSL 1
5222
+_ACEOF
5223
+
5224
+  LIBS="-lssl $LIBS"
5225
+
5226
+else
5227
+  as_fn_error $? "Your OpenSSL installation is missing the X509_VERIFY_PARAM function. Please upgrade to a more recent version of OpenSSL." "$LINENO" 5
5228
+fi
5229
+
5230
+
5231
+LDFLAGS="$save_LDFLAGS"
5232
+CFLAGS="$save_CFLAGS"
5233
+LIBS="$save_LIBS"
5234
+
5235
+SSL_CPPFLAGS=$SSL_CPPFLAGS
5236
+
5237
+SSL_LDFLAGS=$SSL_LDFLAGS
5238
+
5239
+SSL_LIBS=$SSL_LIBS
5240
+
5241
+
5049 5242
 
5050 5243
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
5051 5244
 $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
... ...
@@ -8138,7 +8338,7 @@ $as_echo "$lt_cv_ld_force_load" >&6; }
8138 8138
       case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
8139 8139
 	10.0,*86*-darwin8*|10.0,*-darwin[91]*)
8140 8140
 	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
8141
-	10.[012][,.]*)
8141
+	10.[012]*)
8142 8142
 	  _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
8143 8143
 	10.*)
8144 8144
 	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
... ...
@@ -265,6 +265,7 @@ CC = @CC@
265 265
 CCDEPMODE = @CCDEPMODE@
266 266
 CFGDIR = @CFGDIR@
267 267
 CFLAGS = @CFLAGS@
268
+CHECK_CFLAGS = @CHECK_CFLAGS@
268 269
 CHECK_CPPFLAGS = @CHECK_CPPFLAGS@
269 270
 CHECK_LIBS = @CHECK_LIBS@
270 271
 CLAMAVGROUP = @CLAMAVGROUP@
... ...
@@ -372,6 +373,9 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
372 372
 PATH_SEPARATOR = @PATH_SEPARATOR@
373 373
 PCRE_CPPFLAGS = @PCRE_CPPFLAGS@
374 374
 PCRE_LIBS = @PCRE_LIBS@
375
+PKG_CONFIG = @PKG_CONFIG@
376
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
377
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
375 378
 RANLIB = @RANLIB@
376 379
 SED = @SED@
377 380
 SET_MAKE = @SET_MAKE@
... ...
@@ -186,6 +186,7 @@ CC = @CC@
186 186
 CCDEPMODE = @CCDEPMODE@
187 187
 CFGDIR = @CFGDIR@
188 188
 CFLAGS = @CFLAGS@
189
+CHECK_CFLAGS = @CHECK_CFLAGS@
189 190
 CHECK_CPPFLAGS = @CHECK_CPPFLAGS@
190 191
 CHECK_LIBS = @CHECK_LIBS@
191 192
 CLAMAVGROUP = @CLAMAVGROUP@
... ...
@@ -293,6 +294,9 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
293 293
 PATH_SEPARATOR = @PATH_SEPARATOR@
294 294
 PCRE_CPPFLAGS = @PCRE_CPPFLAGS@
295 295
 PCRE_LIBS = @PCRE_LIBS@
296
+PKG_CONFIG = @PKG_CONFIG@
297
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
298
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
296 299
 RANLIB = @RANLIB@
297 300
 SED = @SED@
298 301
 SET_MAKE = @SET_MAKE@
... ...
@@ -136,6 +136,7 @@ CC = @CC@
136 136
 CCDEPMODE = @CCDEPMODE@
137 137
 CFGDIR = @CFGDIR@
138 138
 CFLAGS = @CFLAGS@
139
+CHECK_CFLAGS = @CHECK_CFLAGS@
139 140
 CHECK_CPPFLAGS = @CHECK_CPPFLAGS@
140 141
 CHECK_LIBS = @CHECK_LIBS@
141 142
 CLAMAVGROUP = @CLAMAVGROUP@
... ...
@@ -243,6 +244,9 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
243 243
 PATH_SEPARATOR = @PATH_SEPARATOR@
244 244
 PCRE_CPPFLAGS = @PCRE_CPPFLAGS@
245 245
 PCRE_LIBS = @PCRE_LIBS@
246
+PKG_CONFIG = @PKG_CONFIG@
247
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
248
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
246 249
 RANLIB = @RANLIB@
247 250
 SED = @SED@
248 251
 SET_MAKE = @SET_MAKE@
... ...
@@ -329,6 +329,7 @@ CC = @CC@
329 329
 CCDEPMODE = @CCDEPMODE@
330 330
 CFGDIR = @CFGDIR@
331 331
 CFLAGS = @CFLAGS@
332
+CHECK_CFLAGS = @CHECK_CFLAGS@
332 333
 CHECK_CPPFLAGS = @CHECK_CPPFLAGS@
333 334
 CHECK_LIBS = @CHECK_LIBS@
334 335
 CLAMAVGROUP = @CLAMAVGROUP@
... ...
@@ -436,6 +437,9 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
436 436
 PATH_SEPARATOR = @PATH_SEPARATOR@
437 437
 PCRE_CPPFLAGS = @PCRE_CPPFLAGS@
438 438
 PCRE_LIBS = @PCRE_LIBS@
439
+PKG_CONFIG = @PKG_CONFIG@
440
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
441
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
439 442
 RANLIB = @RANLIB@
440 443
 SED = @SED@
441 444
 SET_MAKE = @SET_MAKE@