Commit 26d4d93c authored by Sam Hocevar's avatar Sam Hocevar

* ./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.
parent a150a631
......@@ -5,24 +5,29 @@ rm -f aclocal.m4 configure config.guess config.log config.sub ltmain.sh libtool
# 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
......
AC_INIT(src/libdvdcss.c)
AC_CANONICAL_SYSTEM
AC_CONFIG_AUX_DIR(.)
AM_INIT_AUTOMAKE(libdvdcss, 1.2.4)
AM_CONFIG_HEADER(config.h)
......
......@@ -65,7 +65,6 @@ package installed.
%setup -q
%build
./bootstrap
%configure
%make
......
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