combine avahi-core and avahi-common components into one library

[catta] / configure.ac

diff --git a/configure.ac b/configure.ac
index 6abc045ea59fbbd9a65e5a10df38c3d473a5230b..5dcefae5227284280e060f61345cce26d1bcf653 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -20,15 +20,14 @@
 
 AC_PREREQ(2.63)
 AC_INIT([avahi],[0.6.31],[avahi (at) lists (dot) freedesktop (dot) org])
-AC_CONFIG_SRCDIR([avahi-core/server.c])
+AC_CONFIG_SRCDIR([avahi/server.c])
 AC_CONFIG_MACRO_DIR([common])
 AC_CONFIG_HEADERS([config.h])
 AM_INIT_AUTOMAKE([foreign 1.11 -Wall -Wno-portability silent-rules tar-pax])
 
 AC_SUBST(PACKAGE_URL, [http://avahi.org/])
 
-AC_SUBST(LIBAVAHI_COMMON_VERSION_INFO, [8:3:5])
-AC_SUBST(LIBAVAHI_CORE_VERSION_INFO, [7:2:0])
+AC_SUBST(LIBAVAHI_VERSION_INFO, [7:2:0])
 
 AC_CANONICAL_HOST
 
@@ -324,8 +323,7 @@ AM_CONDITIONAL([ENABLE_TESTS], [test "x$ENABLE_TESTS" = "xyes"])
 # ==========================================================================
 AC_CONFIG_FILES([
 Makefile
-avahi-common/Makefile
-avahi-core/Makefile
+avahi/Makefile
 examples/Makefile
 common/Makefile
 ])
@@ -344,6 +342,5 @@ echo "
 "
 
 echo "\
-    Building libavahi-core              yes
     Building tests:                     ${ENABLE_TESTS}
 "