PiDiP 0.12.13

svn path=/trunk/externals/pidip/; revision=1508

1 files changed, 55 insertions, 10 deletions

diff --git a/configure.ac b/configure.ac
index 6d55e6f..9c9bc0f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,10 +1,24 @@
 dnl Process this file with autoconf to produce a configure script.
 
 AC_INIT
-PDP_PIDIP_VERSION=0.12.12
+AC_CONFIG_HEADER(include/pidip_config.h)
+AC_ARG_ENABLE(ffmpeg,
+            [  --enable-ffmpeg         enable ffmpeg streaming support (no)], , 
+	    enable_ffmpeg=no)
+AC_ARG_ENABLE(mpeg4ip,
+            [  --enable-mpeg4ip        enable mpeg4ip streaming support (no)], , 
+ 	    enable_mpeg4ip=no)
+
+PDP_PIDIP_VERSION="0.12.14"
 PD_DIR=/usr/local/pd
 PDP_DIR=/usr/local/pd/pdp
 FFMPEG_SOURCE_DIR=/SOURCES/ffmpeg
+MPEG4IP_SOURCE_DIR=/SOURCES/mpeg4ip
+PDP_STREAMING_OBJECTS=
+PDP_PIDIP_LIBS="$PDP_PIDIP_LIBS -lbz2 -lz -ldl -lmp3lame -logg -lvorbis -lvorbisenc"
+PDP_PIDIP_INCLUDES="-I$PD_DIR/src -I. -I$PDP_DIR/include -I../include"
+
+make clean
 
 AC_ISC_POSIX
 AC_PROG_CC
@@ -64,18 +78,45 @@ else
   exit -1
 fi
 
-echo -n "looking for ffmpeg sources (required) ... "
-if test -f $FFMPEG_SOURCE_DIR/libavformat/avformat.h
+if test $enable_ffmpeg == yes;
 then
-  AC_SUBST(FFMPEG_SOURCE_DIR)
-  echo "ok." 
-else
-  echo "ffmpeg source tree not found... install it, fix the path in configure.ac and run autoconf"
-  exit -1
+  echo -n "looking for ffmpeg sources (required) ... "
+  if test -f $FFMPEG_SOURCE_DIR/libavformat/avformat.h
+  then
+    AC_SUBST(FFMPEG_SOURCE_DIR)
+    PDP_STREAMING_OBJECTS="$PDP_STREAMING_OBJECTS pdp_live~.o pdp_ffmpeg~.o"
+    AC_DEFINE(HAVE_PIDIP_FFMPEG, 1, build pdp_live~/pdp_ffmpeg~)
+    PDP_PIDIP_LIBS="$PDP_PIDIP_LIBS $FFMPEG_SOURCE_DIR/libavformat/libavformat.a $FFMPEG_SOURCE_DIR/libavcodec/libavcodec.a"
+    PDP_PIDIP_INCLUDES="$PDP_PIDIP_INCLUDES  -I$FFMPEG_SOURCE_DIR/libavcodec -I$FFMPEG_SOURCE_DIR/libavformat"
+    echo "ok." 
+  else
+    echo "ffmpeg source tree not found... install it, fix the path in configure.ac and run autoconf"
+    exit -1
+  fi
 fi
 
-LIBS="$LIBS -lbz2 -lz -ldl -lmp3lame -logg -lvorbis -lvorbisenc"
-CFLAGS="$CFLAGS -Wall"
+if test $enable_mpeg4ip == yes;
+then
+   echo -n "looking for mpeg4ip sources (required) ... "
+   if test -f $MPEG4IP_SOURCE_DIR/server/mp4live/mp4live_common.h
+   then
+    AC_SUBST(MPEG4IP_SOURCE_DIR)
+    PDP_STREAMING_OBJECTS="$PDP_STREAMING_OBJECTS pdp_mp4config.o pdp_mp4videosource.o pdp_mp4audiosource.o pdp_mp4live~.o pdp_mp4player~.o pdp_mp4audiosync.o pdp_mp4videosync.o pdp_mp4playermedia.o pdp_mp4playersession.o"
+    AC_DEFINE(HAVE_PIDIP_MPEG4IP, 1, build pdp_mp4live~/pdp_mp4player~)
+    PDP_PIDIP_LIBS="$PDP_PIDIP_LIBS $MPEG4IP_SOURCE_DIR/player/src/our_bytestream_file.o $MPEG4IP_SOURCE_DIR/player/src/our_config_file.o $MPEG4IP_SOURCE_DIR/player/src/qtime_file.o $MPEG4IP_SOURCE_DIR/player/src/mp4_file.o $MPEG4IP_SOURCE_DIR/player/src/mpeg3_file.o $MPEG4IP_SOURCE_DIR/player/src/avi_file.o $MPEG4IP_SOURCE_DIR/player/src/ip_port.o $MPEG4IP_SOURCE_DIR/player/src/media_utils.o $MPEG4IP_SOURCE_DIR/player/src/mpeg2t_thread.o $MPEG4IP_SOURCE_DIR/player/src/mpeg2t_thread_nx.o $MPEG4IP_SOURCE_DIR/player/src/*bytestream.o $MPEG4IP_SOURCE_DIR/player/src/*plugin.o $MPEG4IP_SOURCE_DIR/player/src/player_sdp.o $MPEG4IP_SOURCE_DIR/player/src/player_util.o $MPEG4IP_SOURCE_DIR/player/src/audio.o $MPEG4IP_SOURCE_DIR/player/src/video.o $MPEG4IP_SOURCE_DIR/server/mp4live/video_util_mpeg4.o $MPEG4IP_SOURCE_DIR/server/mp4live/sdp_file.o $MPEG4IP_SOURCE_DIR/server/mp4live/util.o $MPEG4IP_SOURCE_DIR/server/mp4live/video_encoder.o $MPEG4IP_SOURCE_DIR/server/mp4live/video_xvid.o $MPEG4IP_SOURCE_DIR/server/mp4live/media_source.o $MPEG4IP_SOURCE_DIR/server/mp4live/video_util_rgb.o $MPEG4IP_SOURCE_DIR/server/mp4live/video_util_resize.o $MPEG4IP_SOURCE_DIR/server/mp4live/resample.o $MPEG4IP_SOURCE_DIR/server/mp4live/video_encoder_base.o $MPEG4IP_SOURCE_DIR/server/mp4live/audio_encoder.o $MPEG4IP_SOURCE_DIR/server/mp4live/audio_encoder_base.o $MPEG4IP_SOURCE_DIR/server/mp4live/audio_encoder_tables.o $MPEG4IP_SOURCE_DIR/server/mp4live/audio_lame.o $MPEG4IP_SOURCE_DIR/server/mp4live/audio_faac.o $MPEG4IP_SOURCE_DIR/server/mp4live/rtp_transmitter.o $MPEG4IP_SOURCE_DIR/server/mp4live/h261/.libs/*.a $MPEG4IP_SOURCE_DIR/lib/sdp/.libs/libsdp.so $MPEG4IP_SOURCE_DIR/player/lib/mp4util/.libs/libmp4util.so $MPEG4IP_SOURCE_DIR/player/lib/libhttp/.libs/libhttp.a $MPEG4IP_SOURCE_DIR/lib/config_file/.libs/libconfig_file.so $MPEG4IP_SOURCE_DIR/lib/msg_queue/.libs/libmsg_queue.so $MPEG4IP_SOURCE_DIR/lib/mp4av/.libs/libmp4av.so $MPEG4IP_SOURCE_DIR/lib/mp4/.libs/libmp4.so $MPEG4IP_SOURCE_DIR/lib/mp4v2/.libs/libmp4v2.so $MPEG4IP_SOURCE_DIR/lib/SDL/src/.libs/libSDL.so $MPEG4IP_SOURCE_DIR/lib/rtp/*.o $MPEG4IP_SOURCE_DIR/player/lib/rtsp/.libs/librtsp.a $MPEG4IP_SOURCE_DIR/common/video/libmpeg32/.libs/*.a $MPEG4IP_SOURCE_DIR/lib/avi/.libs/libavi.al $MPEG4IP_SOURCE_DIR/lib/mpeg2t/.libs/libmpeg2_transport.al $MPEG4IP_SOURCE_DIR/player/lib/audio/mp3util/.libs/libmp3utils.al -lm -L/usr/X11R6/lib -lX11 -lXext -lpthread $MPEG4IP_SOURCE_DIR/lib/SDL/src/main/libSDLmain.a -ldl -Wl,--rpath -Wl,/usr/local/lib -lfaac -lmpeg4ip_xvid"
+    PDP_PIDIP_INCLUDES="$PDP_PIDIP_INCLUDES -I/usr/include/SDL -I/usr/local/include/SDL -I$MPEG4IP_SOURCE_DIR/server/mp4live -I$MPEG4IP_SOURCE_DIR/player/src -I$MPEG4IP_SOURCE_DIR/player/lib -I$MPEG4IP_SOURCE_DIR/lib/msg_queue -I$MPEG4IP_SOURCE_DIR/lib"
+    MPEG4IP_CFLAGS="-D_REENTRANT -DNOCONTROLS -fexceptions -Wno-char-subscripts -Wno-unknown-pragmas -Wno-deprecated -DPLAYER_PLUGIN_DIR=\"/usr/local/lib/mp4player_plugin\" -g -O2 -DUSE_MMX -DMPEG4IP"
+    AC_SUBST(MPEG4IP_CFLAGS)
+    echo "ok." 
+  else
+    echo "mpeg4ip source tree not found... install it, fix the path in configure.ac and run autoconf"
+    exit -1
+  fi
+fi
+
+AC_SUBST(PDP_STREAMING_OBJECTS)
+AC_SUBST(PDP_PIDIP_LIBS)
+AC_SUBST(PDP_PIDIP_INCLUDES)
 
 AC_CONFIG_FILES([
 Makefile
@@ -83,3 +124,7 @@ system/Makefile
 modules/Makefile
 ])
 AC_OUTPUT
+
+echo "used configure options:"
+echo "  --enable-ffmpeg=$enable_ffmpeg"
+echo "  --enable-mpeg4ip=$enable_mpeg4ip"