summaryrefslogtreecommitdiff
authorMans Rullgard <mans@mansr.com>2012-08-28 15:24:09 (GMT)
committer Mans Rullgard <mans@mansr.com>2012-08-28 22:40:30 (GMT)
commit7baa115a33ab516c85ac94f6c5cdaee73e65ddf8 (patch)
treeaa4e40501185df89a54c4ed9865e96c5fc3389fd
parent095792f25351fbbaeb29504ae0a5d15c3f4b41d7 (diff)
downloadffmpeg-7baa115a33ab516c85ac94f6c5cdaee73e65ddf8.zip
ffmpeg-7baa115a33ab516c85ac94f6c5cdaee73e65ddf8.tar.gz
ffmpeg-7baa115a33ab516c85ac94f6c5cdaee73e65ddf8.tar.bz2
build: export filtered -lz flag in config.mak
This is needed to link tools/cws2fws using a linker with non-standard command line syntax. Signed-off-by: Mans Rullgard <mans@mansr.com>
Diffstat
-rw-r--r--Makefile2
-rwxr-xr-xconfigure1
2 files changed, 2 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index c49e381..b766e6d 100644
--- a/Makefile
+++ b/Makefile
@@ -93,7 +93,7 @@ all: $(PROGS)
$(TOOLS): %$(EXESUF): %.o
$(LD) $(LDFLAGS) $(LD_O) $< $(ELIBS)
-tools/cws2fws$(EXESUF): ELIBS = -lz
+tools/cws2fws$(EXESUF): ELIBS = $(ZLIB)
config.h: .config
.config: $(wildcard $(FFLIBS:%=$(SRC_PATH)/lib%/all*.c))
diff --git a/configure b/configure
index 06bcc1c..32118d0 100755
--- a/configure
+++ b/configure
@@ -3561,6 +3561,7 @@ TARGET_EXEC=$target_exec
TARGET_PATH=$target_path
LIBS-avplay=$sdl_libs
CFLAGS-avplay=$sdl_cflags
+ZLIB=$($ldflags_filter -lz)
LIB_INSTALL_EXTRA_CMD=$LIB_INSTALL_EXTRA_CMD
EXTRALIBS=$extralibs
INSTALL=install