From 72c0a6b974a98392002f0e9bb0a4ac1a31227847 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Thu, 6 Oct 2011 21:13:02 +0200
Subject: [PATCH] config/functions: cleanup

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 config/functions | 52 ++++++++++++++++++++++++++++++++++--------------
 1 file changed, 37 insertions(+), 15 deletions(-)

diff --git a/config/functions b/config/functions
index 8bf9a821c8..5f5b8339a1 100644
--- a/config/functions
+++ b/config/functions
@@ -115,22 +115,44 @@ add_group() {
 }
 
 do_autoreconf() {
-  if [ -e $ROOT/$TOOLCHAIN/bin/autoreconf ] &&
-     [ -e $ROOT/$TOOLCHAIN/bin/autoconf ] &&
-     [ -e $ROOT/$TOOLCHAIN/bin/automake ] &&
-     [ -e $ROOT/$TOOLCHAIN/bin/libtoolize ] &&
-     [ -e $ROOT/$TOOLCHAIN/bin/intltoolize ]; then
-       export LIBTOOL=$ROOT/$TOOLCHAIN/bin/libtool
-       export LIBTOOLIZE=$ROOT/$TOOLCHAIN/bin/libtoolize
-       export AUTOMAKE=$ROOT/$TOOLCHAIN/bin/automake
-       export ACLOCAL_DIR=$SYSROOT_PREFIX/usr/share/aclocal
-       export ACLOCAL="$ROOT/$TOOLCHAIN/bin/aclocal -I $ACLOCAL_DIR"
-       export AUTOCONF=$ROOT/$TOOLCHAIN/bin/autoconf
-       export AUTOHEADER=$ROOT/$TOOLCHAIN/bin/autoheader
-       export AUTORECONF="$ROOT/$TOOLCHAIN/bin/autoreconf -v -f -i -I $ACLOCAL_DIR"
+  export ACLOCAL_DIR=$SYSROOT_PREFIX/usr/share/aclocal
 
-       mkdir -p $ACLOCAL_DIR
-       autoreconf --force --install -I $ACLOCAL_DIR $@
+  if [ -e $ROOT/$TOOLCHAIN/bin/autoconf ]; then
+    export AUTOCONF=$ROOT/$TOOLCHAIN/bin/autoconf
+  fi
+
+  if [ -e $ROOT/$TOOLCHAIN/bin/automake ]; then
+    export AUTOMAKE=$ROOT/$TOOLCHAIN/bin/automake
+  fi
+
+  if [ -e $ROOT/$TOOLCHAIN/bin/autopoint ]; then
+    export AUTOPOINT=$ROOT/$TOOLCHAIN/bin/autopoint
+  fi
+
+  if [ -e $ROOT/$TOOLCHAIN/bin/libtoolize ]; then
+    export LIBTOOLIZE=$ROOT/$TOOLCHAIN/bin/libtoolize
+  fi
+
+  if [ -e $ROOT/$TOOLCHAIN/bin/intltoolize ]; then
+    export INTLTOOLIZE=$ROOT/$TOOLCHAIN/bin/intltoolize
+  fi
+
+  if [ -e $ROOT/$TOOLCHAIN/bin/aclocal ]; then
+    export ACLOCAL="$ROOT/$TOOLCHAIN/bin/aclocal -I $ACLOCAL_DIR"
+  fi
+
+  if [ -e $ROOT/$TOOLCHAIN/bin/autoheader ]; then
+    export AUTOHEADER=$ROOT/$TOOLCHAIN/bin/autoheader
+  fi
+
+  if [ -e $ROOT/$TOOLCHAIN/bin/libtool ]; then
+    export LIBTOOL=$ROOT/$TOOLCHAIN/bin/libtool
+  fi
+
+  if [ -e $ROOT/$TOOLCHAIN/bin/autoreconf -a -e $INTLTOOLIZE ]; then
+    mkdir -p $ACLOCAL_DIR
+    export AUTORECONF="$ROOT/$TOOLCHAIN/bin/autoreconf --verbose --force --install -I $ACLOCAL_DIR"
+    $AUTORECONF $@
   fi
 }