Require automake 1.9

git-svn-id: file:///home/lennart/svn/public/avahi/trunk@241 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe

diff --git a/bootstrap.sh b/bootstrap.sh
index acb153ddbcd09cdbea1b94987b7a28729a346805..d24de757efb015e99afb7984b12a0b41f95397cb 100755 (executable)
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -18,6 +18,8 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 # USA.
 
+VERSION=1.9
+
 run_versioned() {
     local P
     type -p "$1-$2" &> /dev/null && P="$1-$2" || local P="$1"
@@ -28,7 +30,7 @@ run_versioned() {
 
 if [ "x$1" = "xam" ] ; then
     set -ex
-    run_versioned automake 1.9 -a -c --foreign
+    run_versioned automake "$VERSION" -a -c --foreign
     ./config.status
 else 
     set -ex
@@ -36,10 +38,10 @@ else
     rm -rf autom4te.cache
     rm -f config.cache
 
-    run_versioned aclocal 1.9 -I common
+    run_versioned aclocal "$VERSION" -I common
     libtoolize -c --force
     autoheader
-    run_versioned automake 1.9 -a -c --foreign
+    run_versioned automake "$VERSION" -a -c --foreign
     autoconf -Wall
 
     CFLAGS="$CFLAGS -g -O0" ./configure --sysconfdir=/etc --localstatedir=/var "$@"

diff --git a/configure.ac b/configure.ac
index 3fbe8ae27c773a4e9af151ba77bb79dcfb7b03b8..a4ad8fdbd4bdea568fa7a36dd3245ae67045e0ab 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -24,7 +24,7 @@ AC_PREREQ(2.57)
 AC_INIT([avahi],[0.1],[mzninuv (at) 0pointer (dot) de])
 AC_CONFIG_SRCDIR([avahi-core])
 AC_CONFIG_HEADERS([config.h])
-AM_INIT_AUTOMAKE([foreign -Wall])
+AM_INIT_AUTOMAKE([foreign 1.9 -Wall])
 
 AC_SUBST(PACKAGE_URL, [http://www.freedesktop.org/Software/Avahi])
 
@@ -71,7 +71,7 @@ AC_SUBST(GLIB20_CFLAGS)
 AC_SUBST(GLIB20_LIBS)
 
 AC_ARG_ENABLE(gtk,
-        AC_HELP_STRING([--enable-gtk],[use GTK+ (default=yes)]),
+        AS_HELP_STRING(--enable-gtk,use GTK+ (default=yes)),
         [case "${enableval}" in
                 yes) ENABLE_GTK=yes ;;
                 no)  ENABLE_GTK=no ;;
@@ -113,7 +113,7 @@ DX_INIT_DOXYGEN(avahi, doxygen.cfg, doxygen)
 # D-BUS
 #
 AC_ARG_ENABLE(dbus,
-        AC_HELP_STRING([--enable-dbus],[use DBus (default=yes)]),
+        AS_HELP_STRING(--enable-dbus,use DBus (default=yes)),
         [case "${enableval}" in
                 yes) ENABLE_DBUS=yes ;;
                 no)  ENABLE_DBUS=no ;;
@@ -169,7 +169,7 @@ fi
 #
 # Detecting the linux distro for specific things like initscripts.
 #
-AC_ARG_WITH(distro, AC_HELP_STRING([--with-distro=DISTRO], [Specify the Linux distribution to target: One of redhat, suse, gentoo, debian, or slackware]))
+AC_ARG_WITH(distro, AS_HELP_STRING(--with-distro=DISTRO,Specify the Linux distribution to target: One of redhat, suse, gentoo, debian, or slackware))
 if test "z$with_distro" = "z"; then
    AC_CHECK_FILE(/etc/redhat-release,with_distro="redhat")
    AC_CHECK_FILE(/etc/SuSE-release,with_distro="suse")