Browse code

autojunk'd

Kevin Lin authored on 2015/11/05 07:57:00
Showing 21 changed files
... ...
@@ -352,6 +352,7 @@ CC = @CC@
352 352
 CCDEPMODE = @CCDEPMODE@
353 353
 CFGDIR = @CFGDIR@
354 354
 CFLAGS = @CFLAGS@
355
+CHECK_CFLAGS = @CHECK_CFLAGS@
355 356
 CHECK_CPPFLAGS = @CHECK_CPPFLAGS@
356 357
 CHECK_LIBS = @CHECK_LIBS@
357 358
 CLAMAVGROUP = @CLAMAVGROUP@
... ...
@@ -459,6 +460,9 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
459 459
 PATH_SEPARATOR = @PATH_SEPARATOR@
460 460
 PCRE_CPPFLAGS = @PCRE_CPPFLAGS@
461 461
 PCRE_LIBS = @PCRE_LIBS@
462
+PKG_CONFIG = @PKG_CONFIG@
463
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
464
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
462 465
 RANLIB = @RANLIB@
463 466
 SED = @SED@
464 467
 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-2013 Free Software Foundation, Inc.
24 184
 #
25 185
 # This file is free software; the Free Software Foundation
... ...
@@ -307,6 +307,7 @@ CC = @CC@
307 307
 CCDEPMODE = @CCDEPMODE@
308 308
 CFGDIR = @CFGDIR@
309 309
 CFLAGS = @CFLAGS@
310
+CHECK_CFLAGS = @CHECK_CFLAGS@
310 311
 CHECK_CPPFLAGS = @CHECK_CPPFLAGS@
311 312
 CHECK_LIBS = @CHECK_LIBS@
312 313
 CLAMAVGROUP = @CLAMAVGROUP@
... ...
@@ -414,6 +415,9 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
414 414
 PATH_SEPARATOR = @PATH_SEPARATOR@
415 415
 PCRE_CPPFLAGS = @PCRE_CPPFLAGS@
416 416
 PCRE_LIBS = @PCRE_LIBS@
417
+PKG_CONFIG = @PKG_CONFIG@
418
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
419
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
417 420
 RANLIB = @RANLIB@
418 421
 SED = @SED@
419 422
 SET_MAKE = @SET_MAKE@
... ...
@@ -243,6 +243,7 @@ CC = @CC@
243 243
 CCDEPMODE = @CCDEPMODE@
244 244
 CFGDIR = @CFGDIR@
245 245
 CFLAGS = @CFLAGS@
246
+CHECK_CFLAGS = @CHECK_CFLAGS@
246 247
 CHECK_CPPFLAGS = @CHECK_CPPFLAGS@
247 248
 CHECK_LIBS = @CHECK_LIBS@
248 249
 CLAMAVGROUP = @CLAMAVGROUP@
... ...
@@ -350,6 +351,9 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
350 350
 PATH_SEPARATOR = @PATH_SEPARATOR@
351 351
 PCRE_CPPFLAGS = @PCRE_CPPFLAGS@
352 352
 PCRE_LIBS = @PCRE_LIBS@
353
+PKG_CONFIG = @PKG_CONFIG@
354
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
355
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
353 356
 RANLIB = @RANLIB@
354 357
 SED = @SED@
355 358
 SET_MAKE = @SET_MAKE@
... ...
@@ -261,6 +261,7 @@ CC = @CC@
261 261
 CCDEPMODE = @CCDEPMODE@
262 262
 CFGDIR = @CFGDIR@
263 263
 CFLAGS = @CFLAGS@
264
+CHECK_CFLAGS = @CHECK_CFLAGS@
264 265
 CHECK_CPPFLAGS = @CHECK_CPPFLAGS@
265 266
 CHECK_LIBS = @CHECK_LIBS@
266 267
 CLAMAVGROUP = @CLAMAVGROUP@
... ...
@@ -368,6 +369,9 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
368 368
 PATH_SEPARATOR = @PATH_SEPARATOR@
369 369
 PCRE_CPPFLAGS = @PCRE_CPPFLAGS@
370 370
 PCRE_LIBS = @PCRE_LIBS@
371
+PKG_CONFIG = @PKG_CONFIG@
372
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
373
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
371 374
 RANLIB = @RANLIB@
372 375
 SED = @SED@
373 376
 SET_MAKE = @SET_MAKE@
... ...
@@ -279,6 +279,7 @@ CC = @CC@
279 279
 CCDEPMODE = @CCDEPMODE@
280 280
 CFGDIR = @CFGDIR@
281 281
 CFLAGS = @CFLAGS@
282
+CHECK_CFLAGS = @CHECK_CFLAGS@
282 283
 CHECK_CPPFLAGS = @CHECK_CPPFLAGS@
283 284
 CHECK_LIBS = @CHECK_LIBS@
284 285
 CLAMAVGROUP = @CLAMAVGROUP@
... ...
@@ -386,6 +387,9 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
386 386
 PATH_SEPARATOR = @PATH_SEPARATOR@
387 387
 PCRE_CPPFLAGS = @PCRE_CPPFLAGS@
388 388
 PCRE_LIBS = @PCRE_LIBS@
389
+PKG_CONFIG = @PKG_CONFIG@
390
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
391
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
389 392
 RANLIB = @RANLIB@
390 393
 SED = @SED@
391 394
 SET_MAKE = @SET_MAKE@
... ...
@@ -272,6 +272,7 @@ CC = @CC@
272 272
 CCDEPMODE = @CCDEPMODE@
273 273
 CFGDIR = @CFGDIR@
274 274
 CFLAGS = @CFLAGS@
275
+CHECK_CFLAGS = @CHECK_CFLAGS@
275 276
 CHECK_CPPFLAGS = @CHECK_CPPFLAGS@
276 277
 CHECK_LIBS = @CHECK_LIBS@
277 278
 CLAMAVGROUP = @CLAMAVGROUP@
... ...
@@ -379,6 +380,9 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
379 379
 PATH_SEPARATOR = @PATH_SEPARATOR@
380 380
 PCRE_CPPFLAGS = @PCRE_CPPFLAGS@
381 381
 PCRE_LIBS = @PCRE_LIBS@
382
+PKG_CONFIG = @PKG_CONFIG@
383
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
384
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
382 385
 RANLIB = @RANLIB@
383 386
 SED = @SED@
384 387
 SET_MAKE = @SET_MAKE@
... ...
@@ -278,6 +278,7 @@ CC = @CC@
278 278
 CCDEPMODE = @CCDEPMODE@
279 279
 CFGDIR = @CFGDIR@
280 280
 CFLAGS = @CFLAGS@
281
+CHECK_CFLAGS = @CHECK_CFLAGS@
281 282
 CHECK_CPPFLAGS = @CHECK_CPPFLAGS@
282 283
 CHECK_LIBS = @CHECK_LIBS@
283 284
 CLAMAVGROUP = @CLAMAVGROUP@
... ...
@@ -385,6 +386,9 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
385 385
 PATH_SEPARATOR = @PATH_SEPARATOR@
386 386
 PCRE_CPPFLAGS = @PCRE_CPPFLAGS@
387 387
 PCRE_LIBS = @PCRE_LIBS@
388
+PKG_CONFIG = @PKG_CONFIG@
389
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
390
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
388 391
 RANLIB = @RANLIB@
389 392
 SED = @SED@
390 393
 SET_MAKE = @SET_MAKE@
... ...
@@ -263,6 +263,7 @@ CC = @CC@
263 263
 CCDEPMODE = @CCDEPMODE@
264 264
 CFGDIR = @CFGDIR@
265 265
 CFLAGS = @CFLAGS@
266
+CHECK_CFLAGS = @CHECK_CFLAGS@
266 267
 CHECK_CPPFLAGS = @CHECK_CPPFLAGS@
267 268
 CHECK_LIBS = @CHECK_LIBS@
268 269
 CLAMAVGROUP = @CLAMAVGROUP@
... ...
@@ -370,6 +371,9 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
370 370
 PATH_SEPARATOR = @PATH_SEPARATOR@
371 371
 PCRE_CPPFLAGS = @PCRE_CPPFLAGS@
372 372
 PCRE_LIBS = @PCRE_LIBS@
373
+PKG_CONFIG = @PKG_CONFIG@
374
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
375
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
373 376
 RANLIB = @RANLIB@
374 377
 SED = @SED@
375 378
 SET_MAKE = @SET_MAKE@
... ...
@@ -261,6 +261,7 @@ CC = @CC@
261 261
 CCDEPMODE = @CCDEPMODE@
262 262
 CFGDIR = @CFGDIR@
263 263
 CFLAGS = @CFLAGS@
264
+CHECK_CFLAGS = @CHECK_CFLAGS@
264 265
 CHECK_CPPFLAGS = @CHECK_CPPFLAGS@
265 266
 CHECK_LIBS = @CHECK_LIBS@
266 267
 CLAMAVGROUP = @CLAMAVGROUP@
... ...
@@ -368,6 +369,9 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
368 368
 PATH_SEPARATOR = @PATH_SEPARATOR@
369 369
 PCRE_CPPFLAGS = @PCRE_CPPFLAGS@
370 370
 PCRE_LIBS = @PCRE_LIBS@
371
+PKG_CONFIG = @PKG_CONFIG@
372
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
373
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
371 374
 RANLIB = @RANLIB@
372 375
 SED = @SED@
373 376
 SET_MAKE = @SET_MAKE@
... ...
@@ -719,8 +719,12 @@ LCOV
719 719
 GCOV
720 720
 HAVE_LIBCHECK_FALSE
721 721
 HAVE_LIBCHECK_TRUE
722
-CHECK_LIBS
723 722
 CHECK_CPPFLAGS
723
+CHECK_LIBS
724
+CHECK_CFLAGS
725
+PKG_CONFIG_LIBDIR
726
+PKG_CONFIG_PATH
727
+PKG_CONFIG
724 728
 BUILD_CONFIGURE_FLAGS
725 729
 VERSIONSCRIPT_FALSE
726 730
 VERSIONSCRIPT_TRUE
... ...
@@ -941,7 +945,12 @@ LIBS
941 941
 CPPFLAGS
942 942
 CPP
943 943
 YACC
944
-YFLAGS'
944
+YFLAGS
945
+PKG_CONFIG
946
+PKG_CONFIG_PATH
947
+PKG_CONFIG_LIBDIR
948
+CHECK_CFLAGS
949
+CHECK_LIBS'
945 950
 ac_subdirs_all='
946 951
 libclamav/c++'
947 952
 
... ...
@@ -1675,6 +1684,14 @@ Some influential environment variables:
1675 1675
   YFLAGS      The list of arguments that will be passed by default to $YACC.
1676 1676
               This script will default YFLAGS to the empty string to avoid a
1677 1677
               default value of `-d' given by some make applications.
1678
+  PKG_CONFIG  path to pkg-config utility
1679
+  PKG_CONFIG_PATH
1680
+              directories to add to pkg-config's search path
1681
+  PKG_CONFIG_LIBDIR
1682
+              path overriding pkg-config's built-in search path
1683
+  CHECK_CFLAGS
1684
+              C compiler flags for CHECK, overriding pkg-config
1685
+  CHECK_LIBS  linker flags for CHECK, overriding pkg-config
1678 1686
 
1679 1687
 Use these variables to override the choices made by `configure' or to help
1680 1688
 it to find libraries and programs with nonstandard names/locations.
... ...
@@ -16108,6 +16125,203 @@ fi
16108 16108
 
16109 16109
 
16110 16110
 if test "$enable_check_ut" != "no" ; then
16111
+
16112
+
16113
+
16114
+
16115
+
16116
+
16117
+
16118
+
16119
+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
16120
+	if test -n "$ac_tool_prefix"; then
16121
+  # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
16122
+set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
16123
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
16124
+$as_echo_n "checking for $ac_word... " >&6; }
16125
+if ${ac_cv_path_PKG_CONFIG+:} false; then :
16126
+  $as_echo_n "(cached) " >&6
16127
+else
16128
+  case $PKG_CONFIG in
16129
+  [\\/]* | ?:[\\/]*)
16130
+  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
16131
+  ;;
16132
+  *)
16133
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
16134
+for as_dir in $PATH
16135
+do
16136
+  IFS=$as_save_IFS
16137
+  test -z "$as_dir" && as_dir=.
16138
+    for ac_exec_ext in '' $ac_executable_extensions; do
16139
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
16140
+    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
16141
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
16142
+    break 2
16143
+  fi
16144
+done
16145
+  done
16146
+IFS=$as_save_IFS
16147
+
16148
+  ;;
16149
+esac
16150
+fi
16151
+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
16152
+if test -n "$PKG_CONFIG"; then
16153
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
16154
+$as_echo "$PKG_CONFIG" >&6; }
16155
+else
16156
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
16157
+$as_echo "no" >&6; }
16158
+fi
16159
+
16160
+
16161
+fi
16162
+if test -z "$ac_cv_path_PKG_CONFIG"; then
16163
+  ac_pt_PKG_CONFIG=$PKG_CONFIG
16164
+  # Extract the first word of "pkg-config", so it can be a program name with args.
16165
+set dummy pkg-config; ac_word=$2
16166
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
16167
+$as_echo_n "checking for $ac_word... " >&6; }
16168
+if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :
16169
+  $as_echo_n "(cached) " >&6
16170
+else
16171
+  case $ac_pt_PKG_CONFIG in
16172
+  [\\/]* | ?:[\\/]*)
16173
+  ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
16174
+  ;;
16175
+  *)
16176
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
16177
+for as_dir in $PATH
16178
+do
16179
+  IFS=$as_save_IFS
16180
+  test -z "$as_dir" && as_dir=.
16181
+    for ac_exec_ext in '' $ac_executable_extensions; do
16182
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
16183
+    ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
16184
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
16185
+    break 2
16186
+  fi
16187
+done
16188
+  done
16189
+IFS=$as_save_IFS
16190
+
16191
+  ;;
16192
+esac
16193
+fi
16194
+ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
16195
+if test -n "$ac_pt_PKG_CONFIG"; then
16196
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
16197
+$as_echo "$ac_pt_PKG_CONFIG" >&6; }
16198
+else
16199
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
16200
+$as_echo "no" >&6; }
16201
+fi
16202
+
16203
+  if test "x$ac_pt_PKG_CONFIG" = x; then
16204
+    PKG_CONFIG=""
16205
+  else
16206
+    case $cross_compiling:$ac_tool_warned in
16207
+yes:)
16208
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
16209
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
16210
+ac_tool_warned=yes ;;
16211
+esac
16212
+    PKG_CONFIG=$ac_pt_PKG_CONFIG
16213
+  fi
16214
+else
16215
+  PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
16216
+fi
16217
+
16218
+fi
16219
+if test -n "$PKG_CONFIG"; then
16220
+	_pkg_min_version=0.9.0
16221
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
16222
+$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
16223
+	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
16224
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
16225
+$as_echo "yes" >&6; }
16226
+	else
16227
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
16228
+$as_echo "no" >&6; }
16229
+		PKG_CONFIG=""
16230
+	fi
16231
+fi
16232
+
16233
+pkg_failed=no
16234
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CHECK" >&5
16235
+$as_echo_n "checking for CHECK... " >&6; }
16236
+
16237
+if test -n "$CHECK_CFLAGS"; then
16238
+    pkg_cv_CHECK_CFLAGS="$CHECK_CFLAGS"
16239
+ elif test -n "$PKG_CONFIG"; then
16240
+    if test -n "$PKG_CONFIG" && \
16241
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"check\""; } >&5
16242
+  ($PKG_CONFIG --exists --print-errors "check") 2>&5
16243
+  ac_status=$?
16244
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
16245
+  test $ac_status = 0; }; then
16246
+  pkg_cv_CHECK_CFLAGS=`$PKG_CONFIG --cflags "check" 2>/dev/null`
16247
+		      test "x$?" != "x0" && pkg_failed=yes
16248
+else
16249
+  pkg_failed=yes
16250
+fi
16251
+ else
16252
+    pkg_failed=untried
16253
+fi
16254
+if test -n "$CHECK_LIBS"; then
16255
+    pkg_cv_CHECK_LIBS="$CHECK_LIBS"
16256
+ elif test -n "$PKG_CONFIG"; then
16257
+    if test -n "$PKG_CONFIG" && \
16258
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"check\""; } >&5
16259
+  ($PKG_CONFIG --exists --print-errors "check") 2>&5
16260
+  ac_status=$?
16261
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
16262
+  test $ac_status = 0; }; then
16263
+  pkg_cv_CHECK_LIBS=`$PKG_CONFIG --libs "check" 2>/dev/null`
16264
+		      test "x$?" != "x0" && pkg_failed=yes
16265
+else
16266
+  pkg_failed=yes
16267
+fi
16268
+ else
16269
+    pkg_failed=untried
16270
+fi
16271
+
16272
+
16273
+
16274
+if test $pkg_failed = yes; then
16275
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
16276
+$as_echo "no" >&6; }
16277
+
16278
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
16279
+        _pkg_short_errors_supported=yes
16280
+else
16281
+        _pkg_short_errors_supported=no
16282
+fi
16283
+        if test $_pkg_short_errors_supported = yes; then
16284
+	        CHECK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "check" 2>&1`
16285
+        else
16286
+	        CHECK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "check" 2>&1`
16287
+        fi
16288
+	# Put the nasty error message in config.log where it belongs
16289
+	echo "$CHECK_PKG_ERRORS" >&5
16290
+
16291
+	HAVE_LIBCHECK=no
16292
+elif test $pkg_failed = untried; then
16293
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
16294
+$as_echo "no" >&6; }
16295
+	HAVE_LIBCHECK=no
16296
+else
16297
+	CHECK_CFLAGS=$pkg_cv_CHECK_CFLAGS
16298
+	CHECK_LIBS=$pkg_cv_CHECK_LIBS
16299
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
16300
+$as_echo "yes" >&6; }
16301
+	HAVE_LIBCHECK=yes
16302
+fi
16303
+
16304
+if test "X$HAVE_LIBCHECK" == "Xyes"; then
16305
+    CHECK_CPPFLAGS=$CHECK_CFLAGS
16306
+else
16307
+
16111 16308
 case "$host_os" in
16112 16309
     *linux*)
16113 16310
         save_LDFLAGS="$LDFLAGS"
... ...
@@ -16810,6 +17024,8 @@ case "$host_os" in
16810 16810
 esac
16811 16811
 
16812 16812
 fi
16813
+fi
16814
+
16813 16815
 
16814 16816
 
16815 16817
  if test "X$HAVE_LIBCHECK" = "Xyes"; then
... ...
@@ -209,6 +209,7 @@ CC = @CC@
209 209
 CCDEPMODE = @CCDEPMODE@
210 210
 CFGDIR = @CFGDIR@
211 211
 CFLAGS = @CFLAGS@
212
+CHECK_CFLAGS = @CHECK_CFLAGS@
212 213
 CHECK_CPPFLAGS = @CHECK_CPPFLAGS@
213 214
 CHECK_LIBS = @CHECK_LIBS@
214 215
 CLAMAVGROUP = @CLAMAVGROUP@
... ...
@@ -316,6 +317,9 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
316 316
 PATH_SEPARATOR = @PATH_SEPARATOR@
317 317
 PCRE_CPPFLAGS = @PCRE_CPPFLAGS@
318 318
 PCRE_LIBS = @PCRE_LIBS@
319
+PKG_CONFIG = @PKG_CONFIG@
320
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
321
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
319 322
 RANLIB = @RANLIB@
320 323
 SED = @SED@
321 324
 SET_MAKE = @SET_MAKE@
... ...
@@ -243,6 +243,7 @@ CC = @CC@
243 243
 CCDEPMODE = @CCDEPMODE@
244 244
 CFGDIR = @CFGDIR@
245 245
 CFLAGS = @CFLAGS@
246
+CHECK_CFLAGS = @CHECK_CFLAGS@
246 247
 CHECK_CPPFLAGS = @CHECK_CPPFLAGS@
247 248
 CHECK_LIBS = @CHECK_LIBS@
248 249
 CLAMAVGROUP = @CLAMAVGROUP@
... ...
@@ -350,6 +351,9 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
350 350
 PATH_SEPARATOR = @PATH_SEPARATOR@
351 351
 PCRE_CPPFLAGS = @PCRE_CPPFLAGS@
352 352
 PCRE_LIBS = @PCRE_LIBS@
353
+PKG_CONFIG = @PKG_CONFIG@
354
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
355
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
353 356
 RANLIB = @RANLIB@
354 357
 SED = @SED@
355 358
 SET_MAKE = @SET_MAKE@
... ...
@@ -239,6 +239,7 @@ CC = @CC@
239 239
 CCDEPMODE = @CCDEPMODE@
240 240
 CFGDIR = @CFGDIR@
241 241
 CFLAGS = @CFLAGS@
242
+CHECK_CFLAGS = @CHECK_CFLAGS@
242 243
 CHECK_CPPFLAGS = @CHECK_CPPFLAGS@
243 244
 CHECK_LIBS = @CHECK_LIBS@
244 245
 CLAMAVGROUP = @CLAMAVGROUP@
... ...
@@ -346,6 +347,9 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
346 346
 PATH_SEPARATOR = @PATH_SEPARATOR@
347 347
 PCRE_CPPFLAGS = @PCRE_CPPFLAGS@
348 348
 PCRE_LIBS = @PCRE_LIBS@
349
+PKG_CONFIG = @PKG_CONFIG@
350
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
351
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
349 352
 RANLIB = @RANLIB@
350 353
 SED = @SED@
351 354
 SET_MAKE = @SET_MAKE@
... ...
@@ -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@
... ...
@@ -716,6 +716,7 @@ CC = @CC@
716 716
 CCDEPMODE = @CCDEPMODE@
717 717
 CFGDIR = @CFGDIR@
718 718
 CFLAGS = @CFLAGS@
719
+CHECK_CFLAGS = @CHECK_CFLAGS@
719 720
 CHECK_CPPFLAGS = @CHECK_CPPFLAGS@
720 721
 CHECK_LIBS = @CHECK_LIBS@
721 722
 CLAMAVGROUP = @CLAMAVGROUP@
... ...
@@ -823,6 +824,9 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
823 823
 PATH_SEPARATOR = @PATH_SEPARATOR@
824 824
 PCRE_CPPFLAGS = @PCRE_CPPFLAGS@
825 825
 PCRE_LIBS = @PCRE_LIBS@
826
+PKG_CONFIG = @PKG_CONFIG@
827
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
828
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
826 829
 RANLIB = @RANLIB@
827 830
 SED = @SED@
828 831
 SET_MAKE = @SET_MAKE@
... ...
@@ -15880,13 +15880,18 @@ elif test $llvmver_test -lt 290; then
15880 15880
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: no ($llvmver)" >&5
15881 15881
 $as_echo "no ($llvmver)" >&6; }
15882 15882
     as_fn_error $? "LLVM >= 2.9 required, but \"$llvmver\"($llvmver_test) found" "$LINENO" 5
15883
-elif test $llvmver_test -ge 370; then
15883
+elif test $llvmver_test -lt 360; then
15884
+    llvmcomp="jit nativecodegen scalaropts ipo"
15885
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok ($llvmver)" >&5
15886
+$as_echo "ok ($llvmver)" >&6; }
15887
+elif test $llvmver_test -lt 370; then
15888
+            llvmcomp="mcjit nativecodegen scalaropts ipo x86asmparser powerpcasmparser"
15889
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok ($llvmver)" >&5
15890
+$as_echo "ok ($llvmver)" >&6; }
15891
+else
15884 15892
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: no ($llvmver)" >&5
15885 15893
 $as_echo "no ($llvmver)" >&6; }
15886 15894
     as_fn_error $? "LLVM < 3.7 required, but \"$llvmver\"($llvmver_test) found" "$LINENO" 5
15887
-else
15888
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok ($llvmver)" >&5
15889
-$as_echo "ok ($llvmver)" >&6; }
15890 15895
 fi
15891 15896
 
15892 15897
 if test "x$llvmconfig" != "x"; then
... ...
@@ -15909,9 +15914,9 @@ if test "x$llvmconfig" != "x"; then
15909 15909
            LLVMCONFIG_LDFLAGS=`$llvmconfig --ldflags`
15910 15910
 
15911 15911
         fi
15912
-        LLVMCONFIG_LIBS=`$llvmconfig --libs jit nativecodegen scalaropts ipo`
15912
+        LLVMCONFIG_LIBS=`$llvmconfig --libs $llvmcomp`
15913 15913
 
15914
-        LLVMCONFIG_LIBFILES=`$llvmconfig --libfiles jit nativecodegen scalaropts ipo`
15914
+        LLVMCONFIG_LIBFILES=`$llvmconfig --libfiles $llvmcomp`
15915 15915
 
15916 15916
     fi
15917 15917
 
... ...
@@ -340,6 +340,7 @@ CC = @CC@
340 340
 CCDEPMODE = @CCDEPMODE@
341 341
 CFGDIR = @CFGDIR@
342 342
 CFLAGS = @CFLAGS@
343
+CHECK_CFLAGS = @CHECK_CFLAGS@
343 344
 CHECK_CPPFLAGS = @CHECK_CPPFLAGS@
344 345
 CHECK_LIBS = @CHECK_LIBS@
345 346
 CLAMAVGROUP = @CLAMAVGROUP@
... ...
@@ -447,6 +448,9 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
447 447
 PATH_SEPARATOR = @PATH_SEPARATOR@
448 448
 PCRE_CPPFLAGS = @PCRE_CPPFLAGS@
449 449
 PCRE_LIBS = @PCRE_LIBS@
450
+PKG_CONFIG = @PKG_CONFIG@
451
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
452
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
450 453
 RANLIB = @RANLIB@
451 454
 SED = @SED@
452 455
 SET_MAKE = @SET_MAKE@
... ...
@@ -262,6 +262,7 @@ CC = @CC@
262 262
 CCDEPMODE = @CCDEPMODE@
263 263
 CFGDIR = @CFGDIR@
264 264
 CFLAGS = @CFLAGS@
265
+CHECK_CFLAGS = @CHECK_CFLAGS@
265 266
 CHECK_CPPFLAGS = @CHECK_CPPFLAGS@
266 267
 CHECK_LIBS = @CHECK_LIBS@
267 268
 CLAMAVGROUP = @CLAMAVGROUP@
... ...
@@ -369,6 +370,9 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
369 369
 PATH_SEPARATOR = @PATH_SEPARATOR@
370 370
 PCRE_CPPFLAGS = @PCRE_CPPFLAGS@
371 371
 PCRE_LIBS = @PCRE_LIBS@
372
+PKG_CONFIG = @PKG_CONFIG@
373
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
374
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
372 375
 RANLIB = @RANLIB@
373 376
 SED = @SED@
374 377
 SET_MAKE = @SET_MAKE@
... ...
@@ -192,6 +192,7 @@ CC = @CC@
192 192
 CCDEPMODE = @CCDEPMODE@
193 193
 CFGDIR = @CFGDIR@
194 194
 CFLAGS = @CFLAGS@
195
+CHECK_CFLAGS = @CHECK_CFLAGS@
195 196
 CHECK_CPPFLAGS = @CHECK_CPPFLAGS@
196 197
 CHECK_LIBS = @CHECK_LIBS@
197 198
 CLAMAVGROUP = @CLAMAVGROUP@
... ...
@@ -299,6 +300,9 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
299 299
 PATH_SEPARATOR = @PATH_SEPARATOR@
300 300
 PCRE_CPPFLAGS = @PCRE_CPPFLAGS@
301 301
 PCRE_LIBS = @PCRE_LIBS@
302
+PKG_CONFIG = @PKG_CONFIG@
303
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
304
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
302 305
 RANLIB = @RANLIB@
303 306
 SED = @SED@
304 307
 SET_MAKE = @SET_MAKE@
... ...
@@ -482,6 +482,7 @@ CC = @CC@
482 482
 CCDEPMODE = @CCDEPMODE@
483 483
 CFGDIR = @CFGDIR@
484 484
 CFLAGS = @CFLAGS@
485
+CHECK_CFLAGS = @CHECK_CFLAGS@
485 486
 CHECK_CPPFLAGS = @CHECK_CPPFLAGS@
486 487
 CHECK_LIBS = @CHECK_LIBS@
487 488
 CLAMAVGROUP = @CLAMAVGROUP@
... ...
@@ -589,6 +590,9 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
589 589
 PATH_SEPARATOR = @PATH_SEPARATOR@
590 590
 PCRE_CPPFLAGS = @PCRE_CPPFLAGS@
591 591
 PCRE_LIBS = @PCRE_LIBS@
592
+PKG_CONFIG = @PKG_CONFIG@
593
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
594
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
592 595
 RANLIB = @RANLIB@
593 596
 SED = @SED@
594 597
 SET_MAKE = @SET_MAKE@