Mercurial > mplayer.hg

changeset 19546:e32250c3db9a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add --extra-libs option to pass linker flags.
author diego
date Sat, 26 Aug 2006 20:53:37 +0000
parents 8f46b547db39
children 8f42b470ae8d
files Makefile configure
diffstat 2 files changed, 8 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile	Sat Aug 26 20:09:54 2006 +0000
+++ b/Makefile	Sat Aug 26 20:53:37 2006 +0000
@@ -150,6 +150,7 @@
               $(ARCH_LIB) \
               $(MATH_LIB) \
               $(LIBC_LIB) \
+              $(EXTRALIBS) \
 
 PARTS = libmpdemux \
         stream \
--- a/configure	Sat Aug 26 20:09:54 2006 +0000
+++ b/configure	Sat Aug 26 20:53:37 2006 +0000
@@ -406,7 +406,8 @@
 Use these options if autodetection fails (Options marked with (*) accept
 multiple paths separated by ':'):
   --with-extraincdir=DIR   extra headers (png, mad, sdl, ...) in DIR (*)
-  --with-extralibdir=DIR   extra library files (png, mad, sdl, ...) in DIR (*)
+  --with-extralibdir=DIR   extra linker search paths in DIR (*)
+  --extra-libs=FLAGS       extra linker flags
   --with-x11libdir=DIR     X library files in DIR (*)
   --with-mlibdir=DIR       libmlib (mediaLib support) in DIR (Solaris only)
   --with-codecsdir=DIR     Binary codec files in DIR
@@ -501,6 +502,9 @@
   --with-extralibdir=*)
     _ld_extra=-L`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -L,g'`
     ;;
+  --extra-libs=*)
+    _extra_libs=`echo $ac_option | cut -d '=' -f 2`
+    ;;
   --enable-runtime-cpudetection)
     _runtime_cpudetection=yes
     ;;
@@ -1719,6 +1723,7 @@
   --disable-static*) ;;
   --with-extraincdir=*) ;;
   --with-extralibdir=*) ;;
+  --extra-libs=*) ;;
   --enable-runtime-cpudetection) ;;
   --disable-runtime-cpudetection) ;;
   --enable-cross-compile) ;;
@@ -7301,6 +7306,7 @@
 JPEG = $_jpeg
 GIF = $_gif
 
+EXTRALIBS = $_extra_libs
 EXTRA_LIB = $_ld_extra
 Z_LIB =  $_ld_static $_ld_zlib
 HAVE_MLIB = $_mlib