More fixes to compile and build on more platforms.

Originally committed as revision 1280 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/Makefile b/Makefile
index 95fa31d..db78217 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -69,7 +69,7 @@ ffmpeg$(EXE): ffmpeg_g$(EXE)
 ffserver$(EXE): ffserver.o $(DEP_LIBS)
        $(CC) $(LDFLAGS) $(FFSLDFLAGS) \
                -o $@ ffserver.o -L./libavcodec -L./libavformat \
-              -lavformat -lavcodec -ldl $(EXTRALIBS) 
+              -lavformat -lavcodec $(EXTRALIBS) 
 
 ffplay: ffmpeg$(EXE)
        ln -sf $< $@
@@ -120,7 +120,7 @@ TAGS:
 # regression tests
 
 libavtest test mpeg4 mpeg: ffmpeg$(EXE)
-       make -C tests $@
+       $(MAKE) -C tests $@
 
 ifneq ($(wildcard .depend),)
 include .depend

diff --git a/configure b/configure
index f962eb5..cf38fb7 100755 (executable)
--- a/configure
+++ b/configure
@@ -100,6 +100,12 @@ else
 netserver="yes"
 extralibs="-lnet"
 fi ;;
+FreeBSD)
+v4l="no"
+audio_oss="yes"
+make="gmake"
+LDFLAGS="-export-dynamic"
+;;
 BSD/OS)
 v4l="no"
 audio_oss="yes"
@@ -148,10 +154,17 @@ cat > $TMPC << EOF
 int main( void ) { return (int) dlopen("foo", 0); }
 EOF
 
+ldl=-ldl
+
 if $cc -o $TMPO $TMPC -ldl 2> /dev/null  ; then
 vhook=yes
 fi
 
+if $cc -o $TMPO $TMPC 2> /dev/null  ; then
+vhook=yes
+ldl=""
+fi
+
 cat > $TMPC << EOF
 #include <X11/Xlib.h>
 #include <Imlib2.h>
@@ -201,7 +214,7 @@ for opt do
   ;;
   --disable-a52) a52="no"
   ;;
-  --enable-a52bin) a52bin="yes" ; extralibs="-ldl $extralibs"
+  --enable-a52bin) a52bin="yes" ; extralibs="$ldl $extralibs"
   ;;
   --enable-mp3lame) mp3lame="yes"
   ;;
@@ -475,7 +488,6 @@ echo "STRIP=$strip" >> config.mak
 echo "OPTFLAGS=$CFLAGS" >> config.mak
 echo "LDFLAGS=$LDFLAGS" >> config.mak
 echo "SHFLAGS=$SHFLAGS" >> config.mak
-echo "LDFLAGS=$LDFLAGS" >> config.mak
 if test "$cpu" = "x86" ; then
   echo "TARGET_ARCH_X86=yes" >> config.mak
   echo "#define ARCH_X86 1" >> $TMPH
@@ -529,7 +541,7 @@ fi
 if test "$vhook" = "yes" ; then
   echo "BUILD_VHOOK=yes" >> config.mak
   echo "#define HAVE_VHOOK 1" >> $TMPH
-  extralibs="$extralibs -ldl"
+  extralibs="$extralibs $ldl"
 fi
 if test "$lshared" = "yes" ; then
   echo "BUILD_SHARED=yes" >> config.mak

diff --git a/ffserver.c b/ffserver.c
index 8a55af9..1be33eb 100644 (file)
--- a/ffserver.c
+++ b/ffserver.c
@@ -20,7 +20,6 @@
 #include "avformat.h"
 
 #include <stdarg.h>
-#include <netinet/in.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <sys/ioctl.h>
@@ -31,6 +30,7 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/wait.h>
+#include <netinet/in.h>
 #include <arpa/inet.h>
 #include <netdb.h>
 #include <ctype.h>