[adonthell-wastesedge-commits] Release_0-3-4 ed9afe1 01/22: FIXED autogen.sh (no longer deletes intl/Makefile.in)

[Kai Sterker]

tag: Release_0-3-4
commit ed9afe169fd22d9c1ef4e1f97ba49363e3414c4d
Author: Kai Sterker <address@hidden>
Commit: Kai Sterker <address@hidden>

    FIXED autogen.sh (no longer deletes intl/Makefile.in)
---
 autogen.sh |   31 +++++++++++++++++++++++++------
 1 file changed, 25 insertions(+), 6 deletions(-)

diff --git a/autogen.sh b/autogen.sh
index 173eb8b..f0687d9 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,16 +1,35 @@
 #!/bin/sh
 # First of all clean up the generated crud
-rm -f configure config.log config.guess config.sub config.cache
-rm -f config.status
+rm -f configure config.log config.cache
+rm -f config.status aclocal.m4
+mv intl/Makefile.in intl/Makefile.bak
 rm -f `find . -name 'Makefile.in'`
+mv intl/Makefile.bak intl/Makefile.in
 rm -f `find . -name 'Makefile'`
 
 # Regenerate everything
-aclocal -I .
-automake --add-missing --gnu --copy
+
+#
+# use aclocal v1.6 if available
+#
+if test "x`which aclocal-1.6`" = "x" ; then
+  aclocal -I .
+else
+  aclocal-1.6 -I .
+fi
+
+#
+# use Autmake v1.6 if available
+#
+if test "x`which automake-1.6`" = "x" ; then
+  automake --add-missing --gnu --copy
+else
+  automake-1.6 --add-missing --gnu --copy
+fi
+
 autoconf 
 
 echo
-echo "Now type './configure' to prepare Waste's Edge for installation."
-echo "Afterwards, 'make install' will install it."
+echo "Now type './configure' to prepare Adonthell for compilation."
+echo "Afterwards, 'make' will build Adonthell."
 echo