Changeset e11b2a73788040feee20b7c7812c1231adeb7b46

Timestamp:

04/14/07 21:49:44 (6 years ago)

Author:

Philipp Kern <phil@…>

Parents:

48e41225251ed074f4ebef01116ac2b5eb306ee8

Children:

73098a354d7a40c8f1a0dab4f91501303586d330

git-committer:

Philipp Kern <phil@0x539.de> / 2007-04-14T19:49:44Z+0000

Message:

2007-04-14 Phliipp Kern <phil@…>

• configure.ac, Makefile.am: check for Avahi in obby and link against avahi-glib if Avahi proper is used for Zeroconf support; provide an additional define WITH_AVAHI for usage within the code

Files:

• ChangeLog (modified) (1 diff)
• Makefile.am (modified) (1 diff)
• configure.ac (modified) (1 diff)

ChangeLog

@@ +1 @@
+2007-04-14  Phliipp Kern <phil@0x539.de>
+
+        * configure.ac, Makefile.am: check for Avahi in obby and link against
+          avahi-glib if Avahi proper is used for Zeroconf support; provide
+          an additional define WITH_AVAHI for usage within the code
+
 2007-04-09  Armin Burgmeier  <armin@0x539.de>
 

Makefile.am

@@ -11 +11 @@
 gobby_CPPFLAGS  = $(gobby_CFLAGS) $(gtksourceview_CFLAGS)
 gobby_CPPFLAGS += -I../inc/ -DLOCALE_DIR=\""$(datadir)/locale"\"
+
+if WITH_AVAHI
+gobby_LDADD += $(avahi_LIBS)
+gobby_CPPFLAGS += $(avahi_CFLAGS)
+endif
 
 if WITH_GNOME

configure.ac

@@ -74 +74 @@
 AM_CONDITIONAL(WITH_ZEROCONF, test x$ac_cv_lib_obby_obby_has_zeroconf = xyes)
 
+# Check for a specific Zeroconf support in obby, namely Avahi.
+AC_CHECK_LIB(obby, obby_has_avahi, [obby_has_avahi=yes],
+             [obby_has_avahi=no], [$pkg_cv_obby_LIBS])
+if test "x$ac_cv_lib_obby_obby_has_avahi" = "xyes" ; then
+        AC_DEFINE([WITH_AVAHI], 1,
+                  [Define whether to use Avahi as Zeroconf backend])
+        PKG_CHECK_MODULES([avahi], [avahi-glib])
+fi
+AM_CONDITIONAL(WITH_AVAHI, test x$ac_cv_lib_obby_obby_has_avahi = xyes)
+
 # Check if we are running on OS X, for special link handling.
 if test "x$build_vendor" = "xapple" ; then