X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=configure.ac;h=798574a96fb5bb38627fa9e177c6434ad7a9dd9e;hb=9642bac4b85de24ce62c53ad6a8e2ab4b2dd31ba;hp=faea098fbf553fa0cf89f6f229887fd8be721a70;hpb=a4d93bdc07c01f05eb7c39a6fc6fe5c505e2c5fc;p=catta

diff --git a/configure.ac b/configure.ac
index faea098..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
@@ -77,6 +77,8 @@ if test "x$GCC" = "xyes" ; then
    rm -f conftest.o
 fi
 
+PKG_PROG_PKG_CONFIG
+
 #
 # Check for GLIB 2.0
 #
@@ -89,14 +91,13 @@ AC_ARG_ENABLE(glib,
         esac],
         [HAVE_GLIB=yes])
 
-if test "x$HAVE_GLIB" = "xyes"; then
+if test "x$HAVE_GLIB" = "xyes" ; then
         PKG_CHECK_MODULES(GLIB20, [ glib-2.0 >= 2.4.0 ])
         AC_SUBST(GLIB20_CFLAGS)
         AC_SUBST(GLIB20_LIBS)
 fi
 AM_CONDITIONAL(HAVE_GLIB, test "x$HAVE_GLIB" = "xyes")
 
-
 #
 # Check for GTK+
 #
@@ -109,7 +110,7 @@ AC_ARG_ENABLE(gtk,
         esac],
         [HAVE_GTK=yes])
 
-if test "x$HAVE_GTK" = "xyes"; then
+if test "x$HAVE_GTK" = "xyes" ; then
         # Check for GTK 2.0
         PKG_CHECK_MODULES(GTK20, [ gtk+-2.0 >= 2.4.0 ])
         AC_SUBST(GTK20_CFLAGS)
@@ -139,7 +140,7 @@ AC_ARG_ENABLE(dbus,
 
 AC_ARG_WITH(dbus-sys, AS_HELP_STRING([--with-dbus-sys=<dir>], [where D-BUS system.d directory is]))
 
-if test "x$HAVE_DBUS" = "xyes"; then
+if test "x$HAVE_DBUS" = "xyes" ; then
 	AC_DEFINE(HAVE_DBUS, 1, [Whether we have D-BUS or not])
 
     PKG_CHECK_MODULES(DBUS, [ dbus-1 >= 0.30 ])
@@ -169,7 +170,7 @@ AC_ARG_ENABLE(expat,
         esac],
         [HAVE_EXPAT=yes]) 
 
-if test "x$HAVE_EXPAT" = "xyes"; then
+if test "x$HAVE_EXPAT" = "xyes" ; then
    AC_CHECK_LIB(expat, XML_ParserCreate, [ AC_CHECK_HEADERS(expat.h, have_expat=true, have_expat=false) ], have_expat=false)
 
    if ! $have_expat ; then
@@ -190,7 +191,7 @@ AC_ARG_ENABLE(libdaemon,
         esac],
         [HAVE_LIBDAEMON=yes]) 
 
-if test "x$HAVE_LIBDAEMON" = "xyes"; then
+if test "x$HAVE_LIBDAEMON" = "xyes" ; then
    PKG_CHECK_MODULES(LIBDAEMON, [ libdaemon >= 0.5 ])
    AC_SUBST(LIBDAEMON_CFLAGS)
    AC_SUBST(LIBDAEMON_LIBS)
@@ -208,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" ])
 
@@ -361,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}
 "