From: Sebastien Estienne <sebastien.estienne@gmail.com>
Date: Tue, 18 Oct 2005 18:36:01 +0000 (+0000)
Subject:  * modified autogen.sh to better support bsd
X-Git-Url: https://git.meshlink.io/?a=commitdiff_plain;h=8b22b43669d936ab75914732209f93a0b7ee81f4;p=catta

 * modified autogen.sh to better support bsd
 * added some info for autogen.sh on bsd in the script
 * cleaned some avahi_log


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

diff --git a/autogen.sh b/autogen.sh
index 9205c57..a9614a5 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -22,7 +22,9 @@ VERSION=1.9
 
 run_versioned() {
     local P
-    type -p "$1-$2" &> /dev/null && P="$1-$2" || local P="$1"
+    type -p "$1-$2" &> /dev/null && P="$1-$2" \
+	|| type -p "$1`echo $2 | tr -d '.'`" &> /dev/null && P="$1`echo $2 | tr -d '.'`" \
+	|| local P="$1"
 
     shift 2
     "$P" "$@"
@@ -37,10 +39,10 @@ else
     rm -rf autom4te.cache
     rm -f config.cache
 
-    libtoolize -c --force
+    run_versioned libtoolize 1.5 -c --force
     run_versioned aclocal "$VERSION" -I common
-    autoconf -Wall
-    autoheader
+    run_versioned autoconf 2.59 -Wall
+    run_versioned autoheader 2.59
     run_versioned automake "$VERSION" -a -c --foreign
 
     if test "x$NOCONFIGURE" = "x"; then
@@ -48,3 +50,8 @@ else
         make clean
     fi
 fi
+
+# on FreeBSD i must copy this file
+# cp /usr/local/share/aclocal/libtool15.m4 common/
+# cp /usr/local/share/aclocal/pkg.m4 common/
+#./configure --disable-qt3 --disable-qt4 --disable-mono --disable-monodoc --disable-python --disable-dbus --disable-glib --disable-expat --disable-libdaemon --with-distro=none --disable-gtk --disable-xmltoman
diff --git a/avahi-core/iface-pfroute.c b/avahi-core/iface-pfroute.c
index e05b226..17b80d4 100644
--- a/avahi-core/iface-pfroute.c
+++ b/avahi-core/iface-pfroute.c
@@ -189,7 +189,7 @@ static void parse_rtmsg(struct rt_msghdr *rtm, int msglen, AvahiInterfaceMonitor
   assert(rtm);
   
   if (rtm->rtm_version != RTM_VERSION) {
-    avahi_log_warn("routing message version %d not understood\n",
+    avahi_log_warn("routing message version %d not understood",
 		   rtm->rtm_version);
     return;
   }
@@ -227,7 +227,7 @@ static void socket_event(AvahiWatch *w, int fd, AvahiWatchEvent event,void *user
 	return;
       }
 
-      avahi_log_debug("\ngot message of size %d on %s", (int)bytes, ctime(&now));
+      avahi_log_debug("socket_event: got message of size %d on %s", (int)bytes, ctime(&now));
       parse_rtmsg((struct rt_msghdr *)msg, bytes ,m);
     }
     while (bytes > 0);