[FFmpeg-cvslog] r9312 - in trunk: configure vhook/Makefile
ramiro
subversion
Thu Jun 14 18:43:56 CEST 2007
Author: ramiro
Date: Thu Jun 14 18:43:56 2007
New Revision: 9312
Log:
Make ppm vhook depend on fork()
Modified:
trunk/configure
trunk/vhook/Makefile
Modified: trunk/configure
==============================================================================
--- trunk/configure (original)
+++ trunk/configure Thu Jun 14 18:43:56 2007
@@ -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
Modified: trunk/vhook/Makefile
==============================================================================
--- trunk/vhook/Makefile (original)
+++ trunk/vhook/Makefile Thu Jun 14 18:43:56 2007
@@ -6,8 +6,12 @@ CFLAGS=-I$(BUILD_ROOT) -I$(SRC_PATH) -I$
-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)
More information about the ffmpeg-cvslog
mailing list