ref: 26d4d93c453ace4533fdc6c9bce594ca7681dc46
parent: a150a631e85f3ee338597e29b29f5460e7a8d45f
author: Sam Hocevar <sam@videolan.org>
date: Thu Nov 14 07:41:47 EST 2002
* ./configure.ac: explicitly set AC_CONFIG_AUX_DIR(.) so that people who
do bootstrap without paying attention to error messages don't screw up
packages :-)
* ./libdvdcss.spec: removed bootstrap from the build phase.
* ./bootstrap: we accept automake 1.7.
--- a/bootstrap
+++ b/bootstrap
@@ -5,24 +5,29 @@
# Check for automake
amvers="none"
-if automake-1.6 --version >/dev/null 2>&1
+if automake-1.7 --version >/dev/null 2>&1
then
- amvers="-1.6"
+ amvers="-1.7"
else
- if automake-1.5 --version >/dev/null 2>&1
+ if automake-1.6 --version >/dev/null 2>&1
then
- amvers="-1.5"
+ amvers="-1.6"
else
- if automake --version > /dev/null 2>&1
+ if automake-1.5 --version >/dev/null 2>&1
then
- amvers=`automake --version | sed -e '1s/[^0-9]*//' -e q`
-
- if expr "$amvers" "<" "1.5" > /dev/null 2>&1
- then amvers="none"
- else amvers=""
- fi
- fi
- fi
+ amvers="-1.5"
+ else
+ if automake --version > /dev/null 2>&1
+ then
+ amvers=`automake --version | sed -e '1s/[^0-9]*//' -e q`
+
+ if expr "$amvers" "<" "1.5" > /dev/null 2>&1
+ then amvers="none"
+ else amvers=""
+ fi
+ fi
+ fi
+ fi
fi
if test x$amvers = xnone
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,7 @@
AC_INIT(src/libdvdcss.c)
AC_CANONICAL_SYSTEM
+AC_CONFIG_AUX_DIR(.)
AM_INIT_AUTOMAKE(libdvdcss, 1.2.4)
AM_CONFIG_HEADER(config.h)
--- a/libdvdcss.spec
+++ b/libdvdcss.spec
@@ -65,7 +65,6 @@
%setup -q
%build
-./bootstrap
%configure
%make