[xiph-commits] r16377 - trunk/ezstream/m4

[moritz at svn.xiph.org]

Author: moritz
Date: 2009-08-01 08:28:07 -0700 (Sat, 01 Aug 2009)
New Revision: 16377

Modified:
   trunk/ezstream/m4/libshout.m4
Log:
Do not rely on a succesful pkg-config(1) check for libshout2, as there are
still some systems where only shout-config gets installed (NetBSD for example.)


Modified: trunk/ezstream/m4/libshout.m4
===================================================================
--- trunk/ezstream/m4/libshout.m4	2009-08-01 15:26:28 UTC (rev 16376)
+++ trunk/ezstream/m4/libshout.m4	2009-08-01 15:28:07 UTC (rev 16377)
@@ -148,9 +148,11 @@
 	AC_MSG_ERROR([The pkg-config utility is required.], [1])
 fi
 
-dnl ####### BEGIN CHECK ######
-PKG_CHECK_EXISTS([shout $1], [
-dnl ##########################
+if test -n "$1" -a x"${ax_check_libshout_shout_pc}" = "xyes"; then
+	PKG_CHECK_EXISTS([shout $1], [],
+		[AC_MSG_ERROR([libshout version $1 is required.], [1])]
+	)
+fi
 
 libshout_libs_autodetect=no
 if test -z "${LIBSHOUT_LIBS}"; then
@@ -202,10 +204,6 @@
 LIBS="${ax_check_libshout_save_LIBS}"
 AC_LANG_POP([C])
 
-dnl ####### END CHECK ########
-], [])
-dnl ##########################
-
 fi						# want_libshout != no
 
 ])