normalize-0.7.7-audiofile-pkgconfig.patch 1.8 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556
  1. Use pkgconfig to check for audiofile since the audiofile-config script was
  2. removed from >=audiofile-0.3.0.
  3. --- normalize-0.7.7/configure.ac.orig
  4. +++ normalize-0.7.7/configure.ac
  5. @@ -248,33 +248,16 @@
  6. dnl *** Stuff for audiofile library ***
  7. -dnl v0.2.1 and before have bugs with 24-bit LE files
  8. -AM_PATH_AUDIOFILE([ 0.2.2 ], [ have_audiofile=true ])
  9. -dnl AC_CHECK_LIB(audiofile, afSetVirtualSampleFormat, have_audiofile=true)
  10. +AC_ARG_WITH(audiofile, AC_HELP_STRING([--with-audiofile],
  11. + [use the audiofile library (default yes)]))
  12. AH_TEMPLATE([USE_AUDIOFILE],
  13. [Define if you want to use the audiofile library.])
  14. -AC_ARG_WITH(audiofile,
  15. - AC_HELP_STRING([--with-audiofile],
  16. - [use the audiofile library (default yes)]),
  17. - [ case "$withval" in
  18. - no) with_audiofile=false ;;
  19. - *) with_audiofile=true ;;
  20. - esac ])
  21. -use_audiofile=false
  22. -if test x$with_audiofile != xfalse; then
  23. - if test x$have_audiofile = xtrue; then
  24. - AC_DEFINE(USE_AUDIOFILE)
  25. - use_audiofile=true
  26. -dnl AUDIOFILELIBS="-laudiofile"
  27. - elif test x$with_audiofile = xtrue; then
  28. - AC_MSG_ERROR([--with-audiofile specified, but audiofile library not found])
  29. - fi
  30. -fi
  31. -dnl AC_SUBST(AUDIOFILELIBS)
  32. -test x$use_audiofile = xfalse && AUDIOFILE_LIBS=
  33. -test x$use_audiofile = xfalse && AUDIOFILE_CFLAGS=
  34. -AM_CONDITIONAL(AUDIOFILE, test x$use_audiofile = xtrue)
  35. +AS_IF([test "x$with_audiofile" = "xyes"], [
  36. + PKG_CHECK_MODULES([AUDIOFILE], [audiofile])
  37. + AC_DEFINE(USE_AUDIOFILE)
  38. +])
  39. +AM_CONDITIONAL(AUDIOFILE, test x$with_audiofile = xyes)
  40. dnl *** Stuff for mad mpeg audio decoder library ***
  41. @@ -330,7 +313,7 @@
  42. echo
  43. echo "Configuration:"
  44. -echo " audiofile library: $use_audiofile"
  45. +echo " audiofile library: $with_audiofile"
  46. echo " mpeg audio support: $use_mad"
  47. echo " xmms volume adjust plugin: $use_xmms"
  48. echo