Browse code
Autojunk'd
Micah Snyder authored on 2019/09/21 00:35:50Showing 23 changed files
- Makefile.in
- clamav-config.h.in
- clamav-milter/Makefile.in
- clambc/Makefile.in
- clamconf/Makefile.in
- clamd/Makefile.in
- clamdscan/Makefile.in
- clamdtop/Makefile.in
- clamonacc/Makefile.in
- clamscan/Makefile.in
- clamsubmit/Makefile.in
- configure
- database/Makefile.in
- docs/Makefile.in
- etc/Makefile.in
- freshclam/Makefile.in
- fuzz/Makefile.in
- libclamav/Makefile.in
- libfreshclam/Makefile.in
- libltdl/Makefile.in
- sigtool/Makefile.in
- test/Makefile.in
- unit_tests/Makefile.in
| ... | ... |
@@ -151,7 +151,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ |
| 151 | 151 |
$(top_srcdir)/m4/reorganization/code_checks/fanotify.m4 \ |
| 152 | 152 |
$(top_srcdir)/m4/reorganization/code_checks/setpgrp.m4 \ |
| 153 | 153 |
$(top_srcdir)/m4/reorganization/milter/enable.m4 \ |
| 154 |
- $(top_srcdir)/m4/reorganization/code_checks/iconv.m4 \ |
|
| 154 |
+ $(top_srcdir)/m4/reorganization/libs/iconv_check.m4 \ |
|
| 155 |
+ $(top_srcdir)/m4/reorganization/libs/iconv.m4 \ |
|
| 155 | 156 |
$(top_srcdir)/m4/reorganization/code_checks/pthreads.m4 \ |
| 156 | 157 |
$(top_srcdir)/m4/reorganization/code_checks/reentrant.m4 \ |
| 157 | 158 |
$(top_srcdir)/m4/reorganization/utility_checks/id.m4 \ |
| ... | ... |
@@ -440,8 +441,6 @@ GPERF = @GPERF@ |
| 440 | 440 |
GREP = @GREP@ |
| 441 | 441 |
HAVE_STRNI = @HAVE_STRNI@ |
| 442 | 442 |
HAVE_YARA = @HAVE_YARA@ |
| 443 |
-ICONV_CPPFLAGS = @ICONV_CPPFLAGS@ |
|
| 444 |
-ICONV_LDFLAGS = @ICONV_LDFLAGS@ |
|
| 445 | 443 |
INCLTDL = @INCLTDL@ |
| 446 | 444 |
INSTALL = @INSTALL@ |
| 447 | 445 |
INSTALL_DATA = @INSTALL_DATA@ |
| ... | ... |
@@ -475,6 +474,7 @@ LIBCLAMAV_VERSION_NUM = @LIBCLAMAV_VERSION_NUM@ |
| 475 | 475 |
LIBCLAMSHARED_CPPFLAGS = @LIBCLAMSHARED_CPPFLAGS@ |
| 476 | 476 |
LIBFRESHCLAM_VERSION = @LIBFRESHCLAM_VERSION@ |
| 477 | 477 |
LIBFRESHCLAM_VERSION_NUM = @LIBFRESHCLAM_VERSION_NUM@ |
| 478 |
+LIBICONV = @LIBICONV@ |
|
| 478 | 479 |
LIBLTDL = @LIBLTDL@ |
| 479 | 480 |
LIBM = @LIBM@ |
| 480 | 481 |
LIBMSPACK_CFLAGS = @LIBMSPACK_CFLAGS@ |
| ... | ... |
@@ -495,6 +495,7 @@ LTDLDEPS = @LTDLDEPS@ |
| 495 | 495 |
LTDLINCL = @LTDLINCL@ |
| 496 | 496 |
LTDLOPEN = @LTDLOPEN@ |
| 497 | 497 |
LTLIBBZ2 = @LTLIBBZ2@ |
| 498 |
+LTLIBICONV = @LTLIBICONV@ |
|
| 498 | 499 |
LTLIBOBJS = @LTLIBOBJS@ |
| 499 | 500 |
LT_ARGZ_H = @LT_ARGZ_H@ |
| 500 | 501 |
LT_CONFIG_H = @LT_CONFIG_H@ |
| ... | ... |
@@ -553,6 +554,8 @@ XML_CPPFLAGS = @XML_CPPFLAGS@ |
| 553 | 553 |
XML_LIBS = @XML_LIBS@ |
| 554 | 554 |
YACC = @YACC@ |
| 555 | 555 |
YFLAGS = @YFLAGS@ |
| 556 |
+ZLIB_CFLAGS = @ZLIB_CFLAGS@ |
|
| 557 |
+ZLIB_LIBS = @ZLIB_LIBS@ |
|
| 556 | 558 |
abs_builddir = @abs_builddir@ |
| 557 | 559 |
abs_srcdir = @abs_srcdir@ |
| 558 | 560 |
abs_top_builddir = @abs_top_builddir@ |
| ... | ... |
@@ -200,9 +200,12 @@ |
| 200 | 200 |
/* Define to 1 if you have the <grp.h> header file. */ |
| 201 | 201 |
#undef HAVE_GRP_H |
| 202 | 202 |
|
| 203 |
-/* iconv() available */ |
|
| 203 |
+/* Define if you have the iconv() function and it works. */ |
|
| 204 | 204 |
#undef HAVE_ICONV |
| 205 | 205 |
|
| 206 |
+/* Define to 1 if you have the <iconv.h> header file. */ |
|
| 207 |
+#undef HAVE_ICONV_H |
|
| 208 |
+ |
|
| 206 | 209 |
/* Define to 1 if you have the `inet_ntop' function. */ |
| 207 | 210 |
#undef HAVE_INET_NTOP |
| 208 | 211 |
|
| ... | ... |
@@ -221,6 +224,9 @@ |
| 221 | 221 |
/* Define to 1 if you have the 'libjson' library (-ljson). */ |
| 222 | 222 |
#undef HAVE_JSON |
| 223 | 223 |
|
| 224 |
+/* Define to 1 if you have the `charset' library (-lcharset). */ |
|
| 225 |
+#undef HAVE_LIBCHARSET |
|
| 226 |
+ |
|
| 224 | 227 |
/* Define to '1' if you have the check.h library */ |
| 225 | 228 |
#undef HAVE_LIBCHECK |
| 226 | 229 |
|
| ... | ... |
@@ -251,6 +257,12 @@ |
| 251 | 251 |
/* Define to 1 if you have the <limits.h> header file. */ |
| 252 | 252 |
#undef HAVE_LIMITS_H |
| 253 | 253 |
|
| 254 |
+/* Define to 1 if you have the <localcharset.h> header file. */ |
|
| 255 |
+#undef HAVE_LOCALCHARSET_H |
|
| 256 |
+ |
|
| 257 |
+/* Define to 1 if you have the `locale_charset' function. */ |
|
| 258 |
+#undef HAVE_LOCALE_CHARSET |
|
| 259 |
+ |
|
| 254 | 260 |
/* Define this if a modern libltdl is already installed */ |
| 255 | 261 |
#undef HAVE_LTDL |
| 256 | 262 |
|
| ... | ... |
@@ -456,9 +468,15 @@ |
| 456 | 456 |
/* yara sources are compiled in */ |
| 457 | 457 |
#undef HAVE_YARA |
| 458 | 458 |
|
| 459 |
+/* Define to 1 if you have the <zlib.h> header file. */ |
|
| 460 |
+#undef HAVE_ZLIB_H |
|
| 461 |
+ |
|
| 459 | 462 |
/* For internal use only - DO NOT DEFINE */ |
| 460 | 463 |
#undef HAVE__INTERNAL__SHA_COLLECT |
| 461 | 464 |
|
| 465 |
+/* Define as const if the declaration of iconv() needs const. */ |
|
| 466 |
+#undef ICONV_CONST |
|
| 467 |
+ |
|
| 462 | 468 |
/* "Full clamav library version number" */ |
| 463 | 469 |
#undef LIBCLAMAV_FULLVER |
| 464 | 470 |
|
| ... | ... |
@@ -148,7 +148,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ |
| 148 | 148 |
$(top_srcdir)/m4/reorganization/code_checks/fanotify.m4 \ |
| 149 | 149 |
$(top_srcdir)/m4/reorganization/code_checks/setpgrp.m4 \ |
| 150 | 150 |
$(top_srcdir)/m4/reorganization/milter/enable.m4 \ |
| 151 |
- $(top_srcdir)/m4/reorganization/code_checks/iconv.m4 \ |
|
| 151 |
+ $(top_srcdir)/m4/reorganization/libs/iconv_check.m4 \ |
|
| 152 |
+ $(top_srcdir)/m4/reorganization/libs/iconv.m4 \ |
|
| 152 | 153 |
$(top_srcdir)/m4/reorganization/code_checks/pthreads.m4 \ |
| 153 | 154 |
$(top_srcdir)/m4/reorganization/code_checks/reentrant.m4 \ |
| 154 | 155 |
$(top_srcdir)/m4/reorganization/utility_checks/id.m4 \ |
| ... | ... |
@@ -388,8 +389,6 @@ GPERF = @GPERF@ |
| 388 | 388 |
GREP = @GREP@ |
| 389 | 389 |
HAVE_STRNI = @HAVE_STRNI@ |
| 390 | 390 |
HAVE_YARA = @HAVE_YARA@ |
| 391 |
-ICONV_CPPFLAGS = @ICONV_CPPFLAGS@ |
|
| 392 |
-ICONV_LDFLAGS = @ICONV_LDFLAGS@ |
|
| 393 | 391 |
INCLTDL = @INCLTDL@ |
| 394 | 392 |
INSTALL = @INSTALL@ |
| 395 | 393 |
INSTALL_DATA = @INSTALL_DATA@ |
| ... | ... |
@@ -423,6 +422,7 @@ LIBCLAMAV_VERSION_NUM = @LIBCLAMAV_VERSION_NUM@ |
| 423 | 423 |
LIBCLAMSHARED_CPPFLAGS = @LIBCLAMSHARED_CPPFLAGS@ |
| 424 | 424 |
LIBFRESHCLAM_VERSION = @LIBFRESHCLAM_VERSION@ |
| 425 | 425 |
LIBFRESHCLAM_VERSION_NUM = @LIBFRESHCLAM_VERSION_NUM@ |
| 426 |
+LIBICONV = @LIBICONV@ |
|
| 426 | 427 |
LIBLTDL = @LIBLTDL@ |
| 427 | 428 |
LIBM = @LIBM@ |
| 428 | 429 |
LIBMSPACK_CFLAGS = @LIBMSPACK_CFLAGS@ |
| ... | ... |
@@ -443,6 +443,7 @@ LTDLDEPS = @LTDLDEPS@ |
| 443 | 443 |
LTDLINCL = @LTDLINCL@ |
| 444 | 444 |
LTDLOPEN = @LTDLOPEN@ |
| 445 | 445 |
LTLIBBZ2 = @LTLIBBZ2@ |
| 446 |
+LTLIBICONV = @LTLIBICONV@ |
|
| 446 | 447 |
LTLIBOBJS = @LTLIBOBJS@ |
| 447 | 448 |
LT_ARGZ_H = @LT_ARGZ_H@ |
| 448 | 449 |
LT_CONFIG_H = @LT_CONFIG_H@ |
| ... | ... |
@@ -501,6 +502,8 @@ XML_CPPFLAGS = @XML_CPPFLAGS@ |
| 501 | 501 |
XML_LIBS = @XML_LIBS@ |
| 502 | 502 |
YACC = @YACC@ |
| 503 | 503 |
YFLAGS = @YFLAGS@ |
| 504 |
+ZLIB_CFLAGS = @ZLIB_CFLAGS@ |
|
| 505 |
+ZLIB_LIBS = @ZLIB_LIBS@ |
|
| 504 | 506 |
abs_builddir = @abs_builddir@ |
| 505 | 507 |
abs_srcdir = @abs_srcdir@ |
| 506 | 508 |
abs_top_builddir = @abs_top_builddir@ |
| ... | ... |
@@ -127,7 +127,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ |
| 127 | 127 |
$(top_srcdir)/m4/reorganization/code_checks/fanotify.m4 \ |
| 128 | 128 |
$(top_srcdir)/m4/reorganization/code_checks/setpgrp.m4 \ |
| 129 | 129 |
$(top_srcdir)/m4/reorganization/milter/enable.m4 \ |
| 130 |
- $(top_srcdir)/m4/reorganization/code_checks/iconv.m4 \ |
|
| 130 |
+ $(top_srcdir)/m4/reorganization/libs/iconv_check.m4 \ |
|
| 131 |
+ $(top_srcdir)/m4/reorganization/libs/iconv.m4 \ |
|
| 131 | 132 |
$(top_srcdir)/m4/reorganization/code_checks/pthreads.m4 \ |
| 132 | 133 |
$(top_srcdir)/m4/reorganization/code_checks/reentrant.m4 \ |
| 133 | 134 |
$(top_srcdir)/m4/reorganization/utility_checks/id.m4 \ |
| ... | ... |
@@ -322,8 +323,6 @@ GPERF = @GPERF@ |
| 322 | 322 |
GREP = @GREP@ |
| 323 | 323 |
HAVE_STRNI = @HAVE_STRNI@ |
| 324 | 324 |
HAVE_YARA = @HAVE_YARA@ |
| 325 |
-ICONV_CPPFLAGS = @ICONV_CPPFLAGS@ |
|
| 326 |
-ICONV_LDFLAGS = @ICONV_LDFLAGS@ |
|
| 327 | 325 |
INCLTDL = @INCLTDL@ |
| 328 | 326 |
INSTALL = @INSTALL@ |
| 329 | 327 |
INSTALL_DATA = @INSTALL_DATA@ |
| ... | ... |
@@ -357,6 +356,7 @@ LIBCLAMAV_VERSION_NUM = @LIBCLAMAV_VERSION_NUM@ |
| 357 | 357 |
LIBCLAMSHARED_CPPFLAGS = @LIBCLAMSHARED_CPPFLAGS@ |
| 358 | 358 |
LIBFRESHCLAM_VERSION = @LIBFRESHCLAM_VERSION@ |
| 359 | 359 |
LIBFRESHCLAM_VERSION_NUM = @LIBFRESHCLAM_VERSION_NUM@ |
| 360 |
+LIBICONV = @LIBICONV@ |
|
| 360 | 361 |
LIBLTDL = @LIBLTDL@ |
| 361 | 362 |
LIBM = @LIBM@ |
| 362 | 363 |
LIBMSPACK_CFLAGS = @LIBMSPACK_CFLAGS@ |
| ... | ... |
@@ -377,6 +377,7 @@ LTDLDEPS = @LTDLDEPS@ |
| 377 | 377 |
LTDLINCL = @LTDLINCL@ |
| 378 | 378 |
LTDLOPEN = @LTDLOPEN@ |
| 379 | 379 |
LTLIBBZ2 = @LTLIBBZ2@ |
| 380 |
+LTLIBICONV = @LTLIBICONV@ |
|
| 380 | 381 |
LTLIBOBJS = @LTLIBOBJS@ |
| 381 | 382 |
LT_ARGZ_H = @LT_ARGZ_H@ |
| 382 | 383 |
LT_CONFIG_H = @LT_CONFIG_H@ |
| ... | ... |
@@ -435,6 +436,8 @@ XML_CPPFLAGS = @XML_CPPFLAGS@ |
| 435 | 435 |
XML_LIBS = @XML_LIBS@ |
| 436 | 436 |
YACC = @YACC@ |
| 437 | 437 |
YFLAGS = @YFLAGS@ |
| 438 |
+ZLIB_CFLAGS = @ZLIB_CFLAGS@ |
|
| 439 |
+ZLIB_LIBS = @ZLIB_LIBS@ |
|
| 438 | 440 |
abs_builddir = @abs_builddir@ |
| 439 | 441 |
abs_srcdir = @abs_srcdir@ |
| 440 | 442 |
abs_top_builddir = @abs_top_builddir@ |
| ... | ... |
@@ -147,7 +147,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ |
| 147 | 147 |
$(top_srcdir)/m4/reorganization/code_checks/fanotify.m4 \ |
| 148 | 148 |
$(top_srcdir)/m4/reorganization/code_checks/setpgrp.m4 \ |
| 149 | 149 |
$(top_srcdir)/m4/reorganization/milter/enable.m4 \ |
| 150 |
- $(top_srcdir)/m4/reorganization/code_checks/iconv.m4 \ |
|
| 150 |
+ $(top_srcdir)/m4/reorganization/libs/iconv_check.m4 \ |
|
| 151 |
+ $(top_srcdir)/m4/reorganization/libs/iconv.m4 \ |
|
| 151 | 152 |
$(top_srcdir)/m4/reorganization/code_checks/pthreads.m4 \ |
| 152 | 153 |
$(top_srcdir)/m4/reorganization/code_checks/reentrant.m4 \ |
| 153 | 154 |
$(top_srcdir)/m4/reorganization/utility_checks/id.m4 \ |
| ... | ... |
@@ -342,8 +343,6 @@ GPERF = @GPERF@ |
| 342 | 342 |
GREP = @GREP@ |
| 343 | 343 |
HAVE_STRNI = @HAVE_STRNI@ |
| 344 | 344 |
HAVE_YARA = @HAVE_YARA@ |
| 345 |
-ICONV_CPPFLAGS = @ICONV_CPPFLAGS@ |
|
| 346 |
-ICONV_LDFLAGS = @ICONV_LDFLAGS@ |
|
| 347 | 345 |
INCLTDL = @INCLTDL@ |
| 348 | 346 |
INSTALL = @INSTALL@ |
| 349 | 347 |
INSTALL_DATA = @INSTALL_DATA@ |
| ... | ... |
@@ -377,6 +376,7 @@ LIBCLAMAV_VERSION_NUM = @LIBCLAMAV_VERSION_NUM@ |
| 377 | 377 |
LIBCLAMSHARED_CPPFLAGS = @LIBCLAMSHARED_CPPFLAGS@ |
| 378 | 378 |
LIBFRESHCLAM_VERSION = @LIBFRESHCLAM_VERSION@ |
| 379 | 379 |
LIBFRESHCLAM_VERSION_NUM = @LIBFRESHCLAM_VERSION_NUM@ |
| 380 |
+LIBICONV = @LIBICONV@ |
|
| 380 | 381 |
LIBLTDL = @LIBLTDL@ |
| 381 | 382 |
LIBM = @LIBM@ |
| 382 | 383 |
LIBMSPACK_CFLAGS = @LIBMSPACK_CFLAGS@ |
| ... | ... |
@@ -389,7 +389,7 @@ LIBPRELUDE_LDFLAGS = @LIBPRELUDE_LDFLAGS@ |
| 389 | 389 |
LIBPRELUDE_LIBS = @LIBPRELUDE_LIBS@ |
| 390 | 390 |
LIBPRELUDE_PREFIX = @LIBPRELUDE_PREFIX@ |
| 391 | 391 |
LIBPRELUDE_PTHREAD_CFLAGS = @LIBPRELUDE_PTHREAD_CFLAGS@ |
| 392 |
-LIBS = $(top_builddir)/libclamav/libclamav.la @CLAMCONF_LIBS@ @CLAMD_LIBS@ @THREAD_LIBS@ @LIBCLAMAV_LIBS@ |
|
| 392 |
+LIBS = $(top_builddir)/libclamav/libclamav.la @CLAMCONF_LIBS@ @CLAMD_LIBS@ @THREAD_LIBS@ @LIBCLAMAV_LIBS@ @ZLIB_LIBS@ |
|
| 393 | 393 |
LIBTOOL = @LIBTOOL@ |
| 394 | 394 |
LIPO = @LIPO@ |
| 395 | 395 |
LN_S = @LN_S@ |
| ... | ... |
@@ -397,6 +397,7 @@ LTDLDEPS = @LTDLDEPS@ |
| 397 | 397 |
LTDLINCL = @LTDLINCL@ |
| 398 | 398 |
LTDLOPEN = @LTDLOPEN@ |
| 399 | 399 |
LTLIBBZ2 = @LTLIBBZ2@ |
| 400 |
+LTLIBICONV = @LTLIBICONV@ |
|
| 400 | 401 |
LTLIBOBJS = @LTLIBOBJS@ |
| 401 | 402 |
LT_ARGZ_H = @LT_ARGZ_H@ |
| 402 | 403 |
LT_CONFIG_H = @LT_CONFIG_H@ |
| ... | ... |
@@ -455,6 +456,8 @@ XML_CPPFLAGS = @XML_CPPFLAGS@ |
| 455 | 455 |
XML_LIBS = @XML_LIBS@ |
| 456 | 456 |
YACC = @YACC@ |
| 457 | 457 |
YFLAGS = @YFLAGS@ |
| 458 |
+ZLIB_CFLAGS = @ZLIB_CFLAGS@ |
|
| 459 |
+ZLIB_LIBS = @ZLIB_LIBS@ |
|
| 458 | 460 |
abs_builddir = @abs_builddir@ |
| 459 | 461 |
abs_srcdir = @abs_srcdir@ |
| 460 | 462 |
abs_top_builddir = @abs_top_builddir@ |
| ... | ... |
@@ -534,7 +537,7 @@ clamconf_SOURCES = \ |
| 534 | 534 |
|
| 535 | 535 |
AM_CFLAGS = @WERR_CFLAGS@ @SSL_CPPFLAGS@ |
| 536 | 536 |
AM_CPPFLAGS = @CLAMCONF_CPPFLAGS@ -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav\ |
| 537 |
- @JSON_CPPFLAGS@ @PCRE_CPPFLAGS@\ |
|
| 537 |
+ @ZLIB_CFLAGS@ @JSON_CPPFLAGS@ @PCRE_CPPFLAGS@\ |
|
| 538 | 538 |
-DBUILD_CPPFLAGS="\"$(CPPFLAGS)\"" -DBUILD_CFLAGS="\"$(CFLAGS)\""\ |
| 539 | 539 |
-DBUILD_CXXFLAGS="\"$(CXXFLAGS)\"" -DBUILD_LDFLAGS="\"$(LDFLAGS)\""\ |
| 540 | 540 |
-DBUILD_CONFIGURE_FLAGS="\"$(BUILD_CONFIGURE_FLAGS)\"" |
| ... | ... |
@@ -148,7 +148,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ |
| 148 | 148 |
$(top_srcdir)/m4/reorganization/code_checks/fanotify.m4 \ |
| 149 | 149 |
$(top_srcdir)/m4/reorganization/code_checks/setpgrp.m4 \ |
| 150 | 150 |
$(top_srcdir)/m4/reorganization/milter/enable.m4 \ |
| 151 |
- $(top_srcdir)/m4/reorganization/code_checks/iconv.m4 \ |
|
| 151 |
+ $(top_srcdir)/m4/reorganization/libs/iconv_check.m4 \ |
|
| 152 |
+ $(top_srcdir)/m4/reorganization/libs/iconv.m4 \ |
|
| 152 | 153 |
$(top_srcdir)/m4/reorganization/code_checks/pthreads.m4 \ |
| 153 | 154 |
$(top_srcdir)/m4/reorganization/code_checks/reentrant.m4 \ |
| 154 | 155 |
$(top_srcdir)/m4/reorganization/utility_checks/id.m4 \ |
| ... | ... |
@@ -390,8 +391,6 @@ GPERF = @GPERF@ |
| 390 | 390 |
GREP = @GREP@ |
| 391 | 391 |
HAVE_STRNI = @HAVE_STRNI@ |
| 392 | 392 |
HAVE_YARA = @HAVE_YARA@ |
| 393 |
-ICONV_CPPFLAGS = @ICONV_CPPFLAGS@ |
|
| 394 |
-ICONV_LDFLAGS = @ICONV_LDFLAGS@ |
|
| 395 | 393 |
INCLTDL = @INCLTDL@ |
| 396 | 394 |
INSTALL = @INSTALL@ |
| 397 | 395 |
INSTALL_DATA = @INSTALL_DATA@ |
| ... | ... |
@@ -425,6 +424,7 @@ LIBCLAMAV_VERSION_NUM = @LIBCLAMAV_VERSION_NUM@ |
| 425 | 425 |
LIBCLAMSHARED_CPPFLAGS = @LIBCLAMSHARED_CPPFLAGS@ |
| 426 | 426 |
LIBFRESHCLAM_VERSION = @LIBFRESHCLAM_VERSION@ |
| 427 | 427 |
LIBFRESHCLAM_VERSION_NUM = @LIBFRESHCLAM_VERSION_NUM@ |
| 428 |
+LIBICONV = @LIBICONV@ |
|
| 428 | 429 |
LIBLTDL = @LIBLTDL@ |
| 429 | 430 |
LIBM = @LIBM@ |
| 430 | 431 |
LIBMSPACK_CFLAGS = @LIBMSPACK_CFLAGS@ |
| ... | ... |
@@ -445,6 +445,7 @@ LTDLDEPS = @LTDLDEPS@ |
| 445 | 445 |
LTDLINCL = @LTDLINCL@ |
| 446 | 446 |
LTDLOPEN = @LTDLOPEN@ |
| 447 | 447 |
LTLIBBZ2 = @LTLIBBZ2@ |
| 448 |
+LTLIBICONV = @LTLIBICONV@ |
|
| 448 | 449 |
LTLIBOBJS = @LTLIBOBJS@ |
| 449 | 450 |
LT_ARGZ_H = @LT_ARGZ_H@ |
| 450 | 451 |
LT_CONFIG_H = @LT_CONFIG_H@ |
| ... | ... |
@@ -503,6 +504,8 @@ XML_CPPFLAGS = @XML_CPPFLAGS@ |
| 503 | 503 |
XML_LIBS = @XML_LIBS@ |
| 504 | 504 |
YACC = @YACC@ |
| 505 | 505 |
YFLAGS = @YFLAGS@ |
| 506 |
+ZLIB_CFLAGS = @ZLIB_CFLAGS@ |
|
| 507 |
+ZLIB_LIBS = @ZLIB_LIBS@ |
|
| 506 | 508 |
abs_builddir = @abs_builddir@ |
| 507 | 509 |
abs_srcdir = @abs_srcdir@ |
| 508 | 510 |
abs_top_builddir = @abs_top_builddir@ |
| ... | ... |
@@ -146,7 +146,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ |
| 146 | 146 |
$(top_srcdir)/m4/reorganization/code_checks/fanotify.m4 \ |
| 147 | 147 |
$(top_srcdir)/m4/reorganization/code_checks/setpgrp.m4 \ |
| 148 | 148 |
$(top_srcdir)/m4/reorganization/milter/enable.m4 \ |
| 149 |
- $(top_srcdir)/m4/reorganization/code_checks/iconv.m4 \ |
|
| 149 |
+ $(top_srcdir)/m4/reorganization/libs/iconv_check.m4 \ |
|
| 150 |
+ $(top_srcdir)/m4/reorganization/libs/iconv.m4 \ |
|
| 150 | 151 |
$(top_srcdir)/m4/reorganization/code_checks/pthreads.m4 \ |
| 151 | 152 |
$(top_srcdir)/m4/reorganization/code_checks/reentrant.m4 \ |
| 152 | 153 |
$(top_srcdir)/m4/reorganization/utility_checks/id.m4 \ |
| ... | ... |
@@ -352,8 +353,6 @@ GPERF = @GPERF@ |
| 352 | 352 |
GREP = @GREP@ |
| 353 | 353 |
HAVE_STRNI = @HAVE_STRNI@ |
| 354 | 354 |
HAVE_YARA = @HAVE_YARA@ |
| 355 |
-ICONV_CPPFLAGS = @ICONV_CPPFLAGS@ |
|
| 356 |
-ICONV_LDFLAGS = @ICONV_LDFLAGS@ |
|
| 357 | 355 |
INCLTDL = @INCLTDL@ |
| 358 | 356 |
INSTALL = @INSTALL@ |
| 359 | 357 |
INSTALL_DATA = @INSTALL_DATA@ |
| ... | ... |
@@ -387,6 +386,7 @@ LIBCLAMAV_VERSION_NUM = @LIBCLAMAV_VERSION_NUM@ |
| 387 | 387 |
LIBCLAMSHARED_CPPFLAGS = @LIBCLAMSHARED_CPPFLAGS@ |
| 388 | 388 |
LIBFRESHCLAM_VERSION = @LIBFRESHCLAM_VERSION@ |
| 389 | 389 |
LIBFRESHCLAM_VERSION_NUM = @LIBFRESHCLAM_VERSION_NUM@ |
| 390 |
+LIBICONV = @LIBICONV@ |
|
| 390 | 391 |
LIBLTDL = @LIBLTDL@ |
| 391 | 392 |
LIBM = @LIBM@ |
| 392 | 393 |
LIBMSPACK_CFLAGS = @LIBMSPACK_CFLAGS@ |
| ... | ... |
@@ -407,6 +407,7 @@ LTDLDEPS = @LTDLDEPS@ |
| 407 | 407 |
LTDLINCL = @LTDLINCL@ |
| 408 | 408 |
LTDLOPEN = @LTDLOPEN@ |
| 409 | 409 |
LTLIBBZ2 = @LTLIBBZ2@ |
| 410 |
+LTLIBICONV = @LTLIBICONV@ |
|
| 410 | 411 |
LTLIBOBJS = @LTLIBOBJS@ |
| 411 | 412 |
LT_ARGZ_H = @LT_ARGZ_H@ |
| 412 | 413 |
LT_CONFIG_H = @LT_CONFIG_H@ |
| ... | ... |
@@ -465,6 +466,8 @@ XML_CPPFLAGS = @XML_CPPFLAGS@ |
| 465 | 465 |
XML_LIBS = @XML_LIBS@ |
| 466 | 466 |
YACC = @YACC@ |
| 467 | 467 |
YFLAGS = @YFLAGS@ |
| 468 |
+ZLIB_CFLAGS = @ZLIB_CFLAGS@ |
|
| 469 |
+ZLIB_LIBS = @ZLIB_LIBS@ |
|
| 468 | 470 |
abs_builddir = @abs_builddir@ |
| 469 | 471 |
abs_srcdir = @abs_srcdir@ |
| 470 | 472 |
abs_top_builddir = @abs_top_builddir@ |
| ... | ... |
@@ -127,7 +127,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ |
| 127 | 127 |
$(top_srcdir)/m4/reorganization/code_checks/fanotify.m4 \ |
| 128 | 128 |
$(top_srcdir)/m4/reorganization/code_checks/setpgrp.m4 \ |
| 129 | 129 |
$(top_srcdir)/m4/reorganization/milter/enable.m4 \ |
| 130 |
- $(top_srcdir)/m4/reorganization/code_checks/iconv.m4 \ |
|
| 130 |
+ $(top_srcdir)/m4/reorganization/libs/iconv_check.m4 \ |
|
| 131 |
+ $(top_srcdir)/m4/reorganization/libs/iconv.m4 \ |
|
| 131 | 132 |
$(top_srcdir)/m4/reorganization/code_checks/pthreads.m4 \ |
| 132 | 133 |
$(top_srcdir)/m4/reorganization/code_checks/reentrant.m4 \ |
| 133 | 134 |
$(top_srcdir)/m4/reorganization/utility_checks/id.m4 \ |
| ... | ... |
@@ -357,8 +358,6 @@ GPERF = @GPERF@ |
| 357 | 357 |
GREP = @GREP@ |
| 358 | 358 |
HAVE_STRNI = @HAVE_STRNI@ |
| 359 | 359 |
HAVE_YARA = @HAVE_YARA@ |
| 360 |
-ICONV_CPPFLAGS = @ICONV_CPPFLAGS@ |
|
| 361 |
-ICONV_LDFLAGS = @ICONV_LDFLAGS@ |
|
| 362 | 360 |
INCLTDL = @INCLTDL@ |
| 363 | 361 |
INSTALL = @INSTALL@ |
| 364 | 362 |
INSTALL_DATA = @INSTALL_DATA@ |
| ... | ... |
@@ -392,6 +391,7 @@ LIBCLAMAV_VERSION_NUM = @LIBCLAMAV_VERSION_NUM@ |
| 392 | 392 |
LIBCLAMSHARED_CPPFLAGS = @LIBCLAMSHARED_CPPFLAGS@ |
| 393 | 393 |
LIBFRESHCLAM_VERSION = @LIBFRESHCLAM_VERSION@ |
| 394 | 394 |
LIBFRESHCLAM_VERSION_NUM = @LIBFRESHCLAM_VERSION_NUM@ |
| 395 |
+LIBICONV = @LIBICONV@ |
|
| 395 | 396 |
LIBLTDL = @LIBLTDL@ |
| 396 | 397 |
LIBM = @LIBM@ |
| 397 | 398 |
LIBMSPACK_CFLAGS = @LIBMSPACK_CFLAGS@ |
| ... | ... |
@@ -412,6 +412,7 @@ LTDLDEPS = @LTDLDEPS@ |
| 412 | 412 |
LTDLINCL = @LTDLINCL@ |
| 413 | 413 |
LTDLOPEN = @LTDLOPEN@ |
| 414 | 414 |
LTLIBBZ2 = @LTLIBBZ2@ |
| 415 |
+LTLIBICONV = @LTLIBICONV@ |
|
| 415 | 416 |
LTLIBOBJS = @LTLIBOBJS@ |
| 416 | 417 |
LT_ARGZ_H = @LT_ARGZ_H@ |
| 417 | 418 |
LT_CONFIG_H = @LT_CONFIG_H@ |
| ... | ... |
@@ -470,6 +471,8 @@ XML_CPPFLAGS = @XML_CPPFLAGS@ |
| 470 | 470 |
XML_LIBS = @XML_LIBS@ |
| 471 | 471 |
YACC = @YACC@ |
| 472 | 472 |
YFLAGS = @YFLAGS@ |
| 473 |
+ZLIB_CFLAGS = @ZLIB_CFLAGS@ |
|
| 474 |
+ZLIB_LIBS = @ZLIB_LIBS@ |
|
| 473 | 475 |
abs_builddir = @abs_builddir@ |
| 474 | 476 |
abs_srcdir = @abs_srcdir@ |
| 475 | 477 |
abs_top_builddir = @abs_top_builddir@ |
| ... | ... |
@@ -148,7 +148,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ |
| 148 | 148 |
$(top_srcdir)/m4/reorganization/code_checks/fanotify.m4 \ |
| 149 | 149 |
$(top_srcdir)/m4/reorganization/code_checks/setpgrp.m4 \ |
| 150 | 150 |
$(top_srcdir)/m4/reorganization/milter/enable.m4 \ |
| 151 |
- $(top_srcdir)/m4/reorganization/code_checks/iconv.m4 \ |
|
| 151 |
+ $(top_srcdir)/m4/reorganization/libs/iconv_check.m4 \ |
|
| 152 |
+ $(top_srcdir)/m4/reorganization/libs/iconv.m4 \ |
|
| 152 | 153 |
$(top_srcdir)/m4/reorganization/code_checks/pthreads.m4 \ |
| 153 | 154 |
$(top_srcdir)/m4/reorganization/code_checks/reentrant.m4 \ |
| 154 | 155 |
$(top_srcdir)/m4/reorganization/utility_checks/id.m4 \ |
| ... | ... |
@@ -362,8 +363,6 @@ GPERF = @GPERF@ |
| 362 | 362 |
GREP = @GREP@ |
| 363 | 363 |
HAVE_STRNI = @HAVE_STRNI@ |
| 364 | 364 |
HAVE_YARA = @HAVE_YARA@ |
| 365 |
-ICONV_CPPFLAGS = @ICONV_CPPFLAGS@ |
|
| 366 |
-ICONV_LDFLAGS = @ICONV_LDFLAGS@ |
|
| 367 | 365 |
INCLTDL = @INCLTDL@ |
| 368 | 366 |
INSTALL = @INSTALL@ |
| 369 | 367 |
INSTALL_DATA = @INSTALL_DATA@ |
| ... | ... |
@@ -397,6 +396,7 @@ LIBCLAMAV_VERSION_NUM = @LIBCLAMAV_VERSION_NUM@ |
| 397 | 397 |
LIBCLAMSHARED_CPPFLAGS = @LIBCLAMSHARED_CPPFLAGS@ |
| 398 | 398 |
LIBFRESHCLAM_VERSION = @LIBFRESHCLAM_VERSION@ |
| 399 | 399 |
LIBFRESHCLAM_VERSION_NUM = @LIBFRESHCLAM_VERSION_NUM@ |
| 400 |
+LIBICONV = @LIBICONV@ |
|
| 400 | 401 |
LIBLTDL = @LIBLTDL@ |
| 401 | 402 |
LIBM = @LIBM@ |
| 402 | 403 |
LIBMSPACK_CFLAGS = @LIBMSPACK_CFLAGS@ |
| ... | ... |
@@ -417,6 +417,7 @@ LTDLDEPS = @LTDLDEPS@ |
| 417 | 417 |
LTDLINCL = @LTDLINCL@ |
| 418 | 418 |
LTDLOPEN = @LTDLOPEN@ |
| 419 | 419 |
LTLIBBZ2 = @LTLIBBZ2@ |
| 420 |
+LTLIBICONV = @LTLIBICONV@ |
|
| 420 | 421 |
LTLIBOBJS = @LTLIBOBJS@ |
| 421 | 422 |
LT_ARGZ_H = @LT_ARGZ_H@ |
| 422 | 423 |
LT_CONFIG_H = @LT_CONFIG_H@ |
| ... | ... |
@@ -475,6 +476,8 @@ XML_CPPFLAGS = @XML_CPPFLAGS@ |
| 475 | 475 |
XML_LIBS = @XML_LIBS@ |
| 476 | 476 |
YACC = @YACC@ |
| 477 | 477 |
YFLAGS = @YFLAGS@ |
| 478 |
+ZLIB_CFLAGS = @ZLIB_CFLAGS@ |
|
| 479 |
+ZLIB_LIBS = @ZLIB_LIBS@ |
|
| 478 | 480 |
abs_builddir = @abs_builddir@ |
| 479 | 481 |
abs_srcdir = @abs_srcdir@ |
| 480 | 482 |
abs_top_builddir = @abs_top_builddir@ |
| ... | ... |
@@ -149,7 +149,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ |
| 149 | 149 |
$(top_srcdir)/m4/reorganization/code_checks/fanotify.m4 \ |
| 150 | 150 |
$(top_srcdir)/m4/reorganization/code_checks/setpgrp.m4 \ |
| 151 | 151 |
$(top_srcdir)/m4/reorganization/milter/enable.m4 \ |
| 152 |
- $(top_srcdir)/m4/reorganization/code_checks/iconv.m4 \ |
|
| 152 |
+ $(top_srcdir)/m4/reorganization/libs/iconv_check.m4 \ |
|
| 153 |
+ $(top_srcdir)/m4/reorganization/libs/iconv.m4 \ |
|
| 153 | 154 |
$(top_srcdir)/m4/reorganization/code_checks/pthreads.m4 \ |
| 154 | 155 |
$(top_srcdir)/m4/reorganization/code_checks/reentrant.m4 \ |
| 155 | 156 |
$(top_srcdir)/m4/reorganization/utility_checks/id.m4 \ |
| ... | ... |
@@ -345,8 +346,6 @@ GPERF = @GPERF@ |
| 345 | 345 |
GREP = @GREP@ |
| 346 | 346 |
HAVE_STRNI = @HAVE_STRNI@ |
| 347 | 347 |
HAVE_YARA = @HAVE_YARA@ |
| 348 |
-ICONV_CPPFLAGS = @ICONV_CPPFLAGS@ |
|
| 349 |
-ICONV_LDFLAGS = @ICONV_LDFLAGS@ |
|
| 350 | 348 |
INCLTDL = @INCLTDL@ |
| 351 | 349 |
INSTALL = @INSTALL@ |
| 352 | 350 |
INSTALL_DATA = @INSTALL_DATA@ |
| ... | ... |
@@ -380,6 +379,7 @@ LIBCLAMAV_VERSION_NUM = @LIBCLAMAV_VERSION_NUM@ |
| 380 | 380 |
LIBCLAMSHARED_CPPFLAGS = @LIBCLAMSHARED_CPPFLAGS@ |
| 381 | 381 |
LIBFRESHCLAM_VERSION = @LIBFRESHCLAM_VERSION@ |
| 382 | 382 |
LIBFRESHCLAM_VERSION_NUM = @LIBFRESHCLAM_VERSION_NUM@ |
| 383 |
+LIBICONV = @LIBICONV@ |
|
| 383 | 384 |
LIBLTDL = @LIBLTDL@ |
| 384 | 385 |
LIBM = @LIBM@ |
| 385 | 386 |
LIBMSPACK_CFLAGS = @LIBMSPACK_CFLAGS@ |
| ... | ... |
@@ -400,6 +400,7 @@ LTDLDEPS = @LTDLDEPS@ |
| 400 | 400 |
LTDLINCL = @LTDLINCL@ |
| 401 | 401 |
LTDLOPEN = @LTDLOPEN@ |
| 402 | 402 |
LTLIBBZ2 = @LTLIBBZ2@ |
| 403 |
+LTLIBICONV = @LTLIBICONV@ |
|
| 403 | 404 |
LTLIBOBJS = @LTLIBOBJS@ |
| 404 | 405 |
LT_ARGZ_H = @LT_ARGZ_H@ |
| 405 | 406 |
LT_CONFIG_H = @LT_CONFIG_H@ |
| ... | ... |
@@ -458,6 +459,8 @@ XML_CPPFLAGS = @XML_CPPFLAGS@ |
| 458 | 458 |
XML_LIBS = @XML_LIBS@ |
| 459 | 459 |
YACC = @YACC@ |
| 460 | 460 |
YFLAGS = @YFLAGS@ |
| 461 |
+ZLIB_CFLAGS = @ZLIB_CFLAGS@ |
|
| 462 |
+ZLIB_LIBS = @ZLIB_LIBS@ |
|
| 461 | 463 |
abs_builddir = @abs_builddir@ |
| 462 | 464 |
abs_srcdir = @abs_srcdir@ |
| 463 | 465 |
abs_top_builddir = @abs_top_builddir@ |
| ... | ... |
@@ -157,7 +157,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ |
| 157 | 157 |
$(top_srcdir)/m4/reorganization/code_checks/fanotify.m4 \ |
| 158 | 158 |
$(top_srcdir)/m4/reorganization/code_checks/setpgrp.m4 \ |
| 159 | 159 |
$(top_srcdir)/m4/reorganization/milter/enable.m4 \ |
| 160 |
- $(top_srcdir)/m4/reorganization/code_checks/iconv.m4 \ |
|
| 160 |
+ $(top_srcdir)/m4/reorganization/libs/iconv_check.m4 \ |
|
| 161 |
+ $(top_srcdir)/m4/reorganization/libs/iconv.m4 \ |
|
| 161 | 162 |
$(top_srcdir)/m4/reorganization/code_checks/pthreads.m4 \ |
| 162 | 163 |
$(top_srcdir)/m4/reorganization/code_checks/reentrant.m4 \ |
| 163 | 164 |
$(top_srcdir)/m4/reorganization/utility_checks/id.m4 \ |
| ... | ... |
@@ -385,8 +386,6 @@ GPERF = @GPERF@ |
| 385 | 385 |
GREP = @GREP@ |
| 386 | 386 |
HAVE_STRNI = @HAVE_STRNI@ |
| 387 | 387 |
HAVE_YARA = @HAVE_YARA@ |
| 388 |
-ICONV_CPPFLAGS = @ICONV_CPPFLAGS@ |
|
| 389 |
-ICONV_LDFLAGS = @ICONV_LDFLAGS@ |
|
| 390 | 388 |
INCLTDL = @INCLTDL@ |
| 391 | 389 |
INSTALL = @INSTALL@ |
| 392 | 390 |
INSTALL_DATA = @INSTALL_DATA@ |
| ... | ... |
@@ -420,6 +419,7 @@ LIBCLAMAV_VERSION_NUM = @LIBCLAMAV_VERSION_NUM@ |
| 420 | 420 |
LIBCLAMSHARED_CPPFLAGS = @LIBCLAMSHARED_CPPFLAGS@ |
| 421 | 421 |
LIBFRESHCLAM_VERSION = @LIBFRESHCLAM_VERSION@ |
| 422 | 422 |
LIBFRESHCLAM_VERSION_NUM = @LIBFRESHCLAM_VERSION_NUM@ |
| 423 |
+LIBICONV = @LIBICONV@ |
|
| 423 | 424 |
LIBLTDL = @LIBLTDL@ |
| 424 | 425 |
LIBM = @LIBM@ |
| 425 | 426 |
LIBMSPACK_CFLAGS = @LIBMSPACK_CFLAGS@ |
| ... | ... |
@@ -440,6 +440,7 @@ LTDLDEPS = @LTDLDEPS@ |
| 440 | 440 |
LTDLINCL = @LTDLINCL@ |
| 441 | 441 |
LTDLOPEN = @LTDLOPEN@ |
| 442 | 442 |
LTLIBBZ2 = @LTLIBBZ2@ |
| 443 |
+LTLIBICONV = @LTLIBICONV@ |
|
| 443 | 444 |
LTLIBOBJS = @LTLIBOBJS@ |
| 444 | 445 |
LT_ARGZ_H = @LT_ARGZ_H@ |
| 445 | 446 |
LT_CONFIG_H = @LT_CONFIG_H@ |
| ... | ... |
@@ -498,6 +499,8 @@ XML_CPPFLAGS = @XML_CPPFLAGS@ |
| 498 | 498 |
XML_LIBS = @XML_LIBS@ |
| 499 | 499 |
YACC = @YACC@ |
| 500 | 500 |
YFLAGS = @YFLAGS@ |
| 501 |
+ZLIB_CFLAGS = @ZLIB_CFLAGS@ |
|
| 502 |
+ZLIB_LIBS = @ZLIB_LIBS@ |
|
| 501 | 503 |
abs_builddir = @abs_builddir@ |
| 502 | 504 |
abs_srcdir = @abs_srcdir@ |
| 503 | 505 |
abs_top_builddir = @abs_top_builddir@ |
| ... | ... |
@@ -742,8 +742,8 @@ BUILD_CLAMD_FALSE |
| 742 | 742 |
BUILD_CLAMD_TRUE |
| 743 | 743 |
CFGDIR |
| 744 | 744 |
DBDIR |
| 745 |
-ICONV_CPPFLAGS |
|
| 746 |
-ICONV_LDFLAGS |
|
| 745 |
+LTLIBICONV |
|
| 746 |
+LIBICONV |
|
| 747 | 747 |
INSTALL_SYSTEMD_UNITS_FALSE |
| 748 | 748 |
INSTALL_SYSTEMD_UNITS_TRUE |
| 749 | 749 |
systemdsystemunitdir |
| ... | ... |
@@ -756,6 +756,8 @@ HAVE_LIBBZ2_TRUE |
| 756 | 756 |
LIBBZ2_PREFIX |
| 757 | 757 |
LTLIBBZ2 |
| 758 | 758 |
LIBBZ2 |
| 759 |
+ZLIB_LIBS |
|
| 760 |
+ZLIB_CFLAGS |
|
| 759 | 761 |
MAINT |
| 760 | 762 |
MAINTAINER_MODE_FALSE |
| 761 | 763 |
MAINTAINER_MODE_TRUE |
| ... | ... |
@@ -977,7 +979,6 @@ with_pcre |
| 977 | 977 |
with_system_libmspack |
| 978 | 978 |
enable_maintainer_mode |
| 979 | 979 |
with_zlib |
| 980 |
-enable_zlib_vcheck |
|
| 981 | 980 |
enable_bzip2 |
| 982 | 981 |
with_libbz2_prefix |
| 983 | 982 |
enable_unrar |
| ... | ... |
@@ -987,7 +988,7 @@ enable_ipv6 |
| 987 | 987 |
enable_dns |
| 988 | 988 |
enable_fanotify |
| 989 | 989 |
enable_milter |
| 990 |
-with_iconv |
|
| 990 |
+with_libiconv_prefix |
|
| 991 | 991 |
enable_pthreads |
| 992 | 992 |
enable_cr |
| 993 | 993 |
enable_id_check |
| ... | ... |
@@ -1039,6 +1040,8 @@ CHECK_CFLAGS |
| 1039 | 1039 |
CHECK_LIBS |
| 1040 | 1040 |
LIBMSPACK_CFLAGS |
| 1041 | 1041 |
LIBMSPACK_LIBS |
| 1042 |
+ZLIB_CFLAGS |
|
| 1043 |
+ZLIB_LIBS |
|
| 1042 | 1044 |
SYSTEMD_CFLAGS |
| 1043 | 1045 |
SYSTEMD_LIBS |
| 1044 | 1046 |
OBJC |
| ... | ... |
@@ -1701,7 +1704,6 @@ if test -n "$ac_init_help"; then |
| 1701 | 1701 |
--enable-maintainer-mode |
| 1702 | 1702 |
make rules and dependencies not useful (and |
| 1703 | 1703 |
sometimes confusing) to the casual installer |
| 1704 |
- --disable-zlib-vcheck do not check for buggy zlib version |
|
| 1705 | 1704 |
--disable-bzip2 do not include bzip2 support |
| 1706 | 1705 |
--disable-unrar do not build libclamunrar and libclamunrar_iface |
| 1707 | 1706 |
--disable-getaddrinfo do not include support for getaddrinfo |
| ... | ... |
@@ -1763,16 +1765,17 @@ Optional Packages: |
| 1763 | 1763 |
--with-system-libmspack Specify system libmspack location or to use internal |
| 1764 | 1764 |
package, uses full path to libmspack or bin |
| 1765 | 1765 |
directory (default=search PATH environment variable) |
| 1766 |
- --with-zlib[=DIR] path to directory containing zlib library |
|
| 1766 |
+ |
|
| 1767 |
+ --with-zlib[=DIR] path to directory containing zlib library |
|
| 1767 | 1768 |
[default=/usr/local or /usr if not found in |
| 1768 | 1769 |
/usr/local] |
| 1770 |
+ |
|
| 1769 | 1771 |
--with-libbz2-prefix[=DIR] search for libbz2 in DIR/include and DIR/lib |
| 1770 | 1772 |
--without-libbz2-prefix don't search for libbz2 in includedir and libdir |
| 1771 | 1773 |
--with-systemdsystemunitdir=DIR |
| 1772 | 1774 |
Directory for systemd service files |
| 1773 |
- --with-iconv[=DIR] path to directory containing libiconv |
|
| 1774 |
- [default=/usr/local or /usr if not found in |
|
| 1775 |
- /usr/local] |
|
| 1775 |
+ --with-libiconv-prefix[=DIR] search for libiconv in DIR/include and DIR/lib |
|
| 1776 |
+ --without-libiconv-prefix don't search for libiconv in includedir and libdir |
|
| 1776 | 1777 |
--with-user[=uid] name of the clamav user [default=clamav] |
| 1777 | 1778 |
--with-group[=gid] name of the clamav group [default=clamav] |
| 1778 | 1779 |
--with-version[=STR] use custom version string (dev only) |
| ... | ... |
@@ -1824,6 +1827,8 @@ Some influential environment variables: |
| 1824 | 1824 |
C compiler flags for LIBMSPACK, overriding pkg-config |
| 1825 | 1825 |
LIBMSPACK_LIBS |
| 1826 | 1826 |
linker flags for LIBMSPACK, overriding pkg-config |
| 1827 |
+ ZLIB_CFLAGS C compiler flags for ZLIB, overriding pkg-config |
|
| 1828 |
+ ZLIB_LIBS linker flags for ZLIB, overriding pkg-config |
|
| 1827 | 1829 |
SYSTEMD_CFLAGS |
| 1828 | 1830 |
C compiler flags for SYSTEMD, overriding pkg-config |
| 1829 | 1831 |
SYSTEMD_LIBS |
| ... | ... |
@@ -23172,70 +23177,110 @@ fi |
| 23172 | 23172 |
|
| 23173 | 23173 |
|
| 23174 | 23174 |
|
| 23175 |
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for zlib installation" >&5
|
|
| 23176 |
-$as_echo_n "checking for zlib installation... " >&6; } |
|
| 23177 |
- |
|
| 23178 | 23175 |
# Check whether --with-zlib was given. |
| 23179 | 23176 |
if test "${with_zlib+set}" = set; then :
|
| 23180 | 23177 |
withval=$with_zlib; |
| 23181 |
-if test "$withval"; then |
|
| 23182 |
- ZLIB_HOME="$withval" |
|
| 23183 |
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: using $ZLIB_HOME" >&5
|
|
| 23184 |
-$as_echo "using $ZLIB_HOME" >&6; } |
|
| 23185 |
-fi |
|
| 23186 |
- |
|
| 23187 |
-else |
|
| 23178 |
+ if test "$withval" != "no" -a "$withval" != "yes"; then |
|
| 23179 |
+ ZLIB_HOME=$withval |
|
| 23180 |
+ CPPFLAGS="${CPPFLAGS} -I$withval/include"
|
|
| 23181 |
+ LDFLAGS="${LDFLAGS} -L$withval/lib"
|
|
| 23182 |
+ fi |
|
| 23188 | 23183 |
|
| 23189 |
-ZLIB_HOME=/usr/local |
|
| 23190 |
-if test ! -f "$ZLIB_HOME/include/zlib.h" |
|
| 23191 |
-then |
|
| 23192 |
- ZLIB_HOME=/usr |
|
| 23193 | 23184 |
fi |
| 23194 |
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ZLIB_HOME" >&5
|
|
| 23195 |
-$as_echo "$ZLIB_HOME" >&6; } |
|
| 23196 | 23185 |
|
| 23197 |
-fi |
|
| 23198 | 23186 |
|
| 23187 |
+FOUND_ZLIB=0 |
|
| 23188 |
+if test "x$ZLIB_HOME" = "x"; then |
|
| 23199 | 23189 |
|
| 23200 |
-CLAMDSCAN_LIBS="$FRESHCLAM_LIBS" |
|
| 23190 |
+pkg_failed=no |
|
| 23191 |
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ZLIB" >&5
|
|
| 23192 |
+$as_echo_n "checking for ZLIB... " >&6; } |
|
| 23201 | 23193 |
|
| 23202 |
-# Check whether --enable-zlib-vcheck was given. |
|
| 23203 |
-if test "${enable_zlib_vcheck+set}" = set; then :
|
|
| 23204 |
- enableval=$enable_zlib_vcheck; zlib_check=$enableval |
|
| 23194 |
+if test -n "$ZLIB_CFLAGS"; then |
|
| 23195 |
+ pkg_cv_ZLIB_CFLAGS="$ZLIB_CFLAGS" |
|
| 23196 |
+ elif test -n "$PKG_CONFIG"; then |
|
| 23197 |
+ if test -n "$PKG_CONFIG" && \ |
|
| 23198 |
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"zlib\""; } >&5
|
|
| 23199 |
+ ($PKG_CONFIG --exists --print-errors "zlib") 2>&5 |
|
| 23200 |
+ ac_status=$? |
|
| 23201 |
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
|
| 23202 |
+ test $ac_status = 0; }; then |
|
| 23203 |
+ pkg_cv_ZLIB_CFLAGS=`$PKG_CONFIG --cflags "zlib" 2>/dev/null` |
|
| 23204 |
+ test "x$?" != "x0" && pkg_failed=yes |
|
| 23205 |
+else |
|
| 23206 |
+ pkg_failed=yes |
|
| 23207 |
+fi |
|
| 23208 |
+ else |
|
| 23209 |
+ pkg_failed=untried |
|
| 23210 |
+fi |
|
| 23211 |
+if test -n "$ZLIB_LIBS"; then |
|
| 23212 |
+ pkg_cv_ZLIB_LIBS="$ZLIB_LIBS" |
|
| 23213 |
+ elif test -n "$PKG_CONFIG"; then |
|
| 23214 |
+ if test -n "$PKG_CONFIG" && \ |
|
| 23215 |
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"zlib\""; } >&5
|
|
| 23216 |
+ ($PKG_CONFIG --exists --print-errors "zlib") 2>&5 |
|
| 23217 |
+ ac_status=$? |
|
| 23218 |
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
|
| 23219 |
+ test $ac_status = 0; }; then |
|
| 23220 |
+ pkg_cv_ZLIB_LIBS=`$PKG_CONFIG --libs "zlib" 2>/dev/null` |
|
| 23221 |
+ test "x$?" != "x0" && pkg_failed=yes |
|
| 23205 | 23222 |
else |
| 23206 |
- zlib_check="yes" |
|
| 23223 |
+ pkg_failed=yes |
|
| 23224 |
+fi |
|
| 23225 |
+ else |
|
| 23226 |
+ pkg_failed=untried |
|
| 23207 | 23227 |
fi |
| 23208 | 23228 |
|
| 23209 | 23229 |
|
| 23210 |
-if test ! -f "$ZLIB_HOME/include/zlib.h" |
|
| 23211 |
-then |
|
| 23212 |
- as_fn_error $? "Please install zlib and zlib-devel packages" "$LINENO" 5 |
|
| 23230 |
+ |
|
| 23231 |
+if test $pkg_failed = yes; then |
|
| 23232 |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
| 23233 |
+$as_echo "no" >&6; } |
|
| 23234 |
+ |
|
| 23235 |
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then |
|
| 23236 |
+ _pkg_short_errors_supported=yes |
|
| 23213 | 23237 |
else |
| 23238 |
+ _pkg_short_errors_supported=no |
|
| 23239 |
+fi |
|
| 23240 |
+ if test $_pkg_short_errors_supported = yes; then |
|
| 23241 |
+ ZLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "zlib" 2>&1` |
|
| 23242 |
+ else |
|
| 23243 |
+ ZLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "zlib" 2>&1` |
|
| 23244 |
+ fi |
|
| 23245 |
+ # Put the nasty error message in config.log where it belongs |
|
| 23246 |
+ echo "$ZLIB_PKG_ERRORS" >&5 |
|
| 23214 | 23247 |
|
| 23215 |
- vuln=`grep "ZLIB_VERSION \"1.2.0\"" $ZLIB_HOME/include/zlib.h` |
|
| 23216 |
- if test -z "$vuln"; then |
|
| 23217 |
- vuln=`grep "ZLIB_VERSION \"1.2.1\"" $ZLIB_HOME/include/zlib.h` |
|
| 23218 |
- fi |
|
| 23248 |
+ : |
|
| 23249 |
+elif test $pkg_failed = untried; then |
|
| 23250 |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
| 23251 |
+$as_echo "no" >&6; } |
|
| 23252 |
+ : |
|
| 23253 |
+else |
|
| 23254 |
+ ZLIB_CFLAGS=$pkg_cv_ZLIB_CFLAGS |
|
| 23255 |
+ ZLIB_LIBS=$pkg_cv_ZLIB_LIBS |
|
| 23256 |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
|
| 23257 |
+$as_echo "yes" >&6; } |
|
| 23258 |
+ FOUND_ZLIB=1 |
|
| 23259 |
+fi |
|
| 23260 |
+fi |
|
| 23219 | 23261 |
|
| 23220 |
- if test -n "$vuln"; then |
|
| 23221 |
- if test "$zlib_check" = "yes"; then |
|
| 23222 |
- as_fn_error $? "The installed zlib version may contain a security bug. Please upgrade to 1.2.2 or later: http://www.zlib.net. You can omit this check with --disable-zlib-vcheck but DO NOT REPORT any stability issues then!" "$LINENO" 5 |
|
| 23223 |
- else |
|
| 23224 |
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ****** This ClamAV installation may be linked against" >&5
|
|
| 23225 |
-$as_echo "$as_me: WARNING: ****** This ClamAV installation may be linked against" >&2;} |
|
| 23226 |
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ****** a broken zlib version. Please DO NOT report any" >&5
|
|
| 23227 |
-$as_echo "$as_me: WARNING: ****** a broken zlib version. Please DO NOT report any" >&2;} |
|
| 23228 |
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ****** stability problems to the ClamAV developers!" >&5
|
|
| 23229 |
-$as_echo "$as_me: WARNING: ****** stability problems to the ClamAV developers!" >&2;} |
|
| 23230 |
- fi |
|
| 23231 |
- fi |
|
| 23262 |
+if test "$FOUND_ZLIB" = "0"; then |
|
| 23263 |
+ for ac_header in zlib.h |
|
| 23264 |
+do : |
|
| 23265 |
+ ac_fn_c_check_header_mongrel "$LINENO" "zlib.h" "ac_cv_header_zlib_h" "$ac_includes_default" |
|
| 23266 |
+if test "x$ac_cv_header_zlib_h" = xyes; then : |
|
| 23267 |
+ cat >>confdefs.h <<_ACEOF |
|
| 23268 |
+#define HAVE_ZLIB_H 1 |
|
| 23269 |
+_ACEOF |
|
| 23232 | 23270 |
|
| 23233 |
- save_LIBS="$LIBS" |
|
| 23234 |
- if test "$ZLIB_HOME" != "/usr"; then |
|
| 23235 |
- CPPFLAGS="$CPPFLAGS -I$ZLIB_HOME/include" |
|
| 23236 |
- save_LDFLAGS="$LDFLAGS" |
|
| 23237 |
- LDFLAGS="$LDFLAGS -L$ZLIB_HOME/lib" |
|
| 23238 |
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inflateEnd in -lz" >&5
|
|
| 23271 |
+ FOUND_ZLIB=1 |
|
| 23272 |
+ save_LIBS="$LIBS" |
|
| 23273 |
+ if test "x${ZLIB_HOME}" != "x"; then
|
|
| 23274 |
+ save_CPPFLAGS="$CPPFLAGS -I$ZLIB_HOME/include" |
|
| 23275 |
+ save_LDFLAGS="$LDFLAGS" |
|
| 23276 |
+ CPPFLAGS="$CPPFLAGS -I$ZLIB_HOME/include" |
|
| 23277 |
+ LDFLAGS="$LDFLAGS -L$ZLIB_HOME/lib" |
|
| 23278 |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inflateEnd in -lz" >&5
|
|
| 23239 | 23279 |
$as_echo_n "checking for inflateEnd in -lz... " >&6; } |
| 23240 | 23280 |
if ${ac_cv_lib_z_inflateEnd+:} false; then :
|
| 23241 | 23281 |
$as_echo_n "(cached) " >&6 |
| ... | ... |
@@ -23272,12 +23317,12 @@ fi |
| 23272 | 23272 |
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_inflateEnd" >&5
|
| 23273 | 23273 |
$as_echo "$ac_cv_lib_z_inflateEnd" >&6; } |
| 23274 | 23274 |
if test "x$ac_cv_lib_z_inflateEnd" = xyes; then : |
| 23275 |
- LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -L$ZLIB_HOME/lib -lz"; FRESHCLAM_LIBS="$FRESHCLAM_LIBS -L$ZLIB_HOME/lib -lz" |
|
| 23275 |
+ ZLIB_CFLAGS="-I${ZLIB_HOME}/include"; ZLIB_LIBS="-L${ZLIB_HOME}/lib -lz"
|
|
| 23276 | 23276 |
else |
| 23277 | 23277 |
as_fn_error $? "Please install zlib and zlib-devel packages" "$LINENO" 5 |
| 23278 | 23278 |
fi |
| 23279 | 23279 |
|
| 23280 |
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gzopen in -lz" >&5
|
|
| 23280 |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gzopen in -lz" >&5
|
|
| 23281 | 23281 |
$as_echo_n "checking for gzopen in -lz... " >&6; } |
| 23282 | 23282 |
if ${ac_cv_lib_z_gzopen+:} false; then :
|
| 23283 | 23283 |
$as_echo_n "(cached) " >&6 |
| ... | ... |
@@ -23324,9 +23369,10 @@ else |
| 23324 | 23324 |
as_fn_error $? "Your zlib is missing gzopen()" "$LINENO" 5 |
| 23325 | 23325 |
fi |
| 23326 | 23326 |
|
| 23327 |
- LDFLAGS="$save_LDFLAGS" |
|
| 23328 |
- else |
|
| 23329 |
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inflateEnd in -lz" >&5
|
|
| 23327 |
+ CPPFLAGS="$save_CPPFLAGS" |
|
| 23328 |
+ LDFLAGS="$save_LDFLAGS" |
|
| 23329 |
+ else |
|
| 23330 |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inflateEnd in -lz" >&5
|
|
| 23330 | 23331 |
$as_echo_n "checking for inflateEnd in -lz... " >&6; } |
| 23331 | 23332 |
if ${ac_cv_lib_z_inflateEnd+:} false; then :
|
| 23332 | 23333 |
$as_echo_n "(cached) " >&6 |
| ... | ... |
@@ -23363,12 +23409,12 @@ fi |
| 23363 | 23363 |
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_inflateEnd" >&5
|
| 23364 | 23364 |
$as_echo "$ac_cv_lib_z_inflateEnd" >&6; } |
| 23365 | 23365 |
if test "x$ac_cv_lib_z_inflateEnd" = xyes; then : |
| 23366 |
- LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lz";FRESHCLAM_LIBS="$FRESHCLAM_LIBS -lz" |
|
| 23366 |
+ ZLIB_LIBS="-lz" |
|
| 23367 | 23367 |
else |
| 23368 | 23368 |
as_fn_error $? "Please install zlib and zlib-devel packages" "$LINENO" 5 |
| 23369 | 23369 |
fi |
| 23370 | 23370 |
|
| 23371 |
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gzopen in -lz" >&5
|
|
| 23371 |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gzopen in -lz" >&5
|
|
| 23372 | 23372 |
$as_echo_n "checking for gzopen in -lz... " >&6; } |
| 23373 | 23373 |
if ${ac_cv_lib_z_gzopen+:} false; then :
|
| 23374 | 23374 |
$as_echo_n "(cached) " >&6 |
| ... | ... |
@@ -23415,8 +23461,17 @@ else |
| 23415 | 23415 |
as_fn_error $? "Your zlib is missing gzopen()" "$LINENO" 5 |
| 23416 | 23416 |
fi |
| 23417 | 23417 |
|
| 23418 |
- fi |
|
| 23419 |
- LIBS="$save_LIBS" |
|
| 23418 |
+ fi |
|
| 23419 |
+ LIBS="$save_LIBS" |
|
| 23420 |
+ |
|
| 23421 |
+fi |
|
| 23422 |
+ |
|
| 23423 |
+done |
|
| 23424 |
+ |
|
| 23425 |
+fi |
|
| 23426 |
+ |
|
| 23427 |
+if test "$FOUND_ZLIB" = "0"; then |
|
| 23428 |
+ as_fn_error $? "Please install zlib and zlib-devel packages" "$LINENO" 5 |
|
| 23420 | 23429 |
fi |
| 23421 | 23430 |
|
| 23422 | 23431 |
|
| ... | ... |
@@ -24865,257 +24920,886 @@ fi |
| 24865 | 24865 |
|
| 24866 | 24866 |
|
| 24867 | 24867 |
|
| 24868 |
-want_iconv="sure" |
|
| 24869 |
-have_iconv="no" |
|
| 24870 |
-have_iconv_lib="no" |
|
| 24868 |
+# iconv.m4 serial 21 |
|
| 24871 | 24869 |
|
| 24872 |
-save_LDFLAGS="$LDFLAGS" |
|
| 24873 |
-save_LIBS="$LIBS" |
|
| 24874 |
-save_CPPFLAGS="$CPPFLAGS" |
|
| 24875 | 24870 |
|
| 24876 |
-ICONV_HOME="" |
|
| 24877 | 24871 |
|
| 24878 | 24872 |
|
| 24879 |
-# Check whether --with-iconv was given. |
|
| 24880 |
-if test "${with_iconv+set}" = set; then :
|
|
| 24881 |
- withval=$with_iconv; |
|
| 24882 |
- if test "X$withval" = "Xno"; then |
|
| 24883 |
- want_iconv="no" |
|
| 24873 |
+ |
|
| 24874 |
+ |
|
| 24875 |
+ |
|
| 24876 |
+ |
|
| 24877 |
+ |
|
| 24878 |
+ |
|
| 24879 |
+if test "x$with_iconv" != "xno"; then |
|
| 24880 |
+ |
|
| 24881 |
+ |
|
| 24882 |
+ |
|
| 24883 |
+ |
|
| 24884 |
+ |
|
| 24885 |
+ |
|
| 24886 |
+ |
|
| 24887 |
+ |
|
| 24888 |
+ use_additional=yes |
|
| 24889 |
+ |
|
| 24890 |
+ acl_save_prefix="$prefix" |
|
| 24891 |
+ prefix="$acl_final_prefix" |
|
| 24892 |
+ acl_save_exec_prefix="$exec_prefix" |
|
| 24893 |
+ exec_prefix="$acl_final_exec_prefix" |
|
| 24894 |
+ |
|
| 24895 |
+ eval additional_includedir=\"$includedir\" |
|
| 24896 |
+ eval additional_libdir=\"$libdir\" |
|
| 24897 |
+ |
|
| 24898 |
+ exec_prefix="$acl_save_exec_prefix" |
|
| 24899 |
+ prefix="$acl_save_prefix" |
|
| 24900 |
+ |
|
| 24901 |
+ |
|
| 24902 |
+# Check whether --with-libiconv-prefix was given. |
|
| 24903 |
+if test "${with_libiconv_prefix+set}" = set; then :
|
|
| 24904 |
+ withval=$with_libiconv_prefix; |
|
| 24905 |
+ if test "X$withval" = "Xno"; then |
|
| 24906 |
+ use_additional=no |
|
| 24907 |
+ else |
|
| 24908 |
+ additional_compat_libdir= |
|
| 24909 |
+ if test "X$withval" = "X"; then |
|
| 24910 |
+ |
|
| 24911 |
+ acl_save_prefix="$prefix" |
|
| 24912 |
+ prefix="$acl_final_prefix" |
|
| 24913 |
+ acl_save_exec_prefix="$exec_prefix" |
|
| 24914 |
+ exec_prefix="$acl_final_exec_prefix" |
|
| 24915 |
+ |
|
| 24916 |
+ eval additional_includedir=\"$includedir\" |
|
| 24917 |
+ eval additional_libdir=\"$libdir\" |
|
| 24918 |
+ |
|
| 24919 |
+ exec_prefix="$acl_save_exec_prefix" |
|
| 24920 |
+ prefix="$acl_save_prefix" |
|
| 24921 |
+ |
|
| 24922 |
+ else |
|
| 24923 |
+ additional_includedir="$withval/include" |
|
| 24924 |
+ additional_libdir="$withval/$acl_libdirstem" |
|
| 24925 |
+ if test "X$acl_libdirstem" != "Xlib"; then |
|
| 24926 |
+ additional_compat_libdir="-L$withval/lib" |
|
| 24927 |
+ fi |
|
| 24928 |
+ fi |
|
| 24929 |
+ fi |
|
| 24930 |
+ |
|
| 24931 |
+fi |
|
| 24932 |
+ |
|
| 24933 |
+ LIBICONV= |
|
| 24934 |
+ LTLIBICONV= |
|
| 24935 |
+ INCICONV= |
|
| 24936 |
+ LIBICONV_PREFIX= |
|
| 24937 |
+ rpathdirs= |
|
| 24938 |
+ ltrpathdirs= |
|
| 24939 |
+ names_already_handled= |
|
| 24940 |
+ names_next_round='iconv ' |
|
| 24941 |
+ while test -n "$names_next_round"; do |
|
| 24942 |
+ names_this_round="$names_next_round" |
|
| 24943 |
+ names_next_round= |
|
| 24944 |
+ for name in $names_this_round; do |
|
| 24945 |
+ already_handled= |
|
| 24946 |
+ for n in $names_already_handled; do |
|
| 24947 |
+ if test "$n" = "$name"; then |
|
| 24948 |
+ already_handled=yes |
|
| 24949 |
+ break |
|
| 24950 |
+ fi |
|
| 24951 |
+ done |
|
| 24952 |
+ if test -z "$already_handled"; then |
|
| 24953 |
+ names_already_handled="$names_already_handled $name" |
|
| 24954 |
+ uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'` |
|
| 24955 |
+ eval value=\"\$HAVE_LIB$uppername\" |
|
| 24956 |
+ if test -n "$value"; then |
|
| 24957 |
+ if test "$value" = yes; then |
|
| 24958 |
+ eval value=\"\$LIB$uppername\" |
|
| 24959 |
+ test -z "$value" || LIBICONV="${LIBICONV}${LIBICONV:+ }$value"
|
|
| 24960 |
+ eval value=\"\$LTLIB$uppername\" |
|
| 24961 |
+ test -z "$value" || LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }$value"
|
|
| 24962 |
+ else |
|
| 24963 |
+ : |
|
| 24964 |
+ fi |
|
| 24884 | 24965 |
else |
| 24885 |
- want_iconv="yes" |
|
| 24966 |
+ found_dir= |
|
| 24967 |
+ found_la= |
|
| 24968 |
+ found_so= |
|
| 24969 |
+ found_a= |
|
| 24970 |
+ eval libname=\"$acl_libname_spec\" # typically: libname=lib$name |
|
| 24971 |
+ if test -n "$acl_shlibext"; then |
|
| 24972 |
+ shrext=".$acl_shlibext" # typically: shrext=.so |
|
| 24973 |
+ else |
|
| 24974 |
+ shrext= |
|
| 24975 |
+ fi |
|
| 24976 |
+ if test $use_additional = yes; then |
|
| 24977 |
+ dir="$additional_libdir" |
|
| 24978 |
+ if test -n "$acl_shlibext"; then |
|
| 24979 |
+ if test -f "$dir/$libname$shrext"; then |
|
| 24980 |
+ found_dir="$dir" |
|
| 24981 |
+ found_so="$dir/$libname$shrext" |
|
| 24982 |
+ else |
|
| 24983 |
+ if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then |
|
| 24984 |
+ ver=`(cd "$dir" && \ |
|
| 24985 |
+ for f in "$libname$shrext".*; do echo "$f"; done \ |
|
| 24986 |
+ | sed -e "s,^$libname$shrext\\\\.,," \ |
|
| 24987 |
+ | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \ |
|
| 24988 |
+ | sed 1q ) 2>/dev/null` |
|
| 24989 |
+ if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then |
|
| 24990 |
+ found_dir="$dir" |
|
| 24991 |
+ found_so="$dir/$libname$shrext.$ver" |
|
| 24992 |
+ fi |
|
| 24993 |
+ else |
|
| 24994 |
+ eval library_names=\"$acl_library_names_spec\" |
|
| 24995 |
+ for f in $library_names; do |
|
| 24996 |
+ if test -f "$dir/$f"; then |
|
| 24997 |
+ found_dir="$dir" |
|
| 24998 |
+ found_so="$dir/$f" |
|
| 24999 |
+ break |
|
| 25000 |
+ fi |
|
| 25001 |
+ done |
|
| 25002 |
+ fi |
|
| 25003 |
+ fi |
|
| 25004 |
+ fi |
|
| 25005 |
+ if test "X$found_dir" = "X"; then |
|
| 25006 |
+ if test -f "$dir/$libname.$acl_libext"; then |
|
| 25007 |
+ found_dir="$dir" |
|
| 25008 |
+ found_a="$dir/$libname.$acl_libext" |
|
| 25009 |
+ fi |
|
| 25010 |
+ fi |
|
| 25011 |
+ if test "X$found_dir" != "X"; then |
|
| 25012 |
+ if test -f "$dir/$libname.la"; then |
|
| 25013 |
+ found_la="$dir/$libname.la" |
|
| 25014 |
+ fi |
|
| 25015 |
+ fi |
|
| 25016 |
+ fi |
|
| 25017 |
+ if test "X$found_dir" = "X"; then |
|
| 25018 |
+ compat_libdir= |
|
| 25019 |
+ if test "X$acl_libdirstem" != "Xlib"; then |
|
| 25020 |
+ compat_libdir=-L'${exec_prefix}'/lib
|
|
| 25021 |
+ fi |
|
| 25022 |
+ for x in $LDFLAGS $LTLIBICONV $compat_libdir $additional_compat_libdir; do |
|
| 24886 | 25023 |
|
| 24887 |
- if test "X$withval" = "Xyes"; then |
|
| 24888 |
- find_iconv="yes" |
|
| 25024 |
+ acl_save_prefix="$prefix" |
|
| 25025 |
+ prefix="$acl_final_prefix" |
|
| 25026 |
+ acl_save_exec_prefix="$exec_prefix" |
|
| 25027 |
+ exec_prefix="$acl_final_exec_prefix" |
|
| 25028 |
+ eval x=\"$x\" |
|
| 25029 |
+ exec_prefix="$acl_save_exec_prefix" |
|
| 25030 |
+ prefix="$acl_save_prefix" |
|
| 25031 |
+ |
|
| 25032 |
+ case "$x" in |
|
| 25033 |
+ -L*) |
|
| 25034 |
+ dir=`echo "X$x" | sed -e 's/^X-L//'` |
|
| 25035 |
+ if test -n "$acl_shlibext"; then |
|
| 25036 |
+ if test -f "$dir/$libname$shrext"; then |
|
| 25037 |
+ found_dir="$dir" |
|
| 25038 |
+ found_so="$dir/$libname$shrext" |
|
| 25039 |
+ else |
|
| 25040 |
+ if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then |
|
| 25041 |
+ ver=`(cd "$dir" && \ |
|
| 25042 |
+ for f in "$libname$shrext".*; do echo "$f"; done \ |
|
| 25043 |
+ | sed -e "s,^$libname$shrext\\\\.,," \ |
|
| 25044 |
+ | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \ |
|
| 25045 |
+ | sed 1q ) 2>/dev/null` |
|
| 25046 |
+ if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then |
|
| 25047 |
+ found_dir="$dir" |
|
| 25048 |
+ found_so="$dir/$libname$shrext.$ver" |
|
| 25049 |
+ fi |
|
| 25050 |
+ else |
|
| 25051 |
+ eval library_names=\"$acl_library_names_spec\" |
|
| 25052 |
+ for f in $library_names; do |
|
| 25053 |
+ if test -f "$dir/$f"; then |
|
| 25054 |
+ found_dir="$dir" |
|
| 25055 |
+ found_so="$dir/$f" |
|
| 25056 |
+ break |
|
| 25057 |
+ fi |
|
| 25058 |
+ done |
|
| 25059 |
+ fi |
|
| 25060 |
+ fi |
|
| 25061 |
+ fi |
|
| 25062 |
+ if test "X$found_dir" = "X"; then |
|
| 25063 |
+ if test -f "$dir/$libname.$acl_libext"; then |
|
| 25064 |
+ found_dir="$dir" |
|
| 25065 |
+ found_a="$dir/$libname.$acl_libext" |
|
| 25066 |
+ fi |
|
| 25067 |
+ fi |
|
| 25068 |
+ if test "X$found_dir" != "X"; then |
|
| 25069 |
+ if test -f "$dir/$libname.la"; then |
|
| 25070 |
+ found_la="$dir/$libname.la" |
|
| 25071 |
+ fi |
|
| 25072 |
+ fi |
|
| 25073 |
+ ;; |
|
| 25074 |
+ esac |
|
| 25075 |
+ if test "X$found_dir" != "X"; then |
|
| 25076 |
+ break |
|
| 25077 |
+ fi |
|
| 25078 |
+ done |
|
| 25079 |
+ fi |
|
| 25080 |
+ if test "X$found_dir" != "X"; then |
|
| 25081 |
+ LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-L$found_dir -l$name"
|
|
| 25082 |
+ if test "X$found_so" != "X"; then |
|
| 25083 |
+ if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/$acl_libdirstem"; then |
|
| 25084 |
+ LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
|
|
| 25085 |
+ else |
|
| 25086 |
+ haveit= |
|
| 25087 |
+ for x in $ltrpathdirs; do |
|
| 25088 |
+ if test "X$x" = "X$found_dir"; then |
|
| 25089 |
+ haveit=yes |
|
| 25090 |
+ break |
|
| 25091 |
+ fi |
|
| 25092 |
+ done |
|
| 25093 |
+ if test -z "$haveit"; then |
|
| 25094 |
+ ltrpathdirs="$ltrpathdirs $found_dir" |
|
| 25095 |
+ fi |
|
| 25096 |
+ if test "$acl_hardcode_direct" = yes; then |
|
| 25097 |
+ LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
|
|
| 25098 |
+ else |
|
| 25099 |
+ if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then |
|
| 25100 |
+ LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
|
|
| 25101 |
+ haveit= |
|
| 25102 |
+ for x in $rpathdirs; do |
|
| 25103 |
+ if test "X$x" = "X$found_dir"; then |
|
| 25104 |
+ haveit=yes |
|
| 25105 |
+ break |
|
| 25106 |
+ fi |
|
| 25107 |
+ done |
|
| 25108 |
+ if test -z "$haveit"; then |
|
| 25109 |
+ rpathdirs="$rpathdirs $found_dir" |
|
| 25110 |
+ fi |
|
| 25111 |
+ else |
|
| 25112 |
+ haveit= |
|
| 25113 |
+ for x in $LDFLAGS $LIBICONV; do |
|
| 25114 |
+ |
|
| 25115 |
+ acl_save_prefix="$prefix" |
|
| 25116 |
+ prefix="$acl_final_prefix" |
|
| 25117 |
+ acl_save_exec_prefix="$exec_prefix" |
|
| 25118 |
+ exec_prefix="$acl_final_exec_prefix" |
|
| 25119 |
+ eval x=\"$x\" |
|
| 25120 |
+ exec_prefix="$acl_save_exec_prefix" |
|
| 25121 |
+ prefix="$acl_save_prefix" |
|
| 25122 |
+ |
|
| 25123 |
+ if test "X$x" = "X-L$found_dir"; then |
|
| 25124 |
+ haveit=yes |
|
| 25125 |
+ break |
|
| 25126 |
+ fi |
|
| 25127 |
+ done |
|
| 25128 |
+ if test -z "$haveit"; then |
|
| 25129 |
+ LIBICONV="${LIBICONV}${LIBICONV:+ }-L$found_dir"
|
|
| 25130 |
+ fi |
|
| 25131 |
+ if test "$acl_hardcode_minus_L" != no; then |
|
| 25132 |
+ LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
|
|
| 25133 |
+ else |
|
| 25134 |
+ LIBICONV="${LIBICONV}${LIBICONV:+ }-l$name"
|
|
| 25135 |
+ fi |
|
| 25136 |
+ fi |
|
| 25137 |
+ fi |
|
| 25138 |
+ fi |
|
| 24889 | 25139 |
else |
| 24890 |
- LDFLAGS="-L${withval}/lib -liconv"
|
|
| 24891 |
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libiconv_open in -liconv" >&5
|
|
| 24892 |
-$as_echo_n "checking for libiconv_open in -liconv... " >&6; } |
|
| 24893 |
-if ${ac_cv_lib_iconv_libiconv_open+:} false; then :
|
|
| 25140 |
+ if test "X$found_a" != "X"; then |
|
| 25141 |
+ LIBICONV="${LIBICONV}${LIBICONV:+ }$found_a"
|
|
| 25142 |
+ else |
|
| 25143 |
+ LIBICONV="${LIBICONV}${LIBICONV:+ }-L$found_dir -l$name"
|
|
| 25144 |
+ fi |
|
| 25145 |
+ fi |
|
| 25146 |
+ additional_includedir= |
|
| 25147 |
+ case "$found_dir" in |
|
| 25148 |
+ */$acl_libdirstem | */$acl_libdirstem/) |
|
| 25149 |
+ basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'` |
|
| 25150 |
+ LIBICONV_PREFIX="$basedir" |
|
| 25151 |
+ additional_includedir="$basedir/include" |
|
| 25152 |
+ ;; |
|
| 25153 |
+ */lib | */lib/) |
|
| 25154 |
+ basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/lib/"'*$,,'` |
|
| 25155 |
+ LIBICONV_PREFIX="$basedir" |
|
| 25156 |
+ additional_includedir="$basedir/include" |
|
| 25157 |
+ ;; |
|
| 25158 |
+ esac |
|
| 25159 |
+ if test "X$additional_includedir" != "X"; then |
|
| 25160 |
+ if test "X$additional_includedir" != "X/usr/include"; then |
|
| 25161 |
+ haveit= |
|
| 25162 |
+ if test "X$additional_includedir" = "X/usr/local/include"; then |
|
| 25163 |
+ if test -n "$GCC"; then |
|
| 25164 |
+ case $host_os in |
|
| 25165 |
+ linux* | gnu* | k*bsd*-gnu) haveit=yes;; |
|
| 25166 |
+ esac |
|
| 25167 |
+ fi |
|
| 25168 |
+ fi |
|
| 25169 |
+ if test -z "$haveit"; then |
|
| 25170 |
+ for x in $CPPFLAGS $INCICONV; do |
|
| 25171 |
+ |
|
| 25172 |
+ acl_save_prefix="$prefix" |
|
| 25173 |
+ prefix="$acl_final_prefix" |
|
| 25174 |
+ acl_save_exec_prefix="$exec_prefix" |
|
| 25175 |
+ exec_prefix="$acl_final_exec_prefix" |
|
| 25176 |
+ eval x=\"$x\" |
|
| 25177 |
+ exec_prefix="$acl_save_exec_prefix" |
|
| 25178 |
+ prefix="$acl_save_prefix" |
|
| 25179 |
+ |
|
| 25180 |
+ if test "X$x" = "X-I$additional_includedir"; then |
|
| 25181 |
+ haveit=yes |
|
| 25182 |
+ break |
|
| 25183 |
+ fi |
|
| 25184 |
+ done |
|
| 25185 |
+ if test -z "$haveit"; then |
|
| 25186 |
+ if test -d "$additional_includedir"; then |
|
| 25187 |
+ INCICONV="${INCICONV}${INCICONV:+ }-I$additional_includedir"
|
|
| 25188 |
+ fi |
|
| 25189 |
+ fi |
|
| 25190 |
+ fi |
|
| 25191 |
+ fi |
|
| 25192 |
+ fi |
|
| 25193 |
+ if test -n "$found_la"; then |
|
| 25194 |
+ save_libdir="$libdir" |
|
| 25195 |
+ case "$found_la" in |
|
| 25196 |
+ */* | *\\*) . "$found_la" ;; |
|
| 25197 |
+ *) . "./$found_la" ;; |
|
| 25198 |
+ esac |
|
| 25199 |
+ libdir="$save_libdir" |
|
| 25200 |
+ for dep in $dependency_libs; do |
|
| 25201 |
+ case "$dep" in |
|
| 25202 |
+ -L*) |
|
| 25203 |
+ additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'` |
|
| 25204 |
+ if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; then |
|
| 25205 |
+ haveit= |
|
| 25206 |
+ if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then |
|
| 25207 |
+ if test -n "$GCC"; then |
|
| 25208 |
+ case $host_os in |
|
| 25209 |
+ linux* | gnu* | k*bsd*-gnu) haveit=yes;; |
|
| 25210 |
+ esac |
|
| 25211 |
+ fi |
|
| 25212 |
+ fi |
|
| 25213 |
+ if test -z "$haveit"; then |
|
| 25214 |
+ haveit= |
|
| 25215 |
+ for x in $LDFLAGS $LIBICONV; do |
|
| 25216 |
+ |
|
| 25217 |
+ acl_save_prefix="$prefix" |
|
| 25218 |
+ prefix="$acl_final_prefix" |
|
| 25219 |
+ acl_save_exec_prefix="$exec_prefix" |
|
| 25220 |
+ exec_prefix="$acl_final_exec_prefix" |
|
| 25221 |
+ eval x=\"$x\" |
|
| 25222 |
+ exec_prefix="$acl_save_exec_prefix" |
|
| 25223 |
+ prefix="$acl_save_prefix" |
|
| 25224 |
+ |
|
| 25225 |
+ if test "X$x" = "X-L$additional_libdir"; then |
|
| 25226 |
+ haveit=yes |
|
| 25227 |
+ break |
|
| 25228 |
+ fi |
|
| 25229 |
+ done |
|
| 25230 |
+ if test -z "$haveit"; then |
|
| 25231 |
+ if test -d "$additional_libdir"; then |
|
| 25232 |
+ LIBICONV="${LIBICONV}${LIBICONV:+ }-L$additional_libdir"
|
|
| 25233 |
+ fi |
|
| 25234 |
+ fi |
|
| 25235 |
+ haveit= |
|
| 25236 |
+ for x in $LDFLAGS $LTLIBICONV; do |
|
| 25237 |
+ |
|
| 25238 |
+ acl_save_prefix="$prefix" |
|
| 25239 |
+ prefix="$acl_final_prefix" |
|
| 25240 |
+ acl_save_exec_prefix="$exec_prefix" |
|
| 25241 |
+ exec_prefix="$acl_final_exec_prefix" |
|
| 25242 |
+ eval x=\"$x\" |
|
| 25243 |
+ exec_prefix="$acl_save_exec_prefix" |
|
| 25244 |
+ prefix="$acl_save_prefix" |
|
| 25245 |
+ |
|
| 25246 |
+ if test "X$x" = "X-L$additional_libdir"; then |
|
| 25247 |
+ haveit=yes |
|
| 25248 |
+ break |
|
| 25249 |
+ fi |
|
| 25250 |
+ done |
|
| 25251 |
+ if test -z "$haveit"; then |
|
| 25252 |
+ if test -d "$additional_libdir"; then |
|
| 25253 |
+ LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-L$additional_libdir"
|
|
| 25254 |
+ fi |
|
| 25255 |
+ fi |
|
| 25256 |
+ fi |
|
| 25257 |
+ fi |
|
| 25258 |
+ ;; |
|
| 25259 |
+ -R*) |
|
| 25260 |
+ dir=`echo "X$dep" | sed -e 's/^X-R//'` |
|
| 25261 |
+ if test "$enable_rpath" != no; then |
|
| 25262 |
+ haveit= |
|
| 25263 |
+ for x in $rpathdirs; do |
|
| 25264 |
+ if test "X$x" = "X$dir"; then |
|
| 25265 |
+ haveit=yes |
|
| 25266 |
+ break |
|
| 25267 |
+ fi |
|
| 25268 |
+ done |
|
| 25269 |
+ if test -z "$haveit"; then |
|
| 25270 |
+ rpathdirs="$rpathdirs $dir" |
|
| 25271 |
+ fi |
|
| 25272 |
+ haveit= |
|
| 25273 |
+ for x in $ltrpathdirs; do |
|
| 25274 |
+ if test "X$x" = "X$dir"; then |
|
| 25275 |
+ haveit=yes |
|
| 25276 |
+ break |
|
| 25277 |
+ fi |
|
| 25278 |
+ done |
|
| 25279 |
+ if test -z "$haveit"; then |
|
| 25280 |
+ ltrpathdirs="$ltrpathdirs $dir" |
|
| 25281 |
+ fi |
|
| 25282 |
+ fi |
|
| 25283 |
+ ;; |
|
| 25284 |
+ -l*) |
|
| 25285 |
+ names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'` |
|
| 25286 |
+ ;; |
|
| 25287 |
+ *.la) |
|
| 25288 |
+ names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'` |
|
| 25289 |
+ ;; |
|
| 25290 |
+ *) |
|
| 25291 |
+ LIBICONV="${LIBICONV}${LIBICONV:+ }$dep"
|
|
| 25292 |
+ LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }$dep"
|
|
| 25293 |
+ ;; |
|
| 25294 |
+ esac |
|
| 25295 |
+ done |
|
| 25296 |
+ fi |
|
| 25297 |
+ else |
|
| 25298 |
+ LIBICONV="${LIBICONV}${LIBICONV:+ }-l$name"
|
|
| 25299 |
+ LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-l$name"
|
|
| 25300 |
+ fi |
|
| 25301 |
+ fi |
|
| 25302 |
+ fi |
|
| 25303 |
+ done |
|
| 25304 |
+ done |
|
| 25305 |
+ if test "X$rpathdirs" != "X"; then |
|
| 25306 |
+ if test -n "$acl_hardcode_libdir_separator"; then |
|
| 25307 |
+ alldirs= |
|
| 25308 |
+ for found_dir in $rpathdirs; do |
|
| 25309 |
+ alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir"
|
|
| 25310 |
+ done |
|
| 25311 |
+ acl_save_libdir="$libdir" |
|
| 25312 |
+ libdir="$alldirs" |
|
| 25313 |
+ eval flag=\"$acl_hardcode_libdir_flag_spec\" |
|
| 25314 |
+ libdir="$acl_save_libdir" |
|
| 25315 |
+ LIBICONV="${LIBICONV}${LIBICONV:+ }$flag"
|
|
| 25316 |
+ else |
|
| 25317 |
+ for found_dir in $rpathdirs; do |
|
| 25318 |
+ acl_save_libdir="$libdir" |
|
| 25319 |
+ libdir="$found_dir" |
|
| 25320 |
+ eval flag=\"$acl_hardcode_libdir_flag_spec\" |
|
| 25321 |
+ libdir="$acl_save_libdir" |
|
| 25322 |
+ LIBICONV="${LIBICONV}${LIBICONV:+ }$flag"
|
|
| 25323 |
+ done |
|
| 25324 |
+ fi |
|
| 25325 |
+ fi |
|
| 25326 |
+ if test "X$ltrpathdirs" != "X"; then |
|
| 25327 |
+ for found_dir in $ltrpathdirs; do |
|
| 25328 |
+ LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-R$found_dir"
|
|
| 25329 |
+ done |
|
| 25330 |
+ fi |
|
| 25331 |
+ |
|
| 25332 |
+ |
|
| 25333 |
+ |
|
| 25334 |
+ |
|
| 25335 |
+ |
|
| 25336 |
+ |
|
| 25337 |
+ |
|
| 25338 |
+ am_save_CPPFLAGS="$CPPFLAGS" |
|
| 25339 |
+ |
|
| 25340 |
+ for element in $INCICONV; do |
|
| 25341 |
+ haveit= |
|
| 25342 |
+ for x in $CPPFLAGS; do |
|
| 25343 |
+ |
|
| 25344 |
+ acl_save_prefix="$prefix" |
|
| 25345 |
+ prefix="$acl_final_prefix" |
|
| 25346 |
+ acl_save_exec_prefix="$exec_prefix" |
|
| 25347 |
+ exec_prefix="$acl_final_exec_prefix" |
|
| 25348 |
+ eval x=\"$x\" |
|
| 25349 |
+ exec_prefix="$acl_save_exec_prefix" |
|
| 25350 |
+ prefix="$acl_save_prefix" |
|
| 25351 |
+ |
|
| 25352 |
+ if test "X$x" = "X$element"; then |
|
| 25353 |
+ haveit=yes |
|
| 25354 |
+ break |
|
| 25355 |
+ fi |
|
| 25356 |
+ done |
|
| 25357 |
+ if test -z "$haveit"; then |
|
| 25358 |
+ CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }$element"
|
|
| 25359 |
+ fi |
|
| 25360 |
+ done |
|
| 25361 |
+ |
|
| 25362 |
+ |
|
| 25363 |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv" >&5
|
|
| 25364 |
+$as_echo_n "checking for iconv... " >&6; } |
|
| 25365 |
+if ${am_cv_func_iconv+:} false; then :
|
|
| 24894 | 25366 |
$as_echo_n "(cached) " >&6 |
| 24895 | 25367 |
else |
| 24896 |
- ac_check_lib_save_LIBS=$LIBS |
|
| 24897 |
-LIBS="-liconv $LIBS" |
|
| 24898 |
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
|
| 25368 |
+ |
|
| 25369 |
+ am_cv_func_iconv="no, consider installing GNU libiconv" |
|
| 25370 |
+ am_cv_lib_iconv=no |
|
| 25371 |
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
|
| 24899 | 25372 |
/* end confdefs.h. */ |
| 24900 | 25373 |
|
| 24901 |
-/* Override any GCC internal prototype to avoid an error. |
|
| 24902 |
- Use char because int might match the return type of a GCC |
|
| 24903 |
- builtin and then its argument prototype would still apply. */ |
|
| 24904 |
-#ifdef __cplusplus |
|
| 24905 |
-extern "C" |
|
| 24906 |
-#endif |
|
| 24907 |
-char libiconv_open (); |
|
| 25374 |
+#include <stdlib.h> |
|
| 25375 |
+#include <iconv.h> |
|
| 25376 |
+ |
|
| 24908 | 25377 |
int |
| 24909 | 25378 |
main () |
| 24910 | 25379 |
{
|
| 24911 |
-return libiconv_open (); |
|
| 25380 |
+iconv_t cd = iconv_open("","");
|
|
| 25381 |
+ iconv(cd,NULL,NULL,NULL,NULL); |
|
| 25382 |
+ iconv_close(cd); |
|
| 24912 | 25383 |
; |
| 24913 | 25384 |
return 0; |
| 24914 | 25385 |
} |
| 24915 | 25386 |
_ACEOF |
| 24916 | 25387 |
if ac_fn_c_try_link "$LINENO"; then : |
| 24917 |
- ac_cv_lib_iconv_libiconv_open=yes |
|
| 24918 |
-else |
|
| 24919 |
- ac_cv_lib_iconv_libiconv_open=no |
|
| 25388 |
+ am_cv_func_iconv=yes |
|
| 24920 | 25389 |
fi |
| 24921 | 25390 |
rm -f core conftest.err conftest.$ac_objext \ |
| 24922 | 25391 |
conftest$ac_exeext conftest.$ac_ext |
| 24923 |
-LIBS=$ac_check_lib_save_LIBS |
|
| 24924 |
-fi |
|
| 24925 |
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_iconv_libiconv_open" >&5
|
|
| 24926 |
-$as_echo "$ac_cv_lib_iconv_libiconv_open" >&6; } |
|
| 24927 |
-if test "x$ac_cv_lib_iconv_libiconv_open" = xyes; then : |
|
| 24928 |
- |
|
| 24929 |
- ICONV_HOME="${withval}"
|
|
| 24930 |
- have_iconv_lib="yes" |
|
| 24931 |
- |
|
| 24932 |
-else |
|
| 25392 |
+ if test "$am_cv_func_iconv" != yes; then |
|
| 25393 |
+ am_save_LIBS="$LIBS" |
|
| 25394 |
+ LIBS="$LIBS $LIBICONV" |
|
| 25395 |
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
|
| 25396 |
+/* end confdefs.h. */ |
|
| 24933 | 25397 |
|
| 24934 |
- as_fn_error $? "Failed to find iconv (libiconv) in ${withval}" "$LINENO" 5
|
|
| 25398 |
+#include <stdlib.h> |
|
| 25399 |
+#include <iconv.h> |
|
| 24935 | 25400 |
|
| 25401 |
+int |
|
| 25402 |
+main () |
|
| 25403 |
+{
|
|
| 25404 |
+iconv_t cd = iconv_open("","");
|
|
| 25405 |
+ iconv(cd,NULL,NULL,NULL,NULL); |
|
| 25406 |
+ iconv_close(cd); |
|
| 25407 |
+ ; |
|
| 25408 |
+ return 0; |
|
| 25409 |
+} |
|
| 25410 |
+_ACEOF |
|
| 25411 |
+if ac_fn_c_try_link "$LINENO"; then : |
|
| 25412 |
+ am_cv_lib_iconv=yes |
|
| 25413 |
+ am_cv_func_iconv=yes |
|
| 24936 | 25414 |
fi |
| 24937 |
- |
|
| 24938 |
- fi |
|
| 24939 |
- fi |
|
| 24940 |
- |
|
| 24941 |
-else |
|
| 24942 |
- |
|
| 24943 |
- find_iconv="yes" |
|
| 25415 |
+rm -f core conftest.err conftest.$ac_objext \ |
|
| 25416 |
+ conftest$ac_exeext conftest.$ac_ext |
|
| 25417 |
+ LIBS="$am_save_LIBS" |
|
| 25418 |
+ fi |
|
| 24944 | 25419 |
|
| 24945 | 25420 |
fi |
| 24946 |
- |
|
| 24947 |
- |
|
| 24948 |
-if test "X$want_iconv" != "Xno"; then |
|
| 24949 |
- if test "X$find_iconv" = "Xyes"; then |
|
| 24950 |
- LDFLAGS="-L/usr/local/lib -liconv" |
|
| 24951 |
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libiconv_open in -liconv" >&5
|
|
| 24952 |
-$as_echo_n "checking for libiconv_open in -liconv... " >&6; } |
|
| 24953 |
-if ${ac_cv_lib_iconv_libiconv_open+:} false; then :
|
|
| 25421 |
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv" >&5
|
|
| 25422 |
+$as_echo "$am_cv_func_iconv" >&6; } |
|
| 25423 |
+ if test "$am_cv_func_iconv" = yes; then |
|
| 25424 |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working iconv" >&5
|
|
| 25425 |
+$as_echo_n "checking for working iconv... " >&6; } |
|
| 25426 |
+if ${am_cv_func_iconv_works+:} false; then :
|
|
| 24954 | 25427 |
$as_echo_n "(cached) " >&6 |
| 24955 | 25428 |
else |
| 24956 |
- ac_check_lib_save_LIBS=$LIBS |
|
| 24957 |
-LIBS="-liconv $LIBS" |
|
| 24958 |
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
|
| 25429 |
+ |
|
| 25430 |
+ am_save_LIBS="$LIBS" |
|
| 25431 |
+ if test $am_cv_lib_iconv = yes; then |
|
| 25432 |
+ LIBS="$LIBS $LIBICONV" |
|
| 25433 |
+ fi |
|
| 25434 |
+ am_cv_func_iconv_works=no |
|
| 25435 |
+ for ac_iconv_const in '' 'const'; do |
|
| 25436 |
+ if test "$cross_compiling" = yes; then : |
|
| 25437 |
+ case "$host_os" in |
|
| 25438 |
+ aix* | hpux*) am_cv_func_iconv_works="guessing no" ;; |
|
| 25439 |
+ *) am_cv_func_iconv_works="guessing yes" ;; |
|
| 25440 |
+ esac |
|
| 25441 |
+else |
|
| 25442 |
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
|
| 24959 | 25443 |
/* end confdefs.h. */ |
| 24960 | 25444 |
|
| 24961 |
-/* Override any GCC internal prototype to avoid an error. |
|
| 24962 |
- Use char because int might match the return type of a GCC |
|
| 24963 |
- builtin and then its argument prototype would still apply. */ |
|
| 24964 |
-#ifdef __cplusplus |
|
| 24965 |
-extern "C" |
|
| 25445 |
+#include <iconv.h> |
|
| 25446 |
+#include <string.h> |
|
| 25447 |
+ |
|
| 25448 |
+#ifndef ICONV_CONST |
|
| 25449 |
+# define ICONV_CONST $ac_iconv_const |
|
| 24966 | 25450 |
#endif |
| 24967 |
-char libiconv_open (); |
|
| 25451 |
+ |
|
| 24968 | 25452 |
int |
| 24969 | 25453 |
main () |
| 24970 | 25454 |
{
|
| 24971 |
-return libiconv_open (); |
|
| 25455 |
+int result = 0; |
|
| 25456 |
+ /* Test against AIX 5.1 bug: Failures are not distinguishable from successful |
|
| 25457 |
+ returns. */ |
|
| 25458 |
+ {
|
|
| 25459 |
+ iconv_t cd_utf8_to_88591 = iconv_open ("ISO8859-1", "UTF-8");
|
|
| 25460 |
+ if (cd_utf8_to_88591 != (iconv_t)(-1)) |
|
| 25461 |
+ {
|
|
| 25462 |
+ static ICONV_CONST char input[] = "\342\202\254"; /* EURO SIGN */ |
|
| 25463 |
+ char buf[10]; |
|
| 25464 |
+ ICONV_CONST char *inptr = input; |
|
| 25465 |
+ size_t inbytesleft = strlen (input); |
|
| 25466 |
+ char *outptr = buf; |
|
| 25467 |
+ size_t outbytesleft = sizeof (buf); |
|
| 25468 |
+ size_t res = iconv (cd_utf8_to_88591, |
|
| 25469 |
+ &inptr, &inbytesleft, |
|
| 25470 |
+ &outptr, &outbytesleft); |
|
| 25471 |
+ if (res == 0) |
|
| 25472 |
+ result |= 1; |
|
| 25473 |
+ iconv_close (cd_utf8_to_88591); |
|
| 25474 |
+ } |
|
| 25475 |
+ } |
|
| 25476 |
+ /* Test against Solaris 10 bug: Failures are not distinguishable from |
|
| 25477 |
+ successful returns. */ |
|
| 25478 |
+ {
|
|
| 25479 |
+ iconv_t cd_ascii_to_88591 = iconv_open ("ISO8859-1", "646");
|
|
| 25480 |
+ if (cd_ascii_to_88591 != (iconv_t)(-1)) |
|
| 25481 |
+ {
|
|
| 25482 |
+ static ICONV_CONST char input[] = "\263"; |
|
| 25483 |
+ char buf[10]; |
|
| 25484 |
+ ICONV_CONST char *inptr = input; |
|
| 25485 |
+ size_t inbytesleft = strlen (input); |
|
| 25486 |
+ char *outptr = buf; |
|
| 25487 |
+ size_t outbytesleft = sizeof (buf); |
|
| 25488 |
+ size_t res = iconv (cd_ascii_to_88591, |
|
| 25489 |
+ &inptr, &inbytesleft, |
|
| 25490 |
+ &outptr, &outbytesleft); |
|
| 25491 |
+ if (res == 0) |
|
| 25492 |
+ result |= 2; |
|
| 25493 |
+ iconv_close (cd_ascii_to_88591); |
|
| 25494 |
+ } |
|
| 25495 |
+ } |
|
| 25496 |
+ /* Test against AIX 6.1..7.1 bug: Buffer overrun. */ |
|
| 25497 |
+ {
|
|
| 25498 |
+ iconv_t cd_88591_to_utf8 = iconv_open ("UTF-8", "ISO-8859-1");
|
|
| 25499 |
+ if (cd_88591_to_utf8 != (iconv_t)(-1)) |
|
| 25500 |
+ {
|
|
| 25501 |
+ static ICONV_CONST char input[] = "\304"; |
|
| 25502 |
+ static char buf[2] = { (char)0xDE, (char)0xAD };
|
|
| 25503 |
+ ICONV_CONST char *inptr = input; |
|
| 25504 |
+ size_t inbytesleft = 1; |
|
| 25505 |
+ char *outptr = buf; |
|
| 25506 |
+ size_t outbytesleft = 1; |
|
| 25507 |
+ size_t res = iconv (cd_88591_to_utf8, |
|
| 25508 |
+ &inptr, &inbytesleft, |
|
| 25509 |
+ &outptr, &outbytesleft); |
|
| 25510 |
+ if (res != (size_t)(-1) || outptr - buf > 1 || buf[1] != (char)0xAD) |
|
| 25511 |
+ result |= 4; |
|
| 25512 |
+ iconv_close (cd_88591_to_utf8); |
|
| 25513 |
+ } |
|
| 25514 |
+ } |
|
| 25515 |
+#if 0 /* This bug could be worked around by the caller. */ |
|
| 25516 |
+ /* Test against HP-UX 11.11 bug: Positive return value instead of 0. */ |
|
| 25517 |
+ {
|
|
| 25518 |
+ iconv_t cd_88591_to_utf8 = iconv_open ("utf8", "iso88591");
|
|
| 25519 |
+ if (cd_88591_to_utf8 != (iconv_t)(-1)) |
|
| 25520 |
+ {
|
|
| 25521 |
+ static ICONV_CONST char input[] = "\304rger mit b\366sen B\374bchen ohne Augenma\337"; |
|
| 25522 |
+ char buf[50]; |
|
| 25523 |
+ ICONV_CONST char *inptr = input; |
|
| 25524 |
+ size_t inbytesleft = strlen (input); |
|
| 25525 |
+ char *outptr = buf; |
|
| 25526 |
+ size_t outbytesleft = sizeof (buf); |
|
| 25527 |
+ size_t res = iconv (cd_88591_to_utf8, |
|
| 25528 |
+ &inptr, &inbytesleft, |
|
| 25529 |
+ &outptr, &outbytesleft); |
|
| 25530 |
+ if ((int)res > 0) |
|
| 25531 |
+ result |= 8; |
|
| 25532 |
+ iconv_close (cd_88591_to_utf8); |
|
| 25533 |
+ } |
|
| 25534 |
+ } |
|
| 25535 |
+#endif |
|
| 25536 |
+ /* Test against HP-UX 11.11 bug: No converter from EUC-JP to UTF-8 is |
|
| 25537 |
+ provided. */ |
|
| 25538 |
+ {
|
|
| 25539 |
+ /* Try standardized names. */ |
|
| 25540 |
+ iconv_t cd1 = iconv_open ("UTF-8", "EUC-JP");
|
|
| 25541 |
+ /* Try IRIX, OSF/1 names. */ |
|
| 25542 |
+ iconv_t cd2 = iconv_open ("UTF-8", "eucJP");
|
|
| 25543 |
+ /* Try AIX names. */ |
|
| 25544 |
+ iconv_t cd3 = iconv_open ("UTF-8", "IBM-eucJP");
|
|
| 25545 |
+ /* Try HP-UX names. */ |
|
| 25546 |
+ iconv_t cd4 = iconv_open ("utf8", "eucJP");
|
|
| 25547 |
+ if (cd1 == (iconv_t)(-1) && cd2 == (iconv_t)(-1) |
|
| 25548 |
+ && cd3 == (iconv_t)(-1) && cd4 == (iconv_t)(-1)) |
|
| 25549 |
+ result |= 16; |
|
| 25550 |
+ if (cd1 != (iconv_t)(-1)) |
|
| 25551 |
+ iconv_close (cd1); |
|
| 25552 |
+ if (cd2 != (iconv_t)(-1)) |
|
| 25553 |
+ iconv_close (cd2); |
|
| 25554 |
+ if (cd3 != (iconv_t)(-1)) |
|
| 25555 |
+ iconv_close (cd3); |
|
| 25556 |
+ if (cd4 != (iconv_t)(-1)) |
|
| 25557 |
+ iconv_close (cd4); |
|
| 25558 |
+ } |
|
| 25559 |
+ return result; |
|
| 25560 |
+ |
|
| 24972 | 25561 |
; |
| 24973 | 25562 |
return 0; |
| 24974 | 25563 |
} |
| 24975 | 25564 |
_ACEOF |
| 24976 |
-if ac_fn_c_try_link "$LINENO"; then : |
|
| 24977 |
- ac_cv_lib_iconv_libiconv_open=yes |
|
| 24978 |
-else |
|
| 24979 |
- ac_cv_lib_iconv_libiconv_open=no |
|
| 25565 |
+if ac_fn_c_try_run "$LINENO"; then : |
|
| 25566 |
+ am_cv_func_iconv_works=yes |
|
| 24980 | 25567 |
fi |
| 24981 |
-rm -f core conftest.err conftest.$ac_objext \ |
|
| 24982 |
- conftest$ac_exeext conftest.$ac_ext |
|
| 24983 |
-LIBS=$ac_check_lib_save_LIBS |
|
| 25568 |
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ |
|
| 25569 |
+ conftest.$ac_objext conftest.beam conftest.$ac_ext |
|
| 24984 | 25570 |
fi |
| 24985 |
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_iconv_libiconv_open" >&5
|
|
| 24986 |
-$as_echo "$ac_cv_lib_iconv_libiconv_open" >&6; } |
|
| 24987 |
-if test "x$ac_cv_lib_iconv_libiconv_open" = xyes; then : |
|
| 24988 | 25571 |
|
| 24989 |
- ICONV_HOME="/usr/local" |
|
| 24990 |
- have_iconv_lib="yes" |
|
| 25572 |
+ test "$am_cv_func_iconv_works" = no || break |
|
| 25573 |
+ done |
|
| 25574 |
+ LIBS="$am_save_LIBS" |
|
| 24991 | 25575 |
|
| 24992 |
-else |
|
| 25576 |
+fi |
|
| 25577 |
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv_works" >&5
|
|
| 25578 |
+$as_echo "$am_cv_func_iconv_works" >&6; } |
|
| 25579 |
+ case "$am_cv_func_iconv_works" in |
|
| 25580 |
+ *no) am_func_iconv=no am_cv_lib_iconv=no ;; |
|
| 25581 |
+ *) am_func_iconv=yes ;; |
|
| 25582 |
+ esac |
|
| 25583 |
+ else |
|
| 25584 |
+ am_func_iconv=no am_cv_lib_iconv=no |
|
| 25585 |
+ fi |
|
| 25586 |
+ if test "$am_func_iconv" = yes; then |
|
| 25587 |
+ |
|
| 25588 |
+$as_echo "#define HAVE_ICONV 1" >>confdefs.h |
|
| 25589 |
+ |
|
| 25590 |
+ fi |
|
| 25591 |
+ if test "$am_cv_lib_iconv" = yes; then |
|
| 25592 |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to link with libiconv" >&5
|
|
| 25593 |
+$as_echo_n "checking how to link with libiconv... " >&6; } |
|
| 25594 |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBICONV" >&5
|
|
| 25595 |
+$as_echo "$LIBICONV" >&6; } |
|
| 25596 |
+ else |
|
| 25597 |
+ CPPFLAGS="$am_save_CPPFLAGS" |
|
| 25598 |
+ LIBICONV= |
|
| 25599 |
+ LTLIBICONV= |
|
| 25600 |
+ fi |
|
| 24993 | 25601 |
|
| 24994 |
- LDFLAGS="-L/usr/lib -liconv" |
|
| 24995 |
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libiconv_open in -liconv" >&5
|
|
| 24996 |
-$as_echo_n "checking for libiconv_open in -liconv... " >&6; } |
|
| 24997 |
-if ${ac_cv_lib_iconv_libiconv_open+:} false; then :
|
|
| 25602 |
+ |
|
| 25603 |
+ |
|
| 25604 |
+ if test "$am_cv_func_iconv" = yes; then |
|
| 25605 |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv declaration" >&5
|
|
| 25606 |
+$as_echo_n "checking for iconv declaration... " >&6; } |
|
| 25607 |
+ if ${am_cv_proto_iconv+:} false; then :
|
|
| 24998 | 25608 |
$as_echo_n "(cached) " >&6 |
| 24999 | 25609 |
else |
| 25000 |
- ac_check_lib_save_LIBS=$LIBS |
|
| 25001 |
-LIBS="-liconv $LIBS" |
|
| 25002 |
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
|
| 25610 |
+ |
|
| 25611 |
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
|
| 25003 | 25612 |
/* end confdefs.h. */ |
| 25004 | 25613 |
|
| 25005 |
-/* Override any GCC internal prototype to avoid an error. |
|
| 25006 |
- Use char because int might match the return type of a GCC |
|
| 25007 |
- builtin and then its argument prototype would still apply. */ |
|
| 25614 |
+#include <stdlib.h> |
|
| 25615 |
+#include <iconv.h> |
|
| 25616 |
+extern |
|
| 25008 | 25617 |
#ifdef __cplusplus |
| 25009 |
-extern "C" |
|
| 25618 |
+"C" |
|
| 25619 |
+#endif |
|
| 25620 |
+#if defined(__STDC__) || defined(_MSC_VER) || defined(__cplusplus) |
|
| 25621 |
+size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft); |
|
| 25622 |
+#else |
|
| 25623 |
+size_t iconv(); |
|
| 25010 | 25624 |
#endif |
| 25011 |
-char libiconv_open (); |
|
| 25625 |
+ |
|
| 25012 | 25626 |
int |
| 25013 | 25627 |
main () |
| 25014 | 25628 |
{
|
| 25015 |
-return libiconv_open (); |
|
| 25629 |
+ |
|
| 25016 | 25630 |
; |
| 25017 | 25631 |
return 0; |
| 25018 | 25632 |
} |
| 25019 | 25633 |
_ACEOF |
| 25020 |
-if ac_fn_c_try_link "$LINENO"; then : |
|
| 25021 |
- ac_cv_lib_iconv_libiconv_open=yes |
|
| 25634 |
+if ac_fn_c_try_compile "$LINENO"; then : |
|
| 25635 |
+ am_cv_proto_iconv_arg1="" |
|
| 25022 | 25636 |
else |
| 25023 |
- ac_cv_lib_iconv_libiconv_open=no |
|
| 25637 |
+ am_cv_proto_iconv_arg1="const" |
|
| 25024 | 25638 |
fi |
| 25025 |
-rm -f core conftest.err conftest.$ac_objext \ |
|
| 25026 |
- conftest$ac_exeext conftest.$ac_ext |
|
| 25027 |
-LIBS=$ac_check_lib_save_LIBS |
|
| 25639 |
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext |
|
| 25640 |
+ am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);" |
|
| 25028 | 25641 |
fi |
| 25029 |
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_iconv_libiconv_open" >&5
|
|
| 25030 |
-$as_echo "$ac_cv_lib_iconv_libiconv_open" >&6; } |
|
| 25031 |
-if test "x$ac_cv_lib_iconv_libiconv_open" = xyes; then : |
|
| 25032 | 25642 |
|
| 25033 |
- ICONV_HOME="/usr" |
|
| 25034 |
- have_iconv_lib="yes" |
|
| 25643 |
+ am_cv_proto_iconv=`echo "$am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'` |
|
| 25644 |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result:
|
|
| 25645 |
+ $am_cv_proto_iconv" >&5 |
|
| 25646 |
+$as_echo " |
|
| 25647 |
+ $am_cv_proto_iconv" >&6; } |
|
| 25648 |
+ else |
|
| 25649 |
+ am_cv_proto_iconv_arg1="" |
|
| 25650 |
+ fi |
|
| 25651 |
+ |
|
| 25652 |
+cat >>confdefs.h <<_ACEOF |
|
| 25653 |
+#define ICONV_CONST $am_cv_proto_iconv_arg1 |
|
| 25654 |
+_ACEOF |
|
| 25035 | 25655 |
|
| 25036 |
-else |
|
| 25037 | 25656 |
|
| 25038 |
- if test "X$want_iconv" = "Xyes"; then |
|
| 25039 |
- as_fn_error $? "Failed to find iconv (libiconv) in /usr or /usr/local" "$LINENO" 5 |
|
| 25040 |
- fi |
|
| 25657 |
+ |
|
| 25658 |
+ for ac_header in iconv.h |
|
| 25659 |
+do : |
|
| 25660 |
+ ac_fn_c_check_header_compile "$LINENO" "iconv.h" "ac_cv_header_iconv_h" "#include <stdlib.h> |
|
| 25661 |
+" |
|
| 25662 |
+if test "x$ac_cv_header_iconv_h" = xyes; then : |
|
| 25663 |
+ cat >>confdefs.h <<_ACEOF |
|
| 25664 |
+#define HAVE_ICONV_H 1 |
|
| 25665 |
+_ACEOF |
|
| 25041 | 25666 |
|
| 25042 | 25667 |
fi |
| 25043 | 25668 |
|
| 25669 |
+done |
|
| 25670 |
+ |
|
| 25671 |
+ if test "x$am_cv_func_iconv" = "xyes"; then |
|
| 25672 |
+ for ac_header in localcharset.h |
|
| 25673 |
+do : |
|
| 25674 |
+ ac_fn_c_check_header_mongrel "$LINENO" "localcharset.h" "ac_cv_header_localcharset_h" "$ac_includes_default" |
|
| 25675 |
+if test "x$ac_cv_header_localcharset_h" = xyes; then : |
|
| 25676 |
+ cat >>confdefs.h <<_ACEOF |
|
| 25677 |
+#define HAVE_LOCALCHARSET_H 1 |
|
| 25678 |
+_ACEOF |
|
| 25044 | 25679 |
|
| 25045 | 25680 |
fi |
| 25046 | 25681 |
|
| 25047 |
- fi |
|
| 25682 |
+done |
|
| 25048 | 25683 |
|
| 25049 |
- if test "X$have_iconv_lib" = "Xyes"; then |
|
| 25050 |
- LIBS="$LIBCLAMAV_LIBS" |
|
| 25051 |
- if test "X$ICONV_HOME" != "X"; then |
|
| 25052 |
- ICONV_LDFLAGS="$LDFLAGS" |
|
| 25053 |
- ICONV_CPPFLAGS="-I$ICONV_HOME/include" |
|
| 25054 |
- else |
|
| 25055 |
- ICONV_LDFLAGS="" |
|
| 25056 |
- ICONV_CPPFLAGS="" |
|
| 25057 |
- fi |
|
| 25058 |
- CPPFLAGS="$ICONV_CPPFLAGS $LIBCLAMAV_CPPFLAGS" |
|
| 25684 |
+ am_save_LIBS="$LIBS" |
|
| 25685 |
+ LIBS="${LIBS} ${LIBICONV}"
|
|
| 25686 |
+ for ac_func in locale_charset |
|
| 25687 |
+do : |
|
| 25688 |
+ ac_fn_c_check_func "$LINENO" "locale_charset" "ac_cv_func_locale_charset" |
|
| 25689 |
+if test "x$ac_cv_func_locale_charset" = xyes; then : |
|
| 25690 |
+ cat >>confdefs.h <<_ACEOF |
|
| 25691 |
+#define HAVE_LOCALE_CHARSET 1 |
|
| 25692 |
+_ACEOF |
|
| 25059 | 25693 |
|
| 25060 |
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
|
| 25061 |
-/* end confdefs.h. */ |
|
| 25694 |
+fi |
|
| 25695 |
+done |
|
| 25062 | 25696 |
|
| 25063 |
- #include <iconv.h> |
|
| 25697 |
+ LIBS="${am_save_LIBS}"
|
|
| 25698 |
+ if test "x$ac_cv_func_locale_charset" != "xyes"; then |
|
| 25699 |
+ # If locale_charset() is not in libiconv, we have to find libcharset. |
|
| 25700 |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for locale_charset in -lcharset" >&5
|
|
| 25701 |
+$as_echo_n "checking for locale_charset in -lcharset... " >&6; } |
|
| 25702 |
+if ${ac_cv_lib_charset_locale_charset+:} false; then :
|
|
| 25703 |
+ $as_echo_n "(cached) " >&6 |
|
| 25704 |
+else |
|
| 25705 |
+ ac_check_lib_save_LIBS=$LIBS |
|
| 25706 |
+LIBS="-lcharset $LIBS" |
|
| 25707 |
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
|
| 25708 |
+/* end confdefs.h. */ |
|
| 25064 | 25709 |
|
| 25710 |
+/* Override any GCC internal prototype to avoid an error. |
|
| 25711 |
+ Use char because int might match the return type of a GCC |
|
| 25712 |
+ builtin and then its argument prototype would still apply. */ |
|
| 25713 |
+#ifdef __cplusplus |
|
| 25714 |
+extern "C" |
|
| 25715 |
+#endif |
|
| 25716 |
+char locale_charset (); |
|
| 25065 | 25717 |
int |
| 25066 | 25718 |
main () |
| 25067 | 25719 |
{
|
| 25068 |
- |
|
| 25069 |
- char** xin,**xout; |
|
| 25070 |
- unsigned long il,ol; |
|
| 25071 |
- int rc; |
|
| 25072 |
- iconv_t iconv_struct = iconv_open("UTF-16BE","UTF-8");
|
|
| 25073 |
- rc = iconv(iconv_struct,xin,&il,xout,&ol); |
|
| 25074 |
- iconv_close(iconv_struct); |
|
| 25075 |
- |
|
| 25720 |
+return locale_charset (); |
|
| 25076 | 25721 |
; |
| 25077 | 25722 |
return 0; |
| 25078 | 25723 |
} |
| 25079 | 25724 |
_ACEOF |
| 25080 | 25725 |
if ac_fn_c_try_link "$LINENO"; then : |
| 25081 |
- |
|
| 25082 |
- have_iconv="yes" |
|
| 25083 |
- |
|
| 25726 |
+ ac_cv_lib_charset_locale_charset=yes |
|
| 25084 | 25727 |
else |
| 25085 |
- |
|
| 25086 |
- if test "X$want_iconv" = "Xyes"; then |
|
| 25087 |
- as_fn_error $? "The libiconv link test failed. Your libiconv installation may be misconfigured." "$LINENO" 5 |
|
| 25088 |
- else |
|
| 25089 |
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: The libiconv found, but link test failed. Your libiconv installation may be misconfigured. iconv will not be available." >&5
|
|
| 25090 |
-$as_echo "$as_me: WARNING: The libiconv found, but link test failed. Your libiconv installation may be misconfigured. iconv will not be available." >&2;} |
|
| 25091 |
- fi |
|
| 25092 |
- |
|
| 25728 |
+ ac_cv_lib_charset_locale_charset=no |
|
| 25093 | 25729 |
fi |
| 25094 | 25730 |
rm -f core conftest.err conftest.$ac_objext \ |
| 25095 | 25731 |
conftest$ac_exeext conftest.$ac_ext |
| 25096 |
- fi |
|
| 25732 |
+LIBS=$ac_check_lib_save_LIBS |
|
| 25097 | 25733 |
fi |
| 25734 |
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_charset_locale_charset" >&5
|
|
| 25735 |
+$as_echo "$ac_cv_lib_charset_locale_charset" >&6; } |
|
| 25736 |
+if test "x$ac_cv_lib_charset_locale_charset" = xyes; then : |
|
| 25737 |
+ cat >>confdefs.h <<_ACEOF |
|
| 25738 |
+#define HAVE_LIBCHARSET 1 |
|
| 25739 |
+_ACEOF |
|
| 25098 | 25740 |
|
| 25099 |
- |
|
| 25100 |
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libiconv installation" >&5
|
|
| 25101 |
-$as_echo_n "checking for libiconv installation... " >&6; } |
|
| 25102 |
- |
|
| 25103 |
-if test "X$have_iconv" = "Xno"; then |
|
| 25104 |
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
| 25105 |
-$as_echo "no" >&6; } |
|
| 25106 |
-else |
|
| 25107 |
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ICONV_HOME" >&5
|
|
| 25108 |
-$as_echo "$ICONV_HOME" >&6; } |
|
| 25109 |
- |
|
| 25110 |
-$as_echo "#define HAVE_ICONV 1" >>confdefs.h |
|
| 25111 |
- |
|
| 25112 |
- |
|
| 25741 |
+ LIBS="-lcharset $LIBS" |
|
| 25113 | 25742 |
|
| 25114 | 25743 |
fi |
| 25115 | 25744 |
|
| 25116 |
-LIBS="$save_LIBS" |
|
| 25117 |
-LDFLAGS="$save_LDFLAGS" |
|
| 25118 |
-CPPFLAGS="$save_CPPFLAGS" |
|
| 25745 |
+ fi |
|
| 25746 |
+ fi |
|
| 25747 |
+fi |
|
| 25119 | 25748 |
|
| 25120 | 25749 |
have_pthreads=no |
| 25121 | 25750 |
ac_fn_c_check_header_mongrel "$LINENO" "pthread.h" "ac_cv_header_pthread_h" "$ac_includes_default" |
| ... | ... |
@@ -36265,35 +36949,19 @@ fi |
| 36265 | 36265 |
|
| 36266 | 36266 |
{ $as_echo "$as_me:${as_lineno-$LINENO}: Summary of engine detection features" >&5
|
| 36267 | 36267 |
$as_echo "$as_me: Summary of engine detection features" >&6;} |
| 36268 |
-if test "X$have_iconv" = "Xyes"; then |
|
| 36269 | 36268 |
|
| 36270 | 36269 |
|
| 36271 | 36270 |
$as_echo_n " iconv : " |
| 36272 | 36271 |
if test "x" = "xno"; then : |
| 36273 |
- $as_echo "yes, from $ICONV_HOME (disabled)" |
|
| 36272 |
+ $as_echo "$am_func_iconv (disabled)" |
|
| 36274 | 36273 |
elif test "x" = "xyes"; then : |
| 36275 |
- $as_echo "yes, from $ICONV_HOME" |
|
| 36274 |
+ $as_echo "$am_func_iconv" |
|
| 36276 | 36275 |
elif test "x" = "x"; then : |
| 36277 |
- $as_echo "yes, from $ICONV_HOME" |
|
| 36276 |
+ $as_echo "$am_func_iconv" |
|
| 36278 | 36277 |
else |
| 36279 |
- $as_echo "yes, from $ICONV_HOME ()" |
|
| 36278 |
+ $as_echo "$am_func_iconv ()" |
|
| 36280 | 36279 |
fi |
| 36281 | 36280 |
|
| 36282 |
-else |
|
| 36283 |
- |
|
| 36284 |
- |
|
| 36285 |
- $as_echo_n " iconv : " |
|
| 36286 |
- if test "x" = "xno"; then : |
|
| 36287 |
- $as_echo "no (disabled)" |
|
| 36288 |
-elif test "x" = "xyes"; then : |
|
| 36289 |
- $as_echo "no" |
|
| 36290 |
-elif test "x" = "x"; then : |
|
| 36291 |
- $as_echo "no" |
|
| 36292 |
-else |
|
| 36293 |
- $as_echo "no ()" |
|
| 36294 |
-fi |
|
| 36295 |
- |
|
| 36296 |
-fi |
|
| 36297 | 36281 |
|
| 36298 | 36282 |
|
| 36299 | 36283 |
$as_echo_n " bzip2 : " |
| ... | ... |
@@ -36307,19 +36975,35 @@ else |
| 36307 | 36307 |
$as_echo "$bzip_check ($want_bzip2)" |
| 36308 | 36308 |
fi |
| 36309 | 36309 |
|
| 36310 |
+if test "x${ZLIB_HOME}" != "x"; then
|
|
| 36310 | 36311 |
|
| 36311 | 36312 |
|
| 36312 | 36313 |
$as_echo_n " zlib : " |
| 36313 | 36314 |
if test "xyes" = "xno"; then : |
| 36314 |
- $as_echo "$ZLIB_HOME (disabled)" |
|
| 36315 |
+ $as_echo "yes (zlib found at $ZLIB_HOME) (disabled)" |
|
| 36315 | 36316 |
elif test "xyes" = "xyes"; then : |
| 36316 |
- $as_echo "$ZLIB_HOME" |
|
| 36317 |
+ $as_echo "yes (zlib found at $ZLIB_HOME)" |
|
| 36317 | 36318 |
elif test "xyes" = "x"; then : |
| 36318 |
- $as_echo "$ZLIB_HOME" |
|
| 36319 |
+ $as_echo "yes (zlib found at $ZLIB_HOME)" |
|
| 36319 | 36320 |
else |
| 36320 |
- $as_echo "$ZLIB_HOME (yes)" |
|
| 36321 |
+ $as_echo "yes (zlib found at $ZLIB_HOME) (yes)" |
|
| 36321 | 36322 |
fi |
| 36322 | 36323 |
|
| 36324 |
+else |
|
| 36325 |
+ |
|
| 36326 |
+ |
|
| 36327 |
+ $as_echo_n " zlib : " |
|
| 36328 |
+ if test "xyes" = "xno"; then : |
|
| 36329 |
+ $as_echo "yes (from system) (disabled)" |
|
| 36330 |
+elif test "xyes" = "xyes"; then : |
|
| 36331 |
+ $as_echo "yes (from system)" |
|
| 36332 |
+elif test "xyes" = "x"; then : |
|
| 36333 |
+ $as_echo "yes (from system)" |
|
| 36334 |
+else |
|
| 36335 |
+ $as_echo "yes (from system) (yes)" |
|
| 36336 |
+fi |
|
| 36337 |
+ |
|
| 36338 |
+fi |
|
| 36323 | 36339 |
|
| 36324 | 36340 |
|
| 36325 | 36341 |
$as_echo_n " unrar : " |
| ... | ... |
@@ -36477,7 +37161,7 @@ $as_echo "$as_me: WARNING: |
| 36477 | 36477 |
" >&2;} |
| 36478 | 36478 |
fi |
| 36479 | 36479 |
|
| 36480 |
-if test "x$cross_compiling" != "xno" || test "x$gcc_check" != "xyes" || test "x$zlib_check" = "xno" || test "x$bzip_check" != "xok" ; then |
|
| 36480 |
+if test "x$cross_compiling" != "xno" || test "x$gcc_check" != "xyes" || test "x$bzip_check" != "xok" ; then |
|
| 36481 | 36481 |
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:
|
| 36482 | 36482 |
****** WARNING: |
| 36483 | 36483 |
****** You are cross compiling to a different host or you are |
| ... | ... |
@@ -146,7 +146,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ |
| 146 | 146 |
$(top_srcdir)/m4/reorganization/code_checks/fanotify.m4 \ |
| 147 | 147 |
$(top_srcdir)/m4/reorganization/code_checks/setpgrp.m4 \ |
| 148 | 148 |
$(top_srcdir)/m4/reorganization/milter/enable.m4 \ |
| 149 |
- $(top_srcdir)/m4/reorganization/code_checks/iconv.m4 \ |
|
| 149 |
+ $(top_srcdir)/m4/reorganization/libs/iconv_check.m4 \ |
|
| 150 |
+ $(top_srcdir)/m4/reorganization/libs/iconv.m4 \ |
|
| 150 | 151 |
$(top_srcdir)/m4/reorganization/code_checks/pthreads.m4 \ |
| 151 | 152 |
$(top_srcdir)/m4/reorganization/code_checks/reentrant.m4 \ |
| 152 | 153 |
$(top_srcdir)/m4/reorganization/utility_checks/id.m4 \ |
| ... | ... |
@@ -291,8 +292,6 @@ GPERF = @GPERF@ |
| 291 | 291 |
GREP = @GREP@ |
| 292 | 292 |
HAVE_STRNI = @HAVE_STRNI@ |
| 293 | 293 |
HAVE_YARA = @HAVE_YARA@ |
| 294 |
-ICONV_CPPFLAGS = @ICONV_CPPFLAGS@ |
|
| 295 |
-ICONV_LDFLAGS = @ICONV_LDFLAGS@ |
|
| 296 | 294 |
INCLTDL = @INCLTDL@ |
| 297 | 295 |
INSTALL = @INSTALL@ |
| 298 | 296 |
INSTALL_DATA = @INSTALL_DATA@ |
| ... | ... |
@@ -326,6 +325,7 @@ LIBCLAMAV_VERSION_NUM = @LIBCLAMAV_VERSION_NUM@ |
| 326 | 326 |
LIBCLAMSHARED_CPPFLAGS = @LIBCLAMSHARED_CPPFLAGS@ |
| 327 | 327 |
LIBFRESHCLAM_VERSION = @LIBFRESHCLAM_VERSION@ |
| 328 | 328 |
LIBFRESHCLAM_VERSION_NUM = @LIBFRESHCLAM_VERSION_NUM@ |
| 329 |
+LIBICONV = @LIBICONV@ |
|
| 329 | 330 |
LIBLTDL = @LIBLTDL@ |
| 330 | 331 |
LIBM = @LIBM@ |
| 331 | 332 |
LIBMSPACK_CFLAGS = @LIBMSPACK_CFLAGS@ |
| ... | ... |
@@ -346,6 +346,7 @@ LTDLDEPS = @LTDLDEPS@ |
| 346 | 346 |
LTDLINCL = @LTDLINCL@ |
| 347 | 347 |
LTDLOPEN = @LTDLOPEN@ |
| 348 | 348 |
LTLIBBZ2 = @LTLIBBZ2@ |
| 349 |
+LTLIBICONV = @LTLIBICONV@ |
|
| 349 | 350 |
LTLIBOBJS = @LTLIBOBJS@ |
| 350 | 351 |
LT_ARGZ_H = @LT_ARGZ_H@ |
| 351 | 352 |
LT_CONFIG_H = @LT_CONFIG_H@ |
| ... | ... |
@@ -404,6 +405,8 @@ XML_CPPFLAGS = @XML_CPPFLAGS@ |
| 404 | 404 |
XML_LIBS = @XML_LIBS@ |
| 405 | 405 |
YACC = @YACC@ |
| 406 | 406 |
YFLAGS = @YFLAGS@ |
| 407 |
+ZLIB_CFLAGS = @ZLIB_CFLAGS@ |
|
| 408 |
+ZLIB_LIBS = @ZLIB_LIBS@ |
|
| 407 | 409 |
abs_builddir = @abs_builddir@ |
| 408 | 410 |
abs_srcdir = @abs_srcdir@ |
| 409 | 411 |
abs_top_builddir = @abs_top_builddir@ |
| ... | ... |
@@ -146,7 +146,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ |
| 146 | 146 |
$(top_srcdir)/m4/reorganization/code_checks/fanotify.m4 \ |
| 147 | 147 |
$(top_srcdir)/m4/reorganization/code_checks/setpgrp.m4 \ |
| 148 | 148 |
$(top_srcdir)/m4/reorganization/milter/enable.m4 \ |
| 149 |
- $(top_srcdir)/m4/reorganization/code_checks/iconv.m4 \ |
|
| 149 |
+ $(top_srcdir)/m4/reorganization/libs/iconv_check.m4 \ |
|
| 150 |
+ $(top_srcdir)/m4/reorganization/libs/iconv.m4 \ |
|
| 150 | 151 |
$(top_srcdir)/m4/reorganization/code_checks/pthreads.m4 \ |
| 151 | 152 |
$(top_srcdir)/m4/reorganization/code_checks/reentrant.m4 \ |
| 152 | 153 |
$(top_srcdir)/m4/reorganization/utility_checks/id.m4 \ |
| ... | ... |
@@ -325,8 +326,6 @@ GPERF = @GPERF@ |
| 325 | 325 |
GREP = @GREP@ |
| 326 | 326 |
HAVE_STRNI = @HAVE_STRNI@ |
| 327 | 327 |
HAVE_YARA = @HAVE_YARA@ |
| 328 |
-ICONV_CPPFLAGS = @ICONV_CPPFLAGS@ |
|
| 329 |
-ICONV_LDFLAGS = @ICONV_LDFLAGS@ |
|
| 330 | 328 |
INCLTDL = @INCLTDL@ |
| 331 | 329 |
INSTALL = @INSTALL@ |
| 332 | 330 |
INSTALL_DATA = @INSTALL_DATA@ |
| ... | ... |
@@ -360,6 +359,7 @@ LIBCLAMAV_VERSION_NUM = @LIBCLAMAV_VERSION_NUM@ |
| 360 | 360 |
LIBCLAMSHARED_CPPFLAGS = @LIBCLAMSHARED_CPPFLAGS@ |
| 361 | 361 |
LIBFRESHCLAM_VERSION = @LIBFRESHCLAM_VERSION@ |
| 362 | 362 |
LIBFRESHCLAM_VERSION_NUM = @LIBFRESHCLAM_VERSION_NUM@ |
| 363 |
+LIBICONV = @LIBICONV@ |
|
| 363 | 364 |
LIBLTDL = @LIBLTDL@ |
| 364 | 365 |
LIBM = @LIBM@ |
| 365 | 366 |
LIBMSPACK_CFLAGS = @LIBMSPACK_CFLAGS@ |
| ... | ... |
@@ -380,6 +380,7 @@ LTDLDEPS = @LTDLDEPS@ |
| 380 | 380 |
LTDLINCL = @LTDLINCL@ |
| 381 | 381 |
LTDLOPEN = @LTDLOPEN@ |
| 382 | 382 |
LTLIBBZ2 = @LTLIBBZ2@ |
| 383 |
+LTLIBICONV = @LTLIBICONV@ |
|
| 383 | 384 |
LTLIBOBJS = @LTLIBOBJS@ |
| 384 | 385 |
LT_ARGZ_H = @LT_ARGZ_H@ |
| 385 | 386 |
LT_CONFIG_H = @LT_CONFIG_H@ |
| ... | ... |
@@ -438,6 +439,8 @@ XML_CPPFLAGS = @XML_CPPFLAGS@ |
| 438 | 438 |
XML_LIBS = @XML_LIBS@ |
| 439 | 439 |
YACC = @YACC@ |
| 440 | 440 |
YFLAGS = @YFLAGS@ |
| 441 |
+ZLIB_CFLAGS = @ZLIB_CFLAGS@ |
|
| 442 |
+ZLIB_LIBS = @ZLIB_LIBS@ |
|
| 441 | 443 |
abs_builddir = @abs_builddir@ |
| 442 | 444 |
abs_srcdir = @abs_srcdir@ |
| 443 | 445 |
abs_top_builddir = @abs_top_builddir@ |
| ... | ... |
@@ -147,7 +147,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ |
| 147 | 147 |
$(top_srcdir)/m4/reorganization/code_checks/fanotify.m4 \ |
| 148 | 148 |
$(top_srcdir)/m4/reorganization/code_checks/setpgrp.m4 \ |
| 149 | 149 |
$(top_srcdir)/m4/reorganization/milter/enable.m4 \ |
| 150 |
- $(top_srcdir)/m4/reorganization/code_checks/iconv.m4 \ |
|
| 150 |
+ $(top_srcdir)/m4/reorganization/libs/iconv_check.m4 \ |
|
| 151 |
+ $(top_srcdir)/m4/reorganization/libs/iconv.m4 \ |
|
| 151 | 152 |
$(top_srcdir)/m4/reorganization/code_checks/pthreads.m4 \ |
| 152 | 153 |
$(top_srcdir)/m4/reorganization/code_checks/reentrant.m4 \ |
| 153 | 154 |
$(top_srcdir)/m4/reorganization/utility_checks/id.m4 \ |
| ... | ... |
@@ -321,8 +322,6 @@ GPERF = @GPERF@ |
| 321 | 321 |
GREP = @GREP@ |
| 322 | 322 |
HAVE_STRNI = @HAVE_STRNI@ |
| 323 | 323 |
HAVE_YARA = @HAVE_YARA@ |
| 324 |
-ICONV_CPPFLAGS = @ICONV_CPPFLAGS@ |
|
| 325 |
-ICONV_LDFLAGS = @ICONV_LDFLAGS@ |
|
| 326 | 324 |
INCLTDL = @INCLTDL@ |
| 327 | 325 |
INSTALL = @INSTALL@ |
| 328 | 326 |
INSTALL_DATA = @INSTALL_DATA@ |
| ... | ... |
@@ -356,6 +355,7 @@ LIBCLAMAV_VERSION_NUM = @LIBCLAMAV_VERSION_NUM@ |
| 356 | 356 |
LIBCLAMSHARED_CPPFLAGS = @LIBCLAMSHARED_CPPFLAGS@ |
| 357 | 357 |
LIBFRESHCLAM_VERSION = @LIBFRESHCLAM_VERSION@ |
| 358 | 358 |
LIBFRESHCLAM_VERSION_NUM = @LIBFRESHCLAM_VERSION_NUM@ |
| 359 |
+LIBICONV = @LIBICONV@ |
|
| 359 | 360 |
LIBLTDL = @LIBLTDL@ |
| 360 | 361 |
LIBM = @LIBM@ |
| 361 | 362 |
LIBMSPACK_CFLAGS = @LIBMSPACK_CFLAGS@ |
| ... | ... |
@@ -376,6 +376,7 @@ LTDLDEPS = @LTDLDEPS@ |
| 376 | 376 |
LTDLINCL = @LTDLINCL@ |
| 377 | 377 |
LTDLOPEN = @LTDLOPEN@ |
| 378 | 378 |
LTLIBBZ2 = @LTLIBBZ2@ |
| 379 |
+LTLIBICONV = @LTLIBICONV@ |
|
| 379 | 380 |
LTLIBOBJS = @LTLIBOBJS@ |
| 380 | 381 |
LT_ARGZ_H = @LT_ARGZ_H@ |
| 381 | 382 |
LT_CONFIG_H = @LT_CONFIG_H@ |
| ... | ... |
@@ -434,6 +435,8 @@ XML_CPPFLAGS = @XML_CPPFLAGS@ |
| 434 | 434 |
XML_LIBS = @XML_LIBS@ |
| 435 | 435 |
YACC = @YACC@ |
| 436 | 436 |
YFLAGS = @YFLAGS@ |
| 437 |
+ZLIB_CFLAGS = @ZLIB_CFLAGS@ |
|
| 438 |
+ZLIB_LIBS = @ZLIB_LIBS@ |
|
| 437 | 439 |
abs_builddir = @abs_builddir@ |
| 438 | 440 |
abs_srcdir = @abs_srcdir@ |
| 439 | 441 |
abs_top_builddir = @abs_top_builddir@ |
| ... | ... |
@@ -149,7 +149,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ |
| 149 | 149 |
$(top_srcdir)/m4/reorganization/code_checks/fanotify.m4 \ |
| 150 | 150 |
$(top_srcdir)/m4/reorganization/code_checks/setpgrp.m4 \ |
| 151 | 151 |
$(top_srcdir)/m4/reorganization/milter/enable.m4 \ |
| 152 |
- $(top_srcdir)/m4/reorganization/code_checks/iconv.m4 \ |
|
| 152 |
+ $(top_srcdir)/m4/reorganization/libs/iconv_check.m4 \ |
|
| 153 |
+ $(top_srcdir)/m4/reorganization/libs/iconv.m4 \ |
|
| 153 | 154 |
$(top_srcdir)/m4/reorganization/code_checks/pthreads.m4 \ |
| 154 | 155 |
$(top_srcdir)/m4/reorganization/code_checks/reentrant.m4 \ |
| 155 | 156 |
$(top_srcdir)/m4/reorganization/utility_checks/id.m4 \ |
| ... | ... |
@@ -376,8 +377,6 @@ GPERF = @GPERF@ |
| 376 | 376 |
GREP = @GREP@ |
| 377 | 377 |
HAVE_STRNI = @HAVE_STRNI@ |
| 378 | 378 |
HAVE_YARA = @HAVE_YARA@ |
| 379 |
-ICONV_CPPFLAGS = @ICONV_CPPFLAGS@ |
|
| 380 |
-ICONV_LDFLAGS = @ICONV_LDFLAGS@ |
|
| 381 | 379 |
INCLTDL = @INCLTDL@ |
| 382 | 380 |
INSTALL = @INSTALL@ |
| 383 | 381 |
INSTALL_DATA = @INSTALL_DATA@ |
| ... | ... |
@@ -411,6 +410,7 @@ LIBCLAMAV_VERSION_NUM = @LIBCLAMAV_VERSION_NUM@ |
| 411 | 411 |
LIBCLAMSHARED_CPPFLAGS = @LIBCLAMSHARED_CPPFLAGS@ |
| 412 | 412 |
LIBFRESHCLAM_VERSION = @LIBFRESHCLAM_VERSION@ |
| 413 | 413 |
LIBFRESHCLAM_VERSION_NUM = @LIBFRESHCLAM_VERSION_NUM@ |
| 414 |
+LIBICONV = @LIBICONV@ |
|
| 414 | 415 |
LIBLTDL = @LIBLTDL@ |
| 415 | 416 |
LIBM = @LIBM@ |
| 416 | 417 |
LIBMSPACK_CFLAGS = @LIBMSPACK_CFLAGS@ |
| ... | ... |
@@ -423,7 +423,7 @@ LIBPRELUDE_LDFLAGS = @LIBPRELUDE_LDFLAGS@ |
| 423 | 423 |
LIBPRELUDE_LIBS = @LIBPRELUDE_LIBS@ |
| 424 | 424 |
LIBPRELUDE_PREFIX = @LIBPRELUDE_PREFIX@ |
| 425 | 425 |
LIBPRELUDE_PTHREAD_CFLAGS = @LIBPRELUDE_PTHREAD_CFLAGS@ |
| 426 |
-LIBS = @SSL_LDFLAGS@ @SSL_LIBS@ @CURL_LDFLAGS@ @CURL_LIBS@ $(top_builddir)/libclamav/libclamav.la $(top_builddir)/libfreshclam/libfreshclam.la @FRESHCLAM_LIBS@ @THREAD_LIBS@ |
|
| 426 |
+LIBS = @SSL_LDFLAGS@ @SSL_LIBS@ @CURL_LDFLAGS@ @CURL_LIBS@ $(top_builddir)/libclamav/libclamav.la $(top_builddir)/libfreshclam/libfreshclam.la @FRESHCLAM_LIBS@ @ZLIB_LIBS@ @THREAD_LIBS@ |
|
| 427 | 427 |
LIBTOOL = @LIBTOOL@ |
| 428 | 428 |
LIPO = @LIPO@ |
| 429 | 429 |
LN_S = @LN_S@ |
| ... | ... |
@@ -431,6 +431,7 @@ LTDLDEPS = @LTDLDEPS@ |
| 431 | 431 |
LTDLINCL = @LTDLINCL@ |
| 432 | 432 |
LTDLOPEN = @LTDLOPEN@ |
| 433 | 433 |
LTLIBBZ2 = @LTLIBBZ2@ |
| 434 |
+LTLIBICONV = @LTLIBICONV@ |
|
| 434 | 435 |
LTLIBOBJS = @LTLIBOBJS@ |
| 435 | 436 |
LT_ARGZ_H = @LT_ARGZ_H@ |
| 436 | 437 |
LT_CONFIG_H = @LT_CONFIG_H@ |
| ... | ... |
@@ -489,6 +490,8 @@ XML_CPPFLAGS = @XML_CPPFLAGS@ |
| 489 | 489 |
XML_LIBS = @XML_LIBS@ |
| 490 | 490 |
YACC = @YACC@ |
| 491 | 491 |
YFLAGS = @YFLAGS@ |
| 492 |
+ZLIB_CFLAGS = @ZLIB_CFLAGS@ |
|
| 493 |
+ZLIB_LIBS = @ZLIB_LIBS@ |
|
| 492 | 494 |
abs_builddir = @abs_builddir@ |
| 493 | 495 |
abs_srcdir = @abs_srcdir@ |
| 494 | 496 |
abs_top_builddir = @abs_top_builddir@ |
| ... | ... |
@@ -575,7 +578,7 @@ freshclam_SOURCES = \ |
| 575 | 575 |
|
| 576 | 576 |
@INSTALL_SYSTEMD_UNITS_TRUE@systemdsystemunit_DATA = clamav-freshclam.service |
| 577 | 577 |
AM_CFLAGS = @WERR_CFLAGS@ |
| 578 |
-AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav -I$(top_srcdir)/libfreshclam @CURL_CPPFLAGS@ @SSL_CPPFLAGS@ @FRESHCLAM_CPPFLAGS@ @JSON_CPPFLAGS@ @PCRE_CPPFLAGS@ |
|
| 578 |
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav -I$(top_srcdir)/libfreshclam @CURL_CPPFLAGS@ @SSL_CPPFLAGS@ @FRESHCLAM_CPPFLAGS@ @ZLIB_CFLAGS@ @JSON_CPPFLAGS@ @PCRE_CPPFLAGS@ |
|
| 579 | 579 |
AM_INSTALLCHECK_STD_OPTIONS_EXEMPT = freshclam$(EXEEXT) |
| 580 | 580 |
CLEANFILES = *.gcda *.gcno |
| 581 | 581 |
all: all-am |
| ... | ... |
@@ -176,7 +176,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ |
| 176 | 176 |
$(top_srcdir)/m4/reorganization/code_checks/fanotify.m4 \ |
| 177 | 177 |
$(top_srcdir)/m4/reorganization/code_checks/setpgrp.m4 \ |
| 178 | 178 |
$(top_srcdir)/m4/reorganization/milter/enable.m4 \ |
| 179 |
- $(top_srcdir)/m4/reorganization/code_checks/iconv.m4 \ |
|
| 179 |
+ $(top_srcdir)/m4/reorganization/libs/iconv_check.m4 \ |
|
| 180 |
+ $(top_srcdir)/m4/reorganization/libs/iconv.m4 \ |
|
| 180 | 181 |
$(top_srcdir)/m4/reorganization/code_checks/pthreads.m4 \ |
| 181 | 182 |
$(top_srcdir)/m4/reorganization/code_checks/reentrant.m4 \ |
| 182 | 183 |
$(top_srcdir)/m4/reorganization/utility_checks/id.m4 \ |
| ... | ... |
@@ -773,8 +774,6 @@ GPERF = @GPERF@ |
| 773 | 773 |
GREP = @GREP@ |
| 774 | 774 |
HAVE_STRNI = @HAVE_STRNI@ |
| 775 | 775 |
HAVE_YARA = @HAVE_YARA@ |
| 776 |
-ICONV_CPPFLAGS = @ICONV_CPPFLAGS@ |
|
| 777 |
-ICONV_LDFLAGS = @ICONV_LDFLAGS@ |
|
| 778 | 776 |
INCLTDL = @INCLTDL@ |
| 779 | 777 |
INSTALL = @INSTALL@ |
| 780 | 778 |
INSTALL_DATA = @INSTALL_DATA@ |
| ... | ... |
@@ -808,6 +807,7 @@ LIBCLAMAV_VERSION_NUM = @LIBCLAMAV_VERSION_NUM@ |
| 808 | 808 |
LIBCLAMSHARED_CPPFLAGS = @LIBCLAMSHARED_CPPFLAGS@ |
| 809 | 809 |
LIBFRESHCLAM_VERSION = @LIBFRESHCLAM_VERSION@ |
| 810 | 810 |
LIBFRESHCLAM_VERSION_NUM = @LIBFRESHCLAM_VERSION_NUM@ |
| 811 |
+LIBICONV = @LIBICONV@ |
|
| 811 | 812 |
LIBLTDL = @LIBLTDL@ |
| 812 | 813 |
LIBM = @LIBM@ |
| 813 | 814 |
LIBMSPACK_CFLAGS = @LIBMSPACK_CFLAGS@ |
| ... | ... |
@@ -828,6 +828,7 @@ LTDLDEPS = @LTDLDEPS@ |
| 828 | 828 |
LTDLINCL = @LTDLINCL@ |
| 829 | 829 |
LTDLOPEN = @LTDLOPEN@ |
| 830 | 830 |
LTLIBBZ2 = @LTLIBBZ2@ |
| 831 |
+LTLIBICONV = @LTLIBICONV@ |
|
| 831 | 832 |
LTLIBOBJS = @LTLIBOBJS@ |
| 832 | 833 |
LT_ARGZ_H = @LT_ARGZ_H@ |
| 833 | 834 |
LT_CONFIG_H = @LT_CONFIG_H@ |
| ... | ... |
@@ -886,6 +887,8 @@ XML_CPPFLAGS = @XML_CPPFLAGS@ |
| 886 | 886 |
XML_LIBS = @XML_LIBS@ |
| 887 | 887 |
YACC = @YACC@ |
| 888 | 888 |
YFLAGS = @YFLAGS@ |
| 889 |
+ZLIB_CFLAGS = @ZLIB_CFLAGS@ |
|
| 890 |
+ZLIB_LIBS = @ZLIB_LIBS@ |
|
| 889 | 891 |
abs_builddir = @abs_builddir@ |
| 890 | 892 |
abs_srcdir = @abs_srcdir@ |
| 891 | 893 |
abs_top_builddir = @abs_top_builddir@ |
| ... | ... |
@@ -173,7 +173,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ |
| 173 | 173 |
$(top_srcdir)/m4/reorganization/code_checks/fanotify.m4 \ |
| 174 | 174 |
$(top_srcdir)/m4/reorganization/code_checks/setpgrp.m4 \ |
| 175 | 175 |
$(top_srcdir)/m4/reorganization/milter/enable.m4 \ |
| 176 |
- $(top_srcdir)/m4/reorganization/code_checks/iconv.m4 \ |
|
| 176 |
+ $(top_srcdir)/m4/reorganization/libs/iconv_check.m4 \ |
|
| 177 |
+ $(top_srcdir)/m4/reorganization/libs/iconv.m4 \ |
|
| 177 | 178 |
$(top_srcdir)/m4/reorganization/code_checks/pthreads.m4 \ |
| 178 | 179 |
$(top_srcdir)/m4/reorganization/code_checks/reentrant.m4 \ |
| 179 | 180 |
$(top_srcdir)/m4/reorganization/utility_checks/id.m4 \ |
| ... | ... |
@@ -945,8 +946,6 @@ GPERF = @GPERF@ |
| 945 | 945 |
GREP = @GREP@ |
| 946 | 946 |
HAVE_STRNI = @HAVE_STRNI@ |
| 947 | 947 |
HAVE_YARA = @HAVE_YARA@ |
| 948 |
-ICONV_CPPFLAGS = @ICONV_CPPFLAGS@ |
|
| 949 |
-ICONV_LDFLAGS = @ICONV_LDFLAGS@ |
|
| 950 | 948 |
INCLTDL = @INCLTDL@ |
| 951 | 949 |
INSTALL = @INSTALL@ |
| 952 | 950 |
INSTALL_DATA = @INSTALL_DATA@ |
| ... | ... |
@@ -980,6 +979,7 @@ LIBCLAMAV_VERSION_NUM = @LIBCLAMAV_VERSION_NUM@ |
| 980 | 980 |
LIBCLAMSHARED_CPPFLAGS = @LIBCLAMSHARED_CPPFLAGS@ |
| 981 | 981 |
LIBFRESHCLAM_VERSION = @LIBFRESHCLAM_VERSION@ |
| 982 | 982 |
LIBFRESHCLAM_VERSION_NUM = @LIBFRESHCLAM_VERSION_NUM@ |
| 983 |
+LIBICONV = @LIBICONV@ |
|
| 983 | 984 |
LIBLTDL = @LIBLTDL@ |
| 984 | 985 |
LIBM = @LIBM@ |
| 985 | 986 |
LIBMSPACK_CFLAGS = @LIBMSPACK_CFLAGS@ |
| ... | ... |
@@ -1000,6 +1000,7 @@ LTDLDEPS = @LTDLDEPS@ |
| 1000 | 1000 |
LTDLINCL = @LTDLINCL@ |
| 1001 | 1001 |
LTDLOPEN = @LTDLOPEN@ |
| 1002 | 1002 |
LTLIBBZ2 = @LTLIBBZ2@ |
| 1003 |
+LTLIBICONV = @LTLIBICONV@ |
|
| 1003 | 1004 |
LTLIBOBJS = @LTLIBOBJS@ |
| 1004 | 1005 |
LT_ARGZ_H = @LT_ARGZ_H@ |
| 1005 | 1006 |
LT_CONFIG_H = @LT_CONFIG_H@ |
| ... | ... |
@@ -1058,6 +1059,8 @@ XML_CPPFLAGS = @XML_CPPFLAGS@ |
| 1058 | 1058 |
XML_LIBS = @XML_LIBS@ |
| 1059 | 1059 |
YACC = @YACC@ |
| 1060 | 1060 |
YFLAGS = @YFLAGS@ |
| 1061 |
+ZLIB_CFLAGS = @ZLIB_CFLAGS@ |
|
| 1062 |
+ZLIB_LIBS = @ZLIB_LIBS@ |
|
| 1061 | 1063 |
abs_builddir = @abs_builddir@ |
| 1062 | 1064 |
abs_srcdir = @abs_srcdir@ |
| 1063 | 1065 |
abs_top_builddir = @abs_top_builddir@ |
| ... | ... |
@@ -1321,12 +1324,12 @@ SUBDIRS = $(am__append_6) |
| 1321 | 1321 |
@USE_INTERNAL_MSPACK_TRUE@MSPACKDEP = libclammspack.la |
| 1322 | 1322 |
@ENABLE_YARA_TRUE@YARA_CFLAGS = -DHAVE_YARA |
| 1323 | 1323 |
libclamav_nocxx_la_SOURCES = bytecode_nojit.c |
| 1324 |
-libclamav_nocxx_la_CFLAGS = $(AM_CFLAGS) @SSL_CPPFLAGS@ @JSON_CPPFLAGS@ @PCRE_CPPFLAGS@ |
|
| 1325 |
-libclamav_la_LIBADD = @SSL_LIBS@ @JSON_LIBS@ @PCRE_LIBS@ @LIBCLAMAV_LIBS@ @LIBLTDL@ $(XML_LIBS) $(IFACELIBADD) $(MSPACKLIBADD) $(LLVMLIBADD) libclamav_internal_utils.la @THREAD_LIBS@ @LIBM@ |
|
| 1324 |
+libclamav_nocxx_la_CFLAGS = $(AM_CFLAGS) @SSL_CPPFLAGS@ @JSON_CPPFLAGS@ @ZLIB_CFLAGS@ @PCRE_CPPFLAGS@ |
|
| 1325 |
+libclamav_la_LIBADD = @SSL_LIBS@ @JSON_LIBS@ @PCRE_LIBS@ @LIBCLAMAV_LIBS@ @ZLIB_LIBS@ @LIBLTDL@ $(XML_LIBS) $(IFACELIBADD) $(MSPACKLIBADD) $(LLVMLIBADD) libclamav_internal_utils.la @THREAD_LIBS@ @LIBM@ |
|
| 1326 | 1326 |
libclamav_la_DEPENDENCIES = @LTDLDEPS@ $(IFACEDEP) $(LLVMDEP) $(MSPACKDEP) libclamav_internal_utils.la |
| 1327 |
-libclamav_la_CFLAGS = $(MSPACK_CFLAGS) $(AM_CFLAGS) $(YARA_CFLAGS) -DSEARCH_LIBDIR=\"$(libdir)\" @LIBCLAMAV_CPPFLAGS@ @SSL_CPPFLAGS@ @JSON_CPPFLAGS@ @ICONV_CPPFLAGS@ @PCRE_CPPFLAGS@ @XML_CPPFLAGS@ |
|
| 1327 |
+libclamav_la_CFLAGS = $(MSPACK_CFLAGS) $(AM_CFLAGS) $(YARA_CFLAGS) -DSEARCH_LIBDIR=\"$(libdir)\" @LIBCLAMAV_CPPFLAGS@ @SSL_CPPFLAGS@ @JSON_CPPFLAGS@ @ZLIB_CFLAGS@ @PCRE_CPPFLAGS@ @XML_CPPFLAGS@ |
|
| 1328 | 1328 |
libclamav_la_LDFLAGS = @SSL_LDFLAGS@ @TH_SAFE@ @JSON_LDFLAGS@ \ |
| 1329 |
- @ICONV_LDFLAGS@ $(XML_LIBS) -version-info @LIBCLAMAV_VERSION@ \ |
|
| 1329 |
+ @LIBICONV@ $(XML_LIBS) -version-info @LIBCLAMAV_VERSION@ \ |
|
| 1330 | 1330 |
-no-undefined $(am__append_8) |
| 1331 | 1331 |
include_HEADERS = clamav.h |
| 1332 | 1332 |
libclamav_la_SOURCES = matcher-ac.c matcher-ac.h matcher-bm.c \ |
| ... | ... |
@@ -159,7 +159,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ |
| 159 | 159 |
$(top_srcdir)/m4/reorganization/code_checks/fanotify.m4 \ |
| 160 | 160 |
$(top_srcdir)/m4/reorganization/code_checks/setpgrp.m4 \ |
| 161 | 161 |
$(top_srcdir)/m4/reorganization/milter/enable.m4 \ |
| 162 |
- $(top_srcdir)/m4/reorganization/code_checks/iconv.m4 \ |
|
| 162 |
+ $(top_srcdir)/m4/reorganization/libs/iconv_check.m4 \ |
|
| 163 |
+ $(top_srcdir)/m4/reorganization/libs/iconv.m4 \ |
|
| 163 | 164 |
$(top_srcdir)/m4/reorganization/code_checks/pthreads.m4 \ |
| 164 | 165 |
$(top_srcdir)/m4/reorganization/code_checks/reentrant.m4 \ |
| 165 | 166 |
$(top_srcdir)/m4/reorganization/utility_checks/id.m4 \ |
| ... | ... |
@@ -421,8 +422,6 @@ GPERF = @GPERF@ |
| 421 | 421 |
GREP = @GREP@ |
| 422 | 422 |
HAVE_STRNI = @HAVE_STRNI@ |
| 423 | 423 |
HAVE_YARA = @HAVE_YARA@ |
| 424 |
-ICONV_CPPFLAGS = @ICONV_CPPFLAGS@ |
|
| 425 |
-ICONV_LDFLAGS = @ICONV_LDFLAGS@ |
|
| 426 | 424 |
INCLTDL = @INCLTDL@ |
| 427 | 425 |
INSTALL = @INSTALL@ |
| 428 | 426 |
INSTALL_DATA = @INSTALL_DATA@ |
| ... | ... |
@@ -456,6 +455,7 @@ LIBCLAMAV_VERSION_NUM = @LIBCLAMAV_VERSION_NUM@ |
| 456 | 456 |
LIBCLAMSHARED_CPPFLAGS = @LIBCLAMSHARED_CPPFLAGS@ |
| 457 | 457 |
LIBFRESHCLAM_VERSION = @LIBFRESHCLAM_VERSION@ |
| 458 | 458 |
LIBFRESHCLAM_VERSION_NUM = @LIBFRESHCLAM_VERSION_NUM@ |
| 459 |
+LIBICONV = @LIBICONV@ |
|
| 459 | 460 |
LIBLTDL = @LIBLTDL@ |
| 460 | 461 |
LIBM = @LIBM@ |
| 461 | 462 |
LIBMSPACK_CFLAGS = @LIBMSPACK_CFLAGS@ |
| ... | ... |
@@ -476,6 +476,7 @@ LTDLDEPS = @LTDLDEPS@ |
| 476 | 476 |
LTDLINCL = @LTDLINCL@ |
| 477 | 477 |
LTDLOPEN = @LTDLOPEN@ |
| 478 | 478 |
LTLIBBZ2 = @LTLIBBZ2@ |
| 479 |
+LTLIBICONV = @LTLIBICONV@ |
|
| 479 | 480 |
LTLIBOBJS = @LTLIBOBJS@ |
| 480 | 481 |
LT_ARGZ_H = @LT_ARGZ_H@ |
| 481 | 482 |
LT_CONFIG_H = @LT_CONFIG_H@ |
| ... | ... |
@@ -534,6 +535,8 @@ XML_CPPFLAGS = @XML_CPPFLAGS@ |
| 534 | 534 |
XML_LIBS = @XML_LIBS@ |
| 535 | 535 |
YACC = @YACC@ |
| 536 | 536 |
YFLAGS = @YFLAGS@ |
| 537 |
+ZLIB_CFLAGS = @ZLIB_CFLAGS@ |
|
| 538 |
+ZLIB_LIBS = @ZLIB_LIBS@ |
|
| 537 | 539 |
abs_builddir = @abs_builddir@ |
| 538 | 540 |
abs_srcdir = @abs_srcdir@ |
| 539 | 541 |
abs_top_builddir = @abs_top_builddir@ |
| ... | ... |
@@ -602,10 +605,10 @@ top_build_prefix = @top_build_prefix@ |
| 602 | 602 |
top_builddir = @top_builddir@ |
| 603 | 603 |
top_srcdir = @top_srcdir@ |
| 604 | 604 |
xmlconfig = @xmlconfig@ |
| 605 |
-libfreshclam_la_LIBADD = $(top_builddir)/libclamav/libclamav.la @FRESHCLAM_LIBS@ @CURL_LIBS@ @SSL_LIBS@ @JSON_LIBS@ @LIBLTDL@ @THREAD_LIBS@ @LIBM@ |
|
| 605 |
+libfreshclam_la_LIBADD = $(top_builddir)/libclamav/libclamav.la @FRESHCLAM_LIBS@ @ZLIB_LIBS@ @CURL_LIBS@ @SSL_LIBS@ @JSON_LIBS@ @LIBLTDL@ @THREAD_LIBS@ @LIBM@ |
|
| 606 | 606 |
libfreshclam_la_DEPENDENCIES = @LTDLDEPS@ |
| 607 | 607 |
libfreshclam_la_LDFLAGS = @CURL_LDFLAGS@ @SSL_LDFLAGS@ @TH_SAFE@ \ |
| 608 |
- @JSON_LDFLAGS@ @ICONV_LDFLAGS@ $(XML_LIBS) -version-info \ |
|
| 608 |
+ @JSON_LDFLAGS@ @LIBICONV@ $(XML_LIBS) -version-info \ |
|
| 609 | 609 |
@LIBFRESHCLAM_VERSION@ -no-undefined $(am__append_1) \ |
| 610 | 610 |
$(am__append_2) |
| 611 | 611 |
AM_LIBTOOLFLAGS = --tag CXX |
| ... | ... |
@@ -624,7 +627,7 @@ libfreshclam_la_SOURCES = $(top_srcdir)/shared/output.c \ |
| 624 | 624 |
$(am__append_3) $(am__append_4) $(am__append_5) |
| 625 | 625 |
lib_LTLIBRARIES = libfreshclam.la |
| 626 | 626 |
AM_CFLAGS = @WERR_CFLAGS@ |
| 627 |
-AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav @CURL_CPPFLAGS@ @SSL_CPPFLAGS@ @FRESHCLAM_CPPFLAGS@ @JSON_CPPFLAGS@ @PCRE_CPPFLAGS@ |
|
| 627 |
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav @CURL_CPPFLAGS@ @SSL_CPPFLAGS@ @FRESHCLAM_CPPFLAGS@ @ZLIB_CFLAGS@ @JSON_CPPFLAGS@ @PCRE_CPPFLAGS@ |
|
| 628 | 628 |
CLEANFILES = *.gcda *.gcno |
| 629 | 629 |
all: all-am |
| 630 | 630 |
|
| ... | ... |
@@ -132,7 +132,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ |
| 132 | 132 |
$(top_srcdir)/m4/reorganization/code_checks/fanotify.m4 \ |
| 133 | 133 |
$(top_srcdir)/m4/reorganization/code_checks/setpgrp.m4 \ |
| 134 | 134 |
$(top_srcdir)/m4/reorganization/milter/enable.m4 \ |
| 135 |
- $(top_srcdir)/m4/reorganization/code_checks/iconv.m4 \ |
|
| 135 |
+ $(top_srcdir)/m4/reorganization/libs/iconv_check.m4 \ |
|
| 136 |
+ $(top_srcdir)/m4/reorganization/libs/iconv.m4 \ |
|
| 136 | 137 |
$(top_srcdir)/m4/reorganization/code_checks/pthreads.m4 \ |
| 137 | 138 |
$(top_srcdir)/m4/reorganization/code_checks/reentrant.m4 \ |
| 138 | 139 |
$(top_srcdir)/m4/reorganization/utility_checks/id.m4 \ |
| ... | ... |
@@ -420,8 +421,6 @@ GPERF = @GPERF@ |
| 420 | 420 |
GREP = @GREP@ |
| 421 | 421 |
HAVE_STRNI = @HAVE_STRNI@ |
| 422 | 422 |
HAVE_YARA = @HAVE_YARA@ |
| 423 |
-ICONV_CPPFLAGS = @ICONV_CPPFLAGS@ |
|
| 424 |
-ICONV_LDFLAGS = @ICONV_LDFLAGS@ |
|
| 425 | 423 |
INCLTDL = @INCLTDL@ |
| 426 | 424 |
INSTALL = @INSTALL@ |
| 427 | 425 |
INSTALL_DATA = @INSTALL_DATA@ |
| ... | ... |
@@ -455,6 +454,7 @@ LIBCLAMAV_VERSION_NUM = @LIBCLAMAV_VERSION_NUM@ |
| 455 | 455 |
LIBCLAMSHARED_CPPFLAGS = @LIBCLAMSHARED_CPPFLAGS@ |
| 456 | 456 |
LIBFRESHCLAM_VERSION = @LIBFRESHCLAM_VERSION@ |
| 457 | 457 |
LIBFRESHCLAM_VERSION_NUM = @LIBFRESHCLAM_VERSION_NUM@ |
| 458 |
+LIBICONV = @LIBICONV@ |
|
| 458 | 459 |
LIBLTDL = @LIBLTDL@ |
| 459 | 460 |
LIBM = @LIBM@ |
| 460 | 461 |
LIBMSPACK_CFLAGS = @LIBMSPACK_CFLAGS@ |
| ... | ... |
@@ -475,6 +475,7 @@ LTDLDEPS = @LTDLDEPS@ |
| 475 | 475 |
LTDLINCL = @LTDLINCL@ |
| 476 | 476 |
LTDLOPEN = @LTDLOPEN@ |
| 477 | 477 |
LTLIBBZ2 = @LTLIBBZ2@ |
| 478 |
+LTLIBICONV = @LTLIBICONV@ |
|
| 478 | 479 |
LTLIBOBJS = @LTLIBOBJS@ |
| 479 | 480 |
LT_ARGZ_H = @LT_ARGZ_H@ |
| 480 | 481 |
LT_CONFIG_H = @LT_CONFIG_H@ |
| ... | ... |
@@ -533,6 +534,8 @@ XML_CPPFLAGS = @XML_CPPFLAGS@ |
| 533 | 533 |
XML_LIBS = @XML_LIBS@ |
| 534 | 534 |
YACC = @YACC@ |
| 535 | 535 |
YFLAGS = @YFLAGS@ |
| 536 |
+ZLIB_CFLAGS = @ZLIB_CFLAGS@ |
|
| 537 |
+ZLIB_LIBS = @ZLIB_LIBS@ |
|
| 536 | 538 |
abs_builddir = @abs_builddir@ |
| 537 | 539 |
abs_srcdir = @abs_srcdir@ |
| 538 | 540 |
abs_top_builddir = @abs_top_builddir@ |
| ... | ... |
@@ -147,7 +147,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ |
| 147 | 147 |
$(top_srcdir)/m4/reorganization/code_checks/fanotify.m4 \ |
| 148 | 148 |
$(top_srcdir)/m4/reorganization/code_checks/setpgrp.m4 \ |
| 149 | 149 |
$(top_srcdir)/m4/reorganization/milter/enable.m4 \ |
| 150 |
- $(top_srcdir)/m4/reorganization/code_checks/iconv.m4 \ |
|
| 150 |
+ $(top_srcdir)/m4/reorganization/libs/iconv_check.m4 \ |
|
| 151 |
+ $(top_srcdir)/m4/reorganization/libs/iconv.m4 \ |
|
| 151 | 152 |
$(top_srcdir)/m4/reorganization/code_checks/pthreads.m4 \ |
| 152 | 153 |
$(top_srcdir)/m4/reorganization/code_checks/reentrant.m4 \ |
| 153 | 154 |
$(top_srcdir)/m4/reorganization/utility_checks/id.m4 \ |
| ... | ... |
@@ -343,8 +344,6 @@ GPERF = @GPERF@ |
| 343 | 343 |
GREP = @GREP@ |
| 344 | 344 |
HAVE_STRNI = @HAVE_STRNI@ |
| 345 | 345 |
HAVE_YARA = @HAVE_YARA@ |
| 346 |
-ICONV_CPPFLAGS = @ICONV_CPPFLAGS@ |
|
| 347 |
-ICONV_LDFLAGS = @ICONV_LDFLAGS@ |
|
| 348 | 346 |
INCLTDL = @INCLTDL@ |
| 349 | 347 |
INSTALL = @INSTALL@ |
| 350 | 348 |
INSTALL_DATA = @INSTALL_DATA@ |
| ... | ... |
@@ -378,6 +377,7 @@ LIBCLAMAV_VERSION_NUM = @LIBCLAMAV_VERSION_NUM@ |
| 378 | 378 |
LIBCLAMSHARED_CPPFLAGS = @LIBCLAMSHARED_CPPFLAGS@ |
| 379 | 379 |
LIBFRESHCLAM_VERSION = @LIBFRESHCLAM_VERSION@ |
| 380 | 380 |
LIBFRESHCLAM_VERSION_NUM = @LIBFRESHCLAM_VERSION_NUM@ |
| 381 |
+LIBICONV = @LIBICONV@ |
|
| 381 | 382 |
LIBLTDL = @LIBLTDL@ |
| 382 | 383 |
LIBM = @LIBM@ |
| 383 | 384 |
LIBMSPACK_CFLAGS = @LIBMSPACK_CFLAGS@ |
| ... | ... |
@@ -398,6 +398,7 @@ LTDLDEPS = @LTDLDEPS@ |
| 398 | 398 |
LTDLINCL = @LTDLINCL@ |
| 399 | 399 |
LTDLOPEN = @LTDLOPEN@ |
| 400 | 400 |
LTLIBBZ2 = @LTLIBBZ2@ |
| 401 |
+LTLIBICONV = @LTLIBICONV@ |
|
| 401 | 402 |
LTLIBOBJS = @LTLIBOBJS@ |
| 402 | 403 |
LT_ARGZ_H = @LT_ARGZ_H@ |
| 403 | 404 |
LT_CONFIG_H = @LT_CONFIG_H@ |
| ... | ... |
@@ -456,6 +457,8 @@ XML_CPPFLAGS = @XML_CPPFLAGS@ |
| 456 | 456 |
XML_LIBS = @XML_LIBS@ |
| 457 | 457 |
YACC = @YACC@ |
| 458 | 458 |
YFLAGS = @YFLAGS@ |
| 459 |
+ZLIB_CFLAGS = @ZLIB_CFLAGS@ |
|
| 460 |
+ZLIB_LIBS = @ZLIB_LIBS@ |
|
| 459 | 461 |
abs_builddir = @abs_builddir@ |
| 460 | 462 |
abs_srcdir = @abs_srcdir@ |
| 461 | 463 |
abs_top_builddir = @abs_top_builddir@ |
| ... | ... |
@@ -127,7 +127,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ |
| 127 | 127 |
$(top_srcdir)/m4/reorganization/code_checks/fanotify.m4 \ |
| 128 | 128 |
$(top_srcdir)/m4/reorganization/code_checks/setpgrp.m4 \ |
| 129 | 129 |
$(top_srcdir)/m4/reorganization/milter/enable.m4 \ |
| 130 |
- $(top_srcdir)/m4/reorganization/code_checks/iconv.m4 \ |
|
| 130 |
+ $(top_srcdir)/m4/reorganization/libs/iconv_check.m4 \ |
|
| 131 |
+ $(top_srcdir)/m4/reorganization/libs/iconv.m4 \ |
|
| 131 | 132 |
$(top_srcdir)/m4/reorganization/code_checks/pthreads.m4 \ |
| 132 | 133 |
$(top_srcdir)/m4/reorganization/code_checks/reentrant.m4 \ |
| 133 | 134 |
$(top_srcdir)/m4/reorganization/utility_checks/id.m4 \ |
| ... | ... |
@@ -272,8 +273,6 @@ GPERF = @GPERF@ |
| 272 | 272 |
GREP = @GREP@ |
| 273 | 273 |
HAVE_STRNI = @HAVE_STRNI@ |
| 274 | 274 |
HAVE_YARA = @HAVE_YARA@ |
| 275 |
-ICONV_CPPFLAGS = @ICONV_CPPFLAGS@ |
|
| 276 |
-ICONV_LDFLAGS = @ICONV_LDFLAGS@ |
|
| 277 | 275 |
INCLTDL = @INCLTDL@ |
| 278 | 276 |
INSTALL = @INSTALL@ |
| 279 | 277 |
INSTALL_DATA = @INSTALL_DATA@ |
| ... | ... |
@@ -307,6 +306,7 @@ LIBCLAMAV_VERSION_NUM = @LIBCLAMAV_VERSION_NUM@ |
| 307 | 307 |
LIBCLAMSHARED_CPPFLAGS = @LIBCLAMSHARED_CPPFLAGS@ |
| 308 | 308 |
LIBFRESHCLAM_VERSION = @LIBFRESHCLAM_VERSION@ |
| 309 | 309 |
LIBFRESHCLAM_VERSION_NUM = @LIBFRESHCLAM_VERSION_NUM@ |
| 310 |
+LIBICONV = @LIBICONV@ |
|
| 310 | 311 |
LIBLTDL = @LIBLTDL@ |
| 311 | 312 |
LIBM = @LIBM@ |
| 312 | 313 |
LIBMSPACK_CFLAGS = @LIBMSPACK_CFLAGS@ |
| ... | ... |
@@ -327,6 +327,7 @@ LTDLDEPS = @LTDLDEPS@ |
| 327 | 327 |
LTDLINCL = @LTDLINCL@ |
| 328 | 328 |
LTDLOPEN = @LTDLOPEN@ |
| 329 | 329 |
LTLIBBZ2 = @LTLIBBZ2@ |
| 330 |
+LTLIBICONV = @LTLIBICONV@ |
|
| 330 | 331 |
LTLIBOBJS = @LTLIBOBJS@ |
| 331 | 332 |
LT_ARGZ_H = @LT_ARGZ_H@ |
| 332 | 333 |
LT_CONFIG_H = @LT_CONFIG_H@ |
| ... | ... |
@@ -385,6 +386,8 @@ XML_CPPFLAGS = @XML_CPPFLAGS@ |
| 385 | 385 |
XML_LIBS = @XML_LIBS@ |
| 386 | 386 |
YACC = @YACC@ |
| 387 | 387 |
YFLAGS = @YFLAGS@ |
| 388 |
+ZLIB_CFLAGS = @ZLIB_CFLAGS@ |
|
| 389 |
+ZLIB_LIBS = @ZLIB_LIBS@ |
|
| 388 | 390 |
abs_builddir = @abs_builddir@ |
| 389 | 391 |
abs_srcdir = @abs_srcdir@ |
| 390 | 392 |
abs_top_builddir = @abs_top_builddir@ |
| ... | ... |
@@ -128,7 +128,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \ |
| 128 | 128 |
$(top_srcdir)/m4/reorganization/code_checks/fanotify.m4 \ |
| 129 | 129 |
$(top_srcdir)/m4/reorganization/code_checks/setpgrp.m4 \ |
| 130 | 130 |
$(top_srcdir)/m4/reorganization/milter/enable.m4 \ |
| 131 |
- $(top_srcdir)/m4/reorganization/code_checks/iconv.m4 \ |
|
| 131 |
+ $(top_srcdir)/m4/reorganization/libs/iconv_check.m4 \ |
|
| 132 |
+ $(top_srcdir)/m4/reorganization/libs/iconv.m4 \ |
|
| 132 | 133 |
$(top_srcdir)/m4/reorganization/code_checks/pthreads.m4 \ |
| 133 | 134 |
$(top_srcdir)/m4/reorganization/code_checks/reentrant.m4 \ |
| 134 | 135 |
$(top_srcdir)/m4/reorganization/utility_checks/id.m4 \ |
| ... | ... |
@@ -562,8 +563,6 @@ GPERF = @GPERF@ |
| 562 | 562 |
GREP = @GREP@ |
| 563 | 563 |
HAVE_STRNI = @HAVE_STRNI@ |
| 564 | 564 |
HAVE_YARA = @HAVE_YARA@ |
| 565 |
-ICONV_CPPFLAGS = @ICONV_CPPFLAGS@ |
|
| 566 |
-ICONV_LDFLAGS = @ICONV_LDFLAGS@ |
|
| 567 | 565 |
INCLTDL = @INCLTDL@ |
| 568 | 566 |
INSTALL = @INSTALL@ |
| 569 | 567 |
INSTALL_DATA = @INSTALL_DATA@ |
| ... | ... |
@@ -597,6 +596,7 @@ LIBCLAMAV_VERSION_NUM = @LIBCLAMAV_VERSION_NUM@ |
| 597 | 597 |
LIBCLAMSHARED_CPPFLAGS = @LIBCLAMSHARED_CPPFLAGS@ |
| 598 | 598 |
LIBFRESHCLAM_VERSION = @LIBFRESHCLAM_VERSION@ |
| 599 | 599 |
LIBFRESHCLAM_VERSION_NUM = @LIBFRESHCLAM_VERSION_NUM@ |
| 600 |
+LIBICONV = @LIBICONV@ |
|
| 600 | 601 |
LIBLTDL = @LIBLTDL@ |
| 601 | 602 |
LIBM = @LIBM@ |
| 602 | 603 |
LIBMSPACK_CFLAGS = @LIBMSPACK_CFLAGS@ |
| ... | ... |
@@ -617,6 +617,7 @@ LTDLDEPS = @LTDLDEPS@ |
| 617 | 617 |
LTDLINCL = @LTDLINCL@ |
| 618 | 618 |
LTDLOPEN = @LTDLOPEN@ |
| 619 | 619 |
LTLIBBZ2 = @LTLIBBZ2@ |
| 620 |
+LTLIBICONV = @LTLIBICONV@ |
|
| 620 | 621 |
LTLIBOBJS = @LTLIBOBJS@ |
| 621 | 622 |
LT_ARGZ_H = @LT_ARGZ_H@ |
| 622 | 623 |
LT_CONFIG_H = @LT_CONFIG_H@ |
| ... | ... |
@@ -675,6 +676,8 @@ XML_CPPFLAGS = @XML_CPPFLAGS@ |
| 675 | 675 |
XML_LIBS = @XML_LIBS@ |
| 676 | 676 |
YACC = @YACC@ |
| 677 | 677 |
YFLAGS = @YFLAGS@ |
| 678 |
+ZLIB_CFLAGS = @ZLIB_CFLAGS@ |
|
| 679 |
+ZLIB_LIBS = @ZLIB_LIBS@ |
|
| 678 | 680 |
abs_builddir = @abs_builddir@ |
| 679 | 681 |
abs_srcdir = @abs_srcdir@ |
| 680 | 682 |
abs_top_builddir = @abs_top_builddir@ |