[xiph-commits] r18687 - icecast/branches/ph3/icecast

ph3-der-loewe at svn.xiph.org ph3-der-loewe at svn.xiph.org
Mon Nov 12 12:12:12 PST 2012


Author: ph3-der-loewe
Date: 2012-11-12 12:12:12 -0800 (Mon, 12 Nov 2012)
New Revision: 18687

Modified:
   icecast/branches/ph3/icecast/configure.in
Log:
avoid PKG_CHECK_MODULES as it seems to be broken.

Modified: icecast/branches/ph3/icecast/configure.in
===================================================================
--- icecast/branches/ph3/icecast/configure.in	2012-11-09 14:56:10 UTC (rev 18686)
+++ icecast/branches/ph3/icecast/configure.in	2012-11-12 20:12:12 UTC (rev 18687)
@@ -106,11 +106,36 @@
         enable_roaraudio=yes)
 
 if test "x$enable_roaraudio" = xyes ; then
-    PKG_CHECK_MODULES([RoarAudio], [libroar >= 1.0.6], [have_roaraudio=yes], [have_roaraudio=no])
+dnl    PKG_CHECK_MODULES([RoarAudio], [libroar >= 1.0.6], [have_roaraudio=yes], [have_roaraudio=no])
+    echo -n "checking for libroar... "
+    ver=`roar-config --version 2>/dev/null`
+    have_roaraudio=no
+    minver1=1
+    minver2=0
+    minver3=8
+    if test "$ver" != ""; then
+        ver1=`echo "$ver" | cut -d. -f1`
+        ver2=`echo "$ver" | cut -d. -f2`
+        ver3=`echo "$ver" | cut -d. -f3`
+	if test "$ver1" -gt $minver1; then
+	    have_roaraudio=yes
+	elif test "$ver1" = $minver1; then
+	    if test "$ver2" -gt $minver2; then
+	        have_roaraudio=yes
+	    elif test "$ver2" = $minver2; then
+	        if test "$ver3" -ge $minver3; then
+	         have_roaraudio=yes
+		fi
+	    fi
+	fi
+    fi
 
     if test "$have_roaraudio" = yes; then
         ROARAUDIO_LIBS="-lroar"
         AC_DEFINE(HAVE_ROARAUDIO, ,[Define to enable RoarAudio depending modules])
+	echo "ok"
+    else
+        echo "failed"
     fi
 else
     have_roaraudio=no



More information about the commits mailing list