From b4104d99c968abd0ac9bd5a380e3e6d66e6b68ad Mon Sep 17 00:00:00 2001
From: Radim Kolar <>
Date: Fri, 12 Jun 2009 16:09:45 +0200
Subject: [PATCH] Fixed FREEBSD fallback part of autogen.sh corrected execution
 order of tools in GNU build system

---
 autogen.sh | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/autogen.sh b/autogen.sh
index f72ed4f..b4f9a5e 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -14,7 +14,15 @@ rm -f Makefile "Makefile.in"
 echo "Generating configure and friends..."
 if [ `uname -s` = 'FreeBSD' ]; then
     echo "* FreeBSD detected"
-    echo "* Using autoconf 2.59"
+    if [ -x /usr/local/bin/autoconf259 ]; then
+        echo "* Using autoconf 2.59"
+    	AUTOCONF=autoconf259; export AUTOCONF
+        AUTOHEADER=autoheader259; export AUTOHEADER
+    else
+	echo "* Using system default autoconf"
+	AUTOCONF=autoconf
+	AUTOHEADER=autoheader
+    fi
     if [ -x /usr/local/bin/automake19 ]; then
 	echo "* Using automake 1.9"
         ACLOCAL=aclocal19; export ACLOCAL
@@ -25,14 +33,19 @@ if [ `uname -s` = 'FreeBSD' ]; then
         AUTOMAKE=automake18; export AUTOMAKE
     else
 	echo "* Using system default automake"
+	ACLOCAL=aclocal
+	AUTOMAKE=automake
     fi
     #Use autoconf 2.59 + automake 1.X pair
-    AUTOHEADER=autoheader259; export AUTOHEADER
-    AUTOCONF=autoconf259; export AUTOCONF
     export LDFLAGS=-L/usr/local/lib
+    echo "Running $ACLOCAL"
     $ACLOCAL -I /usr/local/share/aclocal
-    $AUTOMAKE -a
+    echo "Running $AUTOCONF"
     $AUTOCONF
+    echo "Running $AUTOHEADER"
+    $AUTOHEADER
+    echo "Running $AUTOMAKE"
+    $AUTOMAKE -a
     #autoreconf259 -iv -I /usr/local/share/aclocal
 else
     echo "Using your default auto* tools"