diff options
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 62 |
1 files changed, 42 insertions, 20 deletions
diff --git a/configure.ac b/configure.ac index 0d19ae2f3..4cc74e4fe 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -714,7 +714,7 @@ AC_ARG_WITH(libpulse, | |||
714 | AC_CHECK_HEADERS(pulse/simple.h, | 714 | AC_CHECK_HEADERS(pulse/simple.h, |
715 | AC_CHECK_LIB([pulse], | 715 | AC_CHECK_LIB([pulse], |
716 | [pa_stream_peek], | 716 | [pa_stream_peek], |
717 | EXT_LIB_PATH="-L$with_pulse/lib $EXT_LIB_PATH" | 717 | EXT_LIB_PATH="-L$with_libpulse/lib $EXT_LIB_PATH" |
718 | pulse=1)) | 718 | pulse=1)) |
719 | ]) | 719 | ]) |
720 | ], | 720 | ], |
@@ -763,15 +763,15 @@ AC_ARG_WITH(libopus, | |||
763 | ], | 763 | ], |
764 | [AC_MSG_RESULT([--with-libopus not specified]) | 764 | [AC_MSG_RESULT([--with-libopus not specified]) |
765 | CHECK_LIBHEADER(LIBOPUS, | 765 | CHECK_LIBHEADER(LIBOPUS, |
766 | opus, | 766 | opus, |
767 | opus_decode_float, | 767 | opus_decode_float, |
768 | opus/opus.h, | 768 | opus/opus.h, |
769 | AC_CHECK_DECL([OPUS_SET_GAIN], | 769 | AC_CHECK_DECL([OPUS_SET_GAIN], |
770 | [opus=1], | 770 | [opus=1], |
771 | [], | 771 | [], |
772 | [[ | 772 | [[ |
773 | #include <opus/opus.h> | 773 | #include <opus/opus.h> |
774 | ]]))]) | 774 | ]]))]) |
775 | AM_CONDITIONAL(HAVE_OPUS, [test "$opus" = 1]) | 775 | AM_CONDITIONAL(HAVE_OPUS, [test "$opus" = 1]) |
776 | AS_IF([test "x$opus" = x1], | 776 | AS_IF([test "x$opus" = x1], |
777 | [AC_DEFINE([HAVE_OPUS],[1],[Have libopus library]) | 777 | [AC_DEFINE([HAVE_OPUS],[1],[Have libopus library]) |
@@ -780,16 +780,38 @@ AS_IF([test "x$opus" = x1], | |||
780 | libopus_msg="no"]) | 780 | libopus_msg="no"]) |
781 | 781 | ||
782 | # libogg | 782 | # libogg |
783 | AC_CHECK_LIB(ogg, ogg_stream_flush_fill, | 783 | AC_MSG_CHECKING(for libogg) |
784 | [AC_CHECK_HEADERS([ogg/ogg.h], | 784 | AC_ARG_WITH(libogg, |
785 | AM_CONDITIONAL(HAVE_OGG, true) | 785 | [ --with-libogg=PREFIX (base of libogg installation)], |
786 | ogg=1 | 786 | [AC_MSG_RESULT([$with_libogg]) |
787 | AC_DEFINE(HAVE_OGG,1,[Have ogg]), | 787 | AS_CASE([$with_libogg], |
788 | AM_CONDITIONAL(HAVE_OGG, false) | 788 | [no],[], |
789 | ogg=0 | 789 | [yes],[ |
790 | AC_DEFINE(HAVE_OGG,0,[lacking ogg]))], | 790 | CHECK_LIBHEADER(LIBOGG, |
791 | AM_CONDITIONAL(HAVE_OGG, false) | 791 | ogg, |
792 | ogg=0) | 792 | ogg_stream_flush_fill, |
793 | ogg/ogg.h, | ||
794 | ogg=1,) | ||
795 | ],[ | ||
796 | LDFLAGS="-L$with_libogg/lib $LDFLAGS" | ||
797 | CPPFLAGS="-I$with_libogg/include $CPPFLAGS" | ||
798 | AC_CHECK_HEADERS(ogg/ogg.h, | ||
799 | AC_CHECK_LIB([ogg], | ||
800 | [ogg_stream_flush_fill], | ||
801 | EXT_LIB_PATH="-L$with_libogg/lib $EXT_LIB_PATH" | ||
802 | ogg=1)) | ||
803 | ]) | ||
804 | ], | ||
805 | [AC_MSG_RESULT([--with-libogg not specified]) | ||
806 | CHECK_LIBHEADER(LIBOGG, | ||
807 | ogg, | ||
808 | ogg_stream_flush_fill, | ||
809 | ogg/ogg.h, | ||
810 | ogg=1,)]) | ||
811 | AM_CONDITIONAL(HAVE_OGG, [test "$ogg" = 1]) | ||
812 | AS_IF([test x"$ogg" = x1], | ||
813 | [AC_DEFINE([HAVE_OGG],[1],[Have ogg])] | ||
814 | [AC_DEFINE([HAVE_OGG],[0],[Lacking ogg])]) | ||
793 | 815 | ||
794 | 816 | ||
795 | PKG_CHECK_MODULES([GLIB], | 817 | PKG_CHECK_MODULES([GLIB], |