[PD-cvs] externals/pidip configure.ac,1.13,1.14

Yves Degoyon sevyves at users.sourceforge.net
Mon Dec 11 23:41:09 CET 2006


Update of /cvsroot/pure-data/externals/pidip
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18273

Modified Files:
	configure.ac 
Log Message:
detect quicktime and runs without magick

Index: configure.ac
===================================================================
RCS file: /cvsroot/pure-data/externals/pidip/configure.ac,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** configure.ac	22 Nov 2005 06:18:01 -0000	1.13
--- configure.ac	11 Dec 2006 22:41:07 -0000	1.14
***************
*** 10,13 ****
--- 10,19 ----
  MPEG4IP_SOURCE_DIR=/SOURCES/mpeg4ip
  PDP_STREAMING_OBJECTS=
+ PDP_CAPTURE_OBJECT=
+ IMLIB_LIBS=
+ IMLIB_CFLAGS=
+ MAGIC_LIBS=
+ MAGIC_CFLAGS=
+ THEORA_LIBS=
  enable_ffmpeg=no
  enable_mpeg4ip=no
***************
*** 84,102 ****
  AM_WITH_DMALLOC
  
! AC_PATH_GENERIC(imlib2, 1.0.0, [
!   AC_SUBST(IMLIB_LIBS)
!   AC_SUBST(IMLIB_CFLAGS) ],
    AC_MSG_ERROR(Cannot find imlib2: Is imlib2-config in the path?) )
  
! dnl the above doesn't work for some reason :/
! IMLIB_LIBS=`imlib2-config --libs`
! IMLIB_CFLAGS=`imlib2-config --cflags`
! AC_SUBST(IMLIB_LIBS)
! AC_SUBST(IMLIB_CFLAGS)
! 
! CAIRO_CFLAGS="-I/usr/include/cairo/ -I/usr/local/include/cairo/"
! AC_SUBST(CAIRO_CFLAGS)
  
- AC_CHECK_LIB(Magick, XWindowByProperty, , AC_MSG_ERROR(screen captures requires ImageMagick library!!), -I/usr/X11R6/include -L/usr/X11R6/lib )
  AC_CHECK_LIB(bz2, BZ2_bzBuffToBuffCompress, , AC_MSG_ERROR(streaming requires bz2 library!!))
  AC_CHECK_LIB(z, deflate, , AC_MSG_ERROR(streaming requires compress library!!))
--- 90,106 ----
  AM_WITH_DMALLOC
  
! AC_PATH_GENERIC(imlib2, 1.0.0, 
!   [ IMLIB_LIBS=`imlib2-config --libs`
!   IMLIB_CFLAGS=`imlib2-config --cflags` ],
    AC_MSG_ERROR(Cannot find imlib2: Is imlib2-config in the path?) )
  
! AC_CHECK_LIB(Magick, XWindowByProperty, 
!               [ PDP_CAPTURE_OBJECT="pdp_capture.o"
!               AC_DEFINE(HAVE_IMAGE_MAGICK, 1, image magick capture capability)
!               MAGICK_LIBS="-L/usr/X11R6/lib -lMagick `Magick-config --libs` `Magick-config --ldflags`"
!               MAGICK_CFLAGS="-I/usr/X11R6/include `Magick-config --cflags` " ],
!               echo "Image Magick not found : not building pdp_capture", 
!               -I/usr/X11R6/include -L/usr/X11R6/lib )
  
  AC_CHECK_LIB(bz2, BZ2_bzBuffToBuffCompress, , AC_MSG_ERROR(streaming requires bz2 library!!))
  AC_CHECK_LIB(z, deflate, , AC_MSG_ERROR(streaming requires compress library!!))
***************
*** 107,119 ****
  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)
! 
! MAGICK_LIBS="-L/usr/X11R6/lib -lMagick `Magick-config --libs` `Magick-config --ldflags`"
! 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
--- 111,140 ----
  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_CHECK_LIB(quicktime, lqt_decode_video, , AC_MSG_ERROR(libquicktime not found) )
  
! qt_minor_version="`lqt-config --version | cut -f3 -d'.'`"
! echo "qt version minor : ${qt_minor_version}"
! if test ${qt_minor_version} == "8";
! then
!   AC_DEFINE(QUICKTIME_NEWER, 1, newer quicktime lib)
! fi
! if test ${qt_minor_version} == "9";
! then
!   AC_DEFINE(QUICKTIME_NEWER, 1, newer quicktime lib)
! fi
! if test ${qt_minor_version} == "10";
! then
!   AC_DEFINE(QUICKTIME_NEWER, 1, newer quicktime lib)
! fi
! if test ${qt_minor_version} == "11";
! then
!   AC_DEFINE(QUICKTIME_NEWER, 1, newer quicktime lib)
! fi
! if test ${qt_minor_version} == "12";
! then
!   AC_DEFINE(QUICKTIME_NEWER, 1, newer quicktime lib)
! fi
  
! THEORA_LIBS="-ltheora -logg -lvorbis -lvorbisenc"
  if test -f /usr/lib/libtheora.a
  then
***************
*** 149,154 ****
  fi
  
- AC_SUBST(THEORA_LIBS)
- 
  echo -n "looking for pd sources (required) ... "
  if test -f $PD_DIR/src/m_pd.h
--- 170,173 ----
***************
*** 207,211 ****
--- 226,237 ----
  fi
  
+ AC_SUBST(PDP_PIDIP_VERSION)
+ AC_SUBST(MAGICK_LIBS)
+ AC_SUBST(MAGICK_CFLAGS)
+ AC_SUBST(IMLIB_LIBS)
+ AC_SUBST(IMLIB_CFLAGS)
+ AC_SUBST(THEORA_LIBS)
  AC_SUBST(PDP_STREAMING_OBJECTS)
+ AC_SUBST(PDP_CAPTURE_OBJECT)
  AC_SUBST(PDP_PIDIP_LIBS)
  AC_SUBST(PDP_PIDIP_INCLUDES)
***************
*** 219,222 ****
  
  echo "used configure options:"
! echo "  --enable-ffmpeg=$enable_ffmpeg"
! echo "  --enable-mpeg4ip=$enable_mpeg4ip"
--- 245,248 ----
  
  echo "used configure options:"
! echo "  --enable_ffmpeg=$enable_ffmpeg"
! echo "  --enable_mpeg4ip=$enable_mpeg4ip"





More information about the Pd-cvs mailing list