diff options
| -rw-r--r-- | configure.in | 35 |
1 files changed, 15 insertions, 20 deletions
diff --git a/configure.in b/configure.in index d476cd28c9..7231ff80c9 100644 --- a/configure.in +++ b/configure.in @@ -1612,18 +1612,12 @@ fi # libshairplay for AirTunes (prefered lib) USE_AIRTUNES=0 if test "x$use_airtunes" != "xno"; then - AC_CHECK_HEADERS([shairplay/raop.h],, - [if test "x$use_airtunes" = "xyes"; then - AC_MSG_ERROR($libshairplay_not_found) - elif test "x$use_airtunes" != "xno"; then - AC_MSG_NOTICE($libshairplay_not_found) - use_airtunes="no" - fi + AC_CHECK_HEADERS([shairplay/raop.h],USE_AIRTUNES=1, + [AC_MSG_NOTICE($libshairplay_not_found) ]) - if test "x$use_airtunes" != "xno"; then - XB_FIND_SONAME([SHAIRPLAY], [shairplay], [use_airtunes]) - USE_AIRTUNES=1 + if test "x$USE_AIRTUNES" != "x0"; then + XB_FIND_SONAME([SHAIRPLAY], [shairplay], [USE_AIRTUNES]) USE_LIBSHAIRPLAY=1 AC_CHECK_MEMBERS([struct raop_callbacks_s.cls],,, [[#include <shairplay/raop.h>]]) @@ -1632,23 +1626,24 @@ if test "x$use_airtunes" != "xno"; then #libshairport - as a fallback for AirTunes if test "x$USE_AIRTUNES" == "x0"; then - AC_CHECK_HEADERS([shairport/shairport.h],, - [if test "x$use_airtunes" = "xyes"; then - AC_MSG_ERROR($libshairport_not_found) - elif test "x$use_airtunes" != "xno"; then - AC_MSG_NOTICE($libshairport_not_found) - use_airtunes="no" - fi + AC_CHECK_HEADERS([shairport/shairport.h],USE_AIRTUNES=1, + [AC_MSG_NOTICE($libshairport_not_found) ]) - if test "x$use_airtunes" != "xno"; then - XB_FIND_SONAME([SHAIRPORT], [shairport], [use_airtunes]) - USE_AIRTUNES=1 + if test "x$USE_AIRTUNES" != "x0"; then + XB_FIND_SONAME([SHAIRPORT], [shairport], [USE_AIRTUNES]) AC_CHECK_MEMBERS([struct AudioOutput.ao_set_metadata],,, [[#include <shairport/shairport.h>]]) AC_DEFINE([HAVE_LIBSHAIRPORT],[1],["Define to 1 if you have libshairport."]) fi fi + + if test "x$USE_AIRTUNES" == "x0"; then + if test "x$use_airtunes" == "xyes"; then + AC_MSG_ERROR("No airtunes library could be found. (libshairport/libshairplay)") + fi + use_airtunes="no" + fi fi # libudev |