[glom] Depend on avahi-ui-3.0 instead of avahi-ui, though it does not officially exist.



commit 105f5958d8e6af96e14cafc75faedab04c26a402
Author: Murray Cumming <murrayc murrayc com>
Date:   Sun Jun 13 14:43:45 2010 +0200

    Depend on avahi-ui-3.0 instead of avahi-ui, though it does not officially exist.
    
    	* configure.ac: avahi-ui links to gtk-2.0, so depending on avahi-ui-3.0 is
    	better even if it currently only exists via my patch (emailed to d-d-l and
    	Lennart because I can't login to avahi.org's trac).

 ChangeLog    |    8 ++++++++
 configure.ac |    5 ++++-
 2 files changed, 12 insertions(+), 1 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 24061ba..9e6e82b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2010-06-13  Murray Cumming  <murrayc murrayc com>
 
+	Depend on avahi-ui-3.0 instead of avahi-ui, though it does not officially exist.
+    
+	* configure.ac: avahi-ui links to gtk-2.0, so depending on avahi-ui-3.0 is
+	better even if it currently only exists via my patch (emailed to d-d-l and
+	Lennart because I can't login to avahi.org's trac).
+
+2010-06-13  Murray Cumming  <murrayc murrayc com>
+
 	Configure: Remove checks for libegg dependencies, because we don't use it.
 
 	* configure.ac: We don't build libegg code here any more.
diff --git a/configure.ac b/configure.ac
index bc49bdb..994aa2d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -149,7 +149,7 @@ AC_ARG_ENABLE([maemo-launcher],
 REQUIRED_LIBGLOM_LIBS='gthread-2.0 giomm-2.4 libxml++-2.6 >= 2.23.1 pygda-4.0 >= 2.25.3 pygobject-2.0 >= 2.6.0 libgdamm-4.0 >= 3.99.18 libgda-4.0 >= 4.0.4 libgda-postgres-4.0'
 
 AS_IF([test "x$glom_host_win32" != xyes],
-      [REQUIRED_LIBGLOM_LIBS="$REQUIRED_LIBGLOM_LIBS libepc-1.0 >= 0.3.1 avahi-ui"])
+      [REQUIRED_LIBGLOM_LIBS="$REQUIRED_LIBGLOM_LIBS libepc-1.0 >= 0.3.1 avahi-ui-3.0"])
 
 # Libraries used by Glom:
 REQUIRED_GLOM_LIBS="$REQUIRED_LIBGLOM_LIBS gtkmm-3.0 >= 2.19.7 gthread-2.0 gconfmm-2.6 libxml++-2.6 libxslt >= 1.1.10 goocanvasmm-2.0 >= 0.14.0"
@@ -175,6 +175,9 @@ AS_IF([test "x$glom_maemo_launcher" = xyes],
 PKG_CHECK_MODULES([LIBGLOM], [$REQUIRED_LIBGLOM_LIBS])
 PKG_CHECK_MODULES([GLOM], [$REQUIRED_GLOM_LIBS])
 
+AC_MSG_WARN([$REQUIRED_LIBGLOM_LIBS])
+AC_MSG_WARN([$REQUIRED_GLOM_LIBS])
+
 MM_PKG_CONFIG_SUBST([GLIB_GENMARSHAL], [--variable=glib_genmarshal glib-2.0])
 
 # Get the location of the ISO-Codes (currencies, languages) files:



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]