From fbb9d1043d775b1ba2524a7f03d05af5b3103cd1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADctor=20Paesa?= <wzrlpy@arsystel.com>
Date: Wed, 13 Sep 2006 22:04:40 +0000
Subject: [PATCH] =?UTF-8?q?Fix=20vhook=20build=20on=20Cygwin,=20shared=20b?=
 =?UTF-8?q?uilds=20only.=20patch=20by=20V=C3=ADctor=20Paesa,=20wzrlpy=20ar?=
 =?UTF-8?q?systel=20com?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Originally committed as revision 6247 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
 configure      | 12 +++++++++++-
 vhook/Makefile |  2 +-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/configure b/configure
index 308e2f180b..47a182a763 100755
--- a/configure
+++ b/configure
@@ -604,7 +604,8 @@ v4l="no"
 v4l2="no"
 audio_oss="yes"
 dv1394="no"
-vhook="no"
+VHOOKSHFLAGS="-shared -L../libavformat -L../libavcodec -L../libavutil"
+VHOOKLIBS='-lavformat$(BUILDSUF) -lavcodec$(BUILDSUF) -lavutil$(BUILDSUF) $(EXTRALIBS)'
 extralibs=""
 EXESUF=".exe"
 SLIBPREF="cyg"
@@ -1375,6 +1376,14 @@ if test "$vhook" = "yes" -o "$a52bin" = "yes" -o "$faadbin" = "yes"; then
     add_extralibs $ldl
 fi
 
+if test "$targetos" = "CYGWIN" -a "$lstatic" = "yes" ; then
+    vhook="no"
+    echo
+    echo "At the moment vhooks don't work on Cygwin static builds."
+    echo "Patches welcome."
+    echo
+fi
+
 if enabled vhook; then
     check_ldflags -rdynamic
     check_ldflags -export-dynamic
@@ -1635,6 +1644,7 @@ echo "LDCONFIG=$LDCONFIG" >> config.mak
 echo "FFSERVERLDFLAGS=$FFSERVERLDFLAGS" >> config.mak
 echo "SHFLAGS=$SHFLAGS" >> config.mak
 echo "VHOOKSHFLAGS=$VHOOKSHFLAGS" >> config.mak
+echo "VHOOKLIBS=$VHOOKLIBS" >> config.mak
 echo "LIBOBJFLAGS=$LIBOBJFLAGS" >> config.mak
 echo "BUILD_STATIC=$lstatic" >> config.mak
 echo "BUILDSUF=$BUILDSUF" >> config.mak
diff --git a/vhook/Makefile b/vhook/Makefile
index 255a2c6fed..d336d0445f 100644
--- a/vhook/Makefile
+++ b/vhook/Makefile
@@ -36,7 +36,7 @@ uninstall:
 	-rmdir "$(shlibdir)/vhook/"
 
 %$(SLIBSUF): %.o
-	$(CC) $(LDFLAGS) -o $@ $(VHOOKSHFLAGS) $< $(LIBS_$@)
+	$(CC) $(LDFLAGS) -o $@ $(VHOOKSHFLAGS) $< $(VHOOKLIBS) $(LIBS_$@)
 
 clean:
 	rm -f *.o *.d *~ *.a *.lib *.so *.dylib *.dll