summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRamiro Polla <ramiro.polla@gmail.com>2007-06-14 16:43:56 +0000
committerRamiro Polla <ramiro.polla@gmail.com>2007-06-14 16:43:56 +0000
commit4f3da9852674d6dd72e0169fd33b3c30c48bd263 (patch)
tree2d8464cf6383c7065751e16dd2c60b1c85f54334
parentb0268cc06002eb22d80bce15e349742476e15f09 (diff)
Make ppm vhook depend on fork()
Originally committed as revision 9312 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rwxr-xr-xconfigure2
-rw-r--r--vhook/Makefile8
2 files changed, 8 insertions, 2 deletions
diff --git a/configure b/configure
index 119320e76d..1b3b1147a0 100755
--- a/configure
+++ b/configure
@@ -1667,6 +1667,8 @@ elif check_func dlopen -ldl; then
ldl=-ldl
fi
+check_func fork
+
test "$vhook" = "default" && vhook="$dlopen"
enabled_any vhook liba52bin libfaadbin ffserver && add_extralibs $ldl
diff --git a/vhook/Makefile b/vhook/Makefile
index 2829817607..663a66a989 100644
--- a/vhook/Makefile
+++ b/vhook/Makefile
@@ -6,8 +6,12 @@ CFLAGS=-I$(BUILD_ROOT) -I$(SRC_PATH) -I$(SRC_PATH)/libavutil -I$(SRC_PATH)/libav
-I$(SRC_PATH)/libavformat -I$(SRC_PATH)/libswscale $(VHOOKCFLAGS) -DHAVE_AV_CONFIG_H
LDFLAGS+= -g
-HOOKS=null$(SLIBSUF) fish$(SLIBSUF) ppm$(SLIBSUF) watermark$(SLIBSUF)
-ALLHOOKS=$(HOOKS) imlib2$(SLIBSUF) drawtext$(SLIBSUF)
+HOOKS=null$(SLIBSUF) fish$(SLIBSUF) watermark$(SLIBSUF)
+ALLHOOKS=$(HOOKS) ppm$(SLIBSUF) imlib2$(SLIBSUF) drawtext$(SLIBSUF)
+
+ifeq ($(HAVE_FORK),yes)
+ HOOKS += ppm$(SLIBSUF)
+endif
ifeq ($(HAVE_IMLIB2),yes)
HOOKS += imlib2$(SLIBSUF)