[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 93f19e0b4902ebf56bb3160782a44520b97a9e88
Author: Török Edvin <edwin at clamav.net>
Date:   Fri Oct 30 14:05:26 2009 +0200

    Avoid trailing slash in libdir for old gcc (bb #1738).

diff --git a/ChangeLog b/ChangeLog
index d23e0b1..92381a8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Fri Oct 30 14:04:43 EET 2009 (edwin)
+------------------------------------
+ * configure, m4/acinclude.m4: Avoid trailing slash in libdir for old gcc (#1738).
+
 Thu Oct 29 23:42:57 CET 2009 (acab)
 -----------------------------------
  * win32/3rdparty/pthreads: upgrade to CVS HEAD
diff --git a/configure b/configure
index 28dc299..7b6e162 100755
--- a/configure
+++ b/configure
@@ -12139,7 +12139,7 @@ $as_echo "#define FILEBUFF 8192" >>confdefs.h
 $as_echo_n "checking for multiarch libdir... " >&6; }
 		# Based on http://lists.gnu.org/archive/html/autoconf/2008-09/msg00072.html
 		if test "$GCC" = yes; then
-			ac_multilibdir=`$CC -print-multi-os-directory $CFLAGS $CPPFLAGS $LDFLAGS`
+			ac_multilibdir=`$CC -print-multi-os-directory $CFLAGS $CPPFLAGS $LDFLAGS` || ac_multilibdir=.
 		else
 			ac_multilibdir=.
 		fi
diff --git a/m4/acinclude.m4 b/m4/acinclude.m4
index 226fd74..1166cef 100644
--- a/m4/acinclude.m4
+++ b/m4/acinclude.m4
@@ -755,7 +755,7 @@ AC_DEFUN([AC_LIB_MULTILIB_GUESS],
 		AC_MSG_CHECKING([for multiarch libdir])
 		# Based on http://lists.gnu.org/archive/html/autoconf/2008-09/msg00072.html
 		if test "$GCC" = yes; then
-			ac_multilibdir=`$CC -print-multi-os-directory $CFLAGS $CPPFLAGS $LDFLAGS`
+			ac_multilibdir=`$CC -print-multi-os-directory $CFLAGS $CPPFLAGS $LDFLAGS` || ac_multilibdir=.
 		else
 			ac_multilibdir=.
 		fi
@@ -778,7 +778,7 @@ AC_DEFUN([AC_LIB_MULTILIB_GUESS],
 					*/lib64 ) acl_libdirstem=lib64 ;;
 				   esac
 			esac
-		fi	
+		fi
 	fi
 ])
 

-- 
Debian repository for ClamAV