[Sumover-dev] [svn commit] r4421 - vic/branches/mpeg4

[sumover-dev at cs.ucl.ac.uk]

Author: douglask
Date: Mon Apr 13 13:53:05 2009
New Revision: 4421

Modified:
   vic/branches/mpeg4/configure.in
   vic/branches/mpeg4/tcl.m4

Log:
Add support for finding /usr/local/include/linux/videodev.h on FreeBSD


Modified: vic/branches/mpeg4/configure.in
==============================================================================
--- vic/branches/mpeg4/configure.in	(original)
+++ vic/branches/mpeg4/configure.in	Mon Apr 13 13:53:05 2009
@@ -300,7 +300,9 @@
 dnl support to compile in
 
 AC_MSG_NOTICE([checking for V4L support])
-AC_CHECK_HEADER([linux/videodev.h], [ have_videodev_h=yes; ])
+AC_CHECK_HEADER([linux/videodev.h],
+	[ have_videodev_h=yes; ],
+	[AC_CHECK_HEADER([/usr/local/include/linux/videodev.h],[ have_videodev_h=yes; ])])
 if test x$have_videodev_h = xyes; then
         AC_MSG_NOTICE([suitable V4L support found... using linux/videodev.h])
         V_OBJ_GRABBER="$V_OBJ_GRABBER video/grabber-video4linux.o"
@@ -336,8 +338,8 @@
         V_OBJ_GRABBER="$V_OBJ_GRABBER video/yuv_convert.o"
 fi
 
-AC_CHECK_HEADER([libv4lconvert.h], [ have_videodev_h=yes; ])
-if test x$have_videodev_h = xyes; then
+AC_CHECK_HEADER([libv4lconvert.h], [ have_libv4lconvert_h=yes; ])
+if test x$have_libv4lconvert_h = xyes; then
         V_DEFINE="$V_DEFINE -DHAVE_LIBV4L"
         if test x$have_V4L = xyes; then
                 V_LIB_GRABBER="$V_LIB_GRABBER -lv4l1"
@@ -560,8 +562,10 @@
 	V_LIB="$V_LIB -lipc"
 	;;
 *-*-netbsd*)
+	V_DEFINE="$V_DEFINE -DNetBSD"
 	V_STATIC=""
 	V_TARCMD="tar -h -c -f"
+	OPSYS=netbsd
 	;;
 *-*-freebsd*)
 	V_STATIC=""

Modified: vic/branches/mpeg4/tcl.m4
==============================================================================
--- vic/branches/mpeg4/tcl.m4	(original)
+++ vic/branches/mpeg4/tcl.m4	Mon Apr 13 13:53:05 2009
@@ -91,7 +91,10 @@
 			`ls -d /usr/contrib/lib 2>/dev/null` \
 			`ls -d /usr/lib64 2>/dev/null` \
 			`ls -d /usr/lib 2>/dev/null` \
+			`ls -d /usr/lib64/tcl[[8-9]].[[0-9]]* 2>/dev/null` \
 			`ls -d /usr/lib/tcl[[8-9]].[[0-9]]* 2>/dev/null` \
+			`ls -d /usr/local/lib64/tcl[[8-9]].[[0-9]]* 2>/dev/null` \
+			`ls -d /usr/local/lib/tcl[[8-9]].[[0-9]]* 2>/dev/null` \
 			; do
 		    if test -f "$i/tclConfig.sh" ; then
 			ac_cv_c_tclconfig=`(cd $i; pwd)`
@@ -222,7 +225,10 @@
 			`ls -d /usr/contrib/lib 2>/dev/null` \
 			`ls -d /usr/lib64 2>/dev/null` \
 			`ls -d /usr/lib 2>/dev/null` \
+			`ls -d /usr/lib64/tk[[8-9]].[[0-9]]* 2>/dev/null` \
 			`ls -d /usr/lib/tk[[8-9]].[[0-9]]* 2>/dev/null` \
+			`ls -d /usr/local/lib64/tk[[8-9]].[[0-9]]* 2>/dev/null` \
+			`ls -d /usr/local/lib/tk[[8-9]].[[0-9]]* 2>/dev/null` \
 			; do
 		    if test -f "$i/tkConfig.sh" ; then
 			ac_cv_c_tkconfig=`(cd $i; pwd)`