From 2dc8ce59b28d3a028551ac5087f31cf83d04e064 Mon Sep 17 00:00:00 2001 From: Björn Jacke Date: Wed, 18 Mar 2009 22:19:06 +0100 Subject: don't set -O twice Signed-off-by: Michael Adam --- source3/configure.in | 2 -- 1 file changed, 2 deletions(-) (limited to 'source3/configure.in') diff --git a/source3/configure.in b/source3/configure.in index cfc2473a82..12808eb6f5 100644 --- a/source3/configure.in +++ b/source3/configure.in @@ -157,8 +157,6 @@ if test "x$CFLAGS" = x; then fi if test "x$debug" = "xyes" ; then CFLAGS="${CFLAGS} -g" -else - CFLAGS="${CFLAGS} -O" fi m4_include(../lib/socket_wrapper/config.m4) -- cgit From a4cc3e253852794f477ef5d836537b50111d0e42 Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Mon, 23 Mar 2009 14:22:37 +0100 Subject: s3:build: prevent from setting "-O -g", check for $debug first. This makes configure actually behave as the comments describe. The reversal of order was introduced by mistake in 90ea8ae9b1ed3b7ed1c93076517e026e629ea1aa Michael --- source3/configure.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'source3/configure.in') diff --git a/source3/configure.in b/source3/configure.in index 12808eb6f5..5f1a5efe7d 100644 --- a/source3/configure.in +++ b/source3/configure.in @@ -152,12 +152,12 @@ AC_SUBST(NSCD_LIBS) # do this here since AC_CACHE_CHECK apparently sets the CFLAGS to "-g -O2" # if it has no value. This prevent *very* large debug binaries from occurring # by default. -if test "x$CFLAGS" = x; then - CFLAGS="-O" -fi if test "x$debug" = "xyes" ; then CFLAGS="${CFLAGS} -g" fi +if test "x$CFLAGS" = x; then + CFLAGS="-O" +fi m4_include(../lib/socket_wrapper/config.m4) m4_include(../lib/nss_wrapper/config.m4) -- cgit From dfa93041abca0778a9988b384ddeaee234b324a2 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Fri, 20 Mar 2009 14:39:19 +0100 Subject: Disable dns_sd by default --- source3/configure.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source3/configure.in') diff --git a/source3/configure.in b/source3/configure.in index 5f1a5efe7d..f8b76a01b4 100644 --- a/source3/configure.in +++ b/source3/configure.in @@ -5973,10 +5973,10 @@ AC_SUBST(FLAGS1) # Check if user wants DNS service discovery support AC_ARG_ENABLE(dnssd, -[AS_HELP_STRING([--enable-dnssd], [Enable DNS service discovery support (default=auto)])]) +[AS_HELP_STRING([--enable-dnssd], [Enable DNS service discovery support (default=no)])]) AC_SUBST(DNSSD_LIBS) -if test x"$enable_dnssd" != x"no"; then +if test x"$enable_dnssd" == x"yes"; then have_dnssd_support=yes AC_CHECK_HEADERS(dns_sd.h) -- cgit From 4c1794c41c0595b2a62a1b4d96f7592ef746a76d Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Fri, 20 Mar 2009 14:53:10 +0100 Subject: Add avahi detection to configure --- source3/configure.in | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) (limited to 'source3/configure.in') diff --git a/source3/configure.in b/source3/configure.in index f8b76a01b4..444f93f4c7 100644 --- a/source3/configure.in +++ b/source3/configure.in @@ -6004,6 +6004,42 @@ if test x"$enable_dnssd" == x"yes"; then fi +################################################# +# Check if user wants avahi support + +AC_ARG_ENABLE(avahi, +[AS_HELP_STRING([--enable-avahi], [Enable Avahi support (default=auto)])]) + +AC_SUBST(AVAHI_LIBS) +if test x"$enable_avahi" != x"no"; then + have_avahi_support=yes + + AC_CHECK_HEADERS(avahi-common/watch.h) + if test x"$ac_cv_header_avahi_common_watch_h" != x"yes"; then + have_avahi_support=no + fi + + AC_CHECK_HEADERS(avahi-client/client.h) + if test x"$ac_cv_header_avahi_common_watch_h" != x"yes"; then + have_avahi_support=no + fi + + AC_CHECK_LIB_EXT(avahi-client, AVAHI_LIBS, avahi_client_new) + if test x"$ac_cv_lib_ext_avahi_client_avahi_client_new" != x"yes"; then + have_avahi_support=no + fi + + if test x"$have_avahi_support" = x"yes"; then + AC_DEFINE(WITH_AVAHI_SUPPORT, 1, + [Whether to enable avahi support]) + else + if test x"$enable_avahi" = x"yes"; then + AC_MSG_ERROR(avahi support not available) + fi + fi + +fi + ################################################# # Check to see if we should use the included iniparser -- cgit From 93e13fe3e07c1915a84f7a7a810a1d85a21bcfe7 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Fri, 20 Mar 2009 14:55:05 +0100 Subject: Add tevent avahi binding --- source3/configure.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/configure.in') diff --git a/source3/configure.in b/source3/configure.in index 444f93f4c7..103edaf369 100644 --- a/source3/configure.in +++ b/source3/configure.in @@ -6032,12 +6032,12 @@ if test x"$enable_avahi" != x"no"; then if test x"$have_avahi_support" = x"yes"; then AC_DEFINE(WITH_AVAHI_SUPPORT, 1, [Whether to enable avahi support]) + AC_SUBST(AVAHI_OBJ, lib/avahi.o) else if test x"$enable_avahi" = x"yes"; then AC_MSG_ERROR(avahi support not available) fi fi - fi ################################################# -- cgit From 63aae58fdcd9110ba294ac7335d4a4e40136aa8b Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Sun, 22 Mar 2009 15:59:33 +0100 Subject: Use avahi to register _smb._tcp in smbd --- source3/configure.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/configure.in') diff --git a/source3/configure.in b/source3/configure.in index 103edaf369..1cf8d9ca4a 100644 --- a/source3/configure.in +++ b/source3/configure.in @@ -6032,7 +6032,7 @@ if test x"$enable_avahi" != x"no"; then if test x"$have_avahi_support" = x"yes"; then AC_DEFINE(WITH_AVAHI_SUPPORT, 1, [Whether to enable avahi support]) - AC_SUBST(AVAHI_OBJ, lib/avahi.o) + AC_SUBST(AVAHI_OBJ, "lib/avahi.o smbd/avahi_register.o") else if test x"$enable_avahi" = x"yes"; then AC_MSG_ERROR(avahi support not available) -- cgit