Commit 393daac2 authored by Loren Merritt's avatar Loren Merritt

regression in r669: --enable-shared should imply --enable-pic on some archs.


git-svn-id: svn://svn.videolan.org/x264/trunk@670 df754926-b1dd-0310-bc7b-ec298dee348c
parent 11380085
......@@ -152,9 +152,6 @@ for opt do
;;
--enable-shared)
shared="yes"
if [ $ARCH = "X86_64" -o $ARCH = "PPC" -o $ARCH = "ALPHA" ] ; then
pic="yes"
fi
;;
--enable-visualize)
LDFLAGS="$LDFLAGS -L/usr/X11R6/lib -lX11"
......@@ -305,6 +302,10 @@ esac
# check requirements
if [ $shared = yes -a \( $ARCH = "X86_64" -o $ARCH = "PPC" -o $ARCH = "ALPHA" \) ] ; then
pic="yes"
fi
if [ $SYS = MACOSX -a $ARCH = X86 ]
then
# we want Apple's nasm from Xcode 2.4.1 or later
......
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