summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2009-06-26 21:52:34 +0200
committerVolker Lendecke <vl@samba.org>2009-06-26 23:15:51 +0200
commit04e4d03868ea67f323bf008eb7b9af740a0467ac (patch)
tree3cf77ed6b1d172359ded0d01b247e1bef20860ee /source3
parent3c382db3a3a5ccfd5348f39a79556f157f814e76 (diff)
downloadsamba-04e4d03868ea67f323bf008eb7b9af740a0467ac.tar.gz
samba-04e4d03868ea67f323bf008eb7b9af740a0467ac.tar.bz2
samba-04e4d03868ea67f323bf008eb7b9af740a0467ac.zip
The solaris linker seems to require an extra mention of dependent libs
Diffstat (limited to 'source3')
-rw-r--r--source3/configure.in11
1 files changed, 8 insertions, 3 deletions
diff --git a/source3/configure.in b/source3/configure.in
index 82a83a3e06..d8ca0a72a3 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -6068,7 +6068,6 @@ fi
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
@@ -6082,12 +6081,18 @@ if test x"$enable_avahi" != x"no"; 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
+ save_LIBS="$LIBS"
+ AC_CHECK_LIB(avahi-client, avahi_client_new)
+ AC_CHECK_LIB(avahi-common, avahi_strerror)
+ LIBS="$save_LIBS"
+
+ if test x"$ac_cv_lib_ext_avahi_client_avahi_client_new" != x"yes" -o \
+ test x"$ac_cv_lib_ext_avahi_common_avahi_strerror" != x"yes" ; then
have_avahi_support=no
fi
if test x"$have_avahi_support" = x"yes"; then
+ AC_SUBST(AVAHI_LIBS, "-lavahi-client -lavahi-common")
AC_DEFINE(WITH_AVAHI_SUPPORT, 1,
[Whether to enable avahi support])
AC_SUBST(AVAHI_OBJ, "lib/avahi.o smbd/avahi_register.o")