Make ppm vhook depend on fork()
authorRamiro Polla <ramiro.polla@gmail.com>
Thu, 14 Jun 2007 16:43:56 +0000 (16:43 +0000)
committerRamiro Polla <ramiro.polla@gmail.com>
Thu, 14 Jun 2007 16:43:56 +0000 (16:43 +0000)
Originally committed as revision 9312 to svn://svn.ffmpeg.org/ffmpeg/trunk

configure
vhook/Makefile

index 119320e..1b3b114 100755 (executable)
--- a/configure
+++ b/configure
@@ -1667,6 +1667,8 @@ elif check_func dlopen -ldl; then
     ldl=-ldl
 fi
 
     ldl=-ldl
 fi
 
+check_func fork
+
 test "$vhook" = "default" && vhook="$dlopen"
 
 enabled_any vhook liba52bin libfaadbin ffserver && add_extralibs $ldl
 test "$vhook" = "default" && vhook="$dlopen"
 
 enabled_any vhook liba52bin libfaadbin ffserver && add_extralibs $ldl
index 2829817..663a66a 100644 (file)
@@ -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
 
        -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)
 
 ifeq ($(HAVE_IMLIB2),yes)
     HOOKS += imlib2$(SLIBSUF)