Changeset 4448

Timestamp:

05/26/09 13:55:33 (4 years ago)

Author:

douglask

Message:

Regenerate configure

Files:

• vic/branches/mpeg4/configure (modified) (5 diffs)

vic/branches/mpeg4/configure

@@ -7451 +7451 @@
 fi
 
-if test -r /usr/include/machine/ioctl_meteor.h ; then
+if test -r /usr/include/machine/ioctl_meteor.h -o \
+    -r /usr/include/dev/ic/bt8xx.h ; then
         V_OBJ_GRABBER="video/grabber-meteor.o $V_OBJ_GRABBER"
 fi
@@ -7506 +7507 @@
                 V_LIB_GRABBER="$V_LIB_GRABBER $dir/libvigrapix.a"
                 V_OBJ_GRABBER="video/grabber-vigra.o $V_OBJ_GRABBER"
-                break
+                break
         fi
 done
@@ -7534 +7535 @@
                 V_LIB_GRABBER="$V_LIB_GRABBER -L$dir/lib -lXext -lXvid"
                 V_OBJ_GRABBER="video/grabber-plx.o video/assistor-plx.o $V_OBJ_GRABBER"
-                break
+                break
         fi
 done
@@ -7636 +7637 @@
         ;;
 *-*-netbsd*)
+        if test "$gpl" = "yes" ; then
+                V_OBJ_GRABBER="video/grabber-ov511.o $V_OBJ_GRABBER"
+        fi
         V_DEFINE="$V_DEFINE -DNetBSD"
         V_STATIC=""
@@ -7642 +7646 @@
         ;;
 *-*-freebsd*)
+        if test "$gpl" = "yes" ; then
+                V_OBJ_GRABBER="video/grabber-ov511.o $V_OBJ_GRABBER"
+        fi
         V_STATIC=""
         V_DEFINE="$V_DEFINE -DSIGARGS=int -DFreeBSD"