Commit a5f2904a authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Don't fallback to automake 1.6

bootstrap might be a little slower,
but that'll ensure more recent build-system in tarballs.
Besides, 
parent c7e38315
...@@ -48,30 +48,12 @@ fi ...@@ -48,30 +48,12 @@ fi
# Check for automake # Check for automake
amvers="none" amvers="none"
if automake-1.8 --version >/dev/null 2>&1; then if automake-1.9 --version >/dev/null 2>&1; then
amvers="-1.8"
# If we also have 1.6 (>> 1.6.1), use it instead because it is faster
if automake-1.6 --version >/dev/null 2>&1; then
if expr "`automake-1.6 --version | sed -e '1s/[^0-9]*//' -e q`" ">" "1.6.1" > /dev/null 2>&1; then
amvers="-1.6"
fi
fi
elif automake-1.9 --version >/dev/null 2>&1; then
amvers="-1.9" amvers="-1.9"
# If we also have 1.6 (>> 1.6.1), use it instead because it is faster elif automake-1.8 --version >/dev/null 2>&1; then
if automake-1.6 --version >/dev/null 2>&1; then amvers="-1.8"
if expr "`automake-1.6 --version | sed -e '1s/[^0-9]*//' -e q`" ">" "1.6.1" > /dev/null 2>&1; then
amvers="-1.6"
fi
fi
elif automake-1.7 --version >/dev/null 2>&1; then elif automake-1.7 --version >/dev/null 2>&1; then
amvers="-1.7" amvers="-1.7"
# If we also have 1.6 (>> 1.6.1), use it instead because it is faster
if automake-1.6 --version >/dev/null 2>&1; then
if expr "`automake-1.6 --version | sed -e '1s/[^0-9]*//' -e q`" ">" "1.6.1" > /dev/null 2>&1; then
amvers="-1.6"
fi
fi
elif automake-1.6 --version >/dev/null 2>&1; then elif automake-1.6 --version >/dev/null 2>&1; then
amvers="-1.6" amvers="-1.6"
if expr "`automake-1.6 --version | sed -e '1s/[^0-9]*//' -e q`" "<=" "1.6.1" > /dev/null 2>&1; then if expr "`automake-1.6 --version | sed -e '1s/[^0-9]*//' -e q`" "<=" "1.6.1" > /dev/null 2>&1; then
...@@ -224,13 +206,15 @@ libvlcdir = \$(libdir)/vlc/\$(basedir) ...@@ -224,13 +206,15 @@ libvlcdir = \$(libdir)/vlc/\$(basedir)
EXTRA_LIBRARIES = ${extra_libs} EXTRA_LIBRARIES = ${extra_libs}
include Modules.am include Modules.am
if !BUILD_MOZILLA
pic = no
else
if HAVE_WIN32 if HAVE_WIN32
### There's no need for pic code on win32 so get rid of this to substantially ### There's no need for pic code on win32 so get rid of this to substantially
### reduce the compilation time. ### reduce the compilation time.
pic = no pic = no
else
if BUILD_MOZILLA
pic = yes
else
pic = no
endif endif
endif endif
......
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