f-spot r3657 - in trunk: . src
- From: sdelcroix svn gnome org
- To: svn-commits-list gnome org
- Subject: f-spot r3657 - in trunk: . src
- Date: Mon, 11 Feb 2008 07:48:05 +0000 (GMT)
Author: sdelcroix
Date: Mon Feb 11 07:48:04 2008
New Revision: 3657
URL: http://svn.gnome.org/viewvc/f-spot?rev=3657&view=rev
Log:
2008-02-11 Stephane Delcroix <sdelcroix novell com>
* configure.in:
* src/Makefile.am: check for gtkhtml-sharp-3.14 if gnome-sharp-2.0 is
newer than 2.19.90. Fix bgo#515065.
Modified:
trunk/ChangeLog
trunk/configure.in
trunk/src/Makefile.am
Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in (original)
+++ trunk/configure.in Mon Feb 11 07:48:04 2008
@@ -69,10 +69,20 @@
LCMS_REQUIRED=1.12
dnl -- LIBGPHOTO2_REQUIRED=2.1.4
-PKG_CHECK_MODULES(F, libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libexif >= $LIBEXIF_REQUIRED_MIN libexif < $LIBEXIF_REQUIRED_MAX gtkhtml-sharp-2.0 >= $GTKSHARP_REQUIRED glade-sharp-2.0 >= $GTKSHARP_REQUIRED gnome-vfs-sharp-2.0 >= $GTKSHARP_REQUIRED gtk+-2.0 >= $GTK_REQUIRED mono >= $MONO_REQUIRED)
+PKG_CHECK_MODULES(F, libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libexif >= $LIBEXIF_REQUIRED_MIN libexif < $LIBEXIF_REQUIRED_MAX glade-sharp-2.0 >= $GTKSHARP_REQUIRED gnome-vfs-sharp-2.0 >= $GTKSHARP_REQUIRED gtk+-2.0 >= $GTK_REQUIRED mono >= $MONO_REQUIRED)
AC_SUBST(F_CFLAGS)
AC_SUBST(F_LIBS)
+PKG_CHECK_MODULES(GNOME_SHARP, gnome-sharp-2.0 >= 2.8)
+if pkg-config --atleast-version=2.19.90 gnome-sharp; then
+ PKG_CHECK_MODULES(GTKHTML_SHARP, gtkhtml-sharp-3.14 >= 2.19.90)
+ GTKHTML_SHARP_PKG="-pkg:gtkhtml-sharp-3.14"
+else
+ PKG_CHECK_MODULES(GTKHTML_SHARP, gtkhtml-sharp-2.0 >= 2.8)
+ GTKHTML_SHARP_PKG="-pkg:gtkhtml-sharp-2.0"
+fi
+AC_SUBST(GTKHTML_SHARP_PKG)
+
CSC_DEFINES=""
if pkg-config --atleast-version=2.10 gtk-sharp-2.0; then
CSC_DEFINES="-d:GTK_2_10"
Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am (original)
+++ trunk/src/Makefile.am Mon Feb 11 07:48:04 2008
@@ -314,7 +314,7 @@
-r:Cms.dll \
$(NUNIT_PKG) \
$(GCONF_PKG) \
- -pkg:gtkhtml-sharp-2.0 \
+ $(GTKHTML_SHARP_PKG) \
-pkg:glade-sharp-2.0 \
-pkg:gnome-vfs-sharp-2.0
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]