#!/bin/sh
#
# $Id$
#
# GEOS Bootstrapping Script
#
giveup()
{
        echo
        echo "  Something went wrong, giving up!"
        echo
        exit 1
}

OSTYPE=`uname -s`

for aclocal in aclocal aclocal-1.10 aclocal-1.9; do
    ACLOCAL=`which $aclocal 2>/dev/null`
    if test -x "${ACLOCAL}"; then
        break;
    fi
done

for automake in automake automake-1.10 automake-1.9; do
    AUTOMAKE=`which $automake 2>/dev/null`
    if test -x "${AUTOMAKE}"; then
        break;
    fi
done


for libtoolize in glibtoolize libtoolize; do
    LIBTOOLIZE=`which $libtoolize 2>/dev/null`
    if test -x "${LIBTOOLIZE}"; then
        break;
    fi
done

#AMFLAGS="--add-missing --copy --force-missing"
AMFLAGS="--add-missing --copy"
if test "$OSTYPE" = "IRIX" -o "$OSTYPE" = "IRIX64"; then
   AMFLAGS=$AMFLAGS" --include-deps";
fi

echo "Running aclocal -I macros"
$ACLOCAL -I macros || giveup
echo "Running autoheader"
autoheader || giveup
echo "Running libtoolize"
$LIBTOOLIZE --force --copy || giveup
echo "Running automake"
$AUTOMAKE $AMFLAGS # || giveup
echo "Running autoconf"
autoconf || giveup

echo "======================================"
echo "Now you are ready to run './configure'"
echo "======================================"

#!/bin/sh
#
# $Id$
#
# GEOS Bootstrapping Script
#
giveup()
{
        echo
        echo "  Something went wrong, giving up!"
        echo
        exit 1
}

OSTYPE=`uname -s`

for libtoolize in glibtoolize libtoolize; do
    LIBTOOLIZE=`which $libtoolize 2>/dev/null`
    if test -x "${LIBTOOLIZE}"; then
        break;
    fi
done

#AMFLAGS="--add-missing --copy --force-missing"
AMFLAGS="--add-missing --copy"
if test "$OSTYPE" = "IRIX" -o "$OSTYPE" = "IRIX64"; then
   AMFLAGS=$AMFLAGS" --include-deps";
fi

echo "Running aclocal -I macros"
aclocal -I macros || giveup
echo "Running autoheader"
autoheader || giveup
echo "Running libtoolize"
$LIBTOOLIZE --force --copy || giveup
echo "Running automake"
automake $AMFLAGS # || giveup
echo "Running autoconf"
autoconf || giveup

echo "======================================"
echo "Now you are ready to run './configure'"
echo "======================================"

--- 
+++ 
@@ -14,21 +14,6 @@
 
 OSTYPE=`uname -s`
 
-for aclocal in aclocal aclocal-1.10 aclocal-1.9; do
-    ACLOCAL=`which $aclocal 2>/dev/null`
-    if test -x "${ACLOCAL}"; then
-        break;
-    fi
-done
-
-for automake in automake automake-1.10 automake-1.9; do
-    AUTOMAKE=`which $automake 2>/dev/null`
-    if test -x "${AUTOMAKE}"; then
-        break;
-    fi
-done
-
-
 for libtoolize in glibtoolize libtoolize; do
     LIBTOOLIZE=`which $libtoolize 2>/dev/null`
     if test -x "${LIBTOOLIZE}"; then
@@ -43,13 +28,13 @@
 fi
 
 echo "Running aclocal -I macros"
-$ACLOCAL -I macros || giveup
+aclocal -I macros || giveup
 echo "Running autoheader"
 autoheader || giveup
 echo "Running libtoolize"
 $LIBTOOLIZE --force --copy || giveup
 echo "Running automake"
-$AUTOMAKE $AMFLAGS # || giveup
+automake $AMFLAGS # || giveup
 echo "Running autoconf"
 autoconf || giveup
 
Add version test for aclocal and automake to allow OpenSolaris to work.


git-svn-id: 6c2b1bd10c324c49ea9d9e6e31006a80e70507cb@2241 5242fede-7e19-0410-aef8-94bd7d2200fb
