X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=configure.ac;h=f2dd5f2ca38b7bcc1e4ce4d20b3b59ac36fac1f4;hb=83b432c2369d7ef4142811bea0109b6588b6f313;hp=ea6ef45d9b7e1aca8e628e9146266fb18bf4df5e;hpb=74c06513b4690cd8715163b1b8e0e74a43dac5fa;p=catta

diff --git a/configure.ac b/configure.ac
index ea6ef45..f2dd5f2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,7 +21,7 @@
 # USA.
 
 AC_PREREQ(2.57)
-AC_INIT([avahi],[0.6.14],[avahi (at) lists (dot) freedesktop (dot) org])
+AC_INIT([avahi],[0.6.15],[avahi (at) lists (dot) freedesktop (dot) org])
 AC_CONFIG_SRCDIR([avahi-core/server.c])
 AC_CONFIG_HEADERS([config.h])
 AM_INIT_AUTOMAKE([foreign 1.9 -Wall])
@@ -104,10 +104,26 @@ AC_DEFINE([HAVE_SYS_SYSCTL_H],[],[Support for sys/sysctl.h])
 , [], [
 #include <sys/types.h>
 #include <sys/socket.h>
+#include <sys/param.h>
 ])
 
 AM_CONDITIONAL(HAVE_SYS_SYSCTL_H, [ test x"$HAVE_SYS_SYSCTL_H" = xyes ])
 
+#
+# Check for lifconf struct; only present on Solaris
+#
+AC_MSG_CHECKING(for struct lifconf)
+AC_CACHE_VAL(avahi_cv_has_struct_lifconf,
+[AC_TRY_COMPILE(
+[#include <sys/socket.h>
+#include <net/if.h>
+],[sizeof (struct lifconf);],
+avahi_cv_has_struct_lifconf=yes,avahi_cv_has_struct_lifconf=no)])
+AC_MSG_RESULT($avahi_cv_has_struct_lifconf)
+if test $avahi_cv_has_struct_lifconf = yes; then
+    AC_DEFINE(HAVE_STRUCT_LIFCONF,1,[Define if there is a struct lifconf.])
+fi
+
 #
 # Check for struct ip_mreqn
 #
@@ -699,10 +715,10 @@ AC_SUBST(AVAHI_GROUP)
 AC_DEFINE_UNQUOTED(AVAHI_GROUP,"$AVAHI_GROUP", [Group for Avahi])
 
 AC_ARG_WITH(avahi_priv_access_group,AS_HELP_STRING([--with-avahi-priv-access-group=<group>],[Priviliged access group for Avahi clients (netdev)]))
-if test -z "$with_priv_access_group" ; then
+if test -z "$with_avahi_priv_access_group" ; then
     AVAHI_PRIV_ACCESS_GROUP=netdev
 else
-    AVAHI_PRIV_ACCESS_GROUP=$with_priv_access_group
+    AVAHI_PRIV_ACCESS_GROUP=$with_avahi_priv_access_group
 fi
 AC_SUBST(AVAHI_PRIV_ACCESS_GROUP)
 AC_DEFINE_UNQUOTED(AVAHI_PRIV_ACCESS_GROUP,"$AVAHI_PRIV_ACCESS_GROUP", [Privileged access group for Avahi clients])