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

[moritz at svn.xiph.org]

Author: moritz
Date: 2009-08-01 09:08:45 -0700 (Sat, 01 Aug 2009)
New Revision: 16380

Modified:
   trunk/ezstream/m4/libshout.m4
Log:
Give it a chance to link statically.


Modified: trunk/ezstream/m4/libshout.m4
===================================================================
--- trunk/ezstream/m4/libshout.m4	2009-08-01 16:08:09 UTC (rev 16379)
+++ trunk/ezstream/m4/libshout.m4	2009-08-01 16:08:45 UTC (rev 16380)
@@ -155,7 +155,8 @@
 fi
 
 libshout_libs_autodetect=no
-if test -z "${LIBSHOUT_LIBS}"; then
+if test -z "${LIBSHOUT_LIBS}" \
+    -a x"${ax_check_libshout_shout_pc}" = "xyes"; then
 	LIBSHOUT_LIBS="`${PKG_CONFIG} --libs-only-l shout`"
 	libshout_libs_autodetect=yes
 fi
@@ -195,6 +196,27 @@
 		],
 		[
 		  AC_MSG_RESULT([no])
+		  if test x"${libshout_libs_autodetect}" = "xyes"; then
+			LIBSHOUT_LIBS="`${PKG_CONFIG} --static --libs-only-l shout`"
+			LIBS="${LIBSHOUT_LIBS} ${ax_check_libshout_save_LIBS}"
+			AC_MSG_CHECKING([if libshout works with explicit dependencies])
+			AC_LINK_IFELSE(
+				[AC_LANG_PROGRAM(
+				[[
+				  #include <shout/shout.h>
+				]],
+				[[
+				  shout_new();
+				]])],
+				[
+				  AC_MSG_RESULT([yes])
+				  local_cv_have_lib_libshout=yes
+				],
+				[
+				  AC_MSG_RESULT([no])
+				]
+			)
+		  fi
 		]
 	)
 ])