Attachment 2832 Details for Bug 3476 – Patch to disable gtk

[patch] Patch to disable gtk

avahi-gtk.diff (text/plain), 1.97 KB, created by Ross Burton on 2005-06-06 00:14:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ross Burton

Created: 2005-06-06 00:14:49 UTC

Size: 1.97 KB

patch

obsolete

>Index: configure.ac
>===================================================================
>--- configure.ac	(revision 101)
>+++ configure.ac	(working copy)
>@@ -62,21 +62,33 @@
> AC_SUBST(GLIB20_CFLAGS)
> AC_SUBST(GLIB20_LIBS)
> 
>-# Check for GTK 2.0
>-PKG_CHECK_MODULES(GLIB20, [ gtk+-2.0 >= 2.4.0 ])
>-AC_SUBST(GTK20_CFLAGS)
>-AC_SUBST(GTK20_LIBS)
>-
>-# Check for GLADE 2.0
>-PKG_CHECK_MODULES(GLADE20, [ libglade-2.0 >= 2.4.0 ])
>-AC_SUBST(GLADE20_CFLAGS)
>-AC_SUBST(GLADE20_LIBS)
>-
> # Check for DBUS
> PKG_CHECK_MODULES(DBUS, [ dbus-1 >= 0.23, dbus-glib-1 >= 0.23 ])
> AC_SUBST(DBUS_CFLAGS)
> AC_SUBST(DBUS_LIBS)
> 
>+AC_ARG_ENABLE(gtk,
>+        AC_HELP_STRING([--enable-gtk],[use GTK+ (default=yes)]),
>+        [case "${enableval}" in
>+                yes) ENABLE_GTK=yes ;;
>+                no)  ENABLE_GTK=no ;;
>+                *) AC_MSG_ERROR(bad value ${enableval} for --enable-gtk) ;;
>+        esac],
>+        [ENABLE_GTK=yes]) dnl Default value
>+
>+if test "x$ENABLE_GTK" = "xyes"; then
>+        # Check for GTK 2.0
>+        PKG_CHECK_MODULES(GTK20, [ gtk+-2.0 >= 2.4.0 ])
>+        AC_SUBST(GTK20_CFLAGS)
>+        AC_SUBST(GTK20_LIBS)
>+        
>+        # Check for GLADE 2.0
>+        PKG_CHECK_MODULES(GLADE20, [ libglade-2.0 >= 2.4.0 ])
>+        AC_SUBST(GLADE20_CFLAGS)
>+        AC_SUBST(GLADE20_LIBS)
>+fi
>+AM_CONDITIONAL(ENABLE_GTK, test "x$ENABLE_GTK" = "xyes")
>+
> # If using GCC specify some additional parameters
> if test "x$GCC" = "xyes" ; then
>    CFLAGS="$CFLAGS -pipe -W -Wall -pedantic"
>Index: avahi-discover/Makefile.am
>===================================================================
>--- avahi-discover/Makefile.am	(revision 101)
>+++ avahi-discover/Makefile.am	(working copy)
>@@ -25,6 +25,7 @@
> # This cool debug trap works on i386/gcc only
> AM_CFLAGS+='-DDEBUG_TRAP=__asm__("int $$3")'
> 
>+if ENABLE_GTK
> bin_PROGRAMS = \
> 	avahi-discover
> 
>@@ -33,3 +34,4 @@
> 
> avahi_discover_CFLAGS = $(AM_CFLAGS)
> avahi_discover_LDADD = $(AM_LDADD) ../avahi-core/libavahi-core.la ../avahi-common/libavahi-common.la
>+endif

Actions: View | Splinter Review

Attachments on bug 3476: 2832

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.