diff options
author | Lennart Poettering <lennart@poettering.net> | 2005-10-19 00:10:02 +0000 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2005-10-19 00:10:02 +0000 |
commit | 16d9e30dd7fa052bd7e6dd37927d7f27bec90ef1 (patch) | |
tree | d52fcd4dfde907c278a29c76e59f899c92c1a4b4 /configure.ac | |
parent | d266407d3e6d8f2a8e14e8bd2f89fa8a4333613c (diff) |
* Compile tests only when --enable-tests was specified on the configure command line
* Build compat layers only when --enable-compat-{howl,libdns_sd} was passed to configure
* drop avahi_strlcpy() to reduce our code/API size
* replace getifname() with if_indextoname in avahi-dnsconfd
* declare environ if needed in avahi-dnsconfd
* drop some useless definitions like AVAHI_PUBLISH_NULL = 0
git-svn-id: file:///home/lennart/svn/public/avahi/trunk@819 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 64 |
1 files changed, 57 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac index 2ed9a8a..744a284 100644 --- a/configure.ac +++ b/configure.ac @@ -229,13 +229,15 @@ 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 putenv strncasecmp]) +AC_CHECK_FUNCS([gethostname memchr memmove memset mkdir select socket strchr strcspn strdup strerror strrchr strspn strstr uname setresuid setreuid strcasecmp gettimeofday putenv strncasecmp strclpy]) AC_FUNC_CHOWN AC_FUNC_STAT AC_TYPE_MODE_T AC_TYPE_PID_T +AC_CHECK_DECLS(environ) + # Check for pkg-config manually first, as if its not installed the # PKG_PROG_PKG_CONFIG macro won't be defined. AC_CHECK_PROG(have_pkg_config, pkg-config, yes, no) @@ -340,8 +342,6 @@ if test "x$HAVE_GTK" = "xyes" ; then fi AM_CONDITIONAL(HAVE_GTK, test "x$HAVE_GTK" = "xyes") - - # # D-BUS # @@ -567,7 +567,6 @@ avahi_socket="${avahi_runtime_dir}/avahi-daemon/socket" AC_SUBST(avahi_runtime_dir) AC_SUBST(avahi_socket) - # # Avahi interfaces dir # @@ -576,7 +575,6 @@ if test "x$HAVE_PYTHON_DBUS" = "xyes" -o "x$HAVE_GTK" = "xyes"; then AC_SUBST(interfacesdir) fi - # # Doxygen # @@ -616,6 +614,49 @@ fi AM_CONDITIONAL([USE_XMLTOMAN], [test "x$xmltoman" = xyes]) +# +# Conditionally compile test and example programs +# +AC_ARG_ENABLE(tests, + AS_HELP_STRING([--enable-tests],[Enable building of tests and examples]), + [case "${enableval}" in + yes) ENABLE_TESTS=yes ;; + no) ENABLE_TESTS=no ;; + *) AC_MSG_ERROR(bad value ${enableval} for --enable-tests) ;; + esac], + [ENABLE_TESTS=no]) + +AM_CONDITIONAL([ENABLE_TESTS], [test "x$ENABLE_TESTS" = "xyes"]) + +# +# Optionally enable libdns_sd compatibility support +# +AC_ARG_ENABLE(compat-libdns_sd, + AS_HELP_STRING([--enable-compat-libdns_sd],[Enable compatibility layer for libdns_sd]), + [case "${enableval}" in + yes) ENABLE_COMPAT_LIBDNS_SD=yes ;; + no) ENABLE_COMPAT_LIBDNS_SD=no ;; + *) AC_MSG_ERROR(bad value ${enableval} for --enable-compat-libdns_sd) ;; + esac], + [ENABLE_COMPAT_LIBDNS_SD=no]) + +AM_CONDITIONAL([ENABLE_COMPAT_LIBDNS_SD], [test "x$ENABLE_COMPAT_LIBDNS_SD" = "xyes"]) + +# +# Optionally enable HOWL compatibility support +# +AC_ARG_ENABLE(compat-howl, + AS_HELP_STRING([--enable-compat-howl],[Enable compatibility layer for HOWL]), + [case "${enableval}" in + yes) ENABLE_COMPAT_HOWL=yes ;; + no) ENABLE_COMPAT_HOWL=no ;; + *) AC_MSG_ERROR(bad value ${enableval} for --enable-compat-howl) ;; + esac], + [ENABLE_COMPAT_HOWL=no]) + +AM_CONDITIONAL([ENABLE_COMPAT_HOWL], [test "x$ENABLE_COMPAT_HOWL" = "xyes"]) + + # ========================================================================== AC_CONFIG_FILES([ Makefile @@ -694,6 +735,14 @@ if test "x$BUILD_DAEMON" = "xyes" -a "x$HAVE_DBUS" = "xyes" ; then BUILD_CLIENT=yes fi +if test "x$ENABLE_COMPAT_LIBDNS_SD" = "xyes" -a "x$BUILD_CLIENT" != "xyes" ; then + AC_MSG_ERROR([building avahi-compat-libdns_sd without building libavahi-client doesn't work]) +fi +if test "x$ENABLE_COMPAT_HOWL" = "xyes" -a "x$BUILD_CLIENT" != "xyes" ; then + AC_MSG_ERROR([building avahi-compat-howl without building libavahi-client doesn't work]) +fi + + echo " Building libavahi-core yes Building avahi-daemon: ${BUILD_DAEMON} @@ -705,6 +754,7 @@ echo " Building libavahi-qt3: ${HAVE_QT3} Building libavahi-qt4: ${HAVE_QT4} Building avahi-sharp: ${HAVE_MONO} - Building avahi-compat-libdns_sd: ${BUILD_CLIENT} - Building avahi-compat-howl: ${BUILD_CLIENT} + Building avahi-compat-libdns_sd: ${ENABLE_COMPAT_LIBDNS_SD} + Building avahi-compat-howl: ${ENABLE_COMPAT_HOWL} + Building tests: ${ENABLE_TESTS} " |