libepc r190 - in trunk: . examples

[hasselmm svn gnome org]

Author: hasselmm
Date: Wed Jan 16 09:59:07 2008
New Revision: 190
URL: http://svn.gnome.org/viewvc/libepc?rev=190&view=rev

Log:
Check for aui_service_dialog_set_service_type_name by feature,
instead of checking the pkg-config version.

* configure.ac: Use AC_CHECK_LIB instead of pkg-config to detect
aui_service_dialog_set_service_type_name.
* examples/consumer-ui.c: Use HAVE_SET_SERVICE_TYPE_NAME macro,
instead of HAVE_AVAHI_UI_0_6_22. Include "config.h"".
* Makefile.am: Drop HAVE_AVAHI_UI_0_6_22 hackery.


Modified:
   trunk/ChangeLog
   trunk/Makefile.am
   trunk/configure.ac
   trunk/examples/consumer-ui.c

Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am	(original)
+++ trunk/Makefile.am	Wed Jan 16 09:59:07 2008
@@ -125,14 +125,6 @@
 	-DGDK_DISABLE_DEPRECATED=1 \
 	-DGTK_DISABLE_DEPRECATED=1
 
-if HAVE_AVAHI_UI_0_6_22
-AVAHI_UI_DEFINES = -DHAVE_AVAHI_UI_0_6_22=1
-else
-AVAHI_UI_DEFINES =
-endif
-
-LIBEPC_UI_CFLAGS += $(AVAHI_UI_DEFINES)
-
 libepc_libepc_1_0_la_CFLAGS			= $(AM_CFLAGS) $(LIBEPC_CFLAGS) -DGETTEXT_PACKAGE=\"libepc\" -DG_LOG_DOMAIN=\"libepc\"
 libepc_libepc_1_0_la_LDFLAGS			= $(LIBEPC_LIBS) -version-info $(LT_VERSION_INFO)
 

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Wed Jan 16 09:59:07 2008
@@ -51,8 +51,12 @@
   LIBEPC_LIBS="$LIBEPC_LIBS $GIO_LIBS"
 fi
 
-AM_CONDITIONAL([HAVE_AVAHI_UI_0_6_22],
-               [$PKG_CONFIG avahi-ui --atleast-version 0.6.22])
+AC_CHECK_LIB([avahi-ui],
+             [aui_service_dialog_set_service_type_name],
+             [AC_DEFINE([HAVE_SET_SERVICE_TYPE_NAME], [1],
+                        [Define to 1 if you have aui_service_dialog_set_service_type_name.])],
+             [],
+             [${AVAHI_UI_LIBS}])
 
 GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0`
 GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0`

Modified: trunk/examples/consumer-ui.c
==============================================================================
--- trunk/examples/consumer-ui.c	(original)
+++ trunk/examples/consumer-ui.c	Wed Jan 16 09:59:07 2008
@@ -1,6 +1,8 @@
 /* The program demonstrates UI integration of the EpcConsumer.
  * This example (consumer-ui.c) is in the public domain.
  */
+#include "config.h"
+
 #include <libepc/consumer.h>
 #include <libepc-ui/password-dialog.h>
 
@@ -238,9 +240,7 @@
   g_free (service_type_https);
   g_free (service_type_http);
 
-#ifdef HAVE_AVAHI_UI_0_6_22
-
-  /* Setup pretty service names */
+#ifdef HAVE_SET_SERVICE_TYPE_NAME /* Setup pretty service names */
 
   aui_service_dialog_set_service_type_name (AUI_SERVICE_DIALOG (dialog),
                                             EPC_SERVICE_TYPE_HTTPS,