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
rm -f conftest.o
fi
+PKG_PROG_PKG_CONFIG
+
#
# Check for GLIB 2.0
#
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+
#
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)
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 ])
esac],
[HAVE_EXPAT=yes])
-if test "x$HAVE_DBUS" = "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
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)
*) 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" ])
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}
"