[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 bb7b9789a12e1a90a16af325040daf4cf9be8f4b
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 f44cac4..9cdd8b1 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).
+
 Wed Sep 30 19:41:43 EEST 2009 (edwin)
 -------------------------------------
  * configure{.in,}: Only use -fno-strict-aliasing for gcc-4.3+ to avoid bugs
diff --git a/configure b/configure
index 3c35747..f402d5d 100755
--- a/configure
+++ b/configure
@@ -12147,7 +12147,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