- unbreak on Mac ;-)

- OpenGL is conditional now as well

ultragrid/configure.in

@@ -399,6 +399,7 @@ then
 		then
 			LIBS="$LIBS -lGLEW"
 			GL_OBJ="$GL_OBJ src/video_display/gl_sdl.o"
+			AC_DEFINE(HAVE_GL)
 		fi
 	else
 		echo "OpenGL libraries not found or not usable."

ultragrid/src/config.h.in

@@ -4,6 +4,12 @@
  */
 #undef HAVE_MACOSX
 
+/* Define to 1 if you have SDL. */
+#undef HAVE_SDL
+
+/* Define to 1 if you have GL. */
+#undef HAVE_GL 
+
 /*
  * Define this if you want IPv6 support.
  */
@@ -94,9 +100,6 @@
 /* Define to 1 if you have the `sched_setscheduler' function. */
 #undef HAVE_SCHED_SETSCHEDULER
 
-/* Define to 1 if you have the <SDL/SDL.h> header file. */
-#undef HAVE_SDL
-
 /* Define to 1 if you have the <soundcard.h> header file. */
 #undef HAVE_SOUNDCARD_H
 

ultragrid/src/main.c

@@ -40,8 +40,8 @@
  * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
  * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Revision: 1.3 $
- * $Date: 2007/12/11 19:16:45 $
+ * $Revision: 1.4 $
+ * $Date: 2007/12/11 19:34:16 $
  *
  */
 
@@ -103,7 +103,7 @@ signal_handler(int signal)
 static void 
 usage(void) 
 {
-	printf("Usage: uv [-d <display_device>] [-t <capture_device>] [-m <mtu>] [-f <framerate>] [-c] address\n");
+	printf("Usage: uv [-d <display_device>] [-t <capture_device>] [-m <mtu>] [-f <framerate>] [-c] [-b <8|10>] address\n");
 }
 
 static void

ultragrid/src/video_display.c

@@ -38,8 +38,8 @@
  * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
  * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Revision: 1.3 $
- * $Date: 2007/12/11 19:16:45 $
+ * $Revision: 1.4 $
+ * $Date: 2007/12/11 19:34:16 $
  *
  */
 
@@ -101,6 +101,7 @@ static display_table_t display_device_table[] = {
                 display_sdl_putf,
                 display_sdl_colour 
 	},
+#ifdef HAVE_GL
 	{	
 		0,
                 display_gl_probe,
@@ -121,6 +122,7 @@ static display_table_t display_device_table[] = {
                 display_dxt_colour 
 	},
 #endif /* HAVE_FASTDXT */
+#endif /* HAVE_GL */
 #endif /* HAVE_SDL */
 #endif /* X_DISPLAY_MISSING */
 #ifdef HAVE_HDSTATION