[banshee] build: Don't copy duplicate libraries
- From: Gabriel Burt <gburt src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [banshee] build: Don't copy duplicate libraries
- Date: Fri, 11 Feb 2011 17:24:46 +0000 (UTC)
commit 7150c9967eae603c5f79c6c904e61dbb0b8c1dad
Author: Iain Lane <laney ubuntu com>
Date: Sun Sep 5 13:36:18 2010 +0100
build: Don't copy duplicate libraries
GIO# and GTK#Beans both supply the same library, gio-sharp.dll. If we
try to install both of these then automake falls over. Ensure that we
only try to copy one of each library.
Signed-off-by: Gabriel Burt <gabriel burt gmail com>
build/m4/banshee/gio.m4 | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/build/m4/banshee/gio.m4 b/build/m4/banshee/gio.m4
index dc66f24..51ff94b 100644
--- a/build/m4/banshee/gio.m4
+++ b/build/m4/banshee/gio.m4
@@ -16,9 +16,13 @@ AC_DEFUN([BANSHEE_CHECK_GIO_SHARP],
asms="`$PKG_CONFIG --variable=Libraries gio-sharp-2.0` `$PKG_CONFIG --variable=Libraries gtk-sharp-beans-2.0`"
for asm in $asms; do
- GIOSHARP_ASSEMBLIES="$GIOSHARP_ASSEMBLIES $asm"
- [[ -r "$asm.config" ]] && GIOSHARP_ASSEMBLIES="$GIOSHARP_ASSEMBLIES $asm.config"
- [[ -r "$asm.mdb" ]] && GIOSHARP_ASSEMBLIES="$GIOSHARP_ASSEMBLIES $asm.mdb"
+ FILENAME=`basename $asm`
+ if [[ "`echo $SEENBEFORE | grep $FILENAME`" = "" ]]; then
+ GIOSHARP_ASSEMBLIES="$GIOSHARP_ASSEMBLIES $asm"
+ [[ -r "$asm.config" ]] && GIOSHARP_ASSEMBLIES="$GIOSHARP_ASSEMBLIES $asm.config"
+ [[ -r "$asm.mdb" ]] && GIOSHARP_ASSEMBLIES="$GIOSHARP_ASSEMBLIES $asm.mdb"
+ SEENBEFORE="$SEENBEFORE $FILENAME"
+ fi
done
AC_SUBST(GIOSHARP_ASSEMBLIES)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]