[SCM] Samba Shared Repository - branch master updated

[Björn Jacke]

The branch, master has been updated
       via  718d280... s3:configure: fix avahi activation
      from  77b9d28... s4:torture "cldap" test - rework and test more results

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 718d2801d6bafedfe91d7b475294d69e2d6a77a4
Author: Björn Jacke <bj at sernet.de>
Date:   Sun Oct 18 17:01:57 2009 +0200

    s3:configure: fix avahi activation
    
    Avahi was correctly found but not activated since e4a26c942.

-----------------------------------------------------------------------

Summary of changes:
 source3/configure.in |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/configure.in b/source3/configure.in
index 36c89ef..69596df 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -6197,12 +6197,12 @@ if test x"$enable_avahi" != x"no"; then
     fi
 
     save_LIBS="$LIBS"
-    AC_CHECK_LIB(avahi-client, avahi_client_new)
-    AC_CHECK_LIB(avahi-common, avahi_strerror)
+    AC_CHECK_LIB(avahi-client, avahi_client_new,[have_avahi_client_new=yes])
+    AC_CHECK_LIB(avahi-common, avahi_strerror,[have_avahi_strerror=yes])
     LIBS="$save_LIBS"
 
-    if test x"$ac_cv_lib_ext_avahi_client_avahi_client_new" != x"yes" -o \
-       x"$ac_cv_lib_ext_avahi_common_avahi_strerror" != x"yes" ; then
+    if test x"$have_avahi_client_new" != x"yes" -o \
+       x"$have_avahi_strerror" != x"yes" ; then
 	have_avahi_support=no
     fi
 


-- 
Samba Shared Repository