1. clamav-devel
  2. Commit bd60cc522f3d75cecf2090a22fdeb6a8773cd676
Browse code

Rework linking in OpenSSL to better support custom installations

Shawn Webb authored on 2014/03/14 21:15:43
Showing 29 changed files
Makefile.in
History View file @ bd60cc5
... ... 
@@ -356,6 +356,7 @@ CLAMAV_MILTER_LIBS = @CLAMAV_MILTER_LIBS@
356 356 
 CLAMBC_CPPFLAGS = @CLAMBC_CPPFLAGS@
357 357 
 CLAMBC_LIBS = @CLAMBC_LIBS@
358 358 
 CLAMCONF_CPPFLAGS = @CLAMCONF_CPPFLAGS@
359 
+CLAMCONF_LIBS = @CLAMCONF_LIBS@
359 360 
 CLAMDSCAN_CPPFLAGS = @CLAMDSCAN_CPPFLAGS@
360 361 
 CLAMDSCAN_LIBS = @CLAMDSCAN_LIBS@
361 362 
 CLAMDTOP_CPPFLAGS = @CLAMDTOP_CPPFLAGS@
... ... 
@@ -450,6 +451,8 @@ SET_MAKE = @SET_MAKE@
450 450 
 SHELL = @SHELL@
451 451 
 SIGTOOL_CPPFLAGS = @SIGTOOL_CPPFLAGS@
452 452 
 SSL_CPPFLAGS = @SSL_CPPFLAGS@
453 
+SSL_LDFLAGS = @SSL_LDFLAGS@
454 
+SSL_LIBS = @SSL_LIBS@
453 455 
 STRIP = @STRIP@
454 456 
 THREAD_LIBS = @THREAD_LIBS@
455 457 
 TH_SAFE = @TH_SAFE@
clamav-milter/Makefile.am
History View file @ bd60cc5
... ... 
@@ -47,5 +47,5 @@ endif
47 47
48 48 
 DEFS = @DEFS@ -DCL_NOLIBCLAMAV
49 49 
 LIBS = $(top_builddir)/libclamav/libclamav_internal_utils.la @CLAMAV_MILTER_LIBS@ @THREAD_LIBS@
50 
-AM_CPPFLAGS = -I$(top_srcdir)/clamd -I$(top_srcdir)/libclamav -I$(top_srcdir)/shared -I$(top_srcdir)
50 
+AM_CPPFLAGS = @SSL_CPPFLAGS@ -I$(top_srcdir)/clamd -I$(top_srcdir)/libclamav -I$(top_srcdir)/shared -I$(top_srcdir)
51 51 
 CLEANFILES=*.gcda *.gcno
clamav-milter/Makefile.in
History View file @ bd60cc5
... ... 
@@ -313,6 +313,7 @@ CLAMAV_MILTER_LIBS = @CLAMAV_MILTER_LIBS@
313 313 
 CLAMBC_CPPFLAGS = @CLAMBC_CPPFLAGS@
314 314 
 CLAMBC_LIBS = @CLAMBC_LIBS@
315 315 
 CLAMCONF_CPPFLAGS = @CLAMCONF_CPPFLAGS@
316 
+CLAMCONF_LIBS = @CLAMCONF_LIBS@
316 317 
 CLAMDSCAN_CPPFLAGS = @CLAMDSCAN_CPPFLAGS@
317 318 
 CLAMDSCAN_LIBS = @CLAMDSCAN_LIBS@
318 319 
 CLAMDTOP_CPPFLAGS = @CLAMDTOP_CPPFLAGS@
... ... 
@@ -407,6 +408,8 @@ SET_MAKE = @SET_MAKE@
407 407 
 SHELL = @SHELL@
408 408 
 SIGTOOL_CPPFLAGS = @SIGTOOL_CPPFLAGS@
409 409 
 SSL_CPPFLAGS = @SSL_CPPFLAGS@
410 
+SSL_LDFLAGS = @SSL_LDFLAGS@
411 
+SSL_LIBS = @SSL_LIBS@
410 412 
 STRIP = @STRIP@
411 413 
 THREAD_LIBS = @THREAD_LIBS@
412 414 
 TH_SAFE = @TH_SAFE@
... ... 
@@ -497,7 +500,7 @@ top_srcdir = @top_srcdir@
497 497
498 498 
 @BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@man_MANS = $(top_builddir)/docs/man/clamav-milter.8
499 499 
 @BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@AM_CFLAGS = @WERR_CFLAGS_MILTER@
500 
-AM_CPPFLAGS = -I$(top_srcdir)/clamd -I$(top_srcdir)/libclamav -I$(top_srcdir)/shared -I$(top_srcdir)
500 
+AM_CPPFLAGS = @SSL_CPPFLAGS@ -I$(top_srcdir)/clamd -I$(top_srcdir)/libclamav -I$(top_srcdir)/shared -I$(top_srcdir)
501 501 
 CLEANFILES = *.gcda *.gcno
502 502 
 all: all-am
503 503
clambc/Makefile.in
History View file @ bd60cc5
... ... 
@@ -249,6 +249,7 @@ CLAMAV_MILTER_LIBS = @CLAMAV_MILTER_LIBS@
249 249 
 CLAMBC_CPPFLAGS = @CLAMBC_CPPFLAGS@
250 250 
 CLAMBC_LIBS = @CLAMBC_LIBS@
251 251 
 CLAMCONF_CPPFLAGS = @CLAMCONF_CPPFLAGS@
252 
+CLAMCONF_LIBS = @CLAMCONF_LIBS@
252 253 
 CLAMDSCAN_CPPFLAGS = @CLAMDSCAN_CPPFLAGS@
253 254 
 CLAMDSCAN_LIBS = @CLAMDSCAN_LIBS@
254 255 
 CLAMDTOP_CPPFLAGS = @CLAMDTOP_CPPFLAGS@
... ... 
@@ -343,6 +344,8 @@ SET_MAKE = @SET_MAKE@
343 343 
 SHELL = @SHELL@
344 344 
 SIGTOOL_CPPFLAGS = @SIGTOOL_CPPFLAGS@
345 345 
 SSL_CPPFLAGS = @SSL_CPPFLAGS@
346 
+SSL_LDFLAGS = @SSL_LDFLAGS@
347 
+SSL_LIBS = @SSL_LIBS@
346 348 
 STRIP = @STRIP@
347 349 
 THREAD_LIBS = @THREAD_LIBS@
348 350 
 TH_SAFE = @TH_SAFE@
clamconf/Makefile.am
History View file @ bd60cc5
... ... 
@@ -30,9 +30,9 @@ clamconf_SOURCES = \
30 30 
 AM_CFLAGS=@WERR_CFLAGS@
31 31
32 32 
 DEFS = @DEFS@ -DCL_NOTHREADS
33 
-AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav\
33 
+AM_CPPFLAGS = @CLAMCONF_CPPFLAGS@ -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav\
34 34 
 	      -DBUILD_CPPFLAGS="\"$(CPPFLAGS)\"" -DBUILD_CFLAGS="\"$(CFLAGS)\""\
35 35 
 	      -DBUILD_CXXFLAGS="\"$(CXXFLAGS)\"" -DBUILD_LDFLAGS="\"$(LDFLAGS)\""\
36 36 
 	      -DBUILD_CONFIGURE_FLAGS="\"$(BUILD_CONFIGURE_FLAGS)\""
37 
-LIBS = $(top_builddir)/libclamav/libclamav.la @CLAMD_LIBS@ @THREAD_LIBS@ @LIBCLAMAV_LIBS@
37 
+LIBS = $(top_builddir)/libclamav/libclamav.la @CLAMCONF_LIBS@ @CLAMD_LIBS@ @THREAD_LIBS@ @LIBCLAMAV_LIBS@
38 38 
 CLEANFILES=*.gcda *.gcno
clamconf/Makefile.in
History View file @ bd60cc5
... ... 
@@ -267,6 +267,7 @@ CLAMAV_MILTER_LIBS = @CLAMAV_MILTER_LIBS@
267 267 
 CLAMBC_CPPFLAGS = @CLAMBC_CPPFLAGS@
268 268 
 CLAMBC_LIBS = @CLAMBC_LIBS@
269 269 
 CLAMCONF_CPPFLAGS = @CLAMCONF_CPPFLAGS@
270 
+CLAMCONF_LIBS = @CLAMCONF_LIBS@
270 271 
 CLAMDSCAN_CPPFLAGS = @CLAMDSCAN_CPPFLAGS@
271 272 
 CLAMDSCAN_LIBS = @CLAMDSCAN_LIBS@
272 273 
 CLAMDTOP_CPPFLAGS = @CLAMDTOP_CPPFLAGS@
... ... 
@@ -325,7 +326,7 @@ LIBCLAMSHARED_CPPFLAGS = @LIBCLAMSHARED_CPPFLAGS@
325 325 
 LIBLTDL = @LIBLTDL@
326 326 
 LIBM = @LIBM@
327 327 
 LIBOBJS = @LIBOBJS@
328 
-LIBS = $(top_builddir)/libclamav/libclamav.la @CLAMD_LIBS@ @THREAD_LIBS@ @LIBCLAMAV_LIBS@
328 
+LIBS = $(top_builddir)/libclamav/libclamav.la @CLAMCONF_LIBS@ @CLAMD_LIBS@ @THREAD_LIBS@ @LIBCLAMAV_LIBS@
329 329 
 LIBTOOL = @LIBTOOL@
330 330 
 LIPO = @LIPO@
331 331 
 LN_S = @LN_S@
... ... 
@@ -361,6 +362,8 @@ SET_MAKE = @SET_MAKE@
361 361 
 SHELL = @SHELL@
362 362 
 SIGTOOL_CPPFLAGS = @SIGTOOL_CPPFLAGS@
363 363 
 SSL_CPPFLAGS = @SSL_CPPFLAGS@
364 
+SSL_LDFLAGS = @SSL_LDFLAGS@
365 
+SSL_LIBS = @SSL_LIBS@
364 366 
 STRIP = @STRIP@
365 367 
 THREAD_LIBS = @THREAD_LIBS@
366 368 
 TH_SAFE = @TH_SAFE@
... ... 
@@ -440,7 +443,7 @@ clamconf_SOURCES = \
440 440 
     clamconf.c
441 441
442 442 
 AM_CFLAGS = @WERR_CFLAGS@
443 
-AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav\
443 
+AM_CPPFLAGS = @CLAMCONF_CPPFLAGS@ -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav\
444 444 
 	      -DBUILD_CPPFLAGS="\"$(CPPFLAGS)\"" -DBUILD_CFLAGS="\"$(CFLAGS)\""\
445 445 
 	      -DBUILD_CXXFLAGS="\"$(CXXFLAGS)\"" -DBUILD_LDFLAGS="\"$(LDFLAGS)\""\
446 446 
 	      -DBUILD_CONFIGURE_FLAGS="\"$(BUILD_CONFIGURE_FLAGS)\""
clamd/Makefile.am
History View file @ bd60cc5
... ... 
@@ -53,7 +53,7 @@ AM_CFLAGS=@WERR_CFLAGS@
53 53 
 endif
54 54
55 55 
 LIBS = $(top_builddir)/libclamav/libclamav.la @CLAMD_LIBS@ @THREAD_LIBS@
56 
-AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav @CLAMD_CPPFLAGS@
56 
+AM_CPPFLAGS = @SSL_CPPFLAGS@ -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav
57 57
58 58 
 # it does support --help and --version but with the default config file
59 59 
 # it outputs an error message which tells us to edit the config files
clamd/Makefile.in
History View file @ bd60cc5
... ... 
@@ -280,6 +280,7 @@ CLAMAV_MILTER_LIBS = @CLAMAV_MILTER_LIBS@
280 280 
 CLAMBC_CPPFLAGS = @CLAMBC_CPPFLAGS@
281 281 
 CLAMBC_LIBS = @CLAMBC_LIBS@
282 282 
 CLAMCONF_CPPFLAGS = @CLAMCONF_CPPFLAGS@
283 
+CLAMCONF_LIBS = @CLAMCONF_LIBS@
283 284 
 CLAMDSCAN_CPPFLAGS = @CLAMDSCAN_CPPFLAGS@
284 285 
 CLAMDSCAN_LIBS = @CLAMDSCAN_LIBS@
285 286 
 CLAMDTOP_CPPFLAGS = @CLAMDTOP_CPPFLAGS@
... ... 
@@ -374,6 +375,8 @@ SET_MAKE = @SET_MAKE@
374 374 
 SHELL = @SHELL@
375 375 
 SIGTOOL_CPPFLAGS = @SIGTOOL_CPPFLAGS@
376 376 
 SSL_CPPFLAGS = @SSL_CPPFLAGS@
377 
+SSL_LDFLAGS = @SSL_LDFLAGS@
378 
+SSL_LIBS = @SSL_LIBS@
377 379 
 STRIP = @STRIP@
378 380 
 THREAD_LIBS = @THREAD_LIBS@
379 381 
 TH_SAFE = @TH_SAFE@
... ... 
@@ -472,7 +475,7 @@ top_srcdir = @top_srcdir@
472 472 
 @BUILD_CLAMD_TRUE@    fan.h
473 473
474 474 
 @BUILD_CLAMD_TRUE@AM_CFLAGS = @WERR_CFLAGS@
475 
-AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav @CLAMD_CPPFLAGS@
475 
+AM_CPPFLAGS = @SSL_CPPFLAGS@ -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav
476 476
477 477 
 # it does support --help and --version but with the default config file
478 478 
 # it outputs an error message which tells us to edit the config files
clamdscan/Makefile.am
History View file @ bd60cc5
... ... 
@@ -44,7 +44,7 @@ endif
44 44
45 45
46 46 
 DEFS = @DEFS@ -DCL_NOTHREADS -DCL_NOLIBCLAMAV
47 
-AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/clamscan -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav @CLAMDSCAN_CPPFLAGS@
47 
+AM_CPPFLAGS = @SSL_CPPFLAGS@ -I$(top_srcdir) -I$(top_srcdir)/clamscan -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav @CLAMDSCAN_CPPFLAGS@
48 48 
 LIBS = $(top_builddir)/libclamav/libclamav_internal_utils_nothreads.la  @CLAMDSCAN_LIBS@
49 49
50 50 
 AM_INSTALLCHECK_STD_OPTIONS_EXEMPT=clamdscan$(EXEEXT)
clamdscan/Makefile.in
History View file @ bd60cc5
... ... 
@@ -278,6 +278,7 @@ CLAMAV_MILTER_LIBS = @CLAMAV_MILTER_LIBS@
278 278 
 CLAMBC_CPPFLAGS = @CLAMBC_CPPFLAGS@
279 279 
 CLAMBC_LIBS = @CLAMBC_LIBS@
280 280 
 CLAMCONF_CPPFLAGS = @CLAMCONF_CPPFLAGS@
281 
+CLAMCONF_LIBS = @CLAMCONF_LIBS@
281 282 
 CLAMDSCAN_CPPFLAGS = @CLAMDSCAN_CPPFLAGS@
282 283 
 CLAMDSCAN_LIBS = @CLAMDSCAN_LIBS@
283 284 
 CLAMDTOP_CPPFLAGS = @CLAMDTOP_CPPFLAGS@
... ... 
@@ -372,6 +373,8 @@ SET_MAKE = @SET_MAKE@
372 372 
 SHELL = @SHELL@
373 373 
 SIGTOOL_CPPFLAGS = @SIGTOOL_CPPFLAGS@
374 374 
 SSL_CPPFLAGS = @SSL_CPPFLAGS@
375 
+SSL_LDFLAGS = @SSL_LDFLAGS@
376 
+SSL_LIBS = @SSL_LIBS@
375 377 
 STRIP = @STRIP@
376 378 
 THREAD_LIBS = @THREAD_LIBS@
377 379 
 TH_SAFE = @TH_SAFE@
... ... 
@@ -461,7 +464,7 @@ top_srcdir = @top_srcdir@
461 461 
 @BUILD_CLAMD_TRUE@    client.h
462 462
463 463 
 @BUILD_CLAMD_TRUE@AM_CFLAGS = @WERR_CFLAGS@
464 
-AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/clamscan -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav @CLAMDSCAN_CPPFLAGS@
464 
+AM_CPPFLAGS = @SSL_CPPFLAGS@ -I$(top_srcdir) -I$(top_srcdir)/clamscan -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav @CLAMDSCAN_CPPFLAGS@
465 465 
 AM_INSTALLCHECK_STD_OPTIONS_EXEMPT = clamdscan$(EXEEXT)
466 466 
 CLEANFILES = *.gcda *.gcno
467 467 
 all: all-am
clamdtop/Makefile.in
History View file @ bd60cc5
... ... 
@@ -284,6 +284,7 @@ CLAMAV_MILTER_LIBS = @CLAMAV_MILTER_LIBS@
284 284 
 CLAMBC_CPPFLAGS = @CLAMBC_CPPFLAGS@
285 285 
 CLAMBC_LIBS = @CLAMBC_LIBS@
286 286 
 CLAMCONF_CPPFLAGS = @CLAMCONF_CPPFLAGS@
287 
+CLAMCONF_LIBS = @CLAMCONF_LIBS@
287 288 
 CLAMDSCAN_CPPFLAGS = @CLAMDSCAN_CPPFLAGS@
288 289 
 CLAMDSCAN_LIBS = @CLAMDSCAN_LIBS@
289 290 
 CLAMDTOP_CPPFLAGS = @CLAMDTOP_CPPFLAGS@
... ... 
@@ -378,6 +379,8 @@ SET_MAKE = @SET_MAKE@
378 378 
 SHELL = @SHELL@
379 379 
 SIGTOOL_CPPFLAGS = @SIGTOOL_CPPFLAGS@
380 380 
 SSL_CPPFLAGS = @SSL_CPPFLAGS@
381 
+SSL_LDFLAGS = @SSL_LDFLAGS@
382 
+SSL_LIBS = @SSL_LIBS@
381 383 
 STRIP = @STRIP@
382 384 
 THREAD_LIBS = @THREAD_LIBS@
383 385 
 TH_SAFE = @TH_SAFE@
clamscan/Makefile.am
History View file @ bd60cc5
... ... 
@@ -38,6 +38,6 @@ clamscan_SOURCES = \
38 38 
 AM_CFLAGS=@WERR_CFLAGS@
39 39 
 DEFS = @DEFS@ -DCL_NOTHREADS
40 40 
 LIBS = $(top_builddir)/libclamav/libclamav.la @THREAD_LIBS@ @CLAMSCAN_LIBS@
41 
-AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav @CLAMSCAN_CPPFLAGS@
41 
+AM_CPPFLAGS = @SSL_CPPFLAGS@ -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav @CLAMSCAN_CPPFLAGS@
42 42
43 43 
 CLEANFILES=*.gcda *.gcno
clamscan/Makefile.in
History View file @ bd60cc5
... ... 
@@ -269,6 +269,7 @@ CLAMAV_MILTER_LIBS = @CLAMAV_MILTER_LIBS@
269 269 
 CLAMBC_CPPFLAGS = @CLAMBC_CPPFLAGS@
270 270 
 CLAMBC_LIBS = @CLAMBC_LIBS@
271 271 
 CLAMCONF_CPPFLAGS = @CLAMCONF_CPPFLAGS@
272 
+CLAMCONF_LIBS = @CLAMCONF_LIBS@
272 273 
 CLAMDSCAN_CPPFLAGS = @CLAMDSCAN_CPPFLAGS@
273 274 
 CLAMDSCAN_LIBS = @CLAMDSCAN_LIBS@
274 275 
 CLAMDTOP_CPPFLAGS = @CLAMDTOP_CPPFLAGS@
... ... 
@@ -363,6 +364,8 @@ SET_MAKE = @SET_MAKE@
363 363 
 SHELL = @SHELL@
364 364 
 SIGTOOL_CPPFLAGS = @SIGTOOL_CPPFLAGS@
365 365 
 SSL_CPPFLAGS = @SSL_CPPFLAGS@
366 
+SSL_LDFLAGS = @SSL_LDFLAGS@
367 
+SSL_LIBS = @SSL_LIBS@
366 368 
 STRIP = @STRIP@
367 369 
 THREAD_LIBS = @THREAD_LIBS@
368 370 
 TH_SAFE = @TH_SAFE@
... ... 
@@ -449,7 +452,7 @@ clamscan_SOURCES = \
449 449 
     manager.h
450 450
451 451 
 AM_CFLAGS = @WERR_CFLAGS@
452 
-AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav @CLAMSCAN_CPPFLAGS@
452 
+AM_CPPFLAGS = @SSL_CPPFLAGS@ -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav @CLAMSCAN_CPPFLAGS@
453 453 
 CLEANFILES = *.gcda *.gcno
454 454 
 all: all-am
455 455
clamsubmit/Makefile.in
History View file @ bd60cc5
... ... 
@@ -267,6 +267,7 @@ CLAMAV_MILTER_LIBS = @CLAMAV_MILTER_LIBS@
267 267 
 CLAMBC_CPPFLAGS = @CLAMBC_CPPFLAGS@
268 268 
 CLAMBC_LIBS = @CLAMBC_LIBS@
269 269 
 CLAMCONF_CPPFLAGS = @CLAMCONF_CPPFLAGS@
270 
+CLAMCONF_LIBS = @CLAMCONF_LIBS@
270 271 
 CLAMDSCAN_CPPFLAGS = @CLAMDSCAN_CPPFLAGS@
271 272 
 CLAMDSCAN_LIBS = @CLAMDSCAN_LIBS@
272 273 
 CLAMDTOP_CPPFLAGS = @CLAMDTOP_CPPFLAGS@
... ... 
@@ -361,6 +362,8 @@ SET_MAKE = @SET_MAKE@
361 361 
 SHELL = @SHELL@
362 362 
 SIGTOOL_CPPFLAGS = @SIGTOOL_CPPFLAGS@
363 363 
 SSL_CPPFLAGS = @SSL_CPPFLAGS@
364 
+SSL_LDFLAGS = @SSL_LDFLAGS@
365 
+SSL_LIBS = @SSL_LIBS@
364 366 
 STRIP = @STRIP@
365 367 
 THREAD_LIBS = @THREAD_LIBS@
366 368 
 TH_SAFE = @TH_SAFE@
configure
History View file @ bd60cc5
... ... 
@@ -645,6 +645,9 @@ LTLIBOBJS
645 645 
 LIBOBJS
646 646 
 ENABLE_CLAMSUBMIT_FALSE
647 647 
 ENABLE_CLAMSUBMIT_TRUE
648 
+SSL_LDFLAGS
649 
+SSL_LIBS
650 
+CLAMCONF_LIBS
648 651 
 CLAMBC_LIBS
649 652 
 CLAMDTOP_LIBS
650 653 
 THREAD_LIBS
... ... 
@@ -16845,11 +16848,12 @@ then
16845 16845 
     as_fn_error $? "OpenSSL not found." "$LINENO" 5
16846 16846 
 fi
16847 16847
16848 
-SSL_LDFLAGS="-L$LIBSSL_HOME/lib -lssl -lcrypto"
16848 
+SSL_LDFLAGS="-L$LIBSSL_HOME/lib"
16849 
+SSL_LIBS="-lssl -lcrypto"
16849 16850 
 SSL_CPPFLAGS="-I$LIBSSL_HOME/include"
16850 16851
16851 16852 
 save_LDFLAGS="$LDFLAGS"
16852 
-LDFLAGS="-L$LIBSSL_HOME/lib -lssl -lcrypto"
16853 
+LDFLAGS="-L$LIBSSL_HOME/lib $SSL_LIBS"
16853 16854
16854 16855 
 save_CFLAGS="$CFLAGS"
16855 16856 
 CFLAGS="$SSL_CPPFLAGS"
... ... 
@@ -16943,22 +16947,6 @@ else
16943 16943 
 fi
16944 16944
16945 16945
16946 
-if test "x$have_ssl" = "xyes"; then
16947 
-    LIBCLAMAV_LIBS="$SSL_LDFLAGS $LIBCLAMAV_LIBS"
16948 
-    CLAMSCAN_LIBS="$SSL_LDFLAGS $CLAMSCAN_LIBS"
16949 
-    FRESHCLAM_LIBS="$SSL_LDFLAGS $FRESHCLAM_LIBS"
16950 
-    CLAMD_LIBS="$SSL_LDFLAGS $CLAMD_LIBS"
16951 
-    CLAMDSCAN_LIBS="$SSL_LDFLAGS $CLAMDSCAN_LIBS"
16952 
-    SIGTOOL_LIBS="$SSL_LDFLAGS $SIGTOOL_LIBS"
16953 
-
16954 
-    LIBCLAMAV_CPPFLAGS="$SSL_CPPFLAGS $LIBCLAMAV_CPPFLAGS"
16955 
-    CLAMSCAN_CPPFLAGS="$SSL_CPPFLAGS $CLAMSCAN_CPPFLAGS"
16956 
-    FRESHCLAM_CPPFLAGS="$SSL_CPPFLAGS $FRESHCLAM_CPPFLAGS"
16957 
-    CLAMD_CPPFLAGS="$SSL_CPPFLAGS $CLAMD_CPPFLAGS"
16958 
-    CLAMDSCAN_CPPFLAGS="$SSL_CPPFLAGS $CLAMDSCAN_CPPFLAGS"
16959 
-    SIGTOOL_CPPFLAGS="$SSL_CPPFLAGS $SIGTOOL_CPPFLAGS"
16960 
-fi
16961 
-
16962 16946 
 LDFLAGS="$save_LDFLAGS"
16963 16947 
 CFLAGS="$save_CFLAGS"
16964 16948
... ... 
@@ -22182,6 +22170,10 @@ fi
22182 22182
22183 22183
22184 22184
22185 
+
22186 
+
22187 
+
22188 
+
22185 22189 
  if test "$have_curl" = "yes"; then
22186 22190 
   ENABLE_CLAMSUBMIT_TRUE=
22187 22191 
   ENABLE_CLAMSUBMIT_FALSE='#'
database/Makefile.in
History View file @ bd60cc5
... ... 
@@ -215,6 +215,7 @@ CLAMAV_MILTER_LIBS = @CLAMAV_MILTER_LIBS@
215 215 
 CLAMBC_CPPFLAGS = @CLAMBC_CPPFLAGS@
216 216 
 CLAMBC_LIBS = @CLAMBC_LIBS@
217 217 
 CLAMCONF_CPPFLAGS = @CLAMCONF_CPPFLAGS@
218 
+CLAMCONF_LIBS = @CLAMCONF_LIBS@
218 219 
 CLAMDSCAN_CPPFLAGS = @CLAMDSCAN_CPPFLAGS@
219 220 
 CLAMDSCAN_LIBS = @CLAMDSCAN_LIBS@
220 221 
 CLAMDTOP_CPPFLAGS = @CLAMDTOP_CPPFLAGS@
... ... 
@@ -309,6 +310,8 @@ SET_MAKE = @SET_MAKE@
309 309 
 SHELL = @SHELL@
310 310 
 SIGTOOL_CPPFLAGS = @SIGTOOL_CPPFLAGS@
311 311 
 SSL_CPPFLAGS = @SSL_CPPFLAGS@
312 
+SSL_LDFLAGS = @SSL_LDFLAGS@
313 
+SSL_LIBS = @SSL_LIBS@
312 314 
 STRIP = @STRIP@
313 315 
 THREAD_LIBS = @THREAD_LIBS@
314 316 
 TH_SAFE = @TH_SAFE@
docs/Makefile.in
History View file @ bd60cc5
... ... 
@@ -248,6 +248,7 @@ CLAMAV_MILTER_LIBS = @CLAMAV_MILTER_LIBS@
248 248 
 CLAMBC_CPPFLAGS = @CLAMBC_CPPFLAGS@
249 249 
 CLAMBC_LIBS = @CLAMBC_LIBS@
250 250 
 CLAMCONF_CPPFLAGS = @CLAMCONF_CPPFLAGS@
251 
+CLAMCONF_LIBS = @CLAMCONF_LIBS@
251 252 
 CLAMDSCAN_CPPFLAGS = @CLAMDSCAN_CPPFLAGS@
252 253 
 CLAMDSCAN_LIBS = @CLAMDSCAN_LIBS@
253 254 
 CLAMDTOP_CPPFLAGS = @CLAMDTOP_CPPFLAGS@
... ... 
@@ -342,6 +343,8 @@ SET_MAKE = @SET_MAKE@
342 342 
 SHELL = @SHELL@
343 343 
 SIGTOOL_CPPFLAGS = @SIGTOOL_CPPFLAGS@
344 344 
 SSL_CPPFLAGS = @SSL_CPPFLAGS@
345 
+SSL_LDFLAGS = @SSL_LDFLAGS@
346 
+SSL_LIBS = @SSL_LIBS@
345 347 
 STRIP = @STRIP@
346 348 
 THREAD_LIBS = @THREAD_LIBS@
347 349 
 TH_SAFE = @TH_SAFE@
etc/Makefile.in
History View file @ bd60cc5
... ... 
@@ -245,6 +245,7 @@ CLAMAV_MILTER_LIBS = @CLAMAV_MILTER_LIBS@
245 245 
 CLAMBC_CPPFLAGS = @CLAMBC_CPPFLAGS@
246 246 
 CLAMBC_LIBS = @CLAMBC_LIBS@
247 247 
 CLAMCONF_CPPFLAGS = @CLAMCONF_CPPFLAGS@
248 
+CLAMCONF_LIBS = @CLAMCONF_LIBS@
248 249 
 CLAMDSCAN_CPPFLAGS = @CLAMDSCAN_CPPFLAGS@
249 250 
 CLAMDSCAN_LIBS = @CLAMDSCAN_LIBS@
250 251 
 CLAMDTOP_CPPFLAGS = @CLAMDTOP_CPPFLAGS@
... ... 
@@ -339,6 +340,8 @@ SET_MAKE = @SET_MAKE@
339 339 
 SHELL = @SHELL@
340 340 
 SIGTOOL_CPPFLAGS = @SIGTOOL_CPPFLAGS@
341 341 
 SSL_CPPFLAGS = @SSL_CPPFLAGS@
342 
+SSL_LDFLAGS = @SSL_LDFLAGS@
343 
+SSL_LIBS = @SSL_LIBS@
342 344 
 STRIP = @STRIP@
343 345 
 THREAD_LIBS = @THREAD_LIBS@
344 346 
 TH_SAFE = @TH_SAFE@
freshclam/Makefile.am
History View file @ bd60cc5
... ... 
@@ -51,7 +51,7 @@ freshclam_SOURCES = \
51 51
52 52 
 AM_CFLAGS=@WERR_CFLAGS@
53 53 
 DEFS = @DEFS@ -DCL_NOTHREADS
54 
-AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav @FRESHCLAM_CPPFLAGS@
54 
+AM_CPPFLAGS = @SSL_CPPFLAGS@ -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav @FRESHCLAM_CPPFLAGS@
55 55 
 LIBS = $(top_builddir)/libclamav/libclamav.la @FRESHCLAM_LIBS@ @THREAD_LIBS@
56 56
57 57 
 AM_INSTALLCHECK_STD_OPTIONS_EXEMPT=freshclam$(EXEEXT)
freshclam/Makefile.in
History View file @ bd60cc5
... ... 
@@ -271,6 +271,7 @@ CLAMAV_MILTER_LIBS = @CLAMAV_MILTER_LIBS@
271 271 
 CLAMBC_CPPFLAGS = @CLAMBC_CPPFLAGS@
272 272 
 CLAMBC_LIBS = @CLAMBC_LIBS@
273 273 
 CLAMCONF_CPPFLAGS = @CLAMCONF_CPPFLAGS@
274 
+CLAMCONF_LIBS = @CLAMCONF_LIBS@
274 275 
 CLAMDSCAN_CPPFLAGS = @CLAMDSCAN_CPPFLAGS@
275 276 
 CLAMDSCAN_LIBS = @CLAMDSCAN_LIBS@
276 277 
 CLAMDTOP_CPPFLAGS = @CLAMDTOP_CPPFLAGS@
... ... 
@@ -365,6 +366,8 @@ SET_MAKE = @SET_MAKE@
365 365 
 SHELL = @SHELL@
366 366 
 SIGTOOL_CPPFLAGS = @SIGTOOL_CPPFLAGS@
367 367 
 SSL_CPPFLAGS = @SSL_CPPFLAGS@
368 
+SSL_LDFLAGS = @SSL_LDFLAGS@
369 
+SSL_LIBS = @SSL_LIBS@
368 370 
 STRIP = @STRIP@
369 371 
 THREAD_LIBS = @THREAD_LIBS@
370 372 
 TH_SAFE = @TH_SAFE@
... ... 
@@ -465,7 +468,7 @@ freshclam_SOURCES = \
465 465 
     mirman.h
466 466
467 467 
 AM_CFLAGS = @WERR_CFLAGS@
468 
-AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav @FRESHCLAM_CPPFLAGS@
468 
+AM_CPPFLAGS = @SSL_CPPFLAGS@ -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav @FRESHCLAM_CPPFLAGS@
469 469 
 AM_INSTALLCHECK_STD_OPTIONS_EXEMPT = freshclam$(EXEEXT)
470 470 
 CLEANFILES = *.gcda *.gcno
471 471 
 all: all-am
libclamav/Makefile.am
History View file @ bd60cc5
... ... 
@@ -94,8 +94,9 @@ libclamav_internal_utils_la_SOURCES=str.c\
94 94 
 				    regex/regex2.h \
95 95 
 				    regex/utils.h
96 96
97 
-libclamav_internal_utils_la_LDFLAGS=-static @LIBCLAMAV_LIBS@
98 
-libclamav_internal_utils_la_CFLAGS=$(AM_CFLAGS)  -fPIC -DPIC @LIBCLAMAV_CPPFLAGS@
97 
+libclamav_internal_utils_la_LDFLAGS=-static @SSL_LDFLAGS@
98 
+libclamav_internal_utils_la_CFLAGS=$(AM_CFLAGS)  -fPIC -DPIC @SSL_CPPFLAGS@
99 
+libclamav_internal_utils_la_LIBADD=@SSL_LIBS@
99 100
100 101 
 libclamav_internal_utils_nothreads_la_SOURCES=str.c\
101 102 
 					conv.c \
... ... 
@@ -120,8 +121,9 @@ libclamav_internal_utils_nothreads_la_SOURCES=str.c\
120 120 
 				    regex/regex2.h \
121 121 
 				    regex/utils.h
122 122
123 
-libclamav_internal_utils_nothreads_la_LDFLAGS=-static @LIBCLAMAV_LIBS@
124 
-libclamav_internal_utils_nothreads_la_CFLAGS=$(AM_CFLAGS) -DCL_NOTHREADS @LIBCLAMAV_CPPFLAGS@
123 
+libclamav_internal_utils_nothreads_la_LDFLAGS=-static @SSL_LDFLAGS@
124 
+libclamav_internal_utils_nothreads_la_CFLAGS=$(AM_CFLAGS) -DCL_NOTHREADS @SSL_CPPFLAGS@
125 
+libclamav_internal_utils_nothreads_la_LIBADD=@SSL_LIBS@
125 126
126 127 
 if ENABLE_LLVM
127 128 
 LLVMLIBADD=c++/libclamavcxx.la -lstdc++ -lm
... ... 
@@ -136,12 +138,12 @@ distclean-recursive distdir maintainer-clean-recursive: c++/Makefile
136 136 
 endif
137 137
138 138 
 libclamav_nocxx_la_SOURCES = bytecode_nojit.c
139 
-libclamav_nocxx_la_CFLAGS=$(AM_CFLAGS) @LIBCLAMAV_CPPFLAGS@
139 
+libclamav_nocxx_la_CFLAGS=$(AM_CFLAGS) @SSL_CPPFLAGS@
140 140
141 
-libclamav_la_LIBADD = @LIBCLAMAV_LIBS@ @LIBLTDL@ $(IFACELIBADD) $(LLVMLIBADD) libclamav_internal_utils.la @THREAD_LIBS@ @LIBM@
141 
+libclamav_la_LIBADD = @SSL_LIBS@ @LIBCLAMAV_LIBS@ @LIBLTDL@ $(IFACELIBADD) $(LLVMLIBADD) libclamav_internal_utils.la @THREAD_LIBS@ @LIBM@
142 142 
 libclamav_la_DEPENDENCIES =  @LTDLDEPS@ $(IFACEDEP) $(LLVMDEP) libclamav_internal_utils.la
143 143 
 libclamav_la_CFLAGS =$(AM_CFLAGS) $(XML_CPPFLAGS) -DSEARCH_LIBDIR=\"$(libdir)\" @LIBCLAMAV_CPPFLAGS@
144 
-libclamav_la_LDFLAGS = @LIBCLAMAV_LIBS@ @TH_SAFE@ $(XML_LIBS) -version-info @LIBCLAMAV_VERSION@ -no-undefined
144 
+libclamav_la_LDFLAGS = @SSL_LDFLAGS@ @TH_SAFE@ $(XML_LIBS) -version-info @LIBCLAMAV_VERSION@ -no-undefined
145 145
146 146 
 if VERSIONSCRIPT
147 147 
 libclamav_la_LDFLAGS += -Wl,@VERSIONSCRIPTFLAG@,@top_srcdir@/libclamav/libclamav.map
libclamav/Makefile.in
History View file @ bd60cc5
... ... 
@@ -338,7 +338,7 @@ am__v_lt_1 =
338 338 
 libclamav_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
339 339 
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(libclamav_la_CFLAGS) \
340 340 
 	$(CFLAGS) $(libclamav_la_LDFLAGS) $(LDFLAGS) -o $@
341 
-libclamav_internal_utils_la_LIBADD =
341 
+libclamav_internal_utils_la_DEPENDENCIES =
342 342 
 am_libclamav_internal_utils_la_OBJECTS =  \
343 343 
 	libclamav_internal_utils_la-str.lo \
344 344 
 	libclamav_internal_utils_la-conv.lo \
... ... 
@@ -357,7 +357,7 @@ libclamav_internal_utils_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
357 357 
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
358 358 
 	$(libclamav_internal_utils_la_CFLAGS) $(CFLAGS) \
359 359 
 	$(libclamav_internal_utils_la_LDFLAGS) $(LDFLAGS) -o $@
360 
-libclamav_internal_utils_nothreads_la_LIBADD =
360 
+libclamav_internal_utils_nothreads_la_DEPENDENCIES =
361 361 
 am_libclamav_internal_utils_nothreads_la_OBJECTS =  \
362 362 
 	libclamav_internal_utils_nothreads_la-str.lo \
363 363 
 	libclamav_internal_utils_nothreads_la-conv.lo \
... ... 
@@ -551,6 +551,7 @@ CLAMAV_MILTER_LIBS = @CLAMAV_MILTER_LIBS@
551 551 
 CLAMBC_CPPFLAGS = @CLAMBC_CPPFLAGS@
552 552 
 CLAMBC_LIBS = @CLAMBC_LIBS@
553 553 
 CLAMCONF_CPPFLAGS = @CLAMCONF_CPPFLAGS@
554 
+CLAMCONF_LIBS = @CLAMCONF_LIBS@
554 555 
 CLAMDSCAN_CPPFLAGS = @CLAMDSCAN_CPPFLAGS@
555 556 
 CLAMDSCAN_LIBS = @CLAMDSCAN_LIBS@
556 557 
 CLAMDTOP_CPPFLAGS = @CLAMDTOP_CPPFLAGS@
... ... 
@@ -645,6 +646,8 @@ SET_MAKE = @SET_MAKE@
645 645 
 SHELL = @SHELL@
646 646 
 SIGTOOL_CPPFLAGS = @SIGTOOL_CPPFLAGS@
647 647 
 SSL_CPPFLAGS = @SSL_CPPFLAGS@
648 
+SSL_LDFLAGS = @SSL_LDFLAGS@
649 
+SSL_LIBS = @SSL_LIBS@
648 650 
 STRIP = @STRIP@
649 651 
 THREAD_LIBS = @THREAD_LIBS@
650 652 
 TH_SAFE = @TH_SAFE@
... ... 
@@ -779,8 +782,9 @@ libclamav_internal_utils_la_SOURCES = str.c\
779 779 
 				    regex/regex2.h \
780 780 
 				    regex/utils.h
781 781
782 
-libclamav_internal_utils_la_LDFLAGS = -static @LIBCLAMAV_LIBS@
783 
-libclamav_internal_utils_la_CFLAGS = $(AM_CFLAGS)  -fPIC -DPIC @LIBCLAMAV_CPPFLAGS@
782 
+libclamav_internal_utils_la_LDFLAGS = -static @SSL_LDFLAGS@
783 
+libclamav_internal_utils_la_CFLAGS = $(AM_CFLAGS)  -fPIC -DPIC @SSL_CPPFLAGS@
784 
+libclamav_internal_utils_la_LIBADD = @SSL_LIBS@
784 785 
 libclamav_internal_utils_nothreads_la_SOURCES = str.c\
785 786 
 					conv.c \
786 787 
 					conv.h \
... ... 
@@ -804,19 +808,20 @@ libclamav_internal_utils_nothreads_la_SOURCES = str.c\
804 804 
 				    regex/regex2.h \
805 805 
 				    regex/utils.h
806 806
807 
-libclamav_internal_utils_nothreads_la_LDFLAGS = -static @LIBCLAMAV_LIBS@
808 
-libclamav_internal_utils_nothreads_la_CFLAGS = $(AM_CFLAGS) -DCL_NOTHREADS @LIBCLAMAV_CPPFLAGS@
807 
+libclamav_internal_utils_nothreads_la_LDFLAGS = -static @SSL_LDFLAGS@
808 
+libclamav_internal_utils_nothreads_la_CFLAGS = $(AM_CFLAGS) -DCL_NOTHREADS @SSL_CPPFLAGS@
809 
+libclamav_internal_utils_nothreads_la_LIBADD = @SSL_LIBS@
809 810 
 @ENABLE_LLVM_FALSE@LLVMLIBADD = libclamav_nocxx.la
810 811 
 @ENABLE_LLVM_TRUE@LLVMLIBADD = c++/libclamavcxx.la -lstdc++ -lm
811 812 
 @ENABLE_LLVM_FALSE@LLVMDEP = libclamav_nocxx.la
812 813 
 @ENABLE_LLVM_TRUE@LLVMDEP = c++/libclamavcxx.la
813 814 
 @ENABLE_LLVM_TRUE@SUBDIRS = c++
814 815 
 libclamav_nocxx_la_SOURCES = bytecode_nojit.c
815 
-libclamav_nocxx_la_CFLAGS = $(AM_CFLAGS) @LIBCLAMAV_CPPFLAGS@
816 
-libclamav_la_LIBADD = @LIBCLAMAV_LIBS@ @LIBLTDL@ $(IFACELIBADD) $(LLVMLIBADD) libclamav_internal_utils.la @THREAD_LIBS@ @LIBM@
816 
+libclamav_nocxx_la_CFLAGS = $(AM_CFLAGS) @SSL_CPPFLAGS@
817 
+libclamav_la_LIBADD = @SSL_LIBS@ @LIBCLAMAV_LIBS@ @LIBLTDL@ $(IFACELIBADD) $(LLVMLIBADD) libclamav_internal_utils.la @THREAD_LIBS@ @LIBM@
817 818 
 libclamav_la_DEPENDENCIES = @LTDLDEPS@ $(IFACEDEP) $(LLVMDEP) libclamav_internal_utils.la
818 819 
 libclamav_la_CFLAGS = $(AM_CFLAGS) $(XML_CPPFLAGS) -DSEARCH_LIBDIR=\"$(libdir)\" @LIBCLAMAV_CPPFLAGS@
819 
-libclamav_la_LDFLAGS = @LIBCLAMAV_LIBS@ @TH_SAFE@ $(XML_LIBS) \
820 
+libclamav_la_LDFLAGS = @SSL_LDFLAGS@ @TH_SAFE@ $(XML_LIBS) \
820 821 
 	-version-info @LIBCLAMAV_VERSION@ -no-undefined \
821 822 
 	$(am__append_6)
822 823 
 include_HEADERS = clamav.h
libltdl/Makefile.in
History View file @ bd60cc5
... ... 
@@ -346,6 +346,7 @@ CLAMAV_MILTER_LIBS = @CLAMAV_MILTER_LIBS@
346 346 
 CLAMBC_CPPFLAGS = @CLAMBC_CPPFLAGS@
347 347 
 CLAMBC_LIBS = @CLAMBC_LIBS@
348 348 
 CLAMCONF_CPPFLAGS = @CLAMCONF_CPPFLAGS@
349 
+CLAMCONF_LIBS = @CLAMCONF_LIBS@
349 350 
 CLAMDSCAN_CPPFLAGS = @CLAMDSCAN_CPPFLAGS@
350 351 
 CLAMDSCAN_LIBS = @CLAMDSCAN_LIBS@
351 352 
 CLAMDTOP_CPPFLAGS = @CLAMDTOP_CPPFLAGS@
... ... 
@@ -440,6 +441,8 @@ SET_MAKE = @SET_MAKE@
440 440 
 SHELL = @SHELL@
441 441 
 SIGTOOL_CPPFLAGS = @SIGTOOL_CPPFLAGS@
442 442 
 SSL_CPPFLAGS = @SSL_CPPFLAGS@
443 
+SSL_LDFLAGS = @SSL_LDFLAGS@
444 
+SSL_LIBS = @SSL_LIBS@
443 445 
 STRIP = @STRIP@
444 446 
 THREAD_LIBS = @THREAD_LIBS@
445 447 
 TH_SAFE = @TH_SAFE@
m4/reorganization/libs/openssl.m4
History View file @ bd60cc5
... ... 
@@ -22,11 +22,12 @@ then
22 22 
     AC_MSG_ERROR([OpenSSL not found.])
23 23 
 fi
24 24
25 
-SSL_LDFLAGS="-L$LIBSSL_HOME/lib -lssl -lcrypto"
25 
+SSL_LDFLAGS="-L$LIBSSL_HOME/lib"
26 
+SSL_LIBS="-lssl -lcrypto"
26 27 
 SSL_CPPFLAGS="-I$LIBSSL_HOME/include"
27 28
28 29 
 save_LDFLAGS="$LDFLAGS"
29 
-LDFLAGS="-L$LIBSSL_HOME/lib -lssl -lcrypto"
30 
+LDFLAGS="-L$LIBSSL_HOME/lib $SSL_LIBS"
30 31
31 32 
 save_CFLAGS="$CFLAGS"
32 33 
 CFLAGS="$SSL_CPPFLAGS"
... ... 
@@ -38,21 +39,5 @@ AC_CHECK_LIB([ssl], [SSL_library_init], [have_ssl="yes"], [AC_MSG_ERROR([Your Op
38 38
39 39 
 AC_CHECK_LIB([crypto], [EVP_EncryptInit], [have_crypto="yes"], [AC_MSG_ERROR([Your OpenSSL installation is misconfigured or missing])])
40 40
41 
-if test "x$have_ssl" = "xyes"; then
42 
-    LIBCLAMAV_LIBS="$SSL_LDFLAGS $LIBCLAMAV_LIBS"
43 
-    CLAMSCAN_LIBS="$SSL_LDFLAGS $CLAMSCAN_LIBS"
44 
-    FRESHCLAM_LIBS="$SSL_LDFLAGS $FRESHCLAM_LIBS"
45 
-    CLAMD_LIBS="$SSL_LDFLAGS $CLAMD_LIBS"
46 
-    CLAMDSCAN_LIBS="$SSL_LDFLAGS $CLAMDSCAN_LIBS"
47 
-    SIGTOOL_LIBS="$SSL_LDFLAGS $SIGTOOL_LIBS"
48 
-
49 
-    LIBCLAMAV_CPPFLAGS="$SSL_CPPFLAGS $LIBCLAMAV_CPPFLAGS"
50 
-    CLAMSCAN_CPPFLAGS="$SSL_CPPFLAGS $CLAMSCAN_CPPFLAGS"
51 
-    FRESHCLAM_CPPFLAGS="$SSL_CPPFLAGS $FRESHCLAM_CPPFLAGS"
52 
-    CLAMD_CPPFLAGS="$SSL_CPPFLAGS $CLAMD_CPPFLAGS"
53 
-    CLAMDSCAN_CPPFLAGS="$SSL_CPPFLAGS $CLAMDSCAN_CPPFLAGS"
54 
-    SIGTOOL_CPPFLAGS="$SSL_CPPFLAGS $SIGTOOL_CPPFLAGS"
55 
-fi
56 
-
57 41 
 LDFLAGS="$save_LDFLAGS"
58 42 
 CFLAGS="$save_CFLAGS"
m4/reorganization/substitutions.m4
History View file @ bd60cc5
... ... 
@@ -23,3 +23,7 @@ AC_SUBST([TH_SAFE])
23 23 
 AC_SUBST([THREAD_LIBS])
24 24 
 AC_SUBST([CLAMDTOP_LIBS])
25 25 
 AC_SUBST([CLAMBC_LIBS])
26 
+AC_SUBST([CLAMCONF_LIBS])
27 
+
28 
+AC_SUBST([SSL_LIBS])
29 
+AC_SUBST([SSL_LDFLAGS])
sigtool/Makefile.am
History View file @ bd60cc5
... ... 
@@ -37,6 +37,6 @@ sigtool_SOURCES = \
37 37
38 38 
 AM_CFLAGS=@WERR_CFLAGS@
39 39 
 DEFS = @DEFS@ -DCL_NOTHREADS
40 
-AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav @SIGTOOL_CPPFLAGS@
40 
+AM_CPPFLAGS = @SSL_CPPFLAGS@ -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav @SIGTOOL_CPPFLAGS@
41 41 
 LIBS = $(top_builddir)/libclamav/libclamav.la @FRESHCLAM_LIBS@ @THREAD_LIBS@
42 42 
 CLEANFILES=*.gcda *.gcno
sigtool/Makefile.in
History View file @ bd60cc5
... ... 
@@ -268,6 +268,7 @@ CLAMAV_MILTER_LIBS = @CLAMAV_MILTER_LIBS@
268 268 
 CLAMBC_CPPFLAGS = @CLAMBC_CPPFLAGS@
269 269 
 CLAMBC_LIBS = @CLAMBC_LIBS@
270 270 
 CLAMCONF_CPPFLAGS = @CLAMCONF_CPPFLAGS@
271 
+CLAMCONF_LIBS = @CLAMCONF_LIBS@
271 272 
 CLAMDSCAN_CPPFLAGS = @CLAMDSCAN_CPPFLAGS@
272 273 
 CLAMDSCAN_LIBS = @CLAMDSCAN_LIBS@
273 274 
 CLAMDTOP_CPPFLAGS = @CLAMDTOP_CPPFLAGS@
... ... 
@@ -362,6 +363,8 @@ SET_MAKE = @SET_MAKE@
362 362 
 SHELL = @SHELL@
363 363 
 SIGTOOL_CPPFLAGS = @SIGTOOL_CPPFLAGS@
364 364 
 SSL_CPPFLAGS = @SSL_CPPFLAGS@
365 
+SSL_LDFLAGS = @SSL_LDFLAGS@
366 
+SSL_LIBS = @SSL_LIBS@
365 367 
 STRIP = @STRIP@
366 368 
 THREAD_LIBS = @THREAD_LIBS@
367 369 
 TH_SAFE = @TH_SAFE@
... ... 
@@ -449,7 +452,7 @@ sigtool_SOURCES = \
449 449 
     sigtool.c
450 450
451 451 
 AM_CFLAGS = @WERR_CFLAGS@
452 
-AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav @SIGTOOL_CPPFLAGS@
452 
+AM_CPPFLAGS = @SSL_CPPFLAGS@ -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav @SIGTOOL_CPPFLAGS@
453 453 
 CLEANFILES = *.gcda *.gcno
454 454 
 all: all-am
455 455
test/Makefile.in
History View file @ bd60cc5
... ... 
@@ -197,6 +197,7 @@ CLAMAV_MILTER_LIBS = @CLAMAV_MILTER_LIBS@
197 197 
 CLAMBC_CPPFLAGS = @CLAMBC_CPPFLAGS@
198 198 
 CLAMBC_LIBS = @CLAMBC_LIBS@
199 199 
 CLAMCONF_CPPFLAGS = @CLAMCONF_CPPFLAGS@
200 
+CLAMCONF_LIBS = @CLAMCONF_LIBS@
200 201 
 CLAMDSCAN_CPPFLAGS = @CLAMDSCAN_CPPFLAGS@
201 202 
 CLAMDSCAN_LIBS = @CLAMDSCAN_LIBS@
202 203 
 CLAMDTOP_CPPFLAGS = @CLAMDTOP_CPPFLAGS@
... ... 
@@ -291,6 +292,8 @@ SET_MAKE = @SET_MAKE@
291 291 
 SHELL = @SHELL@
292 292 
 SIGTOOL_CPPFLAGS = @SIGTOOL_CPPFLAGS@
293 293 
 SSL_CPPFLAGS = @SSL_CPPFLAGS@
294 
+SSL_LDFLAGS = @SSL_LDFLAGS@
295 
+SSL_LIBS = @SSL_LIBS@
294 296 
 STRIP = @STRIP@
295 297 
 THREAD_LIBS = @THREAD_LIBS@
296 298 
 TH_SAFE = @TH_SAFE@
unit_tests/Makefile.in
History View file @ bd60cc5
... ... 
@@ -485,6 +485,7 @@ CLAMAV_MILTER_LIBS = @CLAMAV_MILTER_LIBS@
485 485 
 CLAMBC_CPPFLAGS = @CLAMBC_CPPFLAGS@
486 486 
 CLAMBC_LIBS = @CLAMBC_LIBS@
487 487 
 CLAMCONF_CPPFLAGS = @CLAMCONF_CPPFLAGS@
488 
+CLAMCONF_LIBS = @CLAMCONF_LIBS@
488 489 
 CLAMDSCAN_CPPFLAGS = @CLAMDSCAN_CPPFLAGS@
489 490 
 CLAMDSCAN_LIBS = @CLAMDSCAN_LIBS@
490 491 
 CLAMDTOP_CPPFLAGS = @CLAMDTOP_CPPFLAGS@
... ... 
@@ -579,6 +580,8 @@ SET_MAKE = @SET_MAKE@
579 579 
 SHELL = @SHELL@
580 580 
 SIGTOOL_CPPFLAGS = @SIGTOOL_CPPFLAGS@
581 581 
 SSL_CPPFLAGS = @SSL_CPPFLAGS@
582 
+SSL_LDFLAGS = @SSL_LDFLAGS@
583 
+SSL_LIBS = @SSL_LIBS@
582 584 
 STRIP = @STRIP@
583 585 
 THREAD_LIBS = @THREAD_LIBS@
584 586 
 TH_SAFE = @TH_SAFE@