mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-12-19 06:46:38 +00:00
configure.ac (FFMPEG_SOURCE): Enable PIC code using what ffmpeg wants us to tell it, --enable-shared. Works for me on...
Original commit message from CVS: 2008-04-15 Andy Wingo <wingo@pobox.com> * configure.ac (FFMPEG_SOURCE): Enable PIC code using what ffmpeg wants us to tell it, --enable-shared. Works for me on mac os 10.5 and on x86-64 rawhide.
This commit is contained in:
parent
32bed94a31
commit
e89529fccc
1 changed files with 2 additions and 4 deletions
|
@ -276,7 +276,8 @@ else
|
||||||
FFMPEG_SUBDIRS=gst-libs
|
FFMPEG_SUBDIRS=gst-libs
|
||||||
AC_DEFINE(HAVE_AVI_H)
|
AC_DEFINE(HAVE_AVI_H)
|
||||||
AC_DEFINE([FFMPEG_SOURCE], ["local snapshot"], [Describes where the FFmpeg libraries come from.])
|
AC_DEFINE([FFMPEG_SOURCE], ["local snapshot"], [Describes where the FFmpeg libraries come from.])
|
||||||
ac_configure_args="$ac_configure_args --disable-vhook --disable-ffserver --disable-ffplay --enable-postproc --enable-gpl --enable-static --disable-encoder=flac --disable-decoder=cavs --extra-cflags=-fPIC"
|
# Enable shared and static so that we get .a files, but with PIC code.
|
||||||
|
ac_configure_args="$ac_configure_args --disable-vhook --disable-ffserver --disable-ffplay --enable-postproc --enable-gpl --enable-static --enable-shared --disable-encoder=flac --disable-decoder=cavs"
|
||||||
case $host_os in
|
case $host_os in
|
||||||
# Unfortunately, in Mac OS 10.5 the current rev of ffmpeg builds
|
# Unfortunately, in Mac OS 10.5 the current rev of ffmpeg builds
|
||||||
# some non-PIC code into the .a file. See
|
# some non-PIC code into the .a file. See
|
||||||
|
@ -286,9 +287,6 @@ else
|
||||||
ac_configure_args="$ac_configure_args --disable-mmx --disable-altivec"
|
ac_configure_args="$ac_configure_args --disable-mmx --disable-altivec"
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
# --disable-shared on macos turns on -mdynamic-no-pic, which we
|
|
||||||
# can't have
|
|
||||||
ac_configure_args="$ac_configure_args --disable-shared"
|
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
AC_SUBST(FFMPEG_CO_DIR)
|
AC_SUBST(FFMPEG_CO_DIR)
|
||||||
|
|
Loading…
Reference in a new issue