[Sumover-dev] [svn commit] r4092 - vic/branches/mpeg4
sumover-dev at cs.ucl.ac.uk
sumover-dev at cs.ucl.ac.uk
Fri Aug 24 14:49:12 BST 2007
Author: piers
Date: Fri Aug 24 14:49:12 2007
New Revision: 4092
Modified:
vic/branches/mpeg4/configure
vic/branches/mpeg4/configure.in
Log:
Added configure option for Linux1394 grabber - currently default disabled as it doesn't currently work too well.
Also added the value of the "default" in description for various configure options
Modified: vic/branches/mpeg4/configure
==============================================================================
--- vic/branches/mpeg4/configure (original)
+++ vic/branches/mpeg4/configure Fri Aug 24 14:49:12 2007
@@ -1304,11 +1304,12 @@
--disable-ffmpeg-co Enable or disable ffmpeg svn checkout
--disable-x264-co Enable or disable x264 svn checkout
--disable-cpudetect Enable or disable runtime cpu detection
---disable-h261as Enable or disable the h261as codec
---enable-dvdecode Enable or disable dv decoding
---enable-xvideo Enable or disable Xvideo rendering
---enable-v4l2old Enable or disable old Video4Linux2 grabber
---enable-XvGrabber Enable or disable old XvGrabber
+--disable-h261as Enable or disable the h261as codec (default: enabled)
+--enable-dvdecode Enable or disable dv decoding (default: disabled)
+--enable-xvideo Enable or disable Xvideo rendering (default: disabled)
+--enable-v4l2old Enable or disable old Video4Linux2 grabber (default: disabled)
+--enable-XvGrabber Enable or disable old XvGrabber (default: disabled)
+--enable-Linux1394Grabber Enable or disable Linux1394XvGrabber (default: disabled)
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
@@ -4628,13 +4629,7 @@
echo "can't find tcl.h in $d/include"
exit 1
fi
- places="$d/lib64/libtcl8.4.so \
- $d/lib64/libtcl8.4.dylib \
- $d/lib64/libtcl8.4.a \
- $d/lib64/libtcl.so \
- $d/lib64/libtcl.dylib \
- $d/lib64/libtcl.a \
- $d/lib/libtcl8.4.so \
+ places="$d/lib/libtcl8.4.so \
$d/lib/libtcl8.4.dylib \
$d/lib/libtcl8.4.a \
$d/lib/libtcl.so \
@@ -4651,10 +4646,7 @@
echo "can't find libtcl.a in $d/lib"
exit 1
fi
- places="$d/lib64/tcl-8.4 \
- $d/lib64/tcl8.4 \
- $d/lib64/tcl \
- $d/lib/tcl-8.4 \
+ places="$d/lib/tcl-8.4 \
$d/lib/tcl8.4 \
$d/lib/tcl"
V_LIBRARY_TCL=FAIL
@@ -4912,11 +4904,7 @@
echo "can't find tk.h in $d/include"
exit 1
fi
- places="$d/lib64/libtk8.4.so \
- $d/lib64/libtk8.4.a \
- $d/lib64/libtk.so \
- $d/lib64/libtk.a \
- $d/lib/libtk8.4.so \
+ places="$d/lib/libtk8.4.so \
$d/lib/libtk8.4.a \
$d/lib/libtk.so \
$d/lib/libtk.a"
@@ -4931,9 +4919,7 @@
echo "can't find libtk.a in $d/lib"
exit 1
fi
- places="$d/lib64/tk8.4 \
- $d/lib64/tk \
- $d/lib/tk8.4 \
+ places="$d/lib/tk8.4 \
$d/lib/tk"
V_LIBRARY_TK=FAIL
for dir in $places; do
@@ -6674,8 +6660,6 @@
fi
fi
-# lots of hairy special cases for detecting which frame capture
-# support to compile in
# Check whether --enable-v4l2old was given.
if test "${enable_v4l2old+set}" = set; then
@@ -6738,7 +6722,14 @@
V_OBJ_GRABBER="video/grabber-meteor.o $V_OBJ_GRABBER"
fi
-if test -r /usr/include/libdc1394/dc1394_control.h -a -r /usr/include/libraw1394/raw1394.h; then
+# Check whether --enable-Linux1394Grabber was given.
+if test "${enable_Linux1394Grabber+set}" = set; then
+ enableval=$enable_Linux1394Grabber; Linux1394Grabber=yes
+else
+ Linux1394Grabber=no
+fi
+
+if test -r /usr/include/libdc1394/dc1394_control.h -a -r /usr/include/libraw1394/raw1394.h -a "$Linux1394Grabber" = "yes"; then
V_OBJ_GRABBER="$V_OBJ_GRABBER video/grabber-linux1394.o"
V_LIB_GRABBER="$V_LIB_GRABBER -lraw1394 -ldc1394_control"
fi
Modified: vic/branches/mpeg4/configure.in
==============================================================================
--- vic/branches/mpeg4/configure.in (original)
+++ vic/branches/mpeg4/configure.in Fri Aug 24 14:49:12 2007
@@ -221,7 +221,7 @@
V_H261AS=""
dnl h261 as (arbitrary size)
-AC_ARG_ENABLE(h261as, --disable-h261as Enable or disable the h261as codec, h261as=no, h261as=yes)
+AC_ARG_ENABLE(h261as, --disable-h261as Enable or disable the h261as codec (default: enabled), h261as=no, h261as=yes)
if test "$h261as" = "yes"; then
V_OBJ="$V_OBJ codec/p64/p64as.o codec/decoder-h261as.o codec/encoder-h261as.o"
V_H261AS="-DUSE_H261AS"
@@ -229,7 +229,7 @@
V_DV=""
dnl dv decoding support
-AC_ARG_ENABLE(dvdecode, --enable-dvdecode Enable or disable dv decoding, dvdecode=yes, dvdecode=no)
+AC_ARG_ENABLE(dvdecode, --enable-dvdecode Enable or disable dv decoding (default: disabled), dvdecode=yes, dvdecode=no)
if test "$dvdecode" = "yes"; then
AC_CHECK_LIB([dv], [main], [], [
echo "Error! libdv not available. Please install libdv."
@@ -246,7 +246,7 @@
dnl xvideo rendering support
V_XV=""
-AC_ARG_ENABLE(xvideo, --enable-xvideo Enable or disable Xvideo rendering, xvideo=yes, xvideo=no)
+AC_ARG_ENABLE(xvideo, --enable-xvideo Enable or disable Xvideo rendering (default: disabled), xvideo=yes, xvideo=no)
if test "$xvideo" = "yes"; then
dnl Look for the PIC library first, Debian requires it.
@@ -279,10 +279,10 @@
fi
fi
-# lots of hairy special cases for detecting which frame capture
-# support to compile in
+dnl lots of hairy special cases for detecting which frame capture
+dnl support to compile in
-AC_ARG_ENABLE(v4l2old, --enable-v4l2old Enable or disable old Video4Linux2 grabber, v4l2old=yes, v4l2old=no)
+AC_ARG_ENABLE(v4l2old, --enable-v4l2old Enable or disable old Video4Linux2 grabber (default: disabled), v4l2old=yes, v4l2old=no)
if test "$v4l2old" = "yes" ; then
V_OBJ_GRABBER="$V_OBJ_GRABBER video/grabber-v4l2-old.o"
echo "Using old Linux grabber-v4l2"
@@ -309,7 +309,7 @@
V_OBJ_GRABBER="video/grabber-svideo.o $V_OBJ_GRABBER"
fi
-AC_ARG_ENABLE(XvGrabber,--enable-XvGrabber Enable or disable old XvGrabber, XvGrabber=yes, XvGrabber=no)
+AC_ARG_ENABLE(XvGrabber,--enable-XvGrabber Enable or disable old XvGrabber (default: disabled), XvGrabber=yes, XvGrabber=no)
if test -r /usr/lib/libXv.a -a "$XvGrabber" = "yes" ; then
V_LIB_GRABBER="$V_LIB_GRABBER -lXv"
V_DEFINE="$V_DEFINE -DXV_PSEUDO8"
@@ -331,7 +331,8 @@
V_OBJ_GRABBER="video/grabber-meteor.o $V_OBJ_GRABBER"
fi
-if test -r /usr/include/libdc1394/dc1394_control.h -a -r /usr/include/libraw1394/raw1394.h; then
+AC_ARG_ENABLE(Linux1394Grabber,--enable-Linux1394Grabber Enable or disable Linux1394XvGrabber (default: disabled), Linux1394Grabber=yes, Linux1394Grabber=no)
+if test -r /usr/include/libdc1394/dc1394_control.h -a -r /usr/include/libraw1394/raw1394.h -a "$Linux1394Grabber" = "yes"; then
V_OBJ_GRABBER="$V_OBJ_GRABBER video/grabber-linux1394.o"
V_LIB_GRABBER="$V_LIB_GRABBER -lraw1394 -ldc1394_control"
fi
More information about the Sumover-dev
mailing list