X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=configure.ac;h=798574a96fb5bb38627fa9e177c6434ad7a9dd9e;hb=887faed430bf08b40f3261365e12e8ab4e6f934c;hp=8ada9610e5de7b01caf2e218c799615d098438ec;hpb=32d5a419120c416f8f4e4911f0ad21477f5bf199;p=catta

diff --git a/configure.ac b/configure.ac
index 8ada961..798574a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -61,7 +61,7 @@ AC_FUNC_MEMCMP
 AC_FUNC_SELECT_ARGTYPES
 AC_FUNC_MALLOC
 AC_FUNC_REALLOC
-AC_CHECK_FUNCS([gethostname memchr memmove memset mkdir select socket strchr strcspn strdup strerror strrchr strspn strstr uname setresuid setreuid strcasecmp gettimeofday])
+AC_CHECK_FUNCS([gethostname memchr memmove memset mkdir select socket strchr strcspn strdup strerror strrchr strspn strstr uname setresuid setreuid strcasecmp gettimeofday putenv])
 
 AC_FUNC_CHOWN
 AC_FUNC_STAT
@@ -209,13 +209,10 @@ AC_ARG_ENABLE(python,
 	      *) AC_MSG_ERROR([bad value ${enableval} for --enable-python]) ;;
 	esac],[HAVE_PYTHON=yes])
 
-if test "y$HAVE_PYTHON" = xyes ; then
-   AM_PATH_PYTHON(2.4)
-
-   if  test "x$HAVE_PYTHON" = xyes ; then
-       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)])
-   fi
+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)])
 fi
 AM_CONDITIONAL(HAVE_PYTHON, [test "x$HAVE_PYTHON" = "xyes" ])
 
@@ -362,23 +359,31 @@ echo "
     Group for Avahi:        ${AVAHI_GROUP}
 "
 
-BUILD_DAEMON=no
+BUILD_DAEMON="no (!)"
 
 if test "x$HAVE_EXPAT" = "xyes" -a "x$HAVE_LIBDAEMON" = "xyes" ; then
    BUILD_DAEMON=yes
 fi
 
-BUILD_UTILS=no
+BUILD_UTILS="no (!)"
 
 if test "x$BUILD_DAEMON" = "xyes" -a "x$HAVE_DBUS" = "xyes" -a "x$HAVE_PYTHON" = "xyes" ; then
    BUILD_UTILS=yes
 fi
+
+BUILD_CLIENT="no (!)"
+
+if test "x$BUILD_DAEMON" = "xyes" -a "x$HAVE_DBUS" = "xyes" ; then
+   BUILD_CLIENT=yes
+fi
+
     
 echo "
-    Building avahi-core                 yes
+    Building libavahi-core              yes
     Building avahi-daemon:              ${BUILD_DAEMON}
     Building avahi-dnsconfd:            ${BUILD_DAEMON}
     Building avahi-utils:               ${BUILD_UTILS}
-    Building avahi-glib:                ${HAVE_GLIB}
-    Building avahi-discover-standalone  ${HAVE_GTK}
+    Building libavahi-glib:             ${HAVE_GLIB}
+    Building libavahi-client:           ${BUILD_CLIENT}
+    Building avahi-discover-standalone: ${HAVE_GTK}
 "