[xiph-commits] r16454 - in trunk/theora: . examples

[giles at svn.xiph.org]

Author: giles
Date: 2009-08-07 15:23:28 -0700 (Fri, 07 Aug 2009)
New Revision: 16454

Modified:
   trunk/theora/configure.ac
   trunk/theora/examples/Makefile.am
Log:
Build fixes for OpenBSD.

dump_video requires -lcompat for ftime(), and player_example requires 
-lossaudio for ioctl() and other bits. This is a little heavy-handed, 
but it's better than not building at all.

Patch from Simon Hosie.


Modified: trunk/theora/configure.ac
===================================================================
--- trunk/theora/configure.ac	2009-08-07 14:18:57 UTC (rev 16453)
+++ trunk/theora/configure.ac	2009-08-07 22:23:28 UTC (rev 16454)
@@ -344,6 +344,16 @@
     [  --enable-telemetry      enable debugging output controls ],
     [ ac_enable_telemetry=$enableval ], [ ac_enable_telemetry=no] )
 
+dnl OpenBSD needs some extra flags for examples to build
+case "$target_os" in
+  openbsd*)
+    OBSD_COMPAT='-lcompat'
+    OBSD_OSSAUDIO='-lossaudio'
+    ;;
+esac
+AC_SUBST(OBSD_COMPAT)
+AC_SUBST(OBSD_OSSAUDIO)
+
 if test "x${ac_enable_telemetry}" = xyes; then
    if test "x$HAVE_PKG_CONFIG" = "xyes"
    then

Modified: trunk/theora/examples/Makefile.am
===================================================================
--- trunk/theora/examples/Makefile.am	2009-08-07 14:18:57 UTC (rev 16453)
+++ trunk/theora/examples/Makefile.am	2009-08-07 22:23:28 UTC (rev 16454)
@@ -14,7 +14,7 @@
 
 dump_video_SOURCES = dump_video.c
 EXTRA_dump_video_SOURCES = getopt.c getopt1.c getopt.h
-dump_video_LDADD = $(GETOPT_OBJS) $(LDADDDEC)
+dump_video_LDADD = $(GETOPT_OBJS) $(LDADDDEC) $(OBSD_COMPAT)
 
 dump_psnr_SOURCES = dump_psnr.c
 EXTRA_dump_psnr_SOURCES = getopt.c getopt1.c getopt.h
@@ -22,7 +22,7 @@
 
 player_example_SOURCES = player_example.c
 player_example_CFLAGS = $(SDL_CFLAGS) $(OGG_CFLAGS) $(VORBIS_CFLAGS)
-player_example_LDADD = $(LDADDDEC) $(SDL_LIBS) $(VORBIS_LIBS)
+player_example_LDADD = $(LDADDDEC) $(SDL_LIBS) $(VORBIS_LIBS) $(OBSD_OSSAUDIO)
 
 encoder_example_SOURCES = encoder_example.c
 EXTRA_encoder_example_SOURCES = getopt.c getopt1.c getopt.h