diff options
| author | Trent Lloyd <lathiat@bur.st> | 2005-08-30 11:22:31 +0000 |
|---|---|---|
| committer | Trent Lloyd <lathiat@bur.st> | 2005-08-30 11:22:31 +0000 |
| commit | 3701706c65de0f0b5f652b0cd37670c03800b4a2 (patch) | |
| tree | e32dad3f3cd91ab5ff8fb89749f09f743371d087 | |
| parent | be10803e4dee7cb430423248f12685353c1ea166 (diff) | |
* Fix building of python scripts to exclude things needing DBUS or GTK if they are disabled, including fixing configure.ac not to error in these cases.
git-svn-id: file:///home/lennart/svn/public/avahi/trunk@503 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe
| -rw-r--r-- | avahi-utils/Makefile.am | 31 | ||||
| -rw-r--r-- | configure.ac | 8 |
2 files changed, 24 insertions, 15 deletions
diff --git a/avahi-utils/Makefile.am b/avahi-utils/Makefile.am index edbd2cb..3adf84c 100644 --- a/avahi-utils/Makefile.am +++ b/avahi-utils/Makefile.am @@ -21,7 +21,6 @@ pythonscripts = \ avahi-publish-address \ avahi-publish-service \ avahi-browse \ - avahi-discover \ avahi-bookmarks \ avahi-resolve-host-name \ avahi-resolve-address @@ -30,25 +29,36 @@ 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.desktop.in + avahi-resolve-address.in + if HAVE_PYTHON if HAVE_DBUS SUBDIRS=avahi + +if HAVE_GTK desktopdir = $(datadir)/applications desktop_DATA = avahi-discover.desktop -bin_SCRIPTS = $(pythonscripts) +pythonscripts += avahi-discover + +EXTRA_DIST += \ + avahi-discover.in + avahi-discover.desktop.in 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 $@ +endif + avahi-publish-address: avahi-publish-address.in sed -e 's,@PYTHON\@,$(PYTHON),g' $< > $@ chmod +x $@ @@ -61,11 +71,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 $@ @@ -77,8 +82,8 @@ avahi-resolve-host-name: avahi-resolve-host-name.in avahi-resolve-address: avahi-resolve-address.in sed -e 's,@PYTHON\@,$(PYTHON),g' $< > $@ chmod +x $@ - -CLEANFILES = $(pythonscripts) $(desktop_DATA) - endif endif + +bin_SCRIPTS = $(pythonscripts) +CLEANFILES = $(pythonscripts) $(desktop_DATA) diff --git a/configure.ac b/configure.ac index 5daa502..5cab52c 100644 --- a/configure.ac +++ b/configure.ac @@ -342,8 +342,12 @@ AC_ARG_ENABLE(python, if test "x$HAVE_PYTHON" = "xyes" ; then AM_PATH_PYTHON([2.4]) - AM_CHECK_PYMOD(gtk,,,[AC_MSG_ERROR(Could not find Python module pygtk)]) - AM_CHECK_PYMOD(dbus,,,[AC_MSG_ERROR(Could not find Python module dbus)]) + if test "x$HAVE_GTK" = "xyes" ; then + AM_CHECK_PYMOD(gtk,,,[AC_MSG_ERROR(Could not find Python module pygtk)]) + fi + if test "x$HAVE_DBUS" = "xyes" ; then + AM_CHECK_PYMOD(dbus,,,[AC_MSG_ERROR(Could not find Python module dbus)]) + fi AM_CHECK_PYMOD(socket,,,[AC_MSG_ERROR(Could not find Python module socket)]) AM_CHECK_PYMOD(dbm,,,[AC_MSG_ERROR(Could not find Python module dbm)]) AM_CHECK_PYMOD(anydbm,,,[AC_MSG_ERROR(Could not find Python module anydbm)]) |