Skip to content
Browse files

Merge pull request #3972 from Memphiz/fixshairportfallback

[configure/airtunes] - fix the fallback to libshairport if libshairplay can't be found...
  • Loading branch information...
2 parents ba9411e + a51b182 commit 16c449fab08d3eb3f56ea787511e218faaafbb4c @Memphiz Memphiz committed Jan 6, 2014
Showing with 17 additions and 22 deletions.
  1. +17 −22 configure.in
View
39 configure.in
@@ -1612,43 +1612,38 @@ 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
- USE_LIBSHAIRPORT=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>]])
AC_DEFINE([HAVE_LIBSHAIRPLAY],[1],["Define to 1 if you have libshairplay."])
fi
#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
@@ -2387,7 +2382,7 @@ else
fi
if test "x$use_airtunes" != "xno"; then
- if test "x$USE_LIBSHAIRPORT" == "x1"; then
+ if test "x$USE_LIBSHAIRPLAY" == "x1"; then
final_message="$final_message\n AirTunes support (libshairplay):\tYes"
else
final_message="$final_message\n AirTunes support (libshairport):\tYes"

0 comments on commit 16c449f

Please sign in to comment.
Something went wrong with that request. Please try again.