externals/pidip CHANGES.LOG,1.12,1.13 INSTALL,1.4,1.5 Makefile,1.4,1.5 Makefile.in,1.3,1.4 acinclude.m4,1.5,1.6 aclocal.m4,1.5,1.6 config.log,1.4,1.5 config.status,1.4,1.5 configure,1.5,1.6 configure.ac,1.7,1.8 configure.in,1.2,1.3
Update of /cvsroot/pure-data/externals/pidip In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10577
Modified Files: CHANGES.LOG INSTALL Makefile Makefile.in acinclude.m4 aclocal.m4 config.log config.status configure configure.ac configure.in Log Message: PiDiP 0.12.13
Index: config.status =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/config.status,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** config.status 8 Dec 2003 22:45:54 -0000 1.4 --- config.status 30 Mar 2004 01:56:15 -0000 1.5 *************** *** 261,265 ****
This file was extended by $as_me, which was ! generated by GNU Autoconf 2.58. Invocation command line was
CONFIG_FILES = $CONFIG_FILES --- 261,265 ----
This file was extended by $as_me, which was ! generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES *************** *** 273,276 **** --- 273,277 ---- echo >&5 config_files=" Makefile system/Makefile modules/Makefile" + config_headers=" include/pidip_config.h"
ac_cs_usage="\ *************** *** 287,299 **** --file=FILE[:TEMPLATE] instantiate the configuration file FILE
Configuration files: $config_files
Report bugs to bug-autoconf@gnu.org." ac_cs_version="\ config.status ! configured by ./configure, generated by GNU Autoconf 2.58, ! with options ""
Copyright (C) 2003 Free Software Foundation, Inc. --- 288,305 ---- --file=FILE[:TEMPLATE] instantiate the configuration file FILE + --header=FILE[:TEMPLATE] + instantiate the configuration header FILE
Configuration files: $config_files
+ Configuration headers: + $config_headers + Report bugs to bug-autoconf@gnu.org." ac_cs_version="\ config.status ! configured by ./configure, generated by GNU Autoconf 2.59, ! with options "'--enable-ffmpeg'"
Copyright (C) 2003 Free Software Foundation, Inc. *************** *** 374,379 ****
if $ac_cs_recheck; then ! echo "running /bin/sh ./configure " $ac_configure_extra_args " --no-create --no-recursion" >&6 ! exec /bin/sh ./configure $ac_configure_extra_args --no-create --no-recursion fi
--- 380,385 ----
if $ac_cs_recheck; then ! echo "running /bin/sh ./configure " '--enable-ffmpeg' $ac_configure_extra_args " --no-create --no-recursion" >&6 ! exec /bin/sh ./configure '--enable-ffmpeg' $ac_configure_extra_args --no-create --no-recursion fi
*************** *** 385,388 **** --- 391,395 ---- "system/Makefile" ) CONFIG_FILES="$CONFIG_FILES system/Makefile" ;; "modules/Makefile" ) CONFIG_FILES="$CONFIG_FILES modules/Makefile" ;; + "include/pidip_config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS include/pidip_config.h" ;; *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} *************** *** 397,400 **** --- 404,408 ---- if $ac_need_defaults; then test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files + test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers fi
*************** *** 460,470 **** s,@host_alias@,,;t t s,@target_alias@,,;t t ! s,@DEFS@,-DPACKAGE_NAME="" -DPACKAGE_TARNAME="" -DPACKAGE_VERSION="" -DPACKAGE_STRING="" -DPACKAGE_BUGREPORT="" -DSTDC_HEADERS=1 -DHAVE_LIBMAGICK=1 -DHAVE_LIBBZ2=1 -DHAVE_LIBZ=1 -DHAVE_LIBDL=1 -DHAVE_LIBMP3LAME=1 -DHAVE_LIBOGG=1 -DHAVE_LIBVORBIS=1 -DHAVE_LIBVORBISENC=1 ,;t t s,@ECHO_C@,,;t t s,@ECHO_N@,-n,;t t s,@ECHO_T@,,;t t ! s,@LIBS@,-lvorbisenc -lvorbis -logg -lmp3lame -ldl -lz -lbz2 -lMagick -lbz2 -lz -ldl -lmp3lame -logg -lvorbis -lvorbisenc,;t t s,@CC@,gcc,;t t ! s,@CFLAGS@,-g -O2 -Wall,;t t s,@LDFLAGS@,,;t t s,@CPPFLAGS@,,;t t --- 468,478 ---- s,@host_alias@,,;t t s,@target_alias@,,;t t ! s,@DEFS@,-DHAVE_CONFIG_H,;t t s,@ECHO_C@,,;t t s,@ECHO_N@,-n,;t t s,@ECHO_T@,,;t t ! s,@LIBS@,-lvorbisenc -lvorbis -logg -lmp3lame -ldl -lz -lbz2 -lMagick ,;t t s,@CC@,gcc,;t t ! s,@CFLAGS@,-g -O2,;t t s,@LDFLAGS@,,;t t s,@CPPFLAGS@,,;t t *************** *** 486,490 **** s,@IMLIB2_CFLAGS@,-I/usr/local/include -I/usr/X11R6/include,;t t s,@IMLIB2_LIBS@,-L/usr/local/lib -lImlib2 -lttf -lm -ldl -lXext -lXext -lX11 -L/usr/X11R6/lib,;t t ! s,@PDP_PIDIP_VERSION@,0.12.12,;t t s,@MAGICK_LIBS@,-L/usr/X11R6/lib -lMagick -lMagick -ltiff -lfreetype -ljasper -ljpeg -lpng -lXext -lSM -lICE -lX11 -lbz2 -lxml2 -lz -lpthread -lm -L/usr/local/lib -L/usr/X11R6/lib -L/usr/X11R6/lib -L/usr/local/lib,;t t s,@MAGICK_CFLAGS@,-I/usr/X11R6/include -g -O2 -Wall ,;t t --- 494,498 ---- s,@IMLIB2_CFLAGS@,-I/usr/local/include -I/usr/X11R6/include,;t t s,@IMLIB2_LIBS@,-L/usr/local/lib -lImlib2 -lttf -lm -ldl -lXext -lXext -lX11 -L/usr/X11R6/lib,;t t ! s,@PDP_PIDIP_VERSION@,0.12.14,;t t s,@MAGICK_LIBS@,-L/usr/X11R6/lib -lMagick -lMagick -ltiff -lfreetype -ljasper -ljpeg -lpng -lXext -lSM -lICE -lX11 -lbz2 -lxml2 -lz -lpthread -lm -L/usr/local/lib -L/usr/X11R6/lib -L/usr/X11R6/lib -L/usr/local/lib,;t t s,@MAGICK_CFLAGS@,-I/usr/X11R6/include -g -O2 -Wall ,;t t *************** *** 492,495 **** --- 500,508 ---- s,@PDP_DIR@,/usr/local/pd/pdp,;t t s,@FFMPEG_SOURCE_DIR@,/SOURCES/ffmpeg,;t t + s,@MPEG4IP_SOURCE_DIR@,/SOURCES/mpeg4ip,;t t + s,@MPEG4IP_CFLAGS@,,;t t + s,@PDP_STREAMING_OBJECTS@, pdp_live~.o pdp_ffmpeg~.o,;t t + s,@PDP_PIDIP_LIBS@, -lbz2 -lz -ldl -lmp3lame -logg -lvorbis -lvorbisenc /SOURCES/ffmpeg/libavformat/libavformat.a /SOURCES/ffmpeg/libavcodec/libavcodec.a,;t t + s,@PDP_PIDIP_INCLUDES@,-I/usr/local/pd/src -I. -I/usr/local/pd/pdp/include -I../include -I/SOURCES/ffmpeg/libavcodec -I/SOURCES/ffmpeg/libavformat,;t t s,@LIBOBJS@,,;t t s,@LTLIBOBJS@,,;t t *************** *** 609,646 **** ac_top_srcdir=$ac_top_builddir$srcdir ;; esac ! case "$ac_dir" in ! .) ac_abs_builddir=$ac_builddir;; *) ! case $ac_builddir in ! .) ac_abs_builddir="$ac_dir";; ! [\/]* | ?:[\/]* ) ac_abs_builddir=$ac_builddir;; ! *) ac_abs_builddir="$ac_dir"/$ac_builddir;; esac;; esac ! case "$ac_dir" in .) ac_abs_top_builddir=${ac_top_builddir}.;; *) case ${ac_top_builddir}. in ! .) ac_abs_top_builddir="$ac_dir";; [\/]* | ?:[\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; ! *) ac_abs_top_builddir="$ac_dir"/${ac_top_builddir}.;; esac;; esac ! case "$ac_dir" in .) ac_abs_srcdir=$ac_srcdir;; *) case $ac_srcdir in ! .) ac_abs_srcdir="$ac_dir";; [\/]* | ?:[\/]* ) ac_abs_srcdir=$ac_srcdir;; ! *) ac_abs_srcdir="$ac_dir"/$ac_srcdir;; esac;; esac ! case "$ac_dir" in .) ac_abs_top_srcdir=$ac_top_srcdir;; *) case $ac_top_srcdir in ! .) ac_abs_top_srcdir="$ac_dir";; [\/]* | ?:[\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; ! *) ac_abs_top_srcdir="$ac_dir"/$ac_top_srcdir;; esac;; esac --- 622,662 ---- ac_top_srcdir=$ac_top_builddir$srcdir ;; esac ! ! # Do not use `cd foo && pwd` to compute absolute paths, because ! # the directories may not exist. ! case `pwd` in ! .) ac_abs_builddir="$ac_dir";; *) ! case "$ac_dir" in ! .) ac_abs_builddir=`pwd`;; ! [\/]* | ?:[\/]* ) ac_abs_builddir="$ac_dir";; ! *) ac_abs_builddir=`pwd`/"$ac_dir";; esac;; esac ! case $ac_abs_builddir in .) ac_abs_top_builddir=${ac_top_builddir}.;; *) case ${ac_top_builddir}. in ! .) ac_abs_top_builddir=$ac_abs_builddir;; [\/]* | ?:[\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; ! *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; esac;; esac ! case $ac_abs_builddir in .) ac_abs_srcdir=$ac_srcdir;; *) case $ac_srcdir in ! .) ac_abs_srcdir=$ac_abs_builddir;; [\/]* | ?:[\/]* ) ac_abs_srcdir=$ac_srcdir;; ! *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; esac;; esac ! case $ac_abs_builddir in .) ac_abs_top_srcdir=$ac_top_srcdir;; *) case $ac_top_srcdir in ! .) ac_abs_top_srcdir=$ac_abs_builddir;; [\/]* | ?:[\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; ! *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; esac;; esac *************** *** 727,729 **** --- 743,926 ---- done
+ # + # CONFIG_HEADER section. + # + + # These sed commands are passed to sed as "A NAME B NAME C VALUE D", where + # NAME is the cpp macro being defined and VALUE is the value it is being given. + # + # ac_d sets the value in "#define NAME VALUE" lines. + ac_dA='s,^([ ]*)#([ ]*define[ ][ ]*)' + ac_dB='[ ].*$,\1#\2' + ac_dC=' ' + ac_dD=',;t' + # ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE". + ac_uA='s,^([ ]*)#([ ]*)undef([ ][ ]*)' + ac_uB='$,\1#\2define\3' + ac_uC=' ' + ac_uD=',;t' + + for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue + # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". + case $ac_file in + - | *:- | *:-:* ) # input from stdin + cat >$tmp/stdin + ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` + ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; + *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` + ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; + * ) ac_file_in=$ac_file.in ;; + esac + + test x"$ac_file" != x- && { echo "$as_me:$LINENO: creating $ac_file" >&5 + echo "$as_me: creating $ac_file" >&6;} + + # First look for the input files in the build tree, otherwise in the + # src tree. + ac_file_inputs=`IFS=: + for f in $ac_file_in; do + case $f in + -) echo $tmp/stdin ;; + [\/$]*) + # Absolute (can't be DOS-style, as IFS=:) + test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 + echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + # Do quote $f, to prevent DOS paths from being IFS'd. + echo "$f";; + *) # Relative + if test -f "$f"; then + # Build tree + echo "$f" + elif test -f "$srcdir/$f"; then + # Source tree + echo "$srcdir/$f" + else + # /dev/null tree + { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 + echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + fi;; + esac + done` || { (exit 1); exit 1; } + # Remove the trailing spaces. + sed 's/[ ]*$//' $ac_file_inputs >$tmp/in + + # Handle all the #define templates only if necessary. + if grep "^[ ]*#[ ]*define" $tmp/in >/dev/null; then + # If there are no defines, we may have an empty if/fi + : + cat >$tmp/defines.sed <<CEOF + /^[ ]*#[ ]*define/!b + t clr + : clr + ${ac_dA}PACKAGE_NAME${ac_dB}PACKAGE_NAME${ac_dC}""${ac_dD} + ${ac_dA}PACKAGE_TARNAME${ac_dB}PACKAGE_TARNAME${ac_dC}""${ac_dD} + ${ac_dA}PACKAGE_VERSION${ac_dB}PACKAGE_VERSION${ac_dC}""${ac_dD} + ${ac_dA}PACKAGE_STRING${ac_dB}PACKAGE_STRING${ac_dC}""${ac_dD} + ${ac_dA}PACKAGE_BUGREPORT${ac_dB}PACKAGE_BUGREPORT${ac_dC}""${ac_dD} + ${ac_dA}STDC_HEADERS${ac_dB}STDC_HEADERS${ac_dC}1${ac_dD} + ${ac_dA}HAVE_LIBMAGICK${ac_dB}HAVE_LIBMAGICK${ac_dC}1${ac_dD} + ${ac_dA}HAVE_LIBBZ2${ac_dB}HAVE_LIBBZ2${ac_dC}1${ac_dD} + ${ac_dA}HAVE_LIBZ${ac_dB}HAVE_LIBZ${ac_dC}1${ac_dD} + ${ac_dA}HAVE_LIBDL${ac_dB}HAVE_LIBDL${ac_dC}1${ac_dD} + ${ac_dA}HAVE_LIBMP3LAME${ac_dB}HAVE_LIBMP3LAME${ac_dC}1${ac_dD} + ${ac_dA}HAVE_LIBOGG${ac_dB}HAVE_LIBOGG${ac_dC}1${ac_dD} + ${ac_dA}HAVE_LIBVORBIS${ac_dB}HAVE_LIBVORBIS${ac_dC}1${ac_dD} + ${ac_dA}HAVE_LIBVORBISENC${ac_dB}HAVE_LIBVORBISENC${ac_dC}1${ac_dD} + ${ac_dA}HAVE_PIDIP_FFMPEG${ac_dB}HAVE_PIDIP_FFMPEG${ac_dC}1${ac_dD} + CEOF + sed -f $tmp/defines.sed $tmp/in >$tmp/out + rm -f $tmp/in + mv $tmp/out $tmp/in + + fi # grep + + # Handle all the #undef templates + cat >$tmp/undefs.sed <<CEOF + /^[ ]*#[ ]*undef/!b + t clr + : clr + ${ac_uA}PACKAGE_NAME${ac_uB}PACKAGE_NAME${ac_uC}""${ac_uD} + ${ac_uA}PACKAGE_TARNAME${ac_uB}PACKAGE_TARNAME${ac_uC}""${ac_uD} + ${ac_uA}PACKAGE_VERSION${ac_uB}PACKAGE_VERSION${ac_uC}""${ac_uD} + ${ac_uA}PACKAGE_STRING${ac_uB}PACKAGE_STRING${ac_uC}""${ac_uD} + ${ac_uA}PACKAGE_BUGREPORT${ac_uB}PACKAGE_BUGREPORT${ac_uC}""${ac_uD} + ${ac_uA}STDC_HEADERS${ac_uB}STDC_HEADERS${ac_uC}1${ac_uD} + ${ac_uA}HAVE_LIBMAGICK${ac_uB}HAVE_LIBMAGICK${ac_uC}1${ac_uD} + ${ac_uA}HAVE_LIBBZ2${ac_uB}HAVE_LIBBZ2${ac_uC}1${ac_uD} + ${ac_uA}HAVE_LIBZ${ac_uB}HAVE_LIBZ${ac_uC}1${ac_uD} + ${ac_uA}HAVE_LIBDL${ac_uB}HAVE_LIBDL${ac_uC}1${ac_uD} + ${ac_uA}HAVE_LIBMP3LAME${ac_uB}HAVE_LIBMP3LAME${ac_uC}1${ac_uD} + ${ac_uA}HAVE_LIBOGG${ac_uB}HAVE_LIBOGG${ac_uC}1${ac_uD} + ${ac_uA}HAVE_LIBVORBIS${ac_uB}HAVE_LIBVORBIS${ac_uC}1${ac_uD} + ${ac_uA}HAVE_LIBVORBISENC${ac_uB}HAVE_LIBVORBISENC${ac_uC}1${ac_uD} + ${ac_uA}HAVE_PIDIP_FFMPEG${ac_uB}HAVE_PIDIP_FFMPEG${ac_uC}1${ac_uD} + s,^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */, + CEOF + sed -f $tmp/undefs.sed $tmp/in >$tmp/out + rm -f $tmp/in + mv $tmp/out $tmp/in + + # Let's still pretend it is `configure' which instantiates (i.e., don't + # use $as_me), people would be surprised to read: + # /* config.h. Generated by config.status. */ + if test x"$ac_file" = x-; then + echo "/* Generated by configure. */" >$tmp/config.h + else + echo "/* $ac_file. Generated by configure. */" >$tmp/config.h + fi + cat $tmp/in >>$tmp/config.h + rm -f $tmp/in + if test x"$ac_file" != x-; then + if diff $ac_file $tmp/config.h >/dev/null 2>&1; then + { echo "$as_me:$LINENO: $ac_file is unchanged" >&5 + echo "$as_me: $ac_file is unchanged" >&6;} + else + ac_dir=`(dirname "$ac_file") 2>/dev/null || + $as_expr X"$ac_file" : 'X(.*[^/])//*[^/][^/]*/*$' | \ + X"$ac_file" : 'X(//)[^/]' | \ + X"$ac_file" : 'X(//)$' | \ + X"$ac_file" : 'X(/)' | \ + . : '(.)' 2>/dev/null || + echo X"$ac_file" | + sed '/^X(.*[^/])//*[^/][^/]*/*$/{ s//\1/; q; } + /^X(//)[^/].*/{ s//\1/; q; } + /^X(//)$/{ s//\1/; q; } + /^X(/).*/{ s//\1/; q; } + s/.*/./; q'` + { if $as_mkdir_p; then + mkdir -p "$ac_dir" + else + as_dir="$ac_dir" + as_dirs= + while test ! -d "$as_dir"; do + as_dirs="$as_dir $as_dirs" + as_dir=`(dirname "$as_dir") 2>/dev/null || + $as_expr X"$as_dir" : 'X(.*[^/])//*[^/][^/]*/*$' | \ + X"$as_dir" : 'X(//)[^/]' | \ + X"$as_dir" : 'X(//)$' | \ + X"$as_dir" : 'X(/)' | \ + . : '(.)' 2>/dev/null || + echo X"$as_dir" | + sed '/^X(.*[^/])//*[^/][^/]*/*$/{ s//\1/; q; } + /^X(//)[^/].*/{ s//\1/; q; } + /^X(//)$/{ s//\1/; q; } + /^X(/).*/{ s//\1/; q; } + s/.*/./; q'` + done + test ! -n "$as_dirs" || mkdir $as_dirs + fi || { { echo "$as_me:$LINENO: error: cannot create directory "$ac_dir"" >&5 + echo "$as_me: error: cannot create directory "$ac_dir"" >&2;} + { (exit 1); exit 1; }; }; } + + rm -f $ac_file + mv $tmp/config.h $ac_file + fi + else + cat $tmp/config.h + rm -f $tmp/config.h + fi + done + { (exit 0); exit 0; }
Index: configure =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/configure,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** configure 8 Dec 2003 22:45:54 -0000 1.5 --- configure 30 Mar 2004 01:56:15 -0000 1.6 *************** *** 1,5 **** #! /bin/sh # Guess values for system-dependent variables and create Makefiles. ! # Generated by GNU Autoconf 2.58. # # Copyright (C) 2003 Free Software Foundation, Inc. --- 1,5 ---- #! /bin/sh # Guess values for system-dependent variables and create Makefiles. ! # Generated by GNU Autoconf 2.59. # # Copyright (C) 2003 Free Software Foundation, Inc. *************** *** 272,276 **** PACKAGE_BUGREPORT=
! ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA SET_MAKE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT IMLIB2_CONFIG IMLIB_LIBS IMLIB_CFLAGS IMLIB2_CFLAGS IMLIB2_LIBS PDP_PIDIP_VERSION MAGICK_LIBS MAGICK_CFLAGS PD_DIR PDP_DIR FFMPEG_SOURCE_DIR LIBOBJS LTLIBOBJS' ac_subst_files=''
--- 272,276 ---- PACKAGE_BUGREPORT=
! ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA SET_MAKE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT IMLIB2_CONFIG IMLIB_LIBS IMLIB_CFLAGS IMLIB2_CFLAGS IMLIB2_LIBS PDP_PIDIP_VERSION MAGICK_LIBS MAGICK_CFLAGS PD_DIR PDP_DIR FFMPEG_SOURCE_DIR MPEG4IP_SOURCE_DIR MPEG4IP_CFLAGS PDP_STREAMING_OBJECTS PDP_PIDIP_LIBS PDP_PIDIP_INCLUDES LIBOBJS LTLIBOBJS' ac_subst_files=''
*************** *** 803,806 **** --- 803,808 ---- --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] + --enable-ffmpeg enable ffmpeg streaming support (no) + --enable-mpeg4ip enable mpeg4ip streaming support (no) --enable-maintainer-mode enable make rules and dependencies not useful (and sometimes confusing) to the casual installer *************** *** 859,896 **** ac_top_srcdir=$ac_top_builddir$srcdir ;; esac ! case "$ac_dir" in ! .) ac_abs_builddir=$ac_builddir;; *) ! case $ac_builddir in ! .) ac_abs_builddir="$ac_dir";; ! [\/]* | ?:[\/]* ) ac_abs_builddir=$ac_builddir;; ! *) ac_abs_builddir="$ac_dir"/$ac_builddir;; esac;; esac ! case "$ac_dir" in .) ac_abs_top_builddir=${ac_top_builddir}.;; *) case ${ac_top_builddir}. in ! .) ac_abs_top_builddir="$ac_dir";; [\/]* | ?:[\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; ! *) ac_abs_top_builddir="$ac_dir"/${ac_top_builddir}.;; esac;; esac ! case "$ac_dir" in .) ac_abs_srcdir=$ac_srcdir;; *) case $ac_srcdir in ! .) ac_abs_srcdir="$ac_dir";; [\/]* | ?:[\/]* ) ac_abs_srcdir=$ac_srcdir;; ! *) ac_abs_srcdir="$ac_dir"/$ac_srcdir;; esac;; esac ! case "$ac_dir" in .) ac_abs_top_srcdir=$ac_top_srcdir;; *) case $ac_top_srcdir in ! .) ac_abs_top_srcdir="$ac_dir";; [\/]* | ?:[\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; ! *) ac_abs_top_srcdir="$ac_dir"/$ac_top_srcdir;; esac;; esac --- 861,901 ---- ac_top_srcdir=$ac_top_builddir$srcdir ;; esac ! ! # Do not use `cd foo && pwd` to compute absolute paths, because ! # the directories may not exist. ! case `pwd` in ! .) ac_abs_builddir="$ac_dir";; *) ! case "$ac_dir" in ! .) ac_abs_builddir=`pwd`;; ! [\/]* | ?:[\/]* ) ac_abs_builddir="$ac_dir";; ! *) ac_abs_builddir=`pwd`/"$ac_dir";; esac;; esac ! case $ac_abs_builddir in .) ac_abs_top_builddir=${ac_top_builddir}.;; *) case ${ac_top_builddir}. in ! .) ac_abs_top_builddir=$ac_abs_builddir;; [\/]* | ?:[\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; ! *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; esac;; esac ! case $ac_abs_builddir in .) ac_abs_srcdir=$ac_srcdir;; *) case $ac_srcdir in ! .) ac_abs_srcdir=$ac_abs_builddir;; [\/]* | ?:[\/]* ) ac_abs_srcdir=$ac_srcdir;; ! *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; esac;; esac ! case $ac_abs_builddir in .) ac_abs_top_srcdir=$ac_top_srcdir;; *) case $ac_top_srcdir in ! .) ac_abs_top_srcdir=$ac_abs_builddir;; [\/]* | ?:[\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; ! *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; esac;; esac *************** *** 931,935 ****
It was created by $as_me, which was ! generated by GNU Autoconf 2.58. Invocation command line was
$ $0 $@ --- 936,940 ----
It was created by $as_me, which was ! generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@ *************** *** 1258,1265 ****
! PDP_PIDIP_VERSION=0.12.12 PD_DIR=/usr/local/pd PDP_DIR=/usr/local/pd/pdp FFMPEG_SOURCE_DIR=/SOURCES/ffmpeg
ac_ext=c --- 1263,1293 ----
! ac_config_headers="$ac_config_headers include/pidip_config.h" ! ! # Check whether --enable-ffmpeg or --disable-ffmpeg was given. ! if test "${enable_ffmpeg+set}" = set; then ! enableval="$enable_ffmpeg" ! ! else ! enable_ffmpeg=no ! fi; ! # Check whether --enable-mpeg4ip or --disable-mpeg4ip was given. ! if test "${enable_mpeg4ip+set}" = set; then ! enableval="$enable_mpeg4ip" ! ! else ! enable_mpeg4ip=no ! fi; ! ! 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_ext=c *************** *** 4561,4576 **** fi
! echo -n "looking for ffmpeg sources (required) ... " ! if test -f $FFMPEG_SOURCE_DIR/libavformat/avformat.h then
! echo "ok." ! else ! echo "ffmpeg source tree not found... install it, fix the path in configure.ac and run autoconf" ! exit -1 fi
! LIBS="$LIBS -lbz2 -lz -ldl -lmp3lame -logg -lvorbis -lvorbisenc" ! CFLAGS="$CFLAGS -Wall"
ac_config_files="$ac_config_files Makefile system/Makefile modules/Makefile" --- 4589,4639 ---- fi
! if test $enable_ffmpeg == yes; then + echo -n "looking for ffmpeg sources (required) ... " + if test -f $FFMPEG_SOURCE_DIR/libavformat/avformat.h + then
! PDP_STREAMING_OBJECTS="$PDP_STREAMING_OBJECTS pdp_live~.o pdp_ffmpeg~.o" ! ! cat >>confdefs.h <<_ACEOF ! #define HAVE_PIDIP_FFMPEG 1 ! _ACEOF ! ! 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
! 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 ! ! 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" ! ! cat >>confdefs.h <<_ACEOF ! #define HAVE_PIDIP_MPEG4IP 1 ! _ACEOF ! ! 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" ! ! 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_config_files="$ac_config_files Makefile system/Makefile modules/Makefile" *************** *** 4650,4685 **** fi
! # Transform confdefs.h into DEFS. ! # Protect against shell expansion while executing Makefile rules. ! # Protect against Makefile macro expansion. ! # ! # If the first sed substitution is executed (which looks for macros that ! # take arguments), then we branch to the quote section. Otherwise, ! # look for a macro that doesn't take arguments. ! cat >confdef2opt.sed <<_ACEOF ! t clear ! : clear ! s,^[ ]*#[ ]*define[ ][ ]*([^ (][^ (]*([^)]*))[ ]*(.*),-D\1=\2,g ! t quote ! s,^[ ]*#[ ]*define[ ][ ]*([^ ][^ ]*)[ ]*(.*),-D\1=\2,g ! t quote ! d ! : quote ! s,[ `~#$^&*(){}\|;'"<>?],\&,g ! s,[,\&,g ! s,],\&,g ! s,$,$$,g ! p ! _ACEOF ! # We use echo to avoid assuming a particular line-breaking character. ! # The extra dot is to prevent the shell from consuming trailing ! # line-breaks from the sub-command output. A line-break within ! # single-quotes doesn't work because, if this script is created in a ! # platform that uses two characters for line-breaks (e.g., DOS), tr ! # would break. ! ac_LF_and_DOT=`echo; echo .` ! DEFS=`sed -n -f confdef2opt.sed confdefs.h | tr "$ac_LF_and_DOT" ' .'` ! rm -f confdef2opt.sed !
ac_libobjs= --- 4713,4717 ---- fi
! DEFS=-DHAVE_CONFIG_H
ac_libobjs= *************** *** 4970,4974 ****
This file was extended by $as_me, which was ! generated by GNU Autoconf 2.58. Invocation command line was
CONFIG_FILES = $CONFIG_FILES --- 5002,5006 ----
This file was extended by $as_me, which was ! generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES *************** *** 5015,5022 **** --- 5047,5059 ---- --file=FILE[:TEMPLATE] instantiate the configuration file FILE + --header=FILE[:TEMPLATE] + instantiate the configuration header FILE
Configuration files: $config_files
+ Configuration headers: + $config_headers + Report bugs to bug-autoconf@gnu.org." _ACEOF *************** *** 5025,5029 **** ac_cs_version="\ config.status ! configured by $0, generated by GNU Autoconf 2.58, with options \"`echo "$ac_configure_args" | sed 's/[\""`$]/\\&/g'`\"
--- 5062,5066 ---- ac_cs_version="\ config.status ! configured by $0, generated by GNU Autoconf 2.59, with options \"`echo "$ac_configure_args" | sed 's/[\""`$]/\\&/g'`\"
*************** *** 5130,5133 **** --- 5167,5171 ---- "system/Makefile" ) CONFIG_FILES="$CONFIG_FILES system/Makefile" ;; "modules/Makefile" ) CONFIG_FILES="$CONFIG_FILES modules/Makefile" ;; + "include/pidip_config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS include/pidip_config.h" ;; *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} *************** *** 5142,5145 **** --- 5180,5184 ---- if $ac_need_defaults; then test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files + test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers fi
*************** *** 5240,5243 **** --- 5279,5287 ---- s,@PDP_DIR@,$PDP_DIR,;t t s,@FFMPEG_SOURCE_DIR@,$FFMPEG_SOURCE_DIR,;t t + s,@MPEG4IP_SOURCE_DIR@,$MPEG4IP_SOURCE_DIR,;t t + s,@MPEG4IP_CFLAGS@,$MPEG4IP_CFLAGS,;t t + s,@PDP_STREAMING_OBJECTS@,$PDP_STREAMING_OBJECTS,;t t + s,@PDP_PIDIP_LIBS@,$PDP_PIDIP_LIBS,;t t + s,@PDP_PIDIP_INCLUDES@,$PDP_PIDIP_INCLUDES,;t t s,@LIBOBJS@,$LIBOBJS,;t t s,@LTLIBOBJS@,$LTLIBOBJS,;t t *************** *** 5362,5399 **** ac_top_srcdir=$ac_top_builddir$srcdir ;; esac ! case "$ac_dir" in ! .) ac_abs_builddir=$ac_builddir;; *) ! case $ac_builddir in ! .) ac_abs_builddir="$ac_dir";; ! [\/]* | ?:[\/]* ) ac_abs_builddir=$ac_builddir;; ! *) ac_abs_builddir="$ac_dir"/$ac_builddir;; esac;; esac ! case "$ac_dir" in .) ac_abs_top_builddir=${ac_top_builddir}.;; *) case ${ac_top_builddir}. in ! .) ac_abs_top_builddir="$ac_dir";; [\/]* | ?:[\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; ! *) ac_abs_top_builddir="$ac_dir"/${ac_top_builddir}.;; esac;; esac ! case "$ac_dir" in .) ac_abs_srcdir=$ac_srcdir;; *) case $ac_srcdir in ! .) ac_abs_srcdir="$ac_dir";; [\/]* | ?:[\/]* ) ac_abs_srcdir=$ac_srcdir;; ! *) ac_abs_srcdir="$ac_dir"/$ac_srcdir;; esac;; esac ! case "$ac_dir" in .) ac_abs_top_srcdir=$ac_top_srcdir;; *) case $ac_top_srcdir in ! .) ac_abs_top_srcdir="$ac_dir";; [\/]* | ?:[\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; ! *) ac_abs_top_srcdir="$ac_dir"/$ac_top_srcdir;; esac;; esac --- 5406,5446 ---- ac_top_srcdir=$ac_top_builddir$srcdir ;; esac ! ! # Do not use `cd foo && pwd` to compute absolute paths, because ! # the directories may not exist. ! case `pwd` in ! .) ac_abs_builddir="$ac_dir";; *) ! case "$ac_dir" in ! .) ac_abs_builddir=`pwd`;; ! [\/]* | ?:[\/]* ) ac_abs_builddir="$ac_dir";; ! *) ac_abs_builddir=`pwd`/"$ac_dir";; esac;; esac ! case $ac_abs_builddir in .) ac_abs_top_builddir=${ac_top_builddir}.;; *) case ${ac_top_builddir}. in ! .) ac_abs_top_builddir=$ac_abs_builddir;; [\/]* | ?:[\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; ! *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; esac;; esac ! case $ac_abs_builddir in .) ac_abs_srcdir=$ac_srcdir;; *) case $ac_srcdir in ! .) ac_abs_srcdir=$ac_abs_builddir;; [\/]* | ?:[\/]* ) ac_abs_srcdir=$ac_srcdir;; ! *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; esac;; esac ! case $ac_abs_builddir in .) ac_abs_top_srcdir=$ac_top_srcdir;; *) case $ac_top_srcdir in ! .) ac_abs_top_srcdir=$ac_abs_builddir;; [\/]* | ?:[\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; ! *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; esac;; esac *************** *** 5477,5480 **** --- 5524,5750 ---- done _ACEOF + cat >>$CONFIG_STATUS <<_ACEOF + + # + # CONFIG_HEADER section. + # + + # These sed commands are passed to sed as "A NAME B NAME C VALUE D", where + # NAME is the cpp macro being defined and VALUE is the value it is being given. + # + # ac_d sets the value in "#define NAME VALUE" lines. + ac_dA='s,^([ ]*)#([ ]*define[ ][ ]*)' + ac_dB='[ ].*$,\1#\2' + ac_dC=' ' + ac_dD=',;t' + # ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE". + ac_uA='s,^([ ]*)#([ ]*)undef([ ][ ]*)' + ac_uB='$,\1#\2define\3' + ac_uC=' ' + ac_uD=',;t' + + for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue + # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". + case $ac_file in + - | *:- | *:-:* ) # input from stdin + cat >$tmp/stdin + ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` + ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; + *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` + ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; + * ) ac_file_in=$ac_file.in ;; + esac + + test x"$ac_file" != x- && { echo "$as_me:$LINENO: creating $ac_file" >&5 + echo "$as_me: creating $ac_file" >&6;} + + # First look for the input files in the build tree, otherwise in the + # src tree. + ac_file_inputs=`IFS=: + for f in $ac_file_in; do + case $f in + -) echo $tmp/stdin ;; + [\/$]*) + # Absolute (can't be DOS-style, as IFS=:) + test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 + echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + # Do quote $f, to prevent DOS paths from being IFS'd. + echo "$f";; + *) # Relative + if test -f "$f"; then + # Build tree + echo "$f" + elif test -f "$srcdir/$f"; then + # Source tree + echo "$srcdir/$f" + else + # /dev/null tree + { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 + echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + fi;; + esac + done` || { (exit 1); exit 1; } + # Remove the trailing spaces. + sed 's/[ ]*$//' $ac_file_inputs >$tmp/in + + _ACEOF + + # Transform confdefs.h into two sed scripts, `conftest.defines' and + # `conftest.undefs', that substitutes the proper values into + # config.h.in to produce config.h. The first handles `#define' + # templates, and the second `#undef' templates. + # And first: Protect against being on the right side of a sed subst in + # config.status. Protect against being in an unquoted here document + # in config.status. + rm -f conftest.defines conftest.undefs + # Using a here document instead of a string reduces the quoting nightmare. + # Putting comments in sed scripts is not portable. + # + # `end' is used to avoid that the second main sed command (meant for + # 0-ary CPP macros) applies to n-ary macro definitions. + # See the Autoconf documentation for `clear'. + cat >confdef2sed.sed <<_ACEOF + s/[\&,]/\&/g + s,[\$`],\&,g + t clear + : clear + s,^[ ]*#[ ]*define[ ][ ]*([^ (][^ (]*)(([^)]*))[ ]*(.*)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp + t end + s,^[ ]*#[ ]*define[ ][ ]*([^ ][^ ]*)[ ]*(.*)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp + : end + _ACEOF + # If some macros were called several times there might be several times + # the same #defines, which is useless. Nevertheless, we may not want to + # sort them, since we want the *last* AC-DEFINE to be honored. + uniq confdefs.h | sed -n -f confdef2sed.sed >conftest.defines + sed 's/ac_d/ac_u/g' conftest.defines >conftest.undefs + rm -f confdef2sed.sed + + # This sed command replaces #undef with comments. This is necessary, for + # example, in the case of _POSIX_SOURCE, which is predefined and required + # on some systems where configure will not decide to define it. + cat >>conftest.undefs <<_ACEOF + s,^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */, + _ACEOF + + # Break up conftest.defines because some shells have a limit on the size + # of here documents, and old seds have small limits too (100 cmds). + echo ' # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS + echo ' if grep "^[ ]*#[ ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS + echo ' # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS + echo ' :' >>$CONFIG_STATUS + rm -f conftest.tail + while grep . conftest.defines >/dev/null + do + # Write a limited-size here document to $tmp/defines.sed. + echo ' cat >$tmp/defines.sed <<CEOF' >>$CONFIG_STATUS + # Speed up: don't consider the non `#define' lines. + echo '/^[ ]*#[ ]*define/!b' >>$CONFIG_STATUS + # Work around the forget-to-reset-the-flag bug. + echo 't clr' >>$CONFIG_STATUS + echo ': clr' >>$CONFIG_STATUS + sed ${ac_max_here_lines}q conftest.defines >>$CONFIG_STATUS + echo 'CEOF + sed -f $tmp/defines.sed $tmp/in >$tmp/out + rm -f $tmp/in + mv $tmp/out $tmp/in + ' >>$CONFIG_STATUS + sed 1,${ac_max_here_lines}d conftest.defines >conftest.tail + rm -f conftest.defines + mv conftest.tail conftest.defines + done + rm -f conftest.defines + echo ' fi # grep' >>$CONFIG_STATUS + echo >>$CONFIG_STATUS + + # Break up conftest.undefs because some shells have a limit on the size + # of here documents, and old seds have small limits too (100 cmds). + echo ' # Handle all the #undef templates' >>$CONFIG_STATUS + rm -f conftest.tail + while grep . conftest.undefs >/dev/null + do + # Write a limited-size here document to $tmp/undefs.sed. + echo ' cat >$tmp/undefs.sed <<CEOF' >>$CONFIG_STATUS + # Speed up: don't consider the non `#undef' + echo '/^[ ]*#[ ]*undef/!b' >>$CONFIG_STATUS + # Work around the forget-to-reset-the-flag bug. + echo 't clr' >>$CONFIG_STATUS + echo ': clr' >>$CONFIG_STATUS + sed ${ac_max_here_lines}q conftest.undefs >>$CONFIG_STATUS + echo 'CEOF + sed -f $tmp/undefs.sed $tmp/in >$tmp/out + rm -f $tmp/in + mv $tmp/out $tmp/in + ' >>$CONFIG_STATUS + sed 1,${ac_max_here_lines}d conftest.undefs >conftest.tail + rm -f conftest.undefs + mv conftest.tail conftest.undefs + done + rm -f conftest.undefs + + cat >>$CONFIG_STATUS <<_ACEOF + # Let's still pretend it is `configure' which instantiates (i.e., don't + # use $as_me), people would be surprised to read: + # /* config.h. Generated by config.status. */ + if test x"$ac_file" = x-; then + echo "/* Generated by configure. */" >$tmp/config.h + else + echo "/* $ac_file. Generated by configure. */" >$tmp/config.h + fi + cat $tmp/in >>$tmp/config.h + rm -f $tmp/in + if test x"$ac_file" != x-; then + if diff $ac_file $tmp/config.h >/dev/null 2>&1; then + { echo "$as_me:$LINENO: $ac_file is unchanged" >&5 + echo "$as_me: $ac_file is unchanged" >&6;} + else + ac_dir=`(dirname "$ac_file") 2>/dev/null || + $as_expr X"$ac_file" : 'X(.*[^/])//*[^/][^/]*/*$' | \ + X"$ac_file" : 'X(//)[^/]' | \ + X"$ac_file" : 'X(//)$' | \ + X"$ac_file" : 'X(/)' | \ + . : '(.)' 2>/dev/null || + echo X"$ac_file" | + sed '/^X(.*[^/])//*[^/][^/]*/*$/{ s//\1/; q; } + /^X(//)[^/].*/{ s//\1/; q; } + /^X(//)$/{ s//\1/; q; } + /^X(/).*/{ s//\1/; q; } + s/.*/./; q'` + { if $as_mkdir_p; then + mkdir -p "$ac_dir" + else + as_dir="$ac_dir" + as_dirs= + while test ! -d "$as_dir"; do + as_dirs="$as_dir $as_dirs" + as_dir=`(dirname "$as_dir") 2>/dev/null || + $as_expr X"$as_dir" : 'X(.*[^/])//*[^/][^/]*/*$' | \ + X"$as_dir" : 'X(//)[^/]' | \ + X"$as_dir" : 'X(//)$' | \ + X"$as_dir" : 'X(/)' | \ + . : '(.)' 2>/dev/null || + echo X"$as_dir" | + sed '/^X(.*[^/])//*[^/][^/]*/*$/{ s//\1/; q; } + /^X(//)[^/].*/{ s//\1/; q; } + /^X(//)$/{ s//\1/; q; } + /^X(/).*/{ s//\1/; q; } + s/.*/./; q'` + done + test ! -n "$as_dirs" || mkdir $as_dirs + fi || { { echo "$as_me:$LINENO: error: cannot create directory "$ac_dir"" >&5 + echo "$as_me: error: cannot create directory "$ac_dir"" >&2;} + { (exit 1); exit 1; }; }; } + + rm -f $ac_file + mv $tmp/config.h $ac_file + fi + else + cat $tmp/config.h + rm -f $tmp/config.h + fi + done + _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF *************** *** 5507,5508 **** --- 5777,5782 ---- fi
+ + echo "used configure options:" + echo " --enable-ffmpeg=$enable_ffmpeg" + echo " --enable-mpeg4ip=$enable_mpeg4ip"
Index: configure.in =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/configure.in,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** configure.in 8 Dec 2003 22:45:54 -0000 1.2 --- configure.in 30 Mar 2004 01:56:15 -0000 1.3 *************** *** 2,9 ****
AC_INIT ! PDP_PIDIP_VERSION=0.12.12 PD_DIR=/usr/local/pd PDP_DIR=/usr/local/pd/pdp FFMPEG_SOURCE_DIR=/SOURCES/ffmpeg
AC_ISC_POSIX --- 2,23 ----
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" 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 *************** *** 65,86 **** fi
! echo -n "looking for ffmpeg sources (required) ... " ! if test -f $FFMPEG_SOURCE_DIR/libavformat/avformat.h 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 fi
! LIBS="$LIBS -lbz2 -lz -ldl -lmp3lame -logg -lvorbis -lvorbisenc" ! CFLAGS="$CFLAGS -Wall"
! AC_OUTPUT([ Makefile system/Makefile modules/Makefile - confdefs.h ]) AC_OUTPUT --- 79,130 ---- fi
! if test $enable_ffmpeg == yes; then ! 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
! 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 system/Makefile modules/Makefile ]) AC_OUTPUT + + echo "used configure options:" + echo " --enable-ffmpeg=$enable_ffmpeg" + echo " --enable-mpeg4ip=$enable_mpeg4ip"
Index: Makefile.in =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/Makefile.in,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Makefile.in 8 Dec 2003 22:45:54 -0000 1.3 --- Makefile.in 30 Mar 2004 01:56:15 -0000 1.4 *************** *** 3,25 **** FFMPEG_SOURCE_DIR = @FFMPEG_SOURCE_DIR@
! LIBS = @LIBS@ IMLIB_CFLAGS = @IMLIB_CFLAGS@ IMLIB_LIBS = @IMLIB_LIBS@ MAGICK_CFLAGS = @MAGICK_CFLAGS@ MAGICK_LIBS = @MAGICK_LIBS@ PDP_PIDIP_VERSION = @PDP_PIDIP_VERSION@
PDP_PIDIP_DISTRO = /mnt/c/ydegoyon.free.fr/pidip-$(PDP_PIDIP_VERSION) PDP_PIDIP_TARBALL = $(PDP_PIDIP_DISTRO).tar.gz - # build flags
! PDP_PIDIP_INCLUDE = -I$(PD_DIR)/src -I. -I$(PDP_DIR)/include -I$(FFMPEG_SOURCE_DIR)/libavcodec -I$(FFMPEG_SOURCE_DIR)/libavformat -I../include ! PDP_PIDIP_CFLAGS = $(MAGICK_CFLAGS) $(IMLIB_CFLAGS) \ -DPD -DX_DISPLAY_MISSING -O2 -funroll-loops -fomit-frame-pointer -ffast-math \ -Wall -W -Wstrict-prototypes \ -Wno-unused -Wno-parentheses -Wno-switch \ ! -DPDP_PIDIP_VERSION="$(PDP_PIDIP_VERSION)" \ ! -g ! PDP_PIDIP_CPPFLAGS = -O
all: pidip.pd_linux --- 3,30 ---- FFMPEG_SOURCE_DIR = @FFMPEG_SOURCE_DIR@
! PDP_PIDIP_LIBS = @PDP_PIDIP_LIBS@ IMLIB_CFLAGS = @IMLIB_CFLAGS@ IMLIB_LIBS = @IMLIB_LIBS@ MAGICK_CFLAGS = @MAGICK_CFLAGS@ MAGICK_LIBS = @MAGICK_LIBS@ + PDP_PIDIP_INCLUDES = @PDP_PIDIP_INCLUDES@ PDP_PIDIP_VERSION = @PDP_PIDIP_VERSION@ + MPEG4IP_CFLAGS = @MPEG4IP_CFLAGS@
PDP_PIDIP_DISTRO = /mnt/c/ydegoyon.free.fr/pidip-$(PDP_PIDIP_VERSION) PDP_PIDIP_TARBALL = $(PDP_PIDIP_DISTRO).tar.gz
! ! PDP_PIDIP_CFLAGS = $(MPEG4IP_CFLAGS) $(MAGICK_CFLAGS) $(IMLIB_CFLAGS) \ -DPD -DX_DISPLAY_MISSING -O2 -funroll-loops -fomit-frame-pointer -ffast-math \ -Wall -W -Wstrict-prototypes \ -Wno-unused -Wno-parentheses -Wno-switch \ ! -DPDP_PIDIP_VERSION="$(PDP_PIDIP_VERSION)" -g ! ! PDP_PIDIP_CPPFLAGS = $(MPEG4IP_CFLAGS) $(MAGICK_CFLAGS) $(IMLIB_CFLAGS) \ ! -DPD -DX_DISPLAY_MISSING -O2 -funroll-loops -fomit-frame-pointer -ffast-math \ ! -Wall -W -Wstrict-prototypes \ ! -Wno-unused -Wno-parentheses -Wno-switch \ ! -DPDP_PIDIP_VERSION="$(PDP_PIDIP_VERSION)" -g
all: pidip.pd_linux *************** *** 31,40 **** pidip.pd_linux: pdp_pidip_all rm -f pidip.pd_linux ! gcc -export_dynamic -shared -o pidip.pd_linux modules/*.o system/*.o $(FFMPEG_SOURCE_DIR)/libavformat/libavformat.a $(FFMPEG_SOURCE_DIR)/libavcodec/libavcodec.a $(LIBS) $(IMLIB_LIBS) $(MAGICK_LIBS)
clean: rm -f */*.o rm -f pidip.pd_linux - rm -f *~
install: --- 36,45 ---- pidip.pd_linux: pdp_pidip_all rm -f pidip.pd_linux ! g++ -export_dynamic -shared -o pidip.pd_linux modules/*.o system/*.o $(PDP_PIDIP_LIBS) $(IMLIB_LIBS) $(MAGICK_LIBS) ! strip --strip-unneeded pidip.pd_linux
clean: rm -f */*.o rm -f pidip.pd_linux
install: *************** *** 43,57 ****
distro: clean all ! rm */*.o ! strip --strip-unneeded pidip.pd_linux cd .. && cp -rf pidip /tmp/pidip-$(PDP_PIDIP_VERSION) cd /tmp && tar vczf $(PDP_PIDIP_TARBALL) pidip-$(PDP_PIDIP_VERSION) ! cp /mnt/c/ydegoyon.free.fr/pidip-$(PDP_PIDIP_VERSION).tar.gz /mnt/c/Yves rm -rf /tmp/pidip-$(PDP_PIDIP_VERSION)
.c.o: ! gcc $(PDP_PIDIP_CFLAGS) $(PDP_PIDIP_INCLUDE) -o $*.o -c $*.c
.cpp.o: ! g++ $(PDP_PIDIP_CPPFLAGS) $(PDP_PIDIP_INCLUDE) -o $*.o -c $*.cpp ! --- 48,61 ----
distro: clean all ! rm -f */*.o ! rm -rf autom4te.cache cd .. && cp -rf pidip /tmp/pidip-$(PDP_PIDIP_VERSION) cd /tmp && tar vczf $(PDP_PIDIP_TARBALL) pidip-$(PDP_PIDIP_VERSION) ! cp /mnt/c/ydegoyon.free.fr/pidip-$(PDP_PIDIP_VERSION).tar.gz /mnt/c/Yves/Software rm -rf /tmp/pidip-$(PDP_PIDIP_VERSION)
.c.o: ! gcc $(PDP_PIDIP_CFLAGS) $(PDP_PIDIP_INCLUDES) -o $*.o -c $*.c
.cpp.o: ! g++ $(PDP_PIDIP_CPPFLAGS) $(PDP_PIDIP_INCLUDES) -o $*.o -c $*.cpp
Index: config.log =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/config.log,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** config.log 8 Dec 2003 22:45:54 -0000 1.4 --- config.log 30 Mar 2004 01:56:15 -0000 1.5 *************** *** 3,9 ****
It was created by configure, which was ! generated by GNU Autoconf 2.58. Invocation command line was
! $ ./configure
## --------- ## --- 3,9 ----
It was created by configure, which was ! generated by GNU Autoconf 2.59. Invocation command line was
! $ ./configure --enable-ffmpeg
## --------- ## *************** *** 11,19 **** ## --------- ##
! hostname = dhcp-132-100 uname -m = i686 ! uname -r = 2.5.7 uname -s = Linux ! uname -v = #18 SMP Thu Jul 3 02:12:40 CEST 2003
/usr/bin/uname -p = unknown --- 11,19 ---- ## --------- ##
! hostname = localhost uname -m = i686 ! uname -r = 2.6.1 uname -s = Linux ! uname -v = #7 SMP Tue Feb 10 23:56:11 EST 2004
/usr/bin/uname -p = unknown *************** *** 60,68 **** ## ----------- ##
! configure:1311: checking for gcc ! configure:1327: found /usr/bin/gcc ! configure:1337: result: gcc ! configure:1581: checking for C compiler version ! configure:1584: gcc --version </dev/null >&5 gcc (GCC) 3.2.2 (Mandrake Linux 9.1 3.2.2-3mdk) Copyright (C) 2002 Free Software Foundation, Inc. --- 60,68 ---- ## ----------- ##
! configure:1339: checking for gcc ! configure:1355: found /usr/bin/gcc ! configure:1365: result: gcc ! configure:1609: checking for C compiler version ! configure:1612: gcc --version </dev/null >&5 gcc (GCC) 3.2.2 (Mandrake Linux 9.1 3.2.2-3mdk) Copyright (C) 2002 Free Software Foundation, Inc. *************** *** 70,140 **** warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
! configure:1587: $? = 0 ! configure:1589: gcc -v </dev/null >&5 Reading specs from /usr/lib/gcc-lib/i586-mandrake-linux-gnu/3.2.2/specs Configured with: ../configure --prefix=/usr --libdir=/usr/lib --with-slibdir=/lib --mandir=/usr/share/man --infodir=/usr/share/info --enable-shared --enable-threads=posix --disable-checking --enable-long-long --enable-__cxa_atexit --enable-languages=c,c++,ada,f77,objc,java --host=i586-mandrake-linux-gnu --with-system-zlib Thread model: posix gcc version 3.2.2 (Mandrake Linux 9.1 3.2.2-3mdk) ! configure:1592: $? = 0 ! configure:1594: gcc -V </dev/null >&5 gcc: argument to `-V' is missing ! configure:1597: $? = 1 ! configure:1620: checking for C compiler default output file name ! configure:1623: gcc conftest.c >&5 ! configure:1626: $? = 0 ! configure:1672: result: a.out ! configure:1677: checking whether the C compiler works ! configure:1683: ./a.out ! configure:1686: $? = 0 ! configure:1703: result: yes ! configure:1710: checking whether we are cross compiling ! configure:1712: result: no ! configure:1715: checking for suffix of executables ! configure:1717: gcc -o conftest conftest.c >&5 ! configure:1720: $? = 0 ! configure:1745: result: ! configure:1751: checking for suffix of object files ! configure:1772: gcc -c conftest.c >&5 ! configure:1775: $? = 0 ! configure:1797: result: o ! configure:1801: checking whether we are using the GNU C compiler ! configure:1825: gcc -c conftest.c >&5 ! configure:1831: $? = 0 ! configure:1835: test -z || test ! -s conftest.err ! configure:1838: $? = 0 ! configure:1841: test -s conftest.o ! configure:1844: $? = 0 ! configure:1857: result: yes ! configure:1863: checking whether gcc accepts -g ! configure:1884: gcc -c -g conftest.c >&5 ! configure:1890: $? = 0 ! configure:1894: test -z || test ! -s conftest.err ! configure:1897: $? = 0 ! configure:1900: test -s conftest.o ! configure:1903: $? = 0 ! configure:1914: result: yes ! configure:1931: checking for gcc option to accept ANSI C ! configure:2001: gcc -c -g -O2 conftest.c >&5 ! configure:2007: $? = 0 ! configure:2011: test -z || test ! -s conftest.err ! configure:2014: $? = 0 ! configure:2017: test -s conftest.o ! configure:2020: $? = 0 ! configure:2038: result: none needed ! configure:2056: gcc -c -g -O2 conftest.c >&5 conftest.c:2: parse error before "me" ! configure:2062: $? = 1 configure: failed program was: | #ifndef __cplusplus | choke me | #endif ! configure:2197: checking for strerror in -lcposix ! configure:2227: gcc -o conftest -g -O2 conftest.c -lcposix >&5 /usr/bin/ld: cannot find -lcposix collect2: ld returned 1 exit status ! configure:2233: $? = 1 configure: failed program was: | /* confdefs.h. */ --- 70,140 ---- warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
! configure:1615: $? = 0 ! configure:1617: gcc -v </dev/null >&5 Reading specs from /usr/lib/gcc-lib/i586-mandrake-linux-gnu/3.2.2/specs Configured with: ../configure --prefix=/usr --libdir=/usr/lib --with-slibdir=/lib --mandir=/usr/share/man --infodir=/usr/share/info --enable-shared --enable-threads=posix --disable-checking --enable-long-long --enable-__cxa_atexit --enable-languages=c,c++,ada,f77,objc,java --host=i586-mandrake-linux-gnu --with-system-zlib Thread model: posix gcc version 3.2.2 (Mandrake Linux 9.1 3.2.2-3mdk) ! configure:1620: $? = 0 ! configure:1622: gcc -V </dev/null >&5 gcc: argument to `-V' is missing ! configure:1625: $? = 1 ! configure:1648: checking for C compiler default output file name ! configure:1651: gcc conftest.c >&5 ! configure:1654: $? = 0 ! configure:1700: result: a.out ! configure:1705: checking whether the C compiler works ! configure:1711: ./a.out ! configure:1714: $? = 0 ! configure:1731: result: yes ! configure:1738: checking whether we are cross compiling ! configure:1740: result: no ! configure:1743: checking for suffix of executables ! configure:1745: gcc -o conftest conftest.c >&5 ! configure:1748: $? = 0 ! configure:1773: result: ! configure:1779: checking for suffix of object files ! configure:1800: gcc -c conftest.c >&5 ! configure:1803: $? = 0 ! configure:1825: result: o ! configure:1829: checking whether we are using the GNU C compiler ! configure:1853: gcc -c conftest.c >&5 ! configure:1859: $? = 0 ! configure:1863: test -z || test ! -s conftest.err ! configure:1866: $? = 0 ! configure:1869: test -s conftest.o ! configure:1872: $? = 0 ! configure:1885: result: yes ! configure:1891: checking whether gcc accepts -g ! configure:1912: gcc -c -g conftest.c >&5 ! configure:1918: $? = 0 ! configure:1922: test -z || test ! -s conftest.err ! configure:1925: $? = 0 ! configure:1928: test -s conftest.o ! configure:1931: $? = 0 ! configure:1942: result: yes ! configure:1959: checking for gcc option to accept ANSI C ! configure:2029: gcc -c -g -O2 conftest.c >&5 ! configure:2035: $? = 0 ! configure:2039: test -z || test ! -s conftest.err ! configure:2042: $? = 0 ! configure:2045: test -s conftest.o ! configure:2048: $? = 0 ! configure:2066: result: none needed ! configure:2084: gcc -c -g -O2 conftest.c >&5 conftest.c:2: parse error before "me" ! configure:2090: $? = 1 configure: failed program was: | #ifndef __cplusplus | choke me | #endif ! configure:2225: checking for strerror in -lcposix ! configure:2255: gcc -o conftest -g -O2 conftest.c -lcposix >&5 /usr/bin/ld: cannot find -lcposix collect2: ld returned 1 exit status ! configure:2261: $? = 1 configure: failed program was: | /* confdefs.h. */ *************** *** 161,169 **** | return 0; | } ! configure:2259: result: no ! configure:2313: checking for gcc ! configure:2339: result: gcc ! configure:2583: checking for C compiler version ! configure:2586: gcc --version </dev/null >&5 gcc (GCC) 3.2.2 (Mandrake Linux 9.1 3.2.2-3mdk) Copyright (C) 2002 Free Software Foundation, Inc. --- 161,169 ---- | return 0; | } ! configure:2287: result: no ! configure:2341: checking for gcc ! configure:2367: result: gcc ! configure:2611: checking for C compiler version ! configure:2614: gcc --version </dev/null >&5 gcc (GCC) 3.2.2 (Mandrake Linux 9.1 3.2.2-3mdk) Copyright (C) 2002 Free Software Foundation, Inc. *************** *** 171,212 **** warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
! configure:2589: $? = 0 ! configure:2591: gcc -v </dev/null >&5 Reading specs from /usr/lib/gcc-lib/i586-mandrake-linux-gnu/3.2.2/specs Configured with: ../configure --prefix=/usr --libdir=/usr/lib --with-slibdir=/lib --mandir=/usr/share/man --infodir=/usr/share/info --enable-shared --enable-threads=posix --disable-checking --enable-long-long --enable-__cxa_atexit --enable-languages=c,c++,ada,f77,objc,java --host=i586-mandrake-linux-gnu --with-system-zlib Thread model: posix gcc version 3.2.2 (Mandrake Linux 9.1 3.2.2-3mdk) ! configure:2594: $? = 0 ! configure:2596: gcc -V </dev/null >&5 gcc: argument to `-V' is missing ! configure:2599: $? = 1 ! configure:2602: checking whether we are using the GNU C compiler ! configure:2658: result: yes ! configure:2664: checking whether gcc accepts -g ! configure:2715: result: yes ! configure:2732: checking for gcc option to accept ANSI C ! configure:2839: result: none needed ! configure:2857: gcc -c -g -O2 conftest.c >&5 conftest.c:2: parse error before "me" ! configure:2863: $? = 1 configure: failed program was: | #ifndef __cplusplus | choke me | #endif ! configure:2999: checking for gcc option to accept ANSI C ! configure:3061: gcc -c -g -O2 conftest.c >&5 ! configure:3067: $? = 0 ! configure:3071: test -z || test ! -s conftest.err ! configure:3074: $? = 0 ! configure:3077: test -s conftest.o ! configure:3080: $? = 0 ! configure:3095: result: none needed ! configure:3111: checking how to run the C preprocessor ! configure:3146: gcc -E conftest.c ! configure:3152: $? = 0 ! configure:3184: gcc -E conftest.c conftest.c:9:28: ac_nonexistent.h: No such file or directory ! configure:3190: $? = 1 configure: failed program was: | /* confdefs.h. */ --- 171,212 ---- warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
! configure:2617: $? = 0 ! configure:2619: gcc -v </dev/null >&5 Reading specs from /usr/lib/gcc-lib/i586-mandrake-linux-gnu/3.2.2/specs Configured with: ../configure --prefix=/usr --libdir=/usr/lib --with-slibdir=/lib --mandir=/usr/share/man --infodir=/usr/share/info --enable-shared --enable-threads=posix --disable-checking --enable-long-long --enable-__cxa_atexit --enable-languages=c,c++,ada,f77,objc,java --host=i586-mandrake-linux-gnu --with-system-zlib Thread model: posix gcc version 3.2.2 (Mandrake Linux 9.1 3.2.2-3mdk) ! configure:2622: $? = 0 ! configure:2624: gcc -V </dev/null >&5 gcc: argument to `-V' is missing ! configure:2627: $? = 1 ! configure:2630: checking whether we are using the GNU C compiler ! configure:2686: result: yes ! configure:2692: checking whether gcc accepts -g ! configure:2743: result: yes ! configure:2760: checking for gcc option to accept ANSI C ! configure:2867: result: none needed ! configure:2885: gcc -c -g -O2 conftest.c >&5 conftest.c:2: parse error before "me" ! configure:2891: $? = 1 configure: failed program was: | #ifndef __cplusplus | choke me | #endif ! configure:3027: checking for gcc option to accept ANSI C ! configure:3089: gcc -c -g -O2 conftest.c >&5 ! configure:3095: $? = 0 ! configure:3099: test -z || test ! -s conftest.err ! configure:3102: $? = 0 ! configure:3105: test -s conftest.o ! configure:3108: $? = 0 ! configure:3123: result: none needed ! configure:3139: checking how to run the C preprocessor ! configure:3174: gcc -E conftest.c ! configure:3180: $? = 0 ! configure:3212: gcc -E conftest.c conftest.c:9:28: ac_nonexistent.h: No such file or directory ! configure:3218: $? = 1 configure: failed program was: | /* confdefs.h. */ *************** *** 219,228 **** | /* end confdefs.h. */ | #include <ac_nonexistent.h> ! configure:3229: result: gcc -E ! configure:3253: gcc -E conftest.c ! configure:3259: $? = 0 ! configure:3291: gcc -E conftest.c conftest.c:9:28: ac_nonexistent.h: No such file or directory ! configure:3297: $? = 1 configure: failed program was: | /* confdefs.h. */ --- 219,228 ---- | /* end confdefs.h. */ | #include <ac_nonexistent.h> ! configure:3257: result: gcc -E ! configure:3281: gcc -E conftest.c ! configure:3287: $? = 0 ! configure:3319: gcc -E conftest.c conftest.c:9:28: ac_nonexistent.h: No such file or directory ! configure:3325: $? = 1 configure: failed program was: | /* confdefs.h. */ *************** *** 235,341 **** | /* end confdefs.h. */ | #include <ac_nonexistent.h> ! configure:3341: checking for egrep ! configure:3351: result: grep -E ! configure:3356: checking for ANSI C header files ! configure:3381: gcc -c -g -O2 conftest.c >&5 ! configure:3387: $? = 0 ! configure:3391: test -z || test ! -s conftest.err ! configure:3394: $? = 0 ! configure:3397: test -s conftest.o ! configure:3400: $? = 0 ! configure:3486: gcc -o conftest -g -O2 conftest.c >&5 ! configure:3489: $? = 0 ! configure:3491: ./conftest ! configure:3494: $? = 0 ! configure:3509: result: yes ! configure:3557: checking for a BSD-compatible install ! configure:3612: result: /usr/bin/install -c ! configure:3623: checking whether make sets $(MAKE) ! configure:3643: result: yes ! configure:3652: checking whether build environment is sane ! configure:3695: result: yes ! configure:3698: checking whether to enable maintainer-specific portions of Makefiles ! configure:3707: result: no ! configure:3721: checking if malloc debugging is wanted ! configure:3742: result: no ! configure:3780: checking for imlib2-config ! configure:3798: found /usr/local/bin/imlib2-config ! configure:3811: result: /usr/local/bin/imlib2-config ! configure:3818: checking for imlib2 - version >= 1.0.0 ! configure:3876: result: yes ! configure:3909: checking for XWindowByProperty in -lMagick ! configure:3939: gcc -o conftest -g -O2 conftest.c -lMagick -I/usr/X11R6/include -L/usr/X11R6/lib >&5 ! configure:3945: $? = 0 ! configure:3949: test -z || test ! -s conftest.err ! configure:3952: $? = 0 ! configure:3955: test -s conftest ! configure:3958: $? = 0 ! configure:3971: result: yes ! configure:3987: checking for BZ2_bzBuffToBuffCompress in -lbz2 ! configure:4017: gcc -o conftest -g -O2 conftest.c -lbz2 -lMagick >&5 ! configure:4023: $? = 0 ! configure:4027: test -z || test ! -s conftest.err ! configure:4030: $? = 0 ! configure:4033: test -s conftest ! configure:4036: $? = 0 ! configure:4049: result: yes ! configure:4065: checking for deflate in -lz ! configure:4095: gcc -o conftest -g -O2 conftest.c -lz -lbz2 -lMagick >&5 ! configure:4101: $? = 0 ! configure:4105: test -z || test ! -s conftest.err ! configure:4108: $? = 0 ! configure:4111: test -s conftest ! configure:4114: $? = 0 ! configure:4127: result: yes ! configure:4143: checking for dlopen in -ldl ! configure:4173: gcc -o conftest -g -O2 conftest.c -ldl -lz -lbz2 -lMagick >&5 ! configure:4179: $? = 0 ! configure:4183: test -z || test ! -s conftest.err ! configure:4186: $? = 0 ! configure:4189: test -s conftest ! configure:4192: $? = 0 ! configure:4205: result: yes ! configure:4221: checking for InitMP3 in -lmp3lame ! configure:4251: gcc -o conftest -g -O2 conftest.c -lmp3lame -lm -ldl -lz -lbz2 -lMagick >&5 ! configure:4257: $? = 0 ! configure:4261: test -z || test ! -s conftest.err ! configure:4264: $? = 0 ! configure:4267: test -s conftest ! configure:4270: $? = 0 ! configure:4283: result: yes ! configure:4299: checking for ogg_stream_init in -logg ! configure:4329: gcc -o conftest -g -O2 conftest.c -logg -lm -lmp3lame -ldl -lz -lbz2 -lMagick >&5 ! configure:4335: $? = 0 ! configure:4339: test -z || test ! -s conftest.err ! configure:4342: $? = 0 ! configure:4345: test -s conftest ! configure:4348: $? = 0 ! configure:4361: result: yes ! configure:4377: checking for vorbis_analysis_init in -lvorbis ! configure:4407: gcc -o conftest -g -O2 conftest.c -lvorbis -lm -logg -lmp3lame -ldl -lz -lbz2 -lMagick >&5 ! configure:4413: $? = 0 ! configure:4417: test -z || test ! -s conftest.err ! configure:4420: $? = 0 ! configure:4423: test -s conftest ! configure:4426: $? = 0 ! configure:4439: result: yes ! configure:4455: checking for vorbis_encode_setup_init in -lvorbisenc ! configure:4485: gcc -o conftest -g -O2 conftest.c -lvorbisenc -lm -lvorbis -logg -lmp3lame -ldl -lz -lbz2 -lMagick >&5 ! configure:4491: $? = 0 ! configure:4495: test -z || test ! -s conftest.err ! configure:4498: $? = 0 ! configure:4501: test -s conftest ! configure:4504: $? = 0 ! configure:4517: result: yes ! configure:4701: creating ./config.status
## ---------------------- ## --- 235,341 ---- | /* end confdefs.h. */ | #include <ac_nonexistent.h> ! configure:3369: checking for egrep ! configure:3379: result: grep -E ! configure:3384: checking for ANSI C header files ! configure:3409: gcc -c -g -O2 conftest.c >&5 ! configure:3415: $? = 0 ! configure:3419: test -z || test ! -s conftest.err ! configure:3422: $? = 0 ! configure:3425: test -s conftest.o ! configure:3428: $? = 0 ! configure:3514: gcc -o conftest -g -O2 conftest.c >&5 ! configure:3517: $? = 0 ! configure:3519: ./conftest ! configure:3522: $? = 0 ! configure:3537: result: yes ! configure:3585: checking for a BSD-compatible install ! configure:3640: result: /usr/bin/install -c ! configure:3651: checking whether make sets $(MAKE) ! configure:3671: result: yes ! configure:3680: checking whether build environment is sane ! configure:3723: result: yes ! configure:3726: checking whether to enable maintainer-specific portions of Makefiles ! configure:3735: result: no ! configure:3749: checking if malloc debugging is wanted ! configure:3770: result: no ! configure:3808: checking for imlib2-config ! configure:3826: found /usr/local/bin/imlib2-config ! configure:3839: result: /usr/local/bin/imlib2-config ! configure:3846: checking for imlib2 - version >= 1.0.0 ! configure:3904: result: yes ! configure:3937: checking for XWindowByProperty in -lMagick ! configure:3967: gcc -o conftest -g -O2 conftest.c -lMagick -I/usr/X11R6/include -L/usr/X11R6/lib >&5 ! configure:3973: $? = 0 ! configure:3977: test -z || test ! -s conftest.err ! configure:3980: $? = 0 ! configure:3983: test -s conftest ! configure:3986: $? = 0 ! configure:3999: result: yes ! configure:4015: checking for BZ2_bzBuffToBuffCompress in -lbz2 ! configure:4045: gcc -o conftest -g -O2 conftest.c -lbz2 -lMagick >&5 ! configure:4051: $? = 0 ! configure:4055: test -z || test ! -s conftest.err ! configure:4058: $? = 0 ! configure:4061: test -s conftest ! configure:4064: $? = 0 ! configure:4077: result: yes ! configure:4093: checking for deflate in -lz ! configure:4123: gcc -o conftest -g -O2 conftest.c -lz -lbz2 -lMagick >&5 ! configure:4129: $? = 0 ! configure:4133: test -z || test ! -s conftest.err ! configure:4136: $? = 0 ! configure:4139: test -s conftest ! configure:4142: $? = 0 ! configure:4155: result: yes ! configure:4171: checking for dlopen in -ldl ! configure:4201: gcc -o conftest -g -O2 conftest.c -ldl -lz -lbz2 -lMagick >&5 ! configure:4207: $? = 0 ! configure:4211: test -z || test ! -s conftest.err ! configure:4214: $? = 0 ! configure:4217: test -s conftest ! configure:4220: $? = 0 ! configure:4233: result: yes ! configure:4249: checking for InitMP3 in -lmp3lame ! configure:4279: gcc -o conftest -g -O2 conftest.c -lmp3lame -lm -ldl -lz -lbz2 -lMagick >&5 ! configure:4285: $? = 0 ! configure:4289: test -z || test ! -s conftest.err ! configure:4292: $? = 0 ! configure:4295: test -s conftest ! configure:4298: $? = 0 ! configure:4311: result: yes ! configure:4327: checking for ogg_stream_init in -logg ! configure:4357: gcc -o conftest -g -O2 conftest.c -logg -lm -lmp3lame -ldl -lz -lbz2 -lMagick >&5 ! configure:4363: $? = 0 ! configure:4367: test -z || test ! -s conftest.err ! configure:4370: $? = 0 ! configure:4373: test -s conftest ! configure:4376: $? = 0 ! configure:4389: result: yes ! configure:4405: checking for vorbis_analysis_init in -lvorbis ! configure:4435: gcc -o conftest -g -O2 conftest.c -lvorbis -lm -logg -lmp3lame -ldl -lz -lbz2 -lMagick >&5 ! configure:4441: $? = 0 ! configure:4445: test -z || test ! -s conftest.err ! configure:4448: $? = 0 ! configure:4451: test -s conftest ! configure:4454: $? = 0 ! configure:4467: result: yes ! configure:4483: checking for vorbis_encode_setup_init in -lvorbisenc ! configure:4513: gcc -o conftest -g -O2 conftest.c -lvorbisenc -lm -lvorbis -logg -lmp3lame -ldl -lz -lbz2 -lMagick >&5 ! configure:4519: $? = 0 ! configure:4523: test -z || test ! -s conftest.err ! configure:4526: $? = 0 ! configure:4529: test -s conftest ! configure:4532: $? = 0 ! configure:4545: result: yes ! configure:4733: creating ./config.status
## ---------------------- ## *************** *** 344,348 ****
This file was extended by config.status, which was ! generated by GNU Autoconf 2.58. Invocation command line was
CONFIG_FILES = --- 344,348 ----
This file was extended by config.status, which was ! generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = *************** *** 352,360 **** $ ./config.status
! on dhcp-132-100
! config.status:655: creating Makefile ! config.status:655: creating system/Makefile ! config.status:655: creating modules/Makefile
## ---------------- ## --- 352,361 ---- $ ./config.status
! on localhost
! config.status:671: creating Makefile ! config.status:671: creating system/Makefile ! config.status:671: creating modules/Makefile ! config.status:775: creating include/pidip_config.h
## ---------------- ## *************** *** 406,413 ****
CC='gcc' ! CFLAGS='-g -O2 -Wall' CPP='gcc -E' CPPFLAGS='' ! DEFS='-DPACKAGE_NAME="" -DPACKAGE_TARNAME="" -DPACKAGE_VERSION="" -DPACKAGE_STRING="" -DPACKAGE_BUGREPORT="" -DSTDC_HEADERS=1 -DHAVE_LIBMAGICK=1 -DHAVE_LIBBZ2=1 -DHAVE_LIBZ=1 -DHAVE_LIBDL=1 -DHAVE_LIBMP3LAME=1 -DHAVE_LIBOGG=1 -DHAVE_LIBVORBIS=1 -DHAVE_LIBVORBISENC=1 ' ECHO_C='' ECHO_N='-n' --- 407,414 ----
CC='gcc' ! CFLAGS='-g -O2' CPP='gcc -E' CPPFLAGS='' ! DEFS='-DHAVE_CONFIG_H' ECHO_C='' ECHO_N='-n' *************** *** 426,430 **** LDFLAGS='' LIBOBJS='' ! LIBS='-lvorbisenc -lvorbis -logg -lmp3lame -ldl -lz -lbz2 -lMagick -lbz2 -lz -ldl -lmp3lame -logg -lvorbis -lvorbisenc' LTLIBOBJS='' MAGICK_CFLAGS='-I/usr/X11R6/include -g -O2 -Wall ' --- 427,431 ---- LDFLAGS='' LIBOBJS='' ! LIBS='-lvorbisenc -lvorbis -logg -lmp3lame -ldl -lz -lbz2 -lMagick ' LTLIBOBJS='' MAGICK_CFLAGS='-I/usr/X11R6/include -g -O2 -Wall ' *************** *** 433,436 **** --- 434,439 ---- MAINTAINER_MODE_FALSE='' MAINTAINER_MODE_TRUE='#' + MPEG4IP_CFLAGS='' + MPEG4IP_SOURCE_DIR='/SOURCES/mpeg4ip' OBJEXT='o' PACKAGE_BUGREPORT='' *************** *** 441,445 **** PATH_SEPARATOR=':' PDP_DIR='/usr/local/pd/pdp' ! PDP_PIDIP_VERSION='0.12.12' PD_DIR='/usr/local/pd' SET_MAKE='' --- 444,451 ---- PATH_SEPARATOR=':' PDP_DIR='/usr/local/pd/pdp' ! PDP_PIDIP_INCLUDES='-I/usr/local/pd/src -I. -I/usr/local/pd/pdp/include -I../include -I/SOURCES/ffmpeg/libavcodec -I/SOURCES/ffmpeg/libavformat' ! PDP_PIDIP_LIBS=' -lbz2 -lz -ldl -lmp3lame -logg -lvorbis -lvorbisenc /SOURCES/ffmpeg/libavformat/libavformat.a /SOURCES/ffmpeg/libavcodec/libavcodec.a' ! PDP_PIDIP_VERSION='0.12.14' ! PDP_STREAMING_OBJECTS=' pdp_live~.o pdp_ffmpeg~.o' PD_DIR='/usr/local/pd' SET_MAKE='' *************** *** 477,480 **** --- 483,487 ---- #define HAVE_LIBVORBISENC 1 #define HAVE_LIBZ 1 + #define HAVE_PIDIP_FFMPEG 1 #define PACKAGE_BUGREPORT "" #define PACKAGE_NAME ""
Index: Makefile =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/Makefile,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Makefile 8 Dec 2003 22:45:54 -0000 1.4 --- Makefile 30 Mar 2004 01:56:15 -0000 1.5 *************** *** 3,25 **** FFMPEG_SOURCE_DIR = /SOURCES/ffmpeg
! LIBS = -lvorbisenc -lvorbis -logg -lmp3lame -ldl -lz -lbz2 -lMagick -lbz2 -lz -ldl -lmp3lame -logg -lvorbis -lvorbisenc IMLIB_CFLAGS = -I/usr/local/include -I/usr/X11R6/include IMLIB_LIBS = -L/usr/local/lib -lImlib2 -lttf -lm -ldl -lXext -lXext -lX11 -L/usr/X11R6/lib MAGICK_CFLAGS = -I/usr/X11R6/include -g -O2 -Wall MAGICK_LIBS = -L/usr/X11R6/lib -lMagick -lMagick -ltiff -lfreetype -ljasper -ljpeg -lpng -lXext -lSM -lICE -lX11 -lbz2 -lxml2 -lz -lpthread -lm -L/usr/local/lib -L/usr/X11R6/lib -L/usr/X11R6/lib -L/usr/local/lib ! PDP_PIDIP_VERSION = 0.12.12
PDP_PIDIP_DISTRO = /mnt/c/ydegoyon.free.fr/pidip-$(PDP_PIDIP_VERSION) PDP_PIDIP_TARBALL = $(PDP_PIDIP_DISTRO).tar.gz - # build flags
! PDP_PIDIP_INCLUDE = -I$(PD_DIR)/src -I. -I$(PDP_DIR)/include -I$(FFMPEG_SOURCE_DIR)/libavcodec -I$(FFMPEG_SOURCE_DIR)/libavformat -I../include ! PDP_PIDIP_CFLAGS = $(MAGICK_CFLAGS) $(IMLIB_CFLAGS) \ -DPD -DX_DISPLAY_MISSING -O2 -funroll-loops -fomit-frame-pointer -ffast-math \ -Wall -W -Wstrict-prototypes \ -Wno-unused -Wno-parentheses -Wno-switch \ ! -DPDP_PIDIP_VERSION="$(PDP_PIDIP_VERSION)" \ ! -g ! PDP_PIDIP_CPPFLAGS = -O
all: pidip.pd_linux --- 3,30 ---- FFMPEG_SOURCE_DIR = /SOURCES/ffmpeg
! PDP_PIDIP_LIBS = -lbz2 -lz -ldl -lmp3lame -logg -lvorbis -lvorbisenc /SOURCES/ffmpeg/libavformat/libavformat.a /SOURCES/ffmpeg/libavcodec/libavcodec.a IMLIB_CFLAGS = -I/usr/local/include -I/usr/X11R6/include IMLIB_LIBS = -L/usr/local/lib -lImlib2 -lttf -lm -ldl -lXext -lXext -lX11 -L/usr/X11R6/lib MAGICK_CFLAGS = -I/usr/X11R6/include -g -O2 -Wall MAGICK_LIBS = -L/usr/X11R6/lib -lMagick -lMagick -ltiff -lfreetype -ljasper -ljpeg -lpng -lXext -lSM -lICE -lX11 -lbz2 -lxml2 -lz -lpthread -lm -L/usr/local/lib -L/usr/X11R6/lib -L/usr/X11R6/lib -L/usr/local/lib ! PDP_PIDIP_INCLUDES = -I/usr/local/pd/src -I. -I/usr/local/pd/pdp/include -I../include -I/SOURCES/ffmpeg/libavcodec -I/SOURCES/ffmpeg/libavformat ! PDP_PIDIP_VERSION = 0.12.14 ! MPEG4IP_CFLAGS =
PDP_PIDIP_DISTRO = /mnt/c/ydegoyon.free.fr/pidip-$(PDP_PIDIP_VERSION) PDP_PIDIP_TARBALL = $(PDP_PIDIP_DISTRO).tar.gz
! ! PDP_PIDIP_CFLAGS = $(MPEG4IP_CFLAGS) $(MAGICK_CFLAGS) $(IMLIB_CFLAGS) \ -DPD -DX_DISPLAY_MISSING -O2 -funroll-loops -fomit-frame-pointer -ffast-math \ -Wall -W -Wstrict-prototypes \ -Wno-unused -Wno-parentheses -Wno-switch \ ! -DPDP_PIDIP_VERSION="$(PDP_PIDIP_VERSION)" -g ! ! PDP_PIDIP_CPPFLAGS = $(MPEG4IP_CFLAGS) $(MAGICK_CFLAGS) $(IMLIB_CFLAGS) \ ! -DPD -DX_DISPLAY_MISSING -O2 -funroll-loops -fomit-frame-pointer -ffast-math \ ! -Wall -W -Wstrict-prototypes \ ! -Wno-unused -Wno-parentheses -Wno-switch \ ! -DPDP_PIDIP_VERSION="$(PDP_PIDIP_VERSION)" -g
all: pidip.pd_linux *************** *** 31,40 **** pidip.pd_linux: pdp_pidip_all rm -f pidip.pd_linux ! gcc -export_dynamic -shared -o pidip.pd_linux modules/*.o system/*.o $(FFMPEG_SOURCE_DIR)/libavformat/libavformat.a $(FFMPEG_SOURCE_DIR)/libavcodec/libavcodec.a $(LIBS) $(IMLIB_LIBS) $(MAGICK_LIBS)
clean: rm -f */*.o rm -f pidip.pd_linux - rm -f *~
install: --- 36,45 ---- pidip.pd_linux: pdp_pidip_all rm -f pidip.pd_linux ! g++ -export_dynamic -shared -o pidip.pd_linux modules/*.o system/*.o $(PDP_PIDIP_LIBS) $(IMLIB_LIBS) $(MAGICK_LIBS) ! strip --strip-unneeded pidip.pd_linux
clean: rm -f */*.o rm -f pidip.pd_linux
install: *************** *** 43,57 ****
distro: clean all ! rm */*.o ! strip --strip-unneeded pidip.pd_linux cd .. && cp -rf pidip /tmp/pidip-$(PDP_PIDIP_VERSION) cd /tmp && tar vczf $(PDP_PIDIP_TARBALL) pidip-$(PDP_PIDIP_VERSION) ! cp /mnt/c/ydegoyon.free.fr/pidip-$(PDP_PIDIP_VERSION).tar.gz /mnt/c/Yves rm -rf /tmp/pidip-$(PDP_PIDIP_VERSION)
.c.o: ! gcc $(PDP_PIDIP_CFLAGS) $(PDP_PIDIP_INCLUDE) -o $*.o -c $*.c
.cpp.o: ! g++ $(PDP_PIDIP_CPPFLAGS) $(PDP_PIDIP_INCLUDE) -o $*.o -c $*.cpp ! --- 48,61 ----
distro: clean all ! rm -f */*.o ! rm -rf autom4te.cache cd .. && cp -rf pidip /tmp/pidip-$(PDP_PIDIP_VERSION) cd /tmp && tar vczf $(PDP_PIDIP_TARBALL) pidip-$(PDP_PIDIP_VERSION) ! cp /mnt/c/ydegoyon.free.fr/pidip-$(PDP_PIDIP_VERSION).tar.gz /mnt/c/Yves/Software rm -rf /tmp/pidip-$(PDP_PIDIP_VERSION)
.c.o: ! gcc $(PDP_PIDIP_CFLAGS) $(PDP_PIDIP_INCLUDES) -o $*.o -c $*.c
.cpp.o: ! g++ $(PDP_PIDIP_CPPFLAGS) $(PDP_PIDIP_INCLUDES) -o $*.o -c $*.cpp
Index: configure.ac =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/configure.ac,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** configure.ac 8 Dec 2003 22:45:54 -0000 1.7 --- configure.ac 30 Mar 2004 01:56:15 -0000 1.8 *************** *** 2,9 ****
AC_INIT ! PDP_PIDIP_VERSION=0.12.12 PD_DIR=/usr/local/pd PDP_DIR=/usr/local/pd/pdp FFMPEG_SOURCE_DIR=/SOURCES/ffmpeg
AC_ISC_POSIX --- 2,23 ----
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" 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 *************** *** 65,80 **** fi
! echo -n "looking for ffmpeg sources (required) ... " ! if test -f $FFMPEG_SOURCE_DIR/libavformat/avformat.h 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 fi
! LIBS="$LIBS -lbz2 -lz -ldl -lmp3lame -logg -lvorbis -lvorbisenc" ! CFLAGS="$CFLAGS -Wall"
AC_CONFIG_FILES([ --- 79,121 ---- fi
! if test $enable_ffmpeg == yes; then ! 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
! 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([ *************** *** 84,85 **** --- 125,130 ---- ]) AC_OUTPUT + + echo "used configure options:" + echo " --enable-ffmpeg=$enable_ffmpeg" + echo " --enable-mpeg4ip=$enable_mpeg4ip"
Index: CHANGES.LOG =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/CHANGES.LOG,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** CHANGES.LOG 8 Dec 2003 22:45:54 -0000 1.12 --- CHANGES.LOG 30 Mar 2004 01:56:15 -0000 1.13 *************** *** 1,3 **** --- 1,17 ---- + 0.12.14 ( codename Naveen's Ethiopian Cafe ) + added pdp_mp4player~ : a quicktime stream picker ( compiled against meg4ip v1.0 ) + 0.12.13 ( codename Gollum Club Riereta ) + improved decoding in pdp_live~, in particular for audio/video synchronization + added a "end of stream" outlet in pdp_live~ ( when reaching the end of a file ) + added frame rates in pdp_ffmpeg~, pdp_live~ + added pdp_spotlight : a spotlight, for cabaret (for pep') + added pdp_cabaret patch : a patch to track someone with a spotlight ( poursuite ) + added pdp_ieee1394 : firewire capture object for OSX based on pix_video ( OSX only ) 0.12.12 + added pdp_mp4live~ : mpeg4ip streaming object to stream to a darwin server + note : now, building of streaming objects is optional + ( with --enable-ffmpeg OR --enable-mpeg4ip : warning, you can't enable both, they are conflicting ) + fixed some crashes when objects like pdp_ctrack, pdp_cmap, pdp_compose were in a sub-patch + ( problem reported by Mark Widmer ) added offsets messages in pdp_pen 0.12.11
Index: INSTALL =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/INSTALL,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** INSTALL 8 Dec 2003 22:45:54 -0000 1.4 --- INSTALL 30 Mar 2004 01:56:15 -0000 1.5 *************** *** 1,28 **** ! first, install :
! imlib2 ( http://sourceforge.net/project/showfiles.php?group_id=2 ) ! Image Magick ( http://www.imagemagick.org ) ! ----> watchout !! configure with --enable-shared ! and ffmpeg ! ----> watchout, it requires the cvs snapshot ! : http://ffmpeg.sourceforge.net/cvs ! + don't forget to activate mp3 and vorbis support in ffmpeg : ./configure --enable-mp3lame --enable-vorbis
! you should also have installed libquicktime that is necessary for PDP ! ( http://sourceforge.net/projects/libquicktime ).
! gone through it ?? yeh, i know it's a lot. ! ok, first stage reached )
! fix PD, PDP and FFMPEG paths in configure.ac
! autoconf
! ./configure
! make clean
! make
! as root, make install
pidip is a library, it should be loaded --- 1,36 ---- ! a/ first, install :
! MANDATORY :: ! ============ ! ***** PD sources : http://www-crca.ucsd.edu/~msp/software.html ! ***** PDP and its deps : http://zwizwa.fartit.com/pd/pdp/ ! ***** imlib2 : http://sourceforge.net/project/showfiles.php?group_id=2 ! ***** Image Magick : http://www.imagemagick.org ! ----> watchout !! configure with --enable-shared
! OPTIONALLY :: ! ============= ! ***** ffmpeg : http://ffmpeg.sourceforge.net/cvs ! ( --enable-ffmpeg ) ----> watchout, it requires the cvs snapshot ! ! + don't forget to activate mp3 and vorbis support in ffmpeg : ! ./configure --enable-mp3lame --enable-vorbis ! OR
! ***** mpeg4ip : http://mpeg4ip.sourceforge.net/ ( download mpeg4ip v1.0 ) ! ( --enable-mpeg4ip )
! b/ fix PD, PDP and FFMPEG/MPEG4IP paths in configure.ac
! c/ autoconf
! d/ ./configure [--enable-ffmpeg] OR [--enable-mpeg4ip] ( not both )
! e/ make clean
! f/ make
! g/ as root, make install ! ! h/ modify your pd start-up script :
pidip is a library, it should be loaded
-
Yves Degoyon