diff --git a/m4/shout.m4 b/m4/shout.m4 index 63ed4f4d..2f117b34 100644 --- a/m4/shout.m4 +++ b/m4/shout.m4 @@ -14,46 +14,51 @@ SHOUT_LIBS="" # Step 1: Use pkg-config if available m4_ifdef([PKG_CHECK_MODULES], [# PKG_CHECK_MODULES available - PKG_CHECK_MODULES([SHOUT], [shout >= 2.0]) + PKG_CHECK_MODULES([SHOUT], [shout]) have_shout="maybe"], [# PKG_CHECK_MODULES is unavailable, search for pkg-config program AC_PATH_PROG([PKGCONFIG], [pkg-config], [none]) - if test "$PKGCONFIG" != "none" && `$PKGCONFIG --exists 'shout >= 2.0'` + if test "$PKGCONFIG" != "none" && `$PKGCONFIG --exists shout` then - SHOUT_CFLAGS=`$PKGCONFIG --cflags` - SHOUT_LIBS=`$PKGCONFIG --libs` + SHOUT_CFLAGS=`$PKGCONFIG --cflags shout` + SHOUT_LIBS=`$PKGCONFIG --libs shout` have_shout="maybe" else + if test "$PKGCONFIG" != "none" + then + AC_MSG_NOTICE([$PKGCONFIG couldn't find libshout. Try adjusting PKG_CONFIG_PATH.]) + fi # Step 2: try shout-config AC_PATH_PROG([SHOUTCONFIG], [shout-config], [none]) - if test "$SHOUTCONFIG" != "none" -a `$SHOUTCONFIG --package` = "libshout" + if test "$SHOUTCONFIG" != "none" && test `$SHOUTCONFIG --package` = "libshout" then SHOUT_CFLAGS=`$SHOUTCONFIG --cflags` SHOUT_LIBS=`$SHOUTCONFIG --libs` have_shout="maybe" fi fi - - if test "$have_shout" != "no" - then - ac_save_CFLAGS="$CFLAGS" - ac_save_LIBS="$LIBS" - CFLAGS="$CFLAGS $SHOUT_CFLAGS" - LIBS="$LIBS $SHOUT_LIBS" - AC_CHECK_HEADER([shout/shout.h], [ - AC_DEFINE([HAVE_SHOUT_SHOUT_H], 1, [Define if you have ]) - AC_CHECK_FUNC([shout_new], [ - ifelse([$1], , :, [$1]) - have_shout="yes" - ]) - ]) - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - - if test "$have_shout" != "yes" - then - ifelse([$2], , :, [$2]) - fi ]) + +# Now try actually using libshout +if test "$have_shout" != "no" +then + ac_save_CFLAGS="$CFLAGS" + ac_save_LIBS="$LIBS" + CFLAGS="$CFLAGS $SHOUT_CFLAGS" + LIBS="$LIBS $SHOUT_LIBS" + AC_CHECK_HEADER([shout/shout.h], [ + AC_DEFINE([HAVE_SHOUT_SHOUT_H], 1, [Define if you have ]) + AC_CHECK_FUNC([shout_new], [ + ifelse([$1], , :, [$1]) + have_shout="yes" + ]) + ]) + CFLAGS="$ac_save_CFLAGS" + LIBS="$ac_save_LIBS" +fi + +if test "$have_shout" != "yes" +then + ifelse([$2], , :, [$2]) +fi ])dnl XIPH_PATH_SHOUT