X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=configure.ac;h=660f138b12003f184980093d7562b0a79dc1fa13;hb=90d30bec8d880fb44c0869fd8285543101b7cf60;hp=b62f06acb8d2aabe29cea670d3149301541445a5;hpb=e9a34a5760dff1e476377d6a5904905d5bc0ba86;p=catta diff --git a/configure.ac b/configure.ac index b62f06a..660f138 100644 --- a/configure.ac +++ b/configure.ac @@ -34,6 +34,7 @@ AC_SUBST(LIBAVAHI_CLIENT_VERSION_INFO, [5:2:2]) AC_SUBST(LIBAVAHI_GLIB_VERSION_INFO, [1:1:0]) AC_SUBST(LIBAVAHI_QT3_VERSION_INFO, [1:1:0]) AC_SUBST(LIBAVAHI_QT4_VERSION_INFO, [1:1:0]) +AC_SUBST(LIBAVAHI_UI_VERSION_INFO, [0:0:0]) # Do not touch these, since they we took this version-info from upstream HOWL/Bonjour AC_SUBST(LIBAVAHI_COMPAT_LIBDNS_SD_VERSION_INFO, [1:0:0]) @@ -218,7 +219,7 @@ test_gcc_flag() { # If using GCC specify some additional parameters if test "x$GCC" = "xyes" ; then - DESIRED_FLAGS="-Wall -W -Wextra -pedantic -pipe -Wformat -Wold-style-definition -Wdeclaration-after-statement -Wfloat-equal -Wmissing-declarations -Wmissing-prototypes -Wstrict-prototypes -Wredundant-decls -Wmissing-noreturn -Wshadow -Wendif-labels -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wcast-align -Wwrite-strings -Winline" + DESIRED_FLAGS="-Wall -W -Wextra -pedantic -pipe -Wformat -Wold-style-definition -Wdeclaration-after-statement -Wfloat-equal -Wmissing-declarations -Wmissing-prototypes -Wstrict-prototypes -Wredundant-decls -Wmissing-noreturn -Wshadow -Wendif-labels -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wcast-align -Wwrite-strings -Winline -fPIC" if test "x$HAVE_NETLINK" = "xyes" ; then # Test whether rtnetlink.h can be included when compiled with -std=c99 @@ -735,7 +736,7 @@ fi AC_SUBST(AVAHI_PRIV_ACCESS_GROUP) AC_DEFINE_UNQUOTED(AVAHI_PRIV_ACCESS_GROUP,"$AVAHI_PRIV_ACCESS_GROUP", [Privileged access group for Avahi clients]) -AC_ARG_WITH(autoipd_user, AS_HELP_STRING([--with-autipd-user=],[User for running the avahi-autoipd daemon (avahi-autoipd)])) +AC_ARG_WITH(autoipd_user, AS_HELP_STRING([--with-autoipd-user=],[User for running the avahi-autoipd daemon (avahi-autoipd)])) if test -z "$with_autoipd_user" ; then AVAHI_AUTOIPD_USER=avahi-autoipd else @@ -909,6 +910,7 @@ avahi-compat-libdns_sd/Makefile avahi-compat-howl/Makefile avahi-compat-howl/samples/Makefile avahi-autoipd/Makefile +avahi-ui/Makefile ]) AC_OUTPUT @@ -943,7 +945,7 @@ echo " User for avahi-daemon: ${AVAHI_USER} Group for avahi-daemon: ${AVAHI_GROUP} Priviliged access group for Avahi clients: ${AVAHI_PRIV_ACCESS_GROUP} - User for avahi-autopid: ${AVAHI_AUTOIPD_USER} + User for avahi-autoipd: ${AVAHI_AUTOIPD_USER} Group for avahi-autoipd: ${AVAHI_AUTOIPD_GROUP} Enable chroot(): ${enable_chroot} " @@ -973,6 +975,10 @@ if test "x$ENABLE_COMPAT_HOWL" = "xyes" -a "x$BUILD_CLIENT" != "xyes" ; then ENABLE_COMPAT_HOWL="no (You need libavahi-client!)" fi +BUILD_UI="no" +if test "x$HAVE_GTK" = "xyes" -a "x$BUILD_CLIENT" = "xyes" ; then + BUILD_UI="yes" +fi echo "\ Building libavahi-core yes @@ -991,4 +997,5 @@ echo "\ Building tests: ${ENABLE_TESTS} Building avahi-core documentation: ${ENABLE_CORE_DOCS} Building avahi-autoipd: ${ENABLE_AUTOIPD} + Building libavahi-ui: ${BUILD_UI} "