Properly check for -lm

Originally committed as revision 10528 to svn://svn.ffmpeg.org/ffmpeg/trunk
pull/126/head
Ramiro Polla 18 years ago
parent f84c357325
commit 13ef78254d
  1. 7
      configure

7
configure vendored

@ -1078,7 +1078,6 @@ enabled_any x86_32 x86_64 && enable x86
enabled sparc64 && enable sparc enabled sparc64 && enable sparc
# OS specific # OS specific
osextralibs="-lm"
case $targetos in case $targetos in
beos|haiku|zeta) beos|haiku|zeta)
PREFIX="$HOME/config" PREFIX="$HOME/config"
@ -1129,14 +1128,13 @@ case $targetos in
need_memalign="no" need_memalign="no"
;; ;;
bsd/os) bsd/os)
osextralibs="-lpoll -lgnugetopt -lm" osextralibs="-lpoll -lgnugetopt"
strip="strip -d" strip="strip -d"
;; ;;
darwin) darwin)
need_memalign="no" need_memalign="no"
SHFLAGS="-dynamiclib -Wl,-single_module -Wl,-install_name,\$(SHLIBDIR)/\$(SLIBNAME),-current_version,\$(SPPVERSION),-compatibility_version,\$(SPPVERSION) -Wl,-read_only_relocs,suppress" SHFLAGS="-dynamiclib -Wl,-single_module -Wl,-install_name,\$(SHLIBDIR)/\$(SLIBNAME),-current_version,\$(SPPVERSION),-compatibility_version,\$(SPPVERSION) -Wl,-read_only_relocs,suppress"
VHOOKSHFLAGS='-dynamiclib -Wl,-single_module -flat_namespace -undefined suppress -Wl,-install_name,$(SHLIBDIR)/vhook/$@' VHOOKSHFLAGS='-dynamiclib -Wl,-single_module -flat_namespace -undefined suppress -Wl,-install_name,$(SHLIBDIR)/vhook/$@'
osextralibs=""
strip="strip -x" strip="strip -x"
FFLDFLAGS="-Wl,-dynamic,-search_paths_first" FFLDFLAGS="-Wl,-dynamic,-search_paths_first"
SLIBSUF=".dylib" SLIBSUF=".dylib"
@ -1172,7 +1170,6 @@ case $targetos in
VHOOKSHFLAGS="$VHOOKSHFLAGS -L\$(BUILD_ROOT)/libswscale" VHOOKSHFLAGS="$VHOOKSHFLAGS -L\$(BUILD_ROOT)/libswscale"
VHOOKLIBS="$VHOOKLIBS -lswscale\$(BUILDSUF)" VHOOKLIBS="$VHOOKLIBS -lswscale\$(BUILDSUF)"
fi fi
osextralibs=""
EXESUF=".exe" EXESUF=".exe"
SLIBPREF="cyg" SLIBPREF="cyg"
SLIBSUF=".dll" SLIBSUF=".dll"
@ -1195,6 +1192,8 @@ esac
add_extralibs $osextralibs add_extralibs $osextralibs
check_ldflags -lm
if ! disabled logging ; then if ! disabled logging ; then
enabled logging || logfile="$logging" enabled logging || logfile="$logging"
echo "# $0 $@" >$logfile echo "# $0 $@" >$logfile

Loading…
Cancel
Save