shithub: libdvdcss

Info  •  Files  •  Log  •  Branches

* bootstrap:
    + Run libtoolize before aclocal.
    + Support automake 1.8.

--- a/bootstrap

+++ b/bootstrap

@@ -1,7 +1,7 @@

 #! /bin/sh

-##  bootstrap file for libdvdcss -- Sam Hocevar <sam@zoy.org>

-##  $Id: bootstrap,v 1.8 2003/11/06 10:12:38 sam Exp $

+##  generic bootstrap file for libraries -- Sam Hocevar <sam@zoy.org>

+##  $Id$

 set -x

 set -e

@@ -14,6 +14,8 @@

 # Check for automake

 amvers="no"

+if automake-1.8 --version >/dev/null 2>&1; then

+  amvers="-1.8"

 if automake-1.7 --version >/dev/null 2>&1; then

   amvers="-1.7"

 elif automake-1.6 --version >/dev/null 2>&1; then

@@ -37,10 +39,10 @@

 # Check for libtool

 libtoolize="no"

-if libtoolize --version >/dev/null 2>&1; then

-  libtoolize="libtoolize"

-elif glibtoolize --version >/dev/null 2>&1; then

+if glibtoolize --version >/dev/null 2>&1; then

   libtoolize="glibtoolize"

+elif libtoolize --version >/dev/null 2>&1; then

+  libtoolize="libtoolize"

 fi

 if test "$libtoolize" = "no"; then

@@ -54,14 +56,13 @@

 rm -Rf autom4te.cache

 (cd autotools && rm -f config.guess config.sub missing mkinstalldirs compile ltmain.sh depcomp install-sh)

-aclocal${amvers}

 ${libtoolize} --copy --force

-

 if test -f "ltmain.sh"; then

   echo "$0: working around a minor libtool issue"

   mv ltmain.sh autotools/

 fi

+aclocal${amvers}

 autoconf

 autoheader

 automake${amvers} --add-missing --copy