From c84527f98a43969ecd15a737fb000569feb4c9c0 Mon Sep 17 00:00:00 2001 From: Sebastien Estienne Date: Sun, 7 Aug 2005 10:25:26 +0000 Subject: [PATCH] * added a .desktop for avahi-discover * added macro for checking python modules in common/python.m4 * check for python modules gtk and dbus git-svn-id: file:///home/lennart/svn/public/avahi/trunk@254 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe --- avahi-utils/Makefile.am | 10 +++-- avahi-utils/avahi-discover.desktop | 10 +++++ common/Makefile.am | 8 ++-- common/python.m4 | 62 ++++++++++++++++++++++++++++++ configure.ac | 19 ++++++++- 5 files changed, 101 insertions(+), 8 deletions(-) create mode 100644 avahi-utils/avahi-discover.desktop create mode 100644 common/python.m4 diff --git a/avahi-utils/Makefile.am b/avahi-utils/Makefile.am index 256023c..4b203bd 100644 --- a/avahi-utils/Makefile.am +++ b/avahi-utils/Makefile.am @@ -17,8 +17,6 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 # USA. -SUBDIRS=avahi - pythonscripts = \ avahi-publish-address \ avahi-publish-service \ @@ -35,9 +33,15 @@ EXTRA_DIST = \ avahi-discover.in \ avahi-bookmarks.in \ avahi-resolve-host-name.in \ - avahi-resolve-address.in + avahi-resolve-address.in \ + avahi-discover.desktop if HAVE_PYTHON +SUBDIRS=avahi + +desktopdir = $(datadir)/applications +desktop_DATA = avahi-discover.desktop + bin_SCRIPTS = $(pythonscripts) endif diff --git a/avahi-utils/avahi-discover.desktop b/avahi-utils/avahi-discover.desktop new file mode 100644 index 0000000..da4fa8b --- /dev/null +++ b/avahi-utils/avahi-discover.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=Avahi Zeroconf Browser +Comment=Browse for Zeroconf services available on your network +Exec=avahi-discover +Terminal=false +Type=Application +Icon=gnome-nettool.png +Categories=GNOME;Application;System;Utility +StartupNotify=false diff --git a/common/Makefile.am b/common/Makefile.am index 0b75c8d..1cbad83 100644 --- a/common/Makefile.am +++ b/common/Makefile.am @@ -17,7 +17,7 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 # USA. -EXTRA_DIST = \ - doxygen.m4 \ - doxygen.mk - +EXTRA_DIST = \ + doxygen.m4 \ + doxygen.mk \ + python.m4 diff --git a/common/python.m4 b/common/python.m4 new file mode 100644 index 0000000..e1c5266 --- /dev/null +++ b/common/python.m4 @@ -0,0 +1,62 @@ +## this one is commonly used with AM_PATH_PYTHONDIR ... +dnl AM_CHECK_PYMOD(MODNAME [,SYMBOL [,ACTION-IF-FOUND [,ACTION-IF-NOT-FOUND]]]) +dnl Check if a module containing a given symbol is visible to python. +AC_DEFUN([AM_CHECK_PYMOD], +[AC_REQUIRE([AM_PATH_PYTHON]) +py_mod_var=`echo $1['_']$2 | sed 'y%./+-%__p_%'` +AC_MSG_CHECKING(for ifelse([$2],[],,[$2 in ])python module $1) +AC_CACHE_VAL(py_cv_mod_$py_mod_var, [ +ifelse([$2],[], [prog=" +import sys +try: + import $1 +except ImportError: + sys.exit(1) +except: + sys.exit(0) +sys.exit(0)"], [prog=" +import $1 +$1.$2"]) +if $PYTHON -c "$prog" 1>&AC_FD_CC 2>&AC_FD_CC + then + eval "py_cv_mod_$py_mod_var=yes" + else + eval "py_cv_mod_$py_mod_var=no" + fi +]) +py_val=`eval "echo \`echo '$py_cv_mod_'$py_mod_var\`"` +if test "x$py_val" != xno; then + AC_MSG_RESULT(yes) + ifelse([$3], [],, [$3 +])dnl +else + AC_MSG_RESULT(no) + ifelse([$4], [],, [$4 +])dnl +fi +]) + +dnl a macro to check for ability to create python extensions +dnl AM_CHECK_PYTHON_HEADERS([ACTION-IF-POSSIBLE], [ACTION-IF-NOT-POSSIBLE]) +dnl function also defines PYTHON_INCLUDES +AC_DEFUN([AM_CHECK_PYTHON_HEADERS], +[AC_REQUIRE([AM_PATH_PYTHON]) +AC_MSG_CHECKING(for headers required to compile python extensions) +dnl deduce PYTHON_INCLUDES +py_prefix=`$PYTHON -c "import sys; print sys.prefix"` +py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"` +PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}" +if test "$py_prefix" != "$py_exec_prefix"; then + PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}" +fi +AC_SUBST(PYTHON_INCLUDES) +dnl check if the headers exist: +save_CPPFLAGS="$CPPFLAGS" +CPPFLAGS="$CPPFLAGS $PYTHON_INCLUDES" +AC_TRY_CPP([#include ],dnl +[AC_MSG_RESULT(found) +$1],dnl +[AC_MSG_RESULT(not found) +$2]) +CPPFLAGS="$save_CPPFLAGS" +]) diff --git a/configure.ac b/configure.ac index d62397a..b9ebef3 100644 --- a/configure.ac +++ b/configure.ac @@ -253,7 +253,24 @@ AC_SUBST(avahi_socket) # # Python stuff # -AM_PATH_PYTHON(2.4, [HAVE_PYTHON=yes], [HAVE_PYTHON=no]) +dnl AC_ARG_ENABLE(python, +dnl AS_HELP_STRING(--disable-python, Disable scripts that depends on python), +dnl [case "${enableval}" in +dnl yes) use_python=yes ;; +dnl no) use_python=no ;; +dnl *) AC_MSG_ERROR([bad value ${enableval} for --disable-python]) ;; +dnl esac],[use_python=yes]) + +dnl HAVE_PYTHON=no +dnl if test "x$use_python" = xyes ; then + AM_PATH_PYTHON(2.4, [HAVE_PYTHON=yes], [HAVE_PYTHON=no]) + + if test "x$HAVE_PYTHON" = xyes ; then + AM_CHECK_PYMOD(gtk,,,[AC_MSG_ERROR(could not find pygtk module)]) + AM_CHECK_PYMOD(dbus,,,[AC_MSG_ERROR(could not find python dbus module)]) + fi +dnl fi + AM_CONDITIONAL(HAVE_PYTHON, [test "x$HAVE_PYTHON" = xyes ]) # ========================================================================== -- 2.39.5