diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2005-06-27 00:55:29 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2005-06-27 00:55:29 +0000 |
| commit | 80581e9887ce9968516ec4d7a6a450eeec6e4ade (patch) | |
| tree | 074650375c16b1d696a66798d3757f08e008b509 /configure | |
| parent | 16423e179bf2da7e961f60c2efb59fb31f671cc7 (diff) | |
| download | ffmpeg-80581e9887ce9968516ec4d7a6a450eeec6e4ade.tar.gz | |
x86_64 + PIC fix by (Jacob Meuser: jakemsr, jakemsr com)
Originally committed as revision 4397 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 14 |
1 files changed, 13 insertions, 1 deletions
@@ -197,6 +197,7 @@ netserver="no" need_inet_aton="no" ffserver="yes" ffplay="yes" +LIBOBJFLAGS="" LDFLAGS=-Wl,--warn-common FFSLDFLAGS=-Wl,-E LDCONFIG="ldconfig" @@ -276,7 +277,7 @@ bktr="yes" audio_oss="yes" dv1394="no" make="gmake" -CFLAGS="$CFLAGS \$(PIC)" +LIBOBJFLAGS="\$(PIC)" LDFLAGS="$LDFLAGS -export-dynamic -pthread" LDCONFIG="ldconfig -m \$(libdir)" extralibs="$extralibs -lossaudio" @@ -1103,6 +1104,16 @@ if test "$optimize" = "yes"; then fi fi +# PIC flags for shared library objects where they are needed +if test "$lshared" = "yes" ; then + # LIBOBJFLAGS may have already been set in the OS configuration + if test -z "$LIBOBJFLAGS" ; then + if test "$cpu" = "x86_64" ; then + LIBOBJFLAGS="\$(PIC)" + fi + fi +fi + if test x"$bindir" = x""; then bindir="${prefix}/bin" fi @@ -1219,6 +1230,7 @@ echo "LDFLAGS=$LDFLAGS" >> config.mak echo "LDCONFIG=$LDCONFIG" >> config.mak echo "FFSLDFLAGS=$FFSLDFLAGS" >> config.mak echo "SHFLAGS=$SHFLAGS" >> config.mak +echo "LIBOBJFLAGS=$LIBOBJFLAGS" >> config.mak echo "BUILDSUF=$BUILDSUF" >> config.mak echo "LIBPREF=$LIBPREF" >> config.mak echo "LIBSUF=\${BUILDSUF}$LIBSUF" >> config.mak |