mirror of https://code.videolan.org/videolan/vlc
Undo erroneous previous commit
(wanted to cancel, but I pressed the wrong key)
This commit is contained in:
parent
a5f2904ae4
commit
52778f03a6
32
bootstrap
32
bootstrap
|
@ -48,12 +48,30 @@ fi
|
|||
|
||||
# Check for automake
|
||||
amvers="none"
|
||||
if automake-1.9 --version >/dev/null 2>&1; then
|
||||
amvers="-1.9"
|
||||
elif automake-1.8 --version >/dev/null 2>&1; then
|
||||
if automake-1.8 --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"
|
||||
# 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.7 --version >/dev/null 2>&1; then
|
||||
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
|
||||
amvers="-1.6"
|
||||
if expr "`automake-1.6 --version | sed -e '1s/[^0-9]*//' -e q`" "<=" "1.6.1" > /dev/null 2>&1; then
|
||||
|
@ -206,15 +224,13 @@ libvlcdir = \$(libdir)/vlc/\$(basedir)
|
|||
EXTRA_LIBRARIES = ${extra_libs}
|
||||
include Modules.am
|
||||
|
||||
if !BUILD_MOZILLA
|
||||
pic = no
|
||||
else
|
||||
if HAVE_WIN32
|
||||
### There's no need for pic code on win32 so get rid of this to substantially
|
||||
### reduce the compilation time.
|
||||
pic = no
|
||||
else
|
||||
if BUILD_MOZILLA
|
||||
pic = yes
|
||||
else
|
||||
pic = no
|
||||
endif
|
||||
endif
|
||||
|
||||
|
|
Loading…
Reference in New Issue