[Sumover-dev] [svn commit] r3749 - vic/trunk

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

Author: csp
Date: Tue May 23 13:45:51 2006
New Revision: 3749

Modified:
   vic/trunk/configure
   vic/trunk/configure.in

Log:
Account for MacOS X. With these changes, vic builds on MacOS X 10.4.6.


Modified: vic/trunk/configure
==============================================================================
--- vic/trunk/configure	(original)
+++ vic/trunk/configure	Tue May 23 13:45:51 2006
@@ -719,13 +719,13 @@
   	  /^X\(\/\).*/{ s//\1/; q; }
   	  s/.*/./; q'`
   srcdir=$ac_confdir
-  if test ! -r "$srcdir/$ac_unique_file"; then
+  if test ! -r $srcdir/$ac_unique_file; then
     srcdir=..
   fi
 else
   ac_srcdir_defaulted=no
 fi
-if test ! -r "$srcdir/$ac_unique_file"; then
+if test ! -r $srcdir/$ac_unique_file; then
   if test "$ac_srcdir_defaulted" = yes; then
     { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2
    { (exit 1); exit 1; }; }
@@ -734,7 +734,7 @@
    { (exit 1); exit 1; }; }
   fi
 fi
-(cd $srcdir && test -r "./$ac_unique_file") 2>/dev/null ||
+(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null ||
   { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2
    { (exit 1); exit 1; }; }
 srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'`
@@ -4509,7 +4509,7 @@
 elif test -r /usr/include/linux/videodev.h ; then
         if grep V4L2 /usr/include/linux/videodev.h >/dev/null 2>&1  ; then
                 V_OBJ_GRABBER="$V_OBJ_GRABBER video/grabber-v4l2.o video/grabber-video4linux.o"
-		echo "Using Linux (new)video4linux2(2.6.x compatible) and v4l1"
+		echo "Using Linux (new)video4linux2(2.6.x compatible) and V4L v1"
         else
                 V_OBJ_GRABBER="$V_OBJ_GRABBER video/grabber-video4linux.o"
 		echo "Using Linux video4linux vers 1"
@@ -4792,6 +4792,10 @@
 	fi
 	OPSYS=linux
         ;;
+*darwin*)
+	V_STATIC=""
+	V_DEFINE="$V_DEFINE -DHAVE_IPV6"
+	;;
 esac
 
 V_OBJ_GRABBER="$V_OBJ_GRABBER video/grabber-x11.o"

Modified: vic/trunk/configure.in
==============================================================================
--- vic/trunk/configure.in	(original)
+++ vic/trunk/configure.in	Tue May 23 13:45:51 2006
@@ -322,6 +322,10 @@
 	fi
 	OPSYS=linux
         ;;
+*darwin*)
+	V_STATIC=""
+	V_DEFINE="$V_DEFINE -DHAVE_IPV6"
+	;;
 esac
 
 V_OBJ_GRABBER="$V_OBJ_GRABBER video/grabber-x11.o"