X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=configure.ac;h=2986334eec5ad605c0a4445337020f492bffba80;hb=ba12decc4413dedf22c06545d1ec5938efa8954a;hp=cbdf26cc1627d8badd779984343960cfc9b11e57;hpb=3664c9f0cd50481ecff36b296065418df24620e1;p=catta

diff --git a/configure.ac b/configure.ac
index cbdf26c..2986334 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,13 +21,20 @@
 # USA.
 
 AC_PREREQ(2.57)
-AC_INIT([avahi],[0.2],[avahi (at) lists (dot) freedesktop (dot) org])
+AC_INIT([avahi],[0.4],[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://www.freedesktop.org/Software/Avahi])
 
+AC_SUBST(LIBAVAHI_COMMON_VERSION_INFO, [1:0:1])
+AC_SUBST(LIBAVAHI_CORE_VERSION_INFO, [0:2:0])
+AC_SUBST(LIBAVAHI_CLIENT_VERSION_INFO, [1:0:0])
+AC_SUBST(LIBAVAHI_GLIB_VERSION_INFO, [0:1:0])
+AC_SUBST(LIBAVAHI_QT3_VERSION_INFO, [0:0:0])
+AC_SUBST(LIBAVAHI_QT4_VERSION_INFO, [0:0:0])
+
 if type -p stow > /dev/null && test -d /usr/local/stow ; then
     AC_MSG_NOTICE([*** Found /usr/local/stow: default install prefix set to /usr/local/stow/${PACKAGE_NAME}-${PACKAGE_VERSION} ***])
     ac_default_prefix="/usr/local/stow/${PACKAGE_NAME}-${PACKAGE_VERSION}"
@@ -51,7 +58,7 @@ AC_PROG_LIBTOOL
 #
 AC_ARG_WITH(distro, AS_HELP_STRING([--with-distro=DISTRO],[Specify the Linux distribution to target: One of debian, gentoo, archlinux or none]))
 if test "z$with_distro" = "z"; then
-    #AC_CHECK_FILE(/etc/SuSE-release,with_distro="suse")
+    AC_CHECK_FILE(/etc/SuSE-release,with_distro="suse")
     AC_CHECK_FILE(/etc/gentoo-release,with_distro="gentoo")
     AC_CHECK_FILE(/etc/arch-release,with_distro="archlinux")
     AC_CHECK_FILE(/etc/debian_version,with_distro="debian")
@@ -63,7 +70,7 @@ if test "z$with_distro" = "z"; then
     exit 1
 else
 case $with_distro in
-    debian|gentoo|archlinux|none)
+    debian|gentoo|archlinux|suse|none)
      ;;
     *)
      AC_MSG_ERROR([Your distribution (${with_distro}) is not yet supported, init scripts and dbus configuration will not be installed! (patches welcome), you can specify --with-distro=none to skip this check])
@@ -71,7 +78,7 @@ case $with_distro in
 esac
 fi
 
-#AM_CONDITIONAL(TARGET_SUSE, test x"$with_distro" = xsuse)
+AM_CONDITIONAL(TARGET_SUSE, test x"$with_distro" = xsuse)
 AM_CONDITIONAL(TARGET_GENTOO, test x"$with_distro" = xgentoo)
 AM_CONDITIONAL(TARGET_DEBIAN, test x"$with_distro" = xdebian)
 AM_CONDITIONAL(TARGET_ARCHLINUX, test x"$with_distro" = xarchlinux)
@@ -241,12 +248,11 @@ if test "x$HAVE_GTK" = "xyes" ; then
         PKG_CHECK_MODULES(GLADE20, [ libglade-2.0 >= 2.4.0 ])
         AC_SUBST(GLADE20_CFLAGS)
         AC_SUBST(GLADE20_LIBS)
-
-        interfacesdir="${datadir}/${PACKAGE}/interfaces/"
-        AC_SUBST(interfacesdir)
 fi
 AM_CONDITIONAL(HAVE_GTK, test "x$HAVE_GTK" = "xyes")
 
+
+
 #
 # D-BUS
 #
@@ -265,7 +271,7 @@ AC_ARG_WITH(dbus-system-socket, AS_HELP_STRING([--with-dbus-system-address=<addr
 if test "x$HAVE_DBUS" = "xyes" ; then
     AC_DEFINE(HAVE_DBUS, 1, [Whether we have D-BUS or not])
 
-    PKG_CHECK_MODULES(DBUS, [ dbus-1 >= 0.30 ])
+    PKG_CHECK_MODULES(DBUS, [ dbus-1 >= 0.34 ])
     DBUS_CFLAGS="$DBUS_CFLAGS -DDBUS_API_SUBJECT_TO_CHANGE"
     AC_SUBST(DBUS_CFLAGS)
     AC_SUBST(DBUS_LIBS)
@@ -340,6 +346,9 @@ AC_ARG_ENABLE(python,
           *) AC_MSG_ERROR([bad value ${enableval} for --enable-python]) ;;
     esac],[HAVE_PYTHON=yes])
 
+HAVE_PYTHON_DBUS=no
+HAVE_PYGTK=no
+
 if test "x$HAVE_PYTHON" = "xyes" ; then
     AM_PATH_PYTHON([2.4])
 
@@ -356,7 +365,6 @@ if test "x$HAVE_PYTHON" = "xyes" ; then
         AM_CHECK_PYMOD(gtk,,,[AC_MSG_ERROR(Could not find Python module gtk)])
     fi
 
-    AM_CONDITIONAL(HAVE_PYGTK, test "x$HAVE_PYGTK" = "xyes")
 
     AC_ARG_ENABLE(python-dbus,
         AS_HELP_STRING([--disable-python-dbus],[Disable use of D-BUS in Python]),
@@ -371,13 +379,12 @@ if test "x$HAVE_PYTHON" = "xyes" ; then
         AM_CHECK_PYMOD(dbus,,,[AC_MSG_ERROR(Could not find Python module dbus)])
     fi
 
-    AM_CONDITIONAL(HAVE_PYTHON_DBUS, test "x$HAVE_PYTHON_DBUS" = "xyes")
-
     AM_CHECK_PYMOD(socket,,,[AC_MSG_ERROR(Could not find Python module socket)])
-    AM_CHECK_PYMOD(dbm,,,[AC_MSG_ERROR(Could not find Python module dbm)])
-    AM_CHECK_PYMOD(anydbm,,,[AC_MSG_ERROR(Could not find Python module anydbm)])
+    AM_CHECK_PYMOD(gdbm,,,[AC_MSG_ERROR(Could not find Python module gdbm)])
 fi
 AM_CONDITIONAL(HAVE_PYTHON, [test "x$HAVE_PYTHON" = "xyes" ])
+AM_CONDITIONAL(HAVE_PYGTK, test "x$HAVE_PYGTK" = "xyes")
+AM_CONDITIONAL(HAVE_PYTHON_DBUS, test "x$HAVE_PYTHON_DBUS" = "xyes")
 
 #
 # Defining Avahi User and Group.
@@ -409,6 +416,15 @@ AC_SUBST(avahi_runtime_dir)
 AC_SUBST(avahi_socket)
 
 
+#
+# Avahi interfaces dir
+#
+if test "x$HAVE_PYTHON_DBUS" = "xyes" -o "x$HAVE_GTK" = "xyes"; then
+	interfacesdir="${datadir}/${PACKAGE}/interfaces/"
+	AC_SUBST(interfacesdir)
+fi
+
+
 #
 # Doxygen
 #
@@ -463,6 +479,7 @@ initscript/Makefile
 initscript/debian/Makefile
 initscript/gentoo/Makefile
 initscript/archlinux/Makefile
+initscript/suse/Makefile
 avahi-dnsconfd/Makefile
 avahi-utils/Makefile
 avahi-utils/avahi/Makefile
@@ -471,6 +488,7 @@ common/Makefile
 man/Makefile
 tests/Makefile
 service-type-database/Makefile
+avahi-sharp/Makefile
 ])
 AC_OUTPUT