limit allowed flags to avahi_server_add_service_subtype()

[catta] / avahi-utils / Makefile.am

diff --git a/avahi-utils/Makefile.am b/avahi-utils/Makefile.am
index 1f5a880871b9c0f4da84c9af166bf37db6d895ad..1e10f2592e8a87fef8433e5301220aece2ce7f4e 100644 (file)
--- a/avahi-utils/Makefile.am
+++ b/avahi-utils/Makefile.am
@@ -17,38 +17,43 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 # USA.
 
-pythonscripts = \
-       avahi-publish-address \
-       avahi-publish-service \
-       avahi-browse \
-       avahi-discover \
-       avahi-bookmarks \
-       avahi-resolve-host-name \
-       avahi-resolve-address
-
 EXTRA_DIST = \
        avahi-publish-address.in \
        avahi-publish-service.in \
        avahi-browse.in \
-       avahi-discover.in \
        avahi-bookmarks.in \
        avahi-resolve-host-name.in \
        avahi-resolve-address.in \
+       avahi-discover.in \
        avahi-discover.desktop.in
 
-if HAVE_PYTHON
 SUBDIRS=avahi
 
+if HAVE_PYTHON
+if HAVE_PYTHON_DBUS
+if HAVE_PYGTK
+
+pythonscripts = \
+       avahi-publish-address \
+       avahi-publish-service \
+       avahi-browse \
+       avahi-bookmarks \
+       avahi-resolve-host-name \
+       avahi-resolve-address \
+       avahi-discover
+
 desktopdir = $(datadir)/applications
 desktop_DATA = avahi-discover.desktop
 
-bin_SCRIPTS = $(pythonscripts)
-endif
-
 avahi-discover.desktop: avahi-discover.desktop.in
        sed -e 's,@bindir\@,$(bindir),g' $< > $@
        chmod +x $@
 
+avahi-discover: avahi-discover.in
+       sed -e 's,@PYTHON\@,$(PYTHON),g' \
+               -e 's,@interfacesdir\@,$(interfacesdir),g' $< > $@
+       chmod +x $@
+
 avahi-publish-address: avahi-publish-address.in
        sed -e 's,@PYTHON\@,$(PYTHON),g' $< > $@
        chmod +x $@
@@ -61,11 +66,6 @@ avahi-browse: avahi-browse.in
        sed -e 's,@PYTHON\@,$(PYTHON),g' $< > $@
        chmod +x $@
 
-avahi-discover: avahi-discover.in
-       sed -e 's,@PYTHON\@,$(PYTHON),g' \
-               -e 's,@interfacesdir\@,$(interfacesdir),g' $< > $@
-       chmod +x $@
-
 avahi-bookmarks: avahi-bookmarks.in
        sed -e 's,@PYTHON\@,$(PYTHON),g' $< > $@
        chmod +x $@
@@ -78,4 +78,9 @@ avahi-resolve-address: avahi-resolve-address.in
        sed -e 's,@PYTHON\@,$(PYTHON),g' $< > $@
        chmod +x $@
 
+bin_SCRIPTS = $(pythonscripts)
 CLEANFILES = $(pythonscripts) $(desktop_DATA)
+
+endif
+endif
+endif