[Pkg-clamav-commits] [SCM] Debian repository for ClamAV branch, debian/unstable, updated. debian/0.95+dfsg-1-6156-g094ec9b

[Török Edvin]

The following commit has been merged in the debian/unstable branch:
commit d0fab3c57869960aaf042d04677cb3aa979f0906
Author: Török Edvin <edwin at clamav.net>
Date:   Tue Jan 26 09:56:11 2010 +0200

    don't link clamdscan with -lz -ldl (bb #1474)
    
    Apply a libltdl patch to avoid adding -ldl to LIBS.
    Only add -lz to LIBCLAMAV_LIBS, libtool will add -lz as necessary
    to programs linking libclamav.la.
    Also add an export map to clamdscan, it only needs to export main.
    Also remove the [1] from g++ version check to allow buildtesting with clang++.

diff --git a/clamdscan/Makefile.am b/clamdscan/Makefile.am
index 8a58219..c7ca3c6 100644
--- a/clamdscan/Makefile.am
+++ b/clamdscan/Makefile.am
@@ -31,13 +31,16 @@ clamdscan_SOURCES = \
     $(top_srcdir)/shared/getopt.h \
     $(top_srcdir)/shared/actions.c \
     $(top_srcdir)/shared/actions.h \
-    $(top_srcdir)/libclamav/regex/strlcpy.c\
     clamdscan.c \
     proto.c \
     proto.h \
     client.c \
     client.h
+if VERSIONSCRIPT
+LDFLAGS += -Wl, at VERSIONSCRIPTFLAG@, at top_srcdir@/clamdscan/clamdscan.map
 endif
+endif
+
 
 DEFS = @DEFS@ -DCL_NOTHREADS -DCL_NOLIBCLAMAV
 AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/clamscan -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav
diff --git a/clamdscan/clamdscan.map b/clamdscan/clamdscan.map
new file mode 100644
index 0000000..5f31671
--- /dev/null
+++ b/clamdscan/clamdscan.map
@@ -0,0 +1,4 @@
+{
+global: main;
+local: *;
+};
diff --git a/configure.in b/configure.in
index c0f8c08..cf3732a 100644
--- a/configure.in
+++ b/configure.in
@@ -549,19 +549,19 @@ else
 	fi
     fi
 
+    save_LIBS="$LIBS"
     if test "$ZLIB_HOME" != "/usr"; then
 	CPPFLAGS="$CPPFLAGS -I$ZLIB_HOME/include"
 	save_LDFLAGS="$LDFLAGS"
-	save_LIBS="$LIBS"
 	LDFLAGS="$LDFLAGS -L$ZLIB_HOME/lib"
-	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]))
+	AC_CHECK_LIB([z], [inflateEnd], [LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -L$ZLIB_HOME/lib -lz"], AC_MSG_ERROR([Please install zlib and zlib-devel packages]))
 	AC_CHECK_LIB([z], [gzopen], [], AC_MSG_ERROR([Your zlib is missing gzopen()]))
 	LDFLAGS="$save_LDFLAGS"
-	LIBS="$save_LIBS"
     else
-	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]))
+	AC_CHECK_LIB([z], [inflateEnd], [LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lz"], AC_MSG_ERROR([Please install zlib and zlib-devel packages]))
 	AC_CHECK_LIB([z], [gzopen],[], AC_MSG_ERROR([Your zlib is missing gzopen()]))
     fi
+    LIBS="$save_LIBS"
 fi
 
 AC_ARG_ENABLE([bzip2],
diff --git a/libclamav/c++/configure.ac b/libclamav/c++/configure.ac
index 5afc07f..c490906 100644
--- a/libclamav/c++/configure.ac
+++ b/libclamav/c++/configure.ac
@@ -78,7 +78,7 @@ if test "$enable_llvm" = "auto"; then
     gxx_version=`${CXX} -dumpversion` ||
     AC_MSG_ERROR([Unable to get GNU C++ compiler version])
     case "${gxx_version}" in
-     [[0123]].*)
+     [[023]].*)
 	AC_MSG_ERROR([C++ compiler too old (${gxx_version})])
         ;;
      4.0.1*|4.1.[[12]]*)
diff --git a/m4/ltdl.m4 b/m4/ltdl.m4
index aeae738..ca70368 100644
--- a/m4/ltdl.m4
+++ b/m4/ltdl.m4
@@ -637,6 +637,7 @@ AC_SUBST([LT_DLLOADERS])
 AC_LANG_PUSH([C])
 
 LIBADD_DLOPEN=
+lt_save_LIBS="$LIBS"
 AC_SEARCH_LIBS([dlopen], [dl],
 	[AC_DEFINE([HAVE_LIBDL], [1],
 		   [Define if you have the libdl library or equivalent.])
@@ -660,11 +661,10 @@ AC_SEARCH_LIBS([dlopen], [dl],
 		LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}dlopen.la"])])])
 if test x"$libltdl_cv_func_dlopen" = xyes || test x"$libltdl_cv_lib_dl_dlopen" = xyes
 then
-  lt_save_LIBS="$LIBS"
   LIBS="$LIBS $LIBADD_DLOPEN"
   AC_CHECK_FUNCS([dlerror])
-  LIBS="$lt_save_LIBS"
 fi
+LIBS="$lt_save_LIBS"
 AC_SUBST([LIBADD_DLOPEN])
 
 LIBADD_SHL_LOAD=

-- 
Debian repository for ClamAV