Browse code

Fix linking with gold (bb #1903).

Török Edvin authored on 2010/03/26 17:35:11
Showing 2 changed files
... ...
@@ -15017,7 +15017,7 @@ fi
15017 15017
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_inflateEnd" >&5
15018 15018
 $as_echo "$ac_cv_lib_z_inflateEnd" >&6; }
15019 15019
 if test "x$ac_cv_lib_z_inflateEnd" = x""yes; then :
15020
-  LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -L$ZLIB_HOME/lib -lz"
15020
+  LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -L$ZLIB_HOME/lib -lz"; FRESHCLAM_LIBS="$FRESHCLAM_LIBS -L$ZLIB_HOME/lib -lz"
15021 15021
 else
15022 15022
   as_fn_error "Please install zlib and zlib-devel packages" "$LINENO" 5
15023 15023
 fi
... ...
@@ -15108,7 +15108,7 @@ fi
15108 15108
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_inflateEnd" >&5
15109 15109
 $as_echo "$ac_cv_lib_z_inflateEnd" >&6; }
15110 15110
 if test "x$ac_cv_lib_z_inflateEnd" = x""yes; then :
15111
-  LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lz"
15111
+  LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lz";FRESHCLAM_LIBS="$FRESHCLAM_LIBS -lz"
15112 15112
 else
15113 15113
   as_fn_error "Please install zlib and zlib-devel packages" "$LINENO" 5
15114 15114
 fi
... ...
@@ -556,11 +556,11 @@ else
556 556
 	CPPFLAGS="$CPPFLAGS -I$ZLIB_HOME/include"
557 557
 	save_LDFLAGS="$LDFLAGS"
558 558
 	LDFLAGS="$LDFLAGS -L$ZLIB_HOME/lib"
559
-	AC_CHECK_LIB([z], [inflateEnd], [LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -L$ZLIB_HOME/lib -lz"], AC_MSG_ERROR([Please install zlib and zlib-devel packages]))
559
+	AC_CHECK_LIB([z], [inflateEnd], [LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -L$ZLIB_HOME/lib -lz"; FRESHCLAM_LIBS="$FRESHCLAM_LIBS -L$ZLIB_HOME/lib -lz"], AC_MSG_ERROR([Please install zlib and zlib-devel packages]))
560 560
 	AC_CHECK_LIB([z], [gzopen], [], AC_MSG_ERROR([Your zlib is missing gzopen()]))
561 561
 	LDFLAGS="$save_LDFLAGS"
562 562
     else
563
-	AC_CHECK_LIB([z], [inflateEnd], [LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lz"], AC_MSG_ERROR([Please install zlib and zlib-devel packages]))
563
+	AC_CHECK_LIB([z], [inflateEnd], [LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lz";FRESHCLAM_LIBS="$FRESHCLAM_LIBS -lz"], AC_MSG_ERROR([Please install zlib and zlib-devel packages]))
564 564
 	AC_CHECK_LIB([z], [gzopen],[], AC_MSG_ERROR([Your zlib is missing gzopen()]))
565 565
     fi
566 566
     LIBS="$save_LIBS"