Commit 536b0b58 authored by Thomas B. Rücker's avatar Thomas B. Rücker 😊
Browse files

Applying

svn path=/icecast/trunk/icecast/; revision=19177
parent a82d5fa3
...@@ -22,7 +22,7 @@ VERSIONGREP="sed -e s/.*[^0-9\.]\([0-9]\.[0-9]\).*/\1/" ...@@ -22,7 +22,7 @@ VERSIONGREP="sed -e s/.*[^0-9\.]\([0-9]\.[0-9]\).*/\1/"
# do we need automake? # do we need automake?
if test -r Makefile.am; then if test -r Makefile.am; then
echo Checking for automake version echo "Checking for automake version"
options=`fgrep AUTOMAKE_OPTIONS Makefile.am` options=`fgrep AUTOMAKE_OPTIONS Makefile.am`
AM_NEEDED=`echo "$options" | $VERSIONGREP` AM_NEEDED=`echo "$options" | $VERSIONGREP`
AM_PROGS=automake AM_PROGS=automake
...@@ -70,14 +70,20 @@ if test -r Makefile.am; then ...@@ -70,14 +70,20 @@ if test -r Makefile.am; then
} }
fi fi
(libtoolize --version) > /dev/null 2>&1 || { if command libtoolize --version 2>/dev/null; then
USE_GLIBTOOLIZE=0
else
if command glibtoolize --version 2>/dev/null; then
USE_GLIBTOOLIZE=1
else
echo echo
echo "You must have libtool installed to compile $package." echo "You must have libtool installed to compile $package."
echo "Download the appropriate package for your system," echo "Download the appropriate package for your system,"
echo "or get the source from one of the GNU ftp sites" echo "or get the source from one of the GNU ftp sites"
echo "listed in http://www.gnu.org/order/ftp.html" echo "listed in http://www.gnu.org/order/ftp.html"
DIE=1 DIE=1
} fi
fi
if test "$DIE" -eq 1; then if test "$DIE" -eq 1; then
exit 1 exit 1
...@@ -94,8 +100,13 @@ fi ...@@ -94,8 +100,13 @@ fi
echo " autoheader" echo " autoheader"
autoheader autoheader
echo " libtoolize --automake" if test "$USE_GLIBTOOLIZE" -eq 0; then
libtoolize --automake echo " libtoolize --automake"
libtoolize --automake
else
echo " glibtoolize --automake"
glibtoolize --automake
fi
if test -n "$AUTOMAKE"; then if test -n "$AUTOMAKE"; then
echo " $AUTOMAKE --add-missing" echo " $AUTOMAKE --add-missing"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment