X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=configure.ac;h=6dd58d09731af661805e6b98dc29b054199eba31;hb=f14c2c41f84d65307411a6dab1aabac80e71d705;hp=7dc41700385761214e67eaf201b2ae0fb1bab455;hpb=0cbfefdb155c5b79f63ebb19196e783c4cb48afc;p=catta

diff --git a/configure.ac b/configure.ac
index 7dc4170..6dd58d0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,21 +21,21 @@
 # USA.
 
 AC_PREREQ(2.57)
-AC_INIT([avahi],[0.6.21],[avahi (at) lists (dot) freedesktop (dot) org])
+AC_INIT([avahi],[0.6.22],[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])
 
 AC_SUBST(PACKAGE_URL, [http://avahi.org/])
 
-AC_SUBST(LIBAVAHI_COMMON_VERSION_INFO, [7:5:4])
-AC_SUBST(LIBAVAHI_CORE_VERSION_INFO, [5:3:0])
-AC_SUBST(LIBAVAHI_CLIENT_VERSION_INFO, [5:3:2])
+AC_SUBST(LIBAVAHI_COMMON_VERSION_INFO, [8:0:5])
+AC_SUBST(LIBAVAHI_CORE_VERSION_INFO, [5:4:0])
+AC_SUBST(LIBAVAHI_CLIENT_VERSION_INFO, [5:4:2])
 AC_SUBST(LIBAVAHI_GLIB_VERSION_INFO, [1:1:0])
 AC_SUBST(LIBAVAHI_GOBJECT_VERSION_INFO, [0:0:0])
 AC_SUBST(LIBAVAHI_QT3_VERSION_INFO, [1:1:0])
 AC_SUBST(LIBAVAHI_QT4_VERSION_INFO, [1:1:0])
-AC_SUBST(LIBAVAHI_UI_VERSION_INFO, [0:2:0])
+AC_SUBST(LIBAVAHI_UI_VERSION_INFO, [1:0:1])
 
 # Do not touch these, since they we took this version-info from upstream HOWL/Bonjour
 AC_SUBST(LIBAVAHI_COMPAT_LIBDNS_SD_VERSION_INFO, [1:0:0])
@@ -396,6 +396,18 @@ if test "x$have_kqueue" = "xyes" ; then
     AC_DEFINE([HAVE_KQUEUE], 1, [Enable BSD kqueue() usage])
 fi
 
+AM_GNU_GETTEXT([external])
+
+IT_PROG_INTLTOOL([0.35.0])
+GETTEXT_PACKAGE=avahi
+AC_SUBST([GETTEXT_PACKAGE])
+AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"],[Gettext package])
+AM_GLIB_GNU_GETTEXT
+
+avahilocaledir='${prefix}/${DATADIRNAME}/locale'
+AC_SUBST(avahilocaledir)
+
+
 # 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)
@@ -621,6 +633,7 @@ AC_CHECK_LIB(expat, XML_ParserCreate, [ AC_CHECK_HEADERS(expat.h, have_expat=tru
 AC_CHECK_LIB(bsdxml, XML_ParserCreate, [ AC_CHECK_HEADERS(bsdxml.h, have_bsdxml=true, have_bsdxml=false) ], have_bsdxml=false)
 
 if test "x$with_xml" = "xnone"; then
+        :
 elif test "x$with_xml" = "xexpat"; then
 	use_expat=true
 	if ! $have_expat ; then
@@ -645,7 +658,7 @@ fi
 
 if $use_expat; then
 	with_xml=expat
-	XML_CLAGS=-DUSE_EXPAT_H
+	XML_CFLAGS=-DUSE_EXPAT_H
 	XML_LIBS=-lexpat
 fi
 if $use_bsdxml; then
@@ -1065,6 +1078,7 @@ avahi-compat-howl/Makefile
 avahi-compat-howl/samples/Makefile
 avahi-autoipd/Makefile
 avahi-ui/Makefile
+po/Makefile.in
 ])
 AC_OUTPUT
 
@@ -1140,6 +1154,11 @@ if test "x$HAVE_GTK" = "xyes" -a "x$BUILD_CLIENT" = "xyes" ; then
    BUILD_UI="yes"
 fi
 
+BUILD_GOBJECT="no"
+if test "x$BUILD_CLIENT" = "xyes" -a "x$HAVE_GOBJECT" = "xyes" ; then
+   BUILD_GOBJECT="yes"
+fi
+
 echo "\
     Building libavahi-core              yes
     Building avahi-daemon:              ${BUILD_DAEMON}
@@ -1148,7 +1167,7 @@ echo "\
     Building avahi-utils:               ${BUILD_CLIENT}
     Building avahi-python:              ${BUILD_PYTHON}
     Building libavahi-glib:             ${HAVE_GLIB}
-    Building libavahi-gobject:          ${HAVE_GOBJECT}
+    Building libavahi-gobject:          ${BUILD_GOBJECT}
     Building avahi-discover-standalone: ${HAVE_GTK}
     Building libavahi-qt3:              ${HAVE_QT3}
     Building libavahi-qt4:              ${HAVE_QT4}