PiDiP v 0.12.17

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

1 files changed, 103 insertions, 14 deletions

diff --git a/configure.ac b/configure.ac
index 759dd2a..9bf0afb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,19 +2,71 @@ dnl Process this file with autoconf to produce a configure script.
 
 AC_INIT
 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"
+
+PDP_PIDIP_VERSION="0.12.17"
 PD_DIR=/usr/local/pd
 PDP_DIR=/usr/local/pd/pdp
 FFMPEG_SOURCE_DIR=/SOURCES/ffmpeg
 MPEG4IP_SOURCE_DIR=/SOURCES/mpeg4ip
 PDP_STREAMING_OBJECTS=
+enable_ffmpeg=no
+enable_mpeg4ip=no
+
+AC_ARG_WITH(pdsources, [  --with-pd=PATH          pd source tree])
+if ! test -z "${with_pd}"
+then
+  pd_tree="`cd ${with_pd} 2>/dev/null && pwd`"
+  if test -z "${pd_tree}"
+  then
+   dnl  The given directory can't be found
+   AC_MSG_ERROR([pd sources not found in ${with_pd}])
+  else
+   PD_DIR=${pd_tree}
+  fi
+fi
+
+AC_ARG_WITH(pdpsources, [  --with-pdp=PATH         pdp source tree])
+if ! test -z "${with_pdp}"
+then
+  pdp_tree="`cd ${with_pdp} 2>/dev/null && pwd`"
+  if test -z "${pdp_tree}"
+  then
+   dnl  The given directory can't be found
+   AC_MSG_ERROR([pdp sources not found in ${with_pdp}])
+  else
+   PDP_DIR=${pdp_tree}
+  fi
+fi
+
+AC_ARG_WITH(ffmpeg, [  --with-ffmpeg=PATH      ffmpeg source tree])
+if ! test -z "${with_ffmpeg}"
+then
+  ffmpeg_tree="`cd ${with_ffmpeg} 2>/dev/null && pwd`"
+  if test -z "${ffmpeg_tree}"
+  then
+   dnl  The given directory can't be found
+   AC_MSG_ERROR([ffmpeg sources not found in ${with_ffmpeg}])
+  else
+   FFMPEG_SOURCE_DIR=${ffmpeg_tree}
+   enable_ffmpeg=yes
+  fi
+fi
+
+AC_ARG_WITH(mpeg4ip, [  --with-mpeg4ip=PATH     mpeg4ip source tree])
+if ! test -z "${with_mpeg4ip}"
+then
+  mpeg4ip_tree="`cd ${with_mpeg4ip} 2>/dev/null && pwd`"
+  if test -z "${mpeg4ip_tree}"
+  then
+   dnl  The given directory can't be found
+   AC_MSG_RESULT(no)
+   AC_MSG_ERROR([mpeg4ip sources not found in ${with_mpeg4ip}])
+  else
+   MPEG4IP_SOURCE_DIR=${mpeg4ip_tree}
+   enable_mpeg4ip=yes
+  fi
+fi
+
 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 -I../charmaps"
 
@@ -50,6 +102,7 @@ AC_CHECK_LIB(mp3lame, InitMP3, , AC_MSG_ERROR(streaming requires lame library!!)
 AC_CHECK_LIB(ogg, ogg_stream_init, , AC_MSG_ERROR(streaming requires ogg library!!), -lm)
 AC_CHECK_LIB(vorbis, vorbis_analysis_init, , AC_MSG_ERROR(streaming requires vorbis library!!), -lm)
 AC_CHECK_LIB(vorbisenc, vorbis_encode_setup_init, , AC_MSG_ERROR(streaming requires vorbis encoder library!!), -lm)
+AC_CHECK_LIB(theora, theora_encode_init, , AC_MSG_ERROR(theora library needed! sorry...), -lm)
 
 AC_SUBST(PDP_PIDIP_VERSION)
 
@@ -58,13 +111,49 @@ MAGICK_CFLAGS="-I/usr/X11R6/include `Magick-config --cflags` "
 AC_SUBST(MAGICK_LIBS)
 AC_SUBST(MAGICK_CFLAGS)
 
+THEORA_LIBS=""
+if test -f /usr/lib/libtheora.a
+then
+   THEORA_LIBS="$THEORA_LIBS /usr/lib/libtheora.a"
+fi
+if test -f /usr/local/lib/libtheora.a
+then
+   THEORA_LIBS="$THEORA_LIBS /usr/local/lib/libtheora.a"
+fi
+if test -f /usr/lib/libogg.a
+then
+   THEORA_LIBS="$THEORA_LIBS /usr/lib/libogg.a"
+fi
+if test -f /usr/local/lib/libogg.a
+then
+   THEORA_LIBS="$THEORA_LIBS /usr/local/lib/libogg.a"
+fi
+if test -f /usr/lib/libvorbis.a
+then
+   THEORA_LIBS="$THEORA_LIBS /usr/lib/libvorbis.a"
+fi
+if test -f /usr/local/lib/libvorbis.a
+then
+   THEORA_LIBS="$THEORA_LIBS /usr/local/lib/libvorbis.a"
+fi
+if test -f /usr/lib/libvorbisenc.a
+then
+   THEORA_LIBS="$THEORA_LIBS /usr/lib/libvorbisenc.a"
+fi
+if test -f /usr/local/lib/libvorbisenc.a
+then
+   THEORA_LIBS="$THEORA_LIBS /usr/local/lib/libvorbisenc.a"
+fi
+
+AC_SUBST(THEORA_LIBS)
+
 echo -n "looking for pd sources (required) ... "
 if test -f $PD_DIR/src/m_pd.h
 then
   AC_SUBST(PD_DIR)
   echo "ok." 
 else
-  echo "pd source tree not found... install it, fix the path in configure.ac and run autoconf"
+  echo "pd source tree not found... install it and use the --with-pd=<path> configuration option."
   exit -1
 fi
 
@@ -74,7 +163,7 @@ then
   AC_SUBST(PDP_DIR)
   echo "ok." 
 else
-  echo "pdp source tree not found... install it, fix the path in configure.ac and run autoconf"
+  echo "pdp source tree not found... install it and use the --with-pdp=<path> configuration option."
   exit -1
 fi
 
@@ -84,13 +173,13 @@ then
   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"
+    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"
+    echo "ffmpeg source tree not found... install it and use the --with-ffmpeg=<path> configuration option."
     exit -1
   fi
 fi
@@ -101,7 +190,7 @@ then
    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"
+    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"
@@ -109,7 +198,7 @@ then
     AC_SUBST(MPEG4IP_CFLAGS)
     echo "ok." 
   else
-    echo "mpeg4ip source tree not found... install it, fix the path in configure.ac and run autoconf"
+    echo "mpeg4ip source tree not found... install it and use the --with-mpeg4ip=<path> configuration option."
     exit -1
   fi
 fi