From e3426f7b4c12323e5e3ffa3e6b927f714fc369a5 Mon Sep 17 00:00:00 2001
Message-Id: <e3426f7b4c12323e5e3ffa3e6b927f714fc369a5.1714022522.git.mdw@distorted.org.uk>
From: Mark Wooding <mdw@chiark.greenend.org.uk>
Date: Tue, 9 Oct 2007 22:46:04 +0100
Subject: [PATCH] further empeg support
Organization: Straylight/Edgeware

From: Richard Kettlewell <rjk@greenend.org.uk>

---
 acinclude.m4      | 2 +-
 clients/playrtp.c | 6 ++++++
 configure.ac      | 9 +++++----
 lib/printf.c      | 1 +
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/acinclude.m4 b/acinclude.m4
index 2c008a9..562872a 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -95,7 +95,7 @@ AC_DEFUN([RJK_REQUIRE_PCRE_UTF8],[
                   ])],
                   [rjk_cv_pcre_utf8=yes],
                   [rjk_cv_pcre_utf8=no],
-                  [AC_MSG_ERROR([cross-compiling, cannot check libpcre behaviour])])
+                  [AC_MSG_WARN([cross-compiling, cannot check libpcre behaviour])])
     LIBS="$save_LIBS"
   ])
   if test $rjk_cv_pcre_utf8 = no; then
diff --git a/clients/playrtp.c b/clients/playrtp.c
index 0b5bc04..2eca1c6 100644
--- a/clients/playrtp.c
+++ b/clients/playrtp.c
@@ -65,6 +65,7 @@
 #include <string.h>
 #include <assert.h>
 #include <errno.h>
+#include <netinet/in.h>
 
 #include "log.h"
 #include "mem.h"
@@ -81,6 +82,11 @@
 
 #define readahead linux_headers_are_borked
 
+/** @brief Obsolete synonym */
+#ifndef IPV6_JOIN_GROUP
+# define IPV6_JOIN_GROUP IPV6_ADD_MEMBERSHIP
+#endif
+
 /** @brief RTP socket */
 static int rtpfd;
 
diff --git a/configure.ac b/configure.ac
index 0f9258c..ef43af1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -44,24 +44,25 @@ fi
 AC_MSG_CHECKING([for a known target platform])
 case "$host" in
 *empeg* )
+  AC_MSG_RESULT([empeg car stereo])
   AC_DEFINE([EMPEG_HOST],[1],[define if host is an empeg car stereo])
   # work around broken toolchain
   AC_CHECK_LIB([gpg-error], [gpg_strerror])
+  AC_CHECK_LIB([pthread], [pthread_create])
   want_server=no
-  AC_MSG_RESULT([empeg car stereo])
  ;;
 *linux* | *Linux* )
-  want_server=yes
   AC_MSG_RESULT([Linux])
+  want_server=yes
   ;;
 *-apple-darwin* )
+  AC_MSG_RESULT([Mac OS X])
   want_server=no
   COREAUDIO="-framework CoreAudio"
-  AC_MSG_RESULT([Mac OS X])
   ;;
 * )
-  want_server=no
   AC_MSG_RESULT([unknown, winging it])
+  want_server=no
   ;;
 esac
 AC_SUBST([COREAUDIO])
diff --git a/lib/printf.c b/lib/printf.c
index df807ed..32f18fe 100644
--- a/lib/printf.c
+++ b/lib/printf.c
@@ -33,6 +33,7 @@
 
 #include "printf.h"
 #include "sink.h"
+#include "vacopy.h"
 
 enum flags {
   f_thousands = 1,
-- 
[mdw]