sonic-visualiser: configure comparison

comparison configure @ 560:358541da1cd8

Update configure for local dataquay, etc

author	Chris Cannam
date	Mon, 13 May 2013 14:34:02 +0100
parents	c928aa734e6b
children	f1dfe46ff85a

comparison

equal deleted inserted replaced

-:aad6a158fb4b
+:358541da1cd8
 JACK_CFLAGS
 portaudio_2_0_LIBS
 portaudio_2_0_CFLAGS
 liblo_LIBS
 liblo_CFLAGS
-dataquay_LIBS
-dataquay_CFLAGS
 rubberband_LIBS
 rubberband_CFLAGS
 vamphostsdk_LIBS
 vamphostsdk_CFLAGS
 vamp_LIBS
 vamp_LIBS
 vamphostsdk_CFLAGS
 vamphostsdk_LIBS
 rubberband_CFLAGS
 rubberband_LIBS
-dataquay_CFLAGS
-dataquay_LIBS
 liblo_CFLAGS
 liblo_LIBS
 portaudio_2_0_CFLAGS
 portaudio_2_0_LIBS
 JACK_CFLAGS
 linker flags for vamphostsdk, overriding pkg-config
 rubberband_CFLAGS
 C compiler flags for rubberband, overriding pkg-config
 rubberband_LIBS
 linker flags for rubberband, overriding pkg-config
-dataquay_CFLAGS
-C compiler flags for dataquay, overriding pkg-config
-dataquay_LIBS
-linker flags for dataquay, overriding pkg-config
 liblo_CFLAGS
 C compiler flags for liblo, overriding pkg-config
 liblo_LIBS  linker flags for liblo, overriding pkg-config
 portaudio_2_0_CFLAGS
 C compiler flags for portaudio_2_0, overriding pkg-config
 fi
 fi
 SV_MODULE_MODULE=vamphostsdk
-SV_MODULE_VERSION_TEST="vamp-hostsdk >= 2.3.1"
+SV_MODULE_VERSION_TEST="vamp-hostsdk >= 2.5"
 SV_MODULE_HEADER=vamp-hostsdk/PluginLoader.h
 SV_MODULE_LIB=vamp-hostsdk
-SV_MODULE_FUNC=libvamphostsdk_v_2_3_1_present
+SV_MODULE_FUNC=libvamphostsdk_v_2_5_present
 SV_MODULE_HAVE=HAVE_$(echo vamphostsdk | tr 'a-z' 'A-Z')
 SV_MODULE_FAILED=1
 if test -n "$vamphostsdk_LIBS" ; then
 { $as_echo "$as_me:${as_lineno-$LINENO}: User set ${SV_MODULE_MODULE}_LIBS explicitly, skipping test for $SV_MODULE_MODULE" >&5
 $as_echo "$as_me: User set ${SV_MODULE_MODULE}_LIBS explicitly, skipping test for $SV_MODULE_MODULE" >&6;}
 fi
 fi
-SV_MODULE_MODULE=dataquay
-SV_MODULE_VERSION_TEST="dataquay >= 0.9"
+SV_MODULE_MODULE=liblo
-SV_MODULE_HEADER=dataquay/Uri.h
+SV_MODULE_VERSION_TEST=""
-SV_MODULE_LIB=dataquay
+SV_MODULE_HEADER=lo/lo.h
-SV_MODULE_FUNC=dataquay_v_0_9_present
+SV_MODULE_LIB=lo
-SV_MODULE_HAVE=HAVE_$(echo dataquay | tr 'a-z' 'A-Z')
+SV_MODULE_FUNC=lo_address_new
+SV_MODULE_HAVE=HAVE_$(echo liblo | tr 'a-z' 'A-Z')
 SV_MODULE_FAILED=1
-if test -n "$dataquay_LIBS" ; then
+if test -n "$liblo_LIBS" ; then
 { $as_echo "$as_me:${as_lineno-$LINENO}: User set ${SV_MODULE_MODULE}_LIBS explicitly, skipping test for $SV_MODULE_MODULE" >&5
 $as_echo "$as_me: User set ${SV_MODULE_MODULE}_LIBS explicitly, skipping test for $SV_MODULE_MODULE" >&6;}
-CXXFLAGS="$CXXFLAGS $dataquay_CFLAGS"
+CXXFLAGS="$CXXFLAGS $liblo_CFLAGS"
-LIBS="$LIBS $dataquay_LIBS"
+LIBS="$LIBS $liblo_LIBS"
 SV_MODULE_FAILED=""
 fi
 if test -z "$SV_MODULE_VERSION_TEST" ; then
 SV_MODULE_VERSION_TEST=$SV_MODULE_MODULE
 fi
 if test -n "$SV_MODULE_FAILED" && test -n "$PKG_CONFIG"; then
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dataquay" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for liblo" >&5
-$as_echo_n "checking for dataquay... " >&6; }
+$as_echo_n "checking for liblo... " >&6; }
-if test -n "$dataquay_CFLAGS"; then
+if test -n "$liblo_CFLAGS"; then
-pkg_cv_dataquay_CFLAGS="$dataquay_CFLAGS"
+pkg_cv_liblo_CFLAGS="$liblo_CFLAGS"
 elif test -n "$PKG_CONFIG"; then
 if test -n "$PKG_CONFIG" && \
 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$SV_MODULE_VERSION_TEST\""; } >&5
 ($PKG_CONFIG --exists --print-errors "$SV_MODULE_VERSION_TEST") 2>&5
 ac_status=$?
 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
-pkg_cv_dataquay_CFLAGS=`$PKG_CONFIG --cflags "$SV_MODULE_VERSION_TEST" 2>/dev/null`
+pkg_cv_liblo_CFLAGS=`$PKG_CONFIG --cflags "$SV_MODULE_VERSION_TEST" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
 fi
 else
 pkg_failed=untried
 fi
-if test -n "$dataquay_LIBS"; then
+if test -n "$liblo_LIBS"; then
-pkg_cv_dataquay_LIBS="$dataquay_LIBS"
+pkg_cv_liblo_LIBS="$liblo_LIBS"
 elif test -n "$PKG_CONFIG"; then
 if test -n "$PKG_CONFIG" && \
 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$SV_MODULE_VERSION_TEST\""; } >&5
 ($PKG_CONFIG --exists --print-errors "$SV_MODULE_VERSION_TEST") 2>&5
 ac_status=$?
 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
-pkg_cv_dataquay_LIBS=`$PKG_CONFIG --libs "$SV_MODULE_VERSION_TEST" 2>/dev/null`
+pkg_cv_liblo_LIBS=`$PKG_CONFIG --libs "$SV_MODULE_VERSION_TEST" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
 fi
 else
 _pkg_short_errors_supported=yes
 else
 _pkg_short_errors_supported=no
 fi
 if test $_pkg_short_errors_supported = yes; then
-	        dataquay_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$SV_MODULE_VERSION_TEST" 2>&1`
+	        liblo_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$SV_MODULE_VERSION_TEST" 2>&1`
 else
-	        dataquay_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$SV_MODULE_VERSION_TEST" 2>&1`
+	        liblo_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$SV_MODULE_VERSION_TEST" 2>&1`
 fi
 	# Put the nasty error message in config.log where it belongs
-	echo "$dataquay_PKG_ERRORS" >&5
+	echo "$liblo_PKG_ERRORS" >&5
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find required module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5
-$as_echo "$as_me: Failed to find required module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&6;}
+$as_echo "$as_me: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&6;}
 elif test $pkg_failed = untried; then
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find required module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5
-$as_echo "$as_me: Failed to find required module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&6;}
+$as_echo "$as_me: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&6;}
 else
-	dataquay_CFLAGS=$pkg_cv_dataquay_CFLAGS
+	liblo_CFLAGS=$pkg_cv_liblo_CFLAGS
-	dataquay_LIBS=$pkg_cv_dataquay_LIBS
+	liblo_LIBS=$pkg_cv_liblo_LIBS
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-	HAVES="$HAVES $SV_MODULE_HAVE";CXXFLAGS="$CXXFLAGS $dataquay_CFLAGS";LIBS="$LIBS $dataquay_LIBS";SV_MODULE_FAILED=""
+	HAVES="$HAVES $SV_MODULE_HAVE";CXXFLAGS="$CXXFLAGS $liblo_CFLAGS";LIBS="$LIBS $liblo_LIBS";SV_MODULE_FAILED=""
 fi
 fi
 if test -n "$SV_MODULE_FAILED"; then
 as_ac_Header=`$as_echo "ac_cv_header_$SV_MODULE_HEADER" | $as_tr_sh`
 ac_fn_cxx_check_header_mongrel "$LINENO" "$SV_MODULE_HEADER" "$as_ac_Header" "$ac_includes_default"
 if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
-HAVES="$HAVES $SV_MODULE_HAVE"
+HAVES="$HAVES $SV_MODULE_HAVE";SV_MODULE_FAILED=""
 else
-as_fn_error $? "Failed to find header $SV_MODULE_HEADER for required module $SV_MODULE_MODULE" "$LINENO" 5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find header $SV_MODULE_HEADER for optional module $SV_MODULE_MODULE" >&5
-fi
+$as_echo "$as_me: Failed to find header $SV_MODULE_HEADER for optional module $SV_MODULE_MODULE" >&6;}
+fi
-if test -n "$SV_MODULE_LIB"; then
-as_ac_Lib=`$as_echo "ac_cv_lib_$SV_MODULE_LIB''_$SV_MODULE_FUNC" | $as_tr_sh`
+if test -z "$SV_MODULE_FAILED"; then
+if test -n "$SV_MODULE_LIB"; then
+as_ac_Lib=`$as_echo "ac_cv_lib_$SV_MODULE_LIB''_$SV_MODULE_FUNC" | $as_tr_sh`
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $SV_MODULE_FUNC in -l$SV_MODULE_LIB" >&5
 $as_echo_n "checking for $SV_MODULE_FUNC in -l$SV_MODULE_LIB... " >&6; }
 if eval \${$as_ac_Lib+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
 if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
 LIBS="$LIBS -l$SV_MODULE_LIB"
 else
-as_fn_error $? "Failed to find library $SV_MODULE_LIB for required module $SV_MODULE_MODULE" "$LINENO" 5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find library $SV_MODULE_LIB for optional module $SV_MODULE_MODULE" >&5
-fi
+$as_echo "$as_me: Failed to find library $SV_MODULE_LIB for optional module $SV_MODULE_MODULE" >&6;}
+fi
+fi
 fi
 fi
+SV_MODULE_MODULE=portaudio_2_0
-SV_MODULE_MODULE=liblo
+SV_MODULE_VERSION_TEST="portaudio-2.0 >= 19"
-SV_MODULE_VERSION_TEST=""
+SV_MODULE_HEADER=portaudio.h
-SV_MODULE_HEADER=lo/lo.h
+SV_MODULE_LIB=portaudio
-SV_MODULE_LIB=lo
+SV_MODULE_FUNC=Pa_IsFormatSupported
-SV_MODULE_FUNC=lo_address_new
+SV_MODULE_HAVE=HAVE_$(echo portaudio_2_0 | tr 'a-z' 'A-Z')
-SV_MODULE_HAVE=HAVE_$(echo liblo | tr 'a-z' 'A-Z')
 SV_MODULE_FAILED=1
-if test -n "$liblo_LIBS" ; then
+if test -n "$portaudio_2_0_LIBS" ; then
 { $as_echo "$as_me:${as_lineno-$LINENO}: User set ${SV_MODULE_MODULE}_LIBS explicitly, skipping test for $SV_MODULE_MODULE" >&5
 $as_echo "$as_me: User set ${SV_MODULE_MODULE}_LIBS explicitly, skipping test for $SV_MODULE_MODULE" >&6;}
-CXXFLAGS="$CXXFLAGS $liblo_CFLAGS"
+CXXFLAGS="$CXXFLAGS $portaudio_2_0_CFLAGS"
-LIBS="$LIBS $liblo_LIBS"
+LIBS="$LIBS $portaudio_2_0_LIBS"
 SV_MODULE_FAILED=""
 fi
 if test -z "$SV_MODULE_VERSION_TEST" ; then
 SV_MODULE_VERSION_TEST=$SV_MODULE_MODULE
 fi
 if test -n "$SV_MODULE_FAILED" && test -n "$PKG_CONFIG"; then
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for liblo" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for portaudio_2_0" >&5
-$as_echo_n "checking for liblo... " >&6; }
+$as_echo_n "checking for portaudio_2_0... " >&6; }
-if test -n "$liblo_CFLAGS"; then
+if test -n "$portaudio_2_0_CFLAGS"; then
-pkg_cv_liblo_CFLAGS="$liblo_CFLAGS"
+pkg_cv_portaudio_2_0_CFLAGS="$portaudio_2_0_CFLAGS"
 elif test -n "$PKG_CONFIG"; then
 if test -n "$PKG_CONFIG" && \
 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$SV_MODULE_VERSION_TEST\""; } >&5
 ($PKG_CONFIG --exists --print-errors "$SV_MODULE_VERSION_TEST") 2>&5
 ac_status=$?
 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
-pkg_cv_liblo_CFLAGS=`$PKG_CONFIG --cflags "$SV_MODULE_VERSION_TEST" 2>/dev/null`
+pkg_cv_portaudio_2_0_CFLAGS=`$PKG_CONFIG --cflags "$SV_MODULE_VERSION_TEST" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
 fi
 else
 pkg_failed=untried
 fi
-if test -n "$liblo_LIBS"; then
+if test -n "$portaudio_2_0_LIBS"; then
-pkg_cv_liblo_LIBS="$liblo_LIBS"
+pkg_cv_portaudio_2_0_LIBS="$portaudio_2_0_LIBS"
 elif test -n "$PKG_CONFIG"; then
 if test -n "$PKG_CONFIG" && \
 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$SV_MODULE_VERSION_TEST\""; } >&5
 ($PKG_CONFIG --exists --print-errors "$SV_MODULE_VERSION_TEST") 2>&5
 ac_status=$?
 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
-pkg_cv_liblo_LIBS=`$PKG_CONFIG --libs "$SV_MODULE_VERSION_TEST" 2>/dev/null`
+pkg_cv_portaudio_2_0_LIBS=`$PKG_CONFIG --libs "$SV_MODULE_VERSION_TEST" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
 fi
 else
 _pkg_short_errors_supported=yes
 else
 _pkg_short_errors_supported=no
 fi
 if test $_pkg_short_errors_supported = yes; then
-	        liblo_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$SV_MODULE_VERSION_TEST" 2>&1`
+	        portaudio_2_0_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$SV_MODULE_VERSION_TEST" 2>&1`
 else
-	        liblo_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$SV_MODULE_VERSION_TEST" 2>&1`
+	        portaudio_2_0_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$SV_MODULE_VERSION_TEST" 2>&1`
 fi
 	# Put the nasty error message in config.log where it belongs
-	echo "$liblo_PKG_ERRORS" >&5
+	echo "$portaudio_2_0_PKG_ERRORS" >&5
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5
 $as_echo "$as_me: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&6;}
 elif test $pkg_failed = untried; then
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5
 $as_echo "$as_me: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&6;}
 else
-	liblo_CFLAGS=$pkg_cv_liblo_CFLAGS
+	portaudio_2_0_CFLAGS=$pkg_cv_portaudio_2_0_CFLAGS
-	liblo_LIBS=$pkg_cv_liblo_LIBS
+	portaudio_2_0_LIBS=$pkg_cv_portaudio_2_0_LIBS
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-	HAVES="$HAVES $SV_MODULE_HAVE";CXXFLAGS="$CXXFLAGS $liblo_CFLAGS";LIBS="$LIBS $liblo_LIBS";SV_MODULE_FAILED=""
+	HAVES="$HAVES $SV_MODULE_HAVE";CXXFLAGS="$CXXFLAGS $portaudio_2_0_CFLAGS";LIBS="$LIBS $portaudio_2_0_LIBS";SV_MODULE_FAILED=""
 fi
 fi
 if test -n "$SV_MODULE_FAILED"; then
 as_ac_Header=`$as_echo "ac_cv_header_$SV_MODULE_HEADER" | $as_tr_sh`
 ac_fn_cxx_check_header_mongrel "$LINENO" "$SV_MODULE_HEADER" "$as_ac_Header" "$ac_includes_default"
 fi
 fi
 fi
-SV_MODULE_MODULE=portaudio_2_0
+SV_MODULE_MODULE=JACK
-SV_MODULE_VERSION_TEST="portaudio-2.0 >= 19"
+SV_MODULE_VERSION_TEST="jack >= 0.100"
-SV_MODULE_HEADER=portaudio.h
+SV_MODULE_HEADER=jack/jack.h
-SV_MODULE_LIB=portaudio
+SV_MODULE_LIB=jack
-SV_MODULE_FUNC=Pa_IsFormatSupported
+SV_MODULE_FUNC=jack_client_open
-SV_MODULE_HAVE=HAVE_$(echo portaudio_2_0 | tr 'a-z' 'A-Z')
+SV_MODULE_HAVE=HAVE_$(echo JACK | tr 'a-z' 'A-Z')
 SV_MODULE_FAILED=1
-if test -n "$portaudio_2_0_LIBS" ; then
+if test -n "$JACK_LIBS" ; then
 { $as_echo "$as_me:${as_lineno-$LINENO}: User set ${SV_MODULE_MODULE}_LIBS explicitly, skipping test for $SV_MODULE_MODULE" >&5
 $as_echo "$as_me: User set ${SV_MODULE_MODULE}_LIBS explicitly, skipping test for $SV_MODULE_MODULE" >&6;}
-CXXFLAGS="$CXXFLAGS $portaudio_2_0_CFLAGS"
+CXXFLAGS="$CXXFLAGS $JACK_CFLAGS"
-LIBS="$LIBS $portaudio_2_0_LIBS"
+LIBS="$LIBS $JACK_LIBS"
 SV_MODULE_FAILED=""
 fi
 if test -z "$SV_MODULE_VERSION_TEST" ; then
 SV_MODULE_VERSION_TEST=$SV_MODULE_MODULE
 fi
 if test -n "$SV_MODULE_FAILED" && test -n "$PKG_CONFIG"; then
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for portaudio_2_0" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for JACK" >&5
-$as_echo_n "checking for portaudio_2_0... " >&6; }
+$as_echo_n "checking for JACK... " >&6; }
-if test -n "$portaudio_2_0_CFLAGS"; then
+if test -n "$JACK_CFLAGS"; then
-pkg_cv_portaudio_2_0_CFLAGS="$portaudio_2_0_CFLAGS"
+pkg_cv_JACK_CFLAGS="$JACK_CFLAGS"
 elif test -n "$PKG_CONFIG"; then
 if test -n "$PKG_CONFIG" && \
 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$SV_MODULE_VERSION_TEST\""; } >&5
 ($PKG_CONFIG --exists --print-errors "$SV_MODULE_VERSION_TEST") 2>&5
 ac_status=$?
 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
-pkg_cv_portaudio_2_0_CFLAGS=`$PKG_CONFIG --cflags "$SV_MODULE_VERSION_TEST" 2>/dev/null`
+pkg_cv_JACK_CFLAGS=`$PKG_CONFIG --cflags "$SV_MODULE_VERSION_TEST" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
 fi
 else
 pkg_failed=untried
 fi
-if test -n "$portaudio_2_0_LIBS"; then
+if test -n "$JACK_LIBS"; then
-pkg_cv_portaudio_2_0_LIBS="$portaudio_2_0_LIBS"
+pkg_cv_JACK_LIBS="$JACK_LIBS"
 elif test -n "$PKG_CONFIG"; then
 if test -n "$PKG_CONFIG" && \
 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$SV_MODULE_VERSION_TEST\""; } >&5
 ($PKG_CONFIG --exists --print-errors "$SV_MODULE_VERSION_TEST") 2>&5
 ac_status=$?
 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
-pkg_cv_portaudio_2_0_LIBS=`$PKG_CONFIG --libs "$SV_MODULE_VERSION_TEST" 2>/dev/null`
+pkg_cv_JACK_LIBS=`$PKG_CONFIG --libs "$SV_MODULE_VERSION_TEST" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
 fi
 else
 _pkg_short_errors_supported=yes
 else
 _pkg_short_errors_supported=no
 fi
 if test $_pkg_short_errors_supported = yes; then
-	        portaudio_2_0_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$SV_MODULE_VERSION_TEST" 2>&1`
+	        JACK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$SV_MODULE_VERSION_TEST" 2>&1`
 else
-	        portaudio_2_0_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$SV_MODULE_VERSION_TEST" 2>&1`
+	        JACK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$SV_MODULE_VERSION_TEST" 2>&1`
 fi
 	# Put the nasty error message in config.log where it belongs
-	echo "$portaudio_2_0_PKG_ERRORS" >&5
+	echo "$JACK_PKG_ERRORS" >&5
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5
 $as_echo "$as_me: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&6;}
 elif test $pkg_failed = untried; then
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5
 $as_echo "$as_me: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&6;}
 else
-	portaudio_2_0_CFLAGS=$pkg_cv_portaudio_2_0_CFLAGS
+	JACK_CFLAGS=$pkg_cv_JACK_CFLAGS
-	portaudio_2_0_LIBS=$pkg_cv_portaudio_2_0_LIBS
+	JACK_LIBS=$pkg_cv_JACK_LIBS
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-	HAVES="$HAVES $SV_MODULE_HAVE";CXXFLAGS="$CXXFLAGS $portaudio_2_0_CFLAGS";LIBS="$LIBS $portaudio_2_0_LIBS";SV_MODULE_FAILED=""
+	HAVES="$HAVES $SV_MODULE_HAVE";CXXFLAGS="$CXXFLAGS $JACK_CFLAGS";LIBS="$LIBS $JACK_LIBS";SV_MODULE_FAILED=""
 fi
 fi
 if test -n "$SV_MODULE_FAILED"; then
 as_ac_Header=`$as_echo "ac_cv_header_$SV_MODULE_HEADER" | $as_tr_sh`
 ac_fn_cxx_check_header_mongrel "$LINENO" "$SV_MODULE_HEADER" "$as_ac_Header" "$ac_includes_default"
 fi
 fi
 fi
-SV_MODULE_MODULE=JACK
+SV_MODULE_MODULE=libpulse
-SV_MODULE_VERSION_TEST="jack >= 0.100"
+SV_MODULE_VERSION_TEST="libpulse >= 0.9"
-SV_MODULE_HEADER=jack/jack.h
+SV_MODULE_HEADER=pulse/pulseaudio.h
-SV_MODULE_LIB=jack
+SV_MODULE_LIB=pulse
-SV_MODULE_FUNC=jack_client_open
+SV_MODULE_FUNC=pa_stream_new
-SV_MODULE_HAVE=HAVE_$(echo JACK | tr 'a-z' 'A-Z')
+SV_MODULE_HAVE=HAVE_$(echo libpulse | tr 'a-z' 'A-Z')
 SV_MODULE_FAILED=1
-if test -n "$JACK_LIBS" ; then
+if test -n "$libpulse_LIBS" ; then
 { $as_echo "$as_me:${as_lineno-$LINENO}: User set ${SV_MODULE_MODULE}_LIBS explicitly, skipping test for $SV_MODULE_MODULE" >&5
 $as_echo "$as_me: User set ${SV_MODULE_MODULE}_LIBS explicitly, skipping test for $SV_MODULE_MODULE" >&6;}
-CXXFLAGS="$CXXFLAGS $JACK_CFLAGS"
+CXXFLAGS="$CXXFLAGS $libpulse_CFLAGS"
-LIBS="$LIBS $JACK_LIBS"
+LIBS="$LIBS $libpulse_LIBS"
 SV_MODULE_FAILED=""
 fi
 if test -z "$SV_MODULE_VERSION_TEST" ; then
 SV_MODULE_VERSION_TEST=$SV_MODULE_MODULE
 fi
 if test -n "$SV_MODULE_FAILED" && test -n "$PKG_CONFIG"; then
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for JACK" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libpulse" >&5
-$as_echo_n "checking for JACK... " >&6; }
+$as_echo_n "checking for libpulse... " >&6; }
-if test -n "$JACK_CFLAGS"; then
+if test -n "$libpulse_CFLAGS"; then
-pkg_cv_JACK_CFLAGS="$JACK_CFLAGS"
+pkg_cv_libpulse_CFLAGS="$libpulse_CFLAGS"
 elif test -n "$PKG_CONFIG"; then
 if test -n "$PKG_CONFIG" && \
 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$SV_MODULE_VERSION_TEST\""; } >&5
 ($PKG_CONFIG --exists --print-errors "$SV_MODULE_VERSION_TEST") 2>&5
 ac_status=$?
 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
-pkg_cv_JACK_CFLAGS=`$PKG_CONFIG --cflags "$SV_MODULE_VERSION_TEST" 2>/dev/null`
+pkg_cv_libpulse_CFLAGS=`$PKG_CONFIG --cflags "$SV_MODULE_VERSION_TEST" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
 fi
 else
 pkg_failed=untried
 fi
-if test -n "$JACK_LIBS"; then
+if test -n "$libpulse_LIBS"; then
-pkg_cv_JACK_LIBS="$JACK_LIBS"
+pkg_cv_libpulse_LIBS="$libpulse_LIBS"
 elif test -n "$PKG_CONFIG"; then
 if test -n "$PKG_CONFIG" && \
 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$SV_MODULE_VERSION_TEST\""; } >&5
 ($PKG_CONFIG --exists --print-errors "$SV_MODULE_VERSION_TEST") 2>&5
 ac_status=$?
 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
-pkg_cv_JACK_LIBS=`$PKG_CONFIG --libs "$SV_MODULE_VERSION_TEST" 2>/dev/null`
+pkg_cv_libpulse_LIBS=`$PKG_CONFIG --libs "$SV_MODULE_VERSION_TEST" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
 fi
 else
 _pkg_short_errors_supported=yes
 else
 _pkg_short_errors_supported=no
 fi
 if test $_pkg_short_errors_supported = yes; then
-	        JACK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$SV_MODULE_VERSION_TEST" 2>&1`
+	        libpulse_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$SV_MODULE_VERSION_TEST" 2>&1`
 else
-	        JACK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$SV_MODULE_VERSION_TEST" 2>&1`
+	        libpulse_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$SV_MODULE_VERSION_TEST" 2>&1`
 fi
 	# Put the nasty error message in config.log where it belongs
-	echo "$JACK_PKG_ERRORS" >&5
+	echo "$libpulse_PKG_ERRORS" >&5
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5
 $as_echo "$as_me: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&6;}
 elif test $pkg_failed = untried; then
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5
 $as_echo "$as_me: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&6;}
 else
-	JACK_CFLAGS=$pkg_cv_JACK_CFLAGS
+	libpulse_CFLAGS=$pkg_cv_libpulse_CFLAGS
-	JACK_LIBS=$pkg_cv_JACK_LIBS
+	libpulse_LIBS=$pkg_cv_libpulse_LIBS
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-	HAVES="$HAVES $SV_MODULE_HAVE";CXXFLAGS="$CXXFLAGS $JACK_CFLAGS";LIBS="$LIBS $JACK_LIBS";SV_MODULE_FAILED=""
+	HAVES="$HAVES $SV_MODULE_HAVE";CXXFLAGS="$CXXFLAGS $libpulse_CFLAGS";LIBS="$LIBS $libpulse_LIBS";SV_MODULE_FAILED=""
 fi
 fi
 if test -n "$SV_MODULE_FAILED"; then
 as_ac_Header=`$as_echo "ac_cv_header_$SV_MODULE_HEADER" | $as_tr_sh`
 ac_fn_cxx_check_header_mongrel "$LINENO" "$SV_MODULE_HEADER" "$as_ac_Header" "$ac_includes_default"
 fi
 fi
 fi
-SV_MODULE_MODULE=libpulse
+SV_MODULE_MODULE=lrdf
-SV_MODULE_VERSION_TEST="libpulse >= 0.9"
+SV_MODULE_VERSION_TEST="lrdf >= 0.2"
-SV_MODULE_HEADER=pulse/pulseaudio.h
+SV_MODULE_HEADER=lrdf.h
-SV_MODULE_LIB=pulse
+SV_MODULE_LIB=lrdf
-SV_MODULE_FUNC=pa_stream_new
+SV_MODULE_FUNC=lrdf_init
-SV_MODULE_HAVE=HAVE_$(echo libpulse | tr 'a-z' 'A-Z')
+SV_MODULE_HAVE=HAVE_$(echo lrdf | tr 'a-z' 'A-Z')
 SV_MODULE_FAILED=1
-if test -n "$libpulse_LIBS" ; then
+if test -n "$lrdf_LIBS" ; then
 { $as_echo "$as_me:${as_lineno-$LINENO}: User set ${SV_MODULE_MODULE}_LIBS explicitly, skipping test for $SV_MODULE_MODULE" >&5
 $as_echo "$as_me: User set ${SV_MODULE_MODULE}_LIBS explicitly, skipping test for $SV_MODULE_MODULE" >&6;}
-CXXFLAGS="$CXXFLAGS $libpulse_CFLAGS"
+CXXFLAGS="$CXXFLAGS $lrdf_CFLAGS"
-LIBS="$LIBS $libpulse_LIBS"
+LIBS="$LIBS $lrdf_LIBS"
 SV_MODULE_FAILED=""
 fi
 if test -z "$SV_MODULE_VERSION_TEST" ; then
 SV_MODULE_VERSION_TEST=$SV_MODULE_MODULE
 fi
 if test -n "$SV_MODULE_FAILED" && test -n "$PKG_CONFIG"; then
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libpulse" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for lrdf" >&5
-$as_echo_n "checking for libpulse... " >&6; }
+$as_echo_n "checking for lrdf... " >&6; }
-if test -n "$libpulse_CFLAGS"; then
+if test -n "$lrdf_CFLAGS"; then
-pkg_cv_libpulse_CFLAGS="$libpulse_CFLAGS"
+pkg_cv_lrdf_CFLAGS="$lrdf_CFLAGS"
 elif test -n "$PKG_CONFIG"; then
 if test -n "$PKG_CONFIG" && \
 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$SV_MODULE_VERSION_TEST\""; } >&5
 ($PKG_CONFIG --exists --print-errors "$SV_MODULE_VERSION_TEST") 2>&5
 ac_status=$?
 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
-pkg_cv_libpulse_CFLAGS=`$PKG_CONFIG --cflags "$SV_MODULE_VERSION_TEST" 2>/dev/null`
+pkg_cv_lrdf_CFLAGS=`$PKG_CONFIG --cflags "$SV_MODULE_VERSION_TEST" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
 fi
 else
 pkg_failed=untried
 fi
-if test -n "$libpulse_LIBS"; then
+if test -n "$lrdf_LIBS"; then
-pkg_cv_libpulse_LIBS="$libpulse_LIBS"
+pkg_cv_lrdf_LIBS="$lrdf_LIBS"
 elif test -n "$PKG_CONFIG"; then
 if test -n "$PKG_CONFIG" && \
 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$SV_MODULE_VERSION_TEST\""; } >&5
 ($PKG_CONFIG --exists --print-errors "$SV_MODULE_VERSION_TEST") 2>&5
 ac_status=$?
 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
-pkg_cv_libpulse_LIBS=`$PKG_CONFIG --libs "$SV_MODULE_VERSION_TEST" 2>/dev/null`
+pkg_cv_lrdf_LIBS=`$PKG_CONFIG --libs "$SV_MODULE_VERSION_TEST" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
 fi
 else
 _pkg_short_errors_supported=yes
 else
 _pkg_short_errors_supported=no
 fi
 if test $_pkg_short_errors_supported = yes; then
-	        libpulse_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$SV_MODULE_VERSION_TEST" 2>&1`
+	        lrdf_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$SV_MODULE_VERSION_TEST" 2>&1`
 else
-	        libpulse_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$SV_MODULE_VERSION_TEST" 2>&1`
+	        lrdf_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$SV_MODULE_VERSION_TEST" 2>&1`
 fi
 	# Put the nasty error message in config.log where it belongs
-	echo "$libpulse_PKG_ERRORS" >&5
+	echo "$lrdf_PKG_ERRORS" >&5
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5
 $as_echo "$as_me: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&6;}
 elif test $pkg_failed = untried; then
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5
 $as_echo "$as_me: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&6;}
 else
-	libpulse_CFLAGS=$pkg_cv_libpulse_CFLAGS
+	lrdf_CFLAGS=$pkg_cv_lrdf_CFLAGS
-	libpulse_LIBS=$pkg_cv_libpulse_LIBS
+	lrdf_LIBS=$pkg_cv_lrdf_LIBS
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-	HAVES="$HAVES $SV_MODULE_HAVE";CXXFLAGS="$CXXFLAGS $libpulse_CFLAGS";LIBS="$LIBS $libpulse_LIBS";SV_MODULE_FAILED=""
+	HAVES="$HAVES $SV_MODULE_HAVE";CXXFLAGS="$CXXFLAGS $lrdf_CFLAGS";LIBS="$LIBS $lrdf_LIBS";SV_MODULE_FAILED=""
 fi
 fi
 if test -n "$SV_MODULE_FAILED"; then
 as_ac_Header=`$as_echo "ac_cv_header_$SV_MODULE_HEADER" | $as_tr_sh`
 ac_fn_cxx_check_header_mongrel "$LINENO" "$SV_MODULE_HEADER" "$as_ac_Header" "$ac_includes_default"
 fi
 fi
 fi
-SV_MODULE_MODULE=lrdf
+SV_MODULE_MODULE=oggz
-SV_MODULE_VERSION_TEST="lrdf >= 0.2"
+SV_MODULE_VERSION_TEST="oggz >= 1.0.0"
-SV_MODULE_HEADER=lrdf.h
+SV_MODULE_HEADER=oggz/oggz.h
-SV_MODULE_LIB=lrdf
+SV_MODULE_LIB=oggz
-SV_MODULE_FUNC=lrdf_init
+SV_MODULE_FUNC=oggz_run
-SV_MODULE_HAVE=HAVE_$(echo lrdf | tr 'a-z' 'A-Z')
+SV_MODULE_HAVE=HAVE_$(echo oggz | tr 'a-z' 'A-Z')
 SV_MODULE_FAILED=1
-if test -n "$lrdf_LIBS" ; then
+if test -n "$oggz_LIBS" ; then
 { $as_echo "$as_me:${as_lineno-$LINENO}: User set ${SV_MODULE_MODULE}_LIBS explicitly, skipping test for $SV_MODULE_MODULE" >&5
 $as_echo "$as_me: User set ${SV_MODULE_MODULE}_LIBS explicitly, skipping test for $SV_MODULE_MODULE" >&6;}
-CXXFLAGS="$CXXFLAGS $lrdf_CFLAGS"
+CXXFLAGS="$CXXFLAGS $oggz_CFLAGS"
-LIBS="$LIBS $lrdf_LIBS"
+LIBS="$LIBS $oggz_LIBS"
 SV_MODULE_FAILED=""
 fi
 if test -z "$SV_MODULE_VERSION_TEST" ; then
 SV_MODULE_VERSION_TEST=$SV_MODULE_MODULE
 fi
 if test -n "$SV_MODULE_FAILED" && test -n "$PKG_CONFIG"; then
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for lrdf" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for oggz" >&5
-$as_echo_n "checking for lrdf... " >&6; }
+$as_echo_n "checking for oggz... " >&6; }
-if test -n "$lrdf_CFLAGS"; then
+if test -n "$oggz_CFLAGS"; then
-pkg_cv_lrdf_CFLAGS="$lrdf_CFLAGS"
+pkg_cv_oggz_CFLAGS="$oggz_CFLAGS"
 elif test -n "$PKG_CONFIG"; then
 if test -n "$PKG_CONFIG" && \
 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$SV_MODULE_VERSION_TEST\""; } >&5
 ($PKG_CONFIG --exists --print-errors "$SV_MODULE_VERSION_TEST") 2>&5
 ac_status=$?
 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
-pkg_cv_lrdf_CFLAGS=`$PKG_CONFIG --cflags "$SV_MODULE_VERSION_TEST" 2>/dev/null`
+pkg_cv_oggz_CFLAGS=`$PKG_CONFIG --cflags "$SV_MODULE_VERSION_TEST" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
 fi
 else
 pkg_failed=untried
 fi
-if test -n "$lrdf_LIBS"; then
+if test -n "$oggz_LIBS"; then
-pkg_cv_lrdf_LIBS="$lrdf_LIBS"
+pkg_cv_oggz_LIBS="$oggz_LIBS"
 elif test -n "$PKG_CONFIG"; then
 if test -n "$PKG_CONFIG" && \
 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$SV_MODULE_VERSION_TEST\""; } >&5
 ($PKG_CONFIG --exists --print-errors "$SV_MODULE_VERSION_TEST") 2>&5
 ac_status=$?
 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
-pkg_cv_lrdf_LIBS=`$PKG_CONFIG --libs "$SV_MODULE_VERSION_TEST" 2>/dev/null`
+pkg_cv_oggz_LIBS=`$PKG_CONFIG --libs "$SV_MODULE_VERSION_TEST" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
 fi
 else
 _pkg_short_errors_supported=yes
 else
 _pkg_short_errors_supported=no
 fi
 if test $_pkg_short_errors_supported = yes; then
-	        lrdf_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$SV_MODULE_VERSION_TEST" 2>&1`
+	        oggz_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$SV_MODULE_VERSION_TEST" 2>&1`
 else
-	        lrdf_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$SV_MODULE_VERSION_TEST" 2>&1`
+	        oggz_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$SV_MODULE_VERSION_TEST" 2>&1`
 fi
 	# Put the nasty error message in config.log where it belongs
-	echo "$lrdf_PKG_ERRORS" >&5
+	echo "$oggz_PKG_ERRORS" >&5
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5
 $as_echo "$as_me: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&6;}
 elif test $pkg_failed = untried; then
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5
 $as_echo "$as_me: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&6;}
 else
-	lrdf_CFLAGS=$pkg_cv_lrdf_CFLAGS
+	oggz_CFLAGS=$pkg_cv_oggz_CFLAGS
-	lrdf_LIBS=$pkg_cv_lrdf_LIBS
+	oggz_LIBS=$pkg_cv_oggz_LIBS
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-	HAVES="$HAVES $SV_MODULE_HAVE";CXXFLAGS="$CXXFLAGS $lrdf_CFLAGS";LIBS="$LIBS $lrdf_LIBS";SV_MODULE_FAILED=""
+	HAVES="$HAVES $SV_MODULE_HAVE";CXXFLAGS="$CXXFLAGS $oggz_CFLAGS";LIBS="$LIBS $oggz_LIBS";SV_MODULE_FAILED=""
 fi
 fi
 if test -n "$SV_MODULE_FAILED"; then
 as_ac_Header=`$as_echo "ac_cv_header_$SV_MODULE_HEADER" | $as_tr_sh`
 ac_fn_cxx_check_header_mongrel "$LINENO" "$SV_MODULE_HEADER" "$as_ac_Header" "$ac_includes_default"
 fi
 fi
 fi
-SV_MODULE_MODULE=oggz
+SV_MODULE_MODULE=fishsound
-SV_MODULE_VERSION_TEST="oggz >= 1.0.0"
+SV_MODULE_VERSION_TEST="fishsound >= 1.0.0"
-SV_MODULE_HEADER=oggz/oggz.h
+SV_MODULE_HEADER=fishsound/fishsound.h
-SV_MODULE_LIB=oggz
+SV_MODULE_LIB=fishsound
-SV_MODULE_FUNC=oggz_run
+SV_MODULE_FUNC=fish_sound_new
-SV_MODULE_HAVE=HAVE_$(echo oggz | tr 'a-z' 'A-Z')
+SV_MODULE_HAVE=HAVE_$(echo fishsound | tr 'a-z' 'A-Z')
 SV_MODULE_FAILED=1
-if test -n "$oggz_LIBS" ; then
+if test -n "$fishsound_LIBS" ; then
 { $as_echo "$as_me:${as_lineno-$LINENO}: User set ${SV_MODULE_MODULE}_LIBS explicitly, skipping test for $SV_MODULE_MODULE" >&5
 $as_echo "$as_me: User set ${SV_MODULE_MODULE}_LIBS explicitly, skipping test for $SV_MODULE_MODULE" >&6;}
-CXXFLAGS="$CXXFLAGS $oggz_CFLAGS"
+CXXFLAGS="$CXXFLAGS $fishsound_CFLAGS"
-LIBS="$LIBS $oggz_LIBS"
+LIBS="$LIBS $fishsound_LIBS"
 SV_MODULE_FAILED=""
 fi
 if test -z "$SV_MODULE_VERSION_TEST" ; then
 SV_MODULE_VERSION_TEST=$SV_MODULE_MODULE
 fi
 if test -n "$SV_MODULE_FAILED" && test -n "$PKG_CONFIG"; then
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for oggz" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fishsound" >&5
-$as_echo_n "checking for oggz... " >&6; }
+$as_echo_n "checking for fishsound... " >&6; }
-if test -n "$oggz_CFLAGS"; then
+if test -n "$fishsound_CFLAGS"; then
-pkg_cv_oggz_CFLAGS="$oggz_CFLAGS"
+pkg_cv_fishsound_CFLAGS="$fishsound_CFLAGS"
 elif test -n "$PKG_CONFIG"; then
 if test -n "$PKG_CONFIG" && \
 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$SV_MODULE_VERSION_TEST\""; } >&5
 ($PKG_CONFIG --exists --print-errors "$SV_MODULE_VERSION_TEST") 2>&5
 ac_status=$?
 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
-pkg_cv_oggz_CFLAGS=`$PKG_CONFIG --cflags "$SV_MODULE_VERSION_TEST" 2>/dev/null`
+pkg_cv_fishsound_CFLAGS=`$PKG_CONFIG --cflags "$SV_MODULE_VERSION_TEST" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
 fi
 else
 pkg_failed=untried
 fi
-if test -n "$oggz_LIBS"; then
+if test -n "$fishsound_LIBS"; then
-pkg_cv_oggz_LIBS="$oggz_LIBS"
+pkg_cv_fishsound_LIBS="$fishsound_LIBS"
 elif test -n "$PKG_CONFIG"; then
 if test -n "$PKG_CONFIG" && \
 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$SV_MODULE_VERSION_TEST\""; } >&5
 ($PKG_CONFIG --exists --print-errors "$SV_MODULE_VERSION_TEST") 2>&5
 ac_status=$?
 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
-pkg_cv_oggz_LIBS=`$PKG_CONFIG --libs "$SV_MODULE_VERSION_TEST" 2>/dev/null`
+pkg_cv_fishsound_LIBS=`$PKG_CONFIG --libs "$SV_MODULE_VERSION_TEST" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
 fi
 else
 _pkg_short_errors_supported=yes
 else
 _pkg_short_errors_supported=no
 fi
 if test $_pkg_short_errors_supported = yes; then
-	        oggz_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$SV_MODULE_VERSION_TEST" 2>&1`
+	        fishsound_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$SV_MODULE_VERSION_TEST" 2>&1`
 else
-	        oggz_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$SV_MODULE_VERSION_TEST" 2>&1`
+	        fishsound_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$SV_MODULE_VERSION_TEST" 2>&1`
 fi
 	# Put the nasty error message in config.log where it belongs
-	echo "$oggz_PKG_ERRORS" >&5
+	echo "$fishsound_PKG_ERRORS" >&5
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5
 $as_echo "$as_me: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&6;}
 elif test $pkg_failed = untried; then
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5
 $as_echo "$as_me: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&6;}
 else
-	oggz_CFLAGS=$pkg_cv_oggz_CFLAGS
+	fishsound_CFLAGS=$pkg_cv_fishsound_CFLAGS
-	oggz_LIBS=$pkg_cv_oggz_LIBS
+	fishsound_LIBS=$pkg_cv_fishsound_LIBS
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-	HAVES="$HAVES $SV_MODULE_HAVE";CXXFLAGS="$CXXFLAGS $oggz_CFLAGS";LIBS="$LIBS $oggz_LIBS";SV_MODULE_FAILED=""
+	HAVES="$HAVES $SV_MODULE_HAVE";CXXFLAGS="$CXXFLAGS $fishsound_CFLAGS";LIBS="$LIBS $fishsound_LIBS";SV_MODULE_FAILED=""
 fi
 fi
 if test -n "$SV_MODULE_FAILED"; then
 as_ac_Header=`$as_echo "ac_cv_header_$SV_MODULE_HEADER" | $as_tr_sh`
 ac_fn_cxx_check_header_mongrel "$LINENO" "$SV_MODULE_HEADER" "$as_ac_Header" "$ac_includes_default"
 fi
 fi
 fi
-SV_MODULE_MODULE=fishsound
+SV_MODULE_MODULE=mad
-SV_MODULE_VERSION_TEST="fishsound >= 1.0.0"
+SV_MODULE_VERSION_TEST="mad >= 0.15.0"
-SV_MODULE_HEADER=fishsound/fishsound.h
+SV_MODULE_HEADER=mad.h
-SV_MODULE_LIB=fishsound
+SV_MODULE_LIB=mad
-SV_MODULE_FUNC=fish_sound_new
+SV_MODULE_FUNC=mad_decoder_init
-SV_MODULE_HAVE=HAVE_$(echo fishsound | tr 'a-z' 'A-Z')
+SV_MODULE_HAVE=HAVE_$(echo mad | tr 'a-z' 'A-Z')
 SV_MODULE_FAILED=1
-if test -n "$fishsound_LIBS" ; then
+if test -n "$mad_LIBS" ; then
 { $as_echo "$as_me:${as_lineno-$LINENO}: User set ${SV_MODULE_MODULE}_LIBS explicitly, skipping test for $SV_MODULE_MODULE" >&5
 $as_echo "$as_me: User set ${SV_MODULE_MODULE}_LIBS explicitly, skipping test for $SV_MODULE_MODULE" >&6;}
-CXXFLAGS="$CXXFLAGS $fishsound_CFLAGS"
+CXXFLAGS="$CXXFLAGS $mad_CFLAGS"
-LIBS="$LIBS $fishsound_LIBS"
+LIBS="$LIBS $mad_LIBS"
 SV_MODULE_FAILED=""
 fi
 if test -z "$SV_MODULE_VERSION_TEST" ; then
 SV_MODULE_VERSION_TEST=$SV_MODULE_MODULE
 fi
 if test -n "$SV_MODULE_FAILED" && test -n "$PKG_CONFIG"; then
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fishsound" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for mad" >&5
-$as_echo_n "checking for fishsound... " >&6; }
+$as_echo_n "checking for mad... " >&6; }
-if test -n "$fishsound_CFLAGS"; then
+if test -n "$mad_CFLAGS"; then
-pkg_cv_fishsound_CFLAGS="$fishsound_CFLAGS"
+pkg_cv_mad_CFLAGS="$mad_CFLAGS"
 elif test -n "$PKG_CONFIG"; then
 if test -n "$PKG_CONFIG" && \
 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$SV_MODULE_VERSION_TEST\""; } >&5
 ($PKG_CONFIG --exists --print-errors "$SV_MODULE_VERSION_TEST") 2>&5
 ac_status=$?
 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
-pkg_cv_fishsound_CFLAGS=`$PKG_CONFIG --cflags "$SV_MODULE_VERSION_TEST" 2>/dev/null`
+pkg_cv_mad_CFLAGS=`$PKG_CONFIG --cflags "$SV_MODULE_VERSION_TEST" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
 fi
 else
 pkg_failed=untried
 fi
-if test -n "$fishsound_LIBS"; then
+if test -n "$mad_LIBS"; then
-pkg_cv_fishsound_LIBS="$fishsound_LIBS"
+pkg_cv_mad_LIBS="$mad_LIBS"
 elif test -n "$PKG_CONFIG"; then
 if test -n "$PKG_CONFIG" && \
 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$SV_MODULE_VERSION_TEST\""; } >&5
 ($PKG_CONFIG --exists --print-errors "$SV_MODULE_VERSION_TEST") 2>&5
 ac_status=$?
 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
-pkg_cv_fishsound_LIBS=`$PKG_CONFIG --libs "$SV_MODULE_VERSION_TEST" 2>/dev/null`
+pkg_cv_mad_LIBS=`$PKG_CONFIG --libs "$SV_MODULE_VERSION_TEST" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
 fi
 else
 _pkg_short_errors_supported=yes
 else
 _pkg_short_errors_supported=no
 fi
 if test $_pkg_short_errors_supported = yes; then
-	        fishsound_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$SV_MODULE_VERSION_TEST" 2>&1`
+	        mad_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$SV_MODULE_VERSION_TEST" 2>&1`
 else
-	        fishsound_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$SV_MODULE_VERSION_TEST" 2>&1`
+	        mad_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$SV_MODULE_VERSION_TEST" 2>&1`
 fi
 	# Put the nasty error message in config.log where it belongs
-	echo "$fishsound_PKG_ERRORS" >&5
+	echo "$mad_PKG_ERRORS" >&5
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5
 $as_echo "$as_me: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&6;}
 elif test $pkg_failed = untried; then
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5
 $as_echo "$as_me: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&6;}
 else
-	fishsound_CFLAGS=$pkg_cv_fishsound_CFLAGS
+	mad_CFLAGS=$pkg_cv_mad_CFLAGS
-	fishsound_LIBS=$pkg_cv_fishsound_LIBS
+	mad_LIBS=$pkg_cv_mad_LIBS
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-	HAVES="$HAVES $SV_MODULE_HAVE";CXXFLAGS="$CXXFLAGS $fishsound_CFLAGS";LIBS="$LIBS $fishsound_LIBS";SV_MODULE_FAILED=""
+	HAVES="$HAVES $SV_MODULE_HAVE";CXXFLAGS="$CXXFLAGS $mad_CFLAGS";LIBS="$LIBS $mad_LIBS";SV_MODULE_FAILED=""
 fi
 fi
 if test -n "$SV_MODULE_FAILED"; then
 as_ac_Header=`$as_echo "ac_cv_header_$SV_MODULE_HEADER" | $as_tr_sh`
 ac_fn_cxx_check_header_mongrel "$LINENO" "$SV_MODULE_HEADER" "$as_ac_Header" "$ac_includes_default"
 fi
 fi
 fi
-SV_MODULE_MODULE=mad
+SV_MODULE_MODULE=id3tag
-SV_MODULE_VERSION_TEST="mad >= 0.15.0"
+SV_MODULE_VERSION_TEST="id3tag >= 0.15.0"
-SV_MODULE_HEADER=mad.h
+SV_MODULE_HEADER=id3tag.h
-SV_MODULE_LIB=mad
+SV_MODULE_LIB=id3tag
-SV_MODULE_FUNC=mad_decoder_init
+SV_MODULE_FUNC=id3_tag_new
-SV_MODULE_HAVE=HAVE_$(echo mad | tr 'a-z' 'A-Z')
+SV_MODULE_HAVE=HAVE_$(echo id3tag | tr 'a-z' 'A-Z')
 SV_MODULE_FAILED=1
-if test -n "$mad_LIBS" ; then
+if test -n "$id3tag_LIBS" ; then
 { $as_echo "$as_me:${as_lineno-$LINENO}: User set ${SV_MODULE_MODULE}_LIBS explicitly, skipping test for $SV_MODULE_MODULE" >&5
 $as_echo "$as_me: User set ${SV_MODULE_MODULE}_LIBS explicitly, skipping test for $SV_MODULE_MODULE" >&6;}
-CXXFLAGS="$CXXFLAGS $mad_CFLAGS"
+CXXFLAGS="$CXXFLAGS $id3tag_CFLAGS"
-LIBS="$LIBS $mad_LIBS"
+LIBS="$LIBS $id3tag_LIBS"
 SV_MODULE_FAILED=""
 fi
 if test -z "$SV_MODULE_VERSION_TEST" ; then
 SV_MODULE_VERSION_TEST=$SV_MODULE_MODULE
 fi
 if test -n "$SV_MODULE_FAILED" && test -n "$PKG_CONFIG"; then
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for mad" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for id3tag" >&5
-$as_echo_n "checking for mad... " >&6; }
+$as_echo_n "checking for id3tag... " >&6; }
-if test -n "$mad_CFLAGS"; then
+if test -n "$id3tag_CFLAGS"; then
-pkg_cv_mad_CFLAGS="$mad_CFLAGS"
+pkg_cv_id3tag_CFLAGS="$id3tag_CFLAGS"
 elif test -n "$PKG_CONFIG"; then
 if test -n "$PKG_CONFIG" && \
 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$SV_MODULE_VERSION_TEST\""; } >&5
 ($PKG_CONFIG --exists --print-errors "$SV_MODULE_VERSION_TEST") 2>&5
 ac_status=$?
 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
-pkg_cv_mad_CFLAGS=`$PKG_CONFIG --cflags "$SV_MODULE_VERSION_TEST" 2>/dev/null`
+pkg_cv_id3tag_CFLAGS=`$PKG_CONFIG --cflags "$SV_MODULE_VERSION_TEST" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
 fi
 else
 pkg_failed=untried
 fi
-if test -n "$mad_LIBS"; then
+if test -n "$id3tag_LIBS"; then
-pkg_cv_mad_LIBS="$mad_LIBS"
+pkg_cv_id3tag_LIBS="$id3tag_LIBS"
 elif test -n "$PKG_CONFIG"; then
 if test -n "$PKG_CONFIG" && \
 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$SV_MODULE_VERSION_TEST\""; } >&5
 ($PKG_CONFIG --exists --print-errors "$SV_MODULE_VERSION_TEST") 2>&5
 ac_status=$?
 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
-pkg_cv_mad_LIBS=`$PKG_CONFIG --libs "$SV_MODULE_VERSION_TEST" 2>/dev/null`
+pkg_cv_id3tag_LIBS=`$PKG_CONFIG --libs "$SV_MODULE_VERSION_TEST" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
 fi
 else
 _pkg_short_errors_supported=yes
 else
 _pkg_short_errors_supported=no
 fi
 if test $_pkg_short_errors_supported = yes; then
-	        mad_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$SV_MODULE_VERSION_TEST" 2>&1`
+	        id3tag_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$SV_MODULE_VERSION_TEST" 2>&1`
 else
-	        mad_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$SV_MODULE_VERSION_TEST" 2>&1`
+	        id3tag_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$SV_MODULE_VERSION_TEST" 2>&1`
 fi
 	# Put the nasty error message in config.log where it belongs
-	echo "$mad_PKG_ERRORS" >&5
+	echo "$id3tag_PKG_ERRORS" >&5
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5
 $as_echo "$as_me: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&6;}
 elif test $pkg_failed = untried; then
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5
 $as_echo "$as_me: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&6;}
 else
-	mad_CFLAGS=$pkg_cv_mad_CFLAGS
+	id3tag_CFLAGS=$pkg_cv_id3tag_CFLAGS
-	mad_LIBS=$pkg_cv_mad_LIBS
+	id3tag_LIBS=$pkg_cv_id3tag_LIBS
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-	HAVES="$HAVES $SV_MODULE_HAVE";CXXFLAGS="$CXXFLAGS $mad_CFLAGS";LIBS="$LIBS $mad_LIBS";SV_MODULE_FAILED=""
+	HAVES="$HAVES $SV_MODULE_HAVE";CXXFLAGS="$CXXFLAGS $id3tag_CFLAGS";LIBS="$LIBS $id3tag_LIBS";SV_MODULE_FAILED=""
 fi
 fi
 if test -n "$SV_MODULE_FAILED"; then
 as_ac_Header=`$as_echo "ac_cv_header_$SV_MODULE_HEADER" | $as_tr_sh`
 ac_fn_cxx_check_header_mongrel "$LINENO" "$SV_MODULE_HEADER" "$as_ac_Header" "$ac_includes_default"
 fi
 fi
 fi
-SV_MODULE_MODULE=id3tag
+# Link in -lX11 if it exists -- this is for the X error handler
-SV_MODULE_VERSION_TEST="id3tag >= 0.15.0"
-SV_MODULE_HEADER=id3tag.h
+SV_MODULE_MODULE=X11
-SV_MODULE_LIB=id3tag
+SV_MODULE_VERSION_TEST="x11 >= 1.0.0"
-SV_MODULE_FUNC=id3_tag_new
+SV_MODULE_HEADER=X11/X.h
-SV_MODULE_HAVE=HAVE_$(echo id3tag | tr 'a-z' 'A-Z')
+SV_MODULE_LIB=x11
+SV_MODULE_FUNC=XGetErrorText
+SV_MODULE_HAVE=HAVE_$(echo X11 | tr 'a-z' 'A-Z')
 SV_MODULE_FAILED=1
-if test -n "$id3tag_LIBS" ; then
+if test -n "$X11_LIBS" ; then
 { $as_echo "$as_me:${as_lineno-$LINENO}: User set ${SV_MODULE_MODULE}_LIBS explicitly, skipping test for $SV_MODULE_MODULE" >&5
 $as_echo "$as_me: User set ${SV_MODULE_MODULE}_LIBS explicitly, skipping test for $SV_MODULE_MODULE" >&6;}
-CXXFLAGS="$CXXFLAGS $id3tag_CFLAGS"
+CXXFLAGS="$CXXFLAGS $X11_CFLAGS"
-LIBS="$LIBS $id3tag_LIBS"
+LIBS="$LIBS $X11_LIBS"
 SV_MODULE_FAILED=""
 fi
 if test -z "$SV_MODULE_VERSION_TEST" ; then
 SV_MODULE_VERSION_TEST=$SV_MODULE_MODULE
 fi
 if test -n "$SV_MODULE_FAILED" && test -n "$PKG_CONFIG"; then
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for id3tag" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for X11" >&5
-$as_echo_n "checking for id3tag... " >&6; }
+$as_echo_n "checking for X11... " >&6; }
-if test -n "$id3tag_CFLAGS"; then
+if test -n "$X11_CFLAGS"; then
-pkg_cv_id3tag_CFLAGS="$id3tag_CFLAGS"
+pkg_cv_X11_CFLAGS="$X11_CFLAGS"
 elif test -n "$PKG_CONFIG"; then
 if test -n "$PKG_CONFIG" && \
 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$SV_MODULE_VERSION_TEST\""; } >&5
 ($PKG_CONFIG --exists --print-errors "$SV_MODULE_VERSION_TEST") 2>&5
 ac_status=$?
 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
-pkg_cv_id3tag_CFLAGS=`$PKG_CONFIG --cflags "$SV_MODULE_VERSION_TEST" 2>/dev/null`
+pkg_cv_X11_CFLAGS=`$PKG_CONFIG --cflags "$SV_MODULE_VERSION_TEST" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
 fi
 else
 pkg_failed=untried
 fi
-if test -n "$id3tag_LIBS"; then
+if test -n "$X11_LIBS"; then
-pkg_cv_id3tag_LIBS="$id3tag_LIBS"
+pkg_cv_X11_LIBS="$X11_LIBS"
 elif test -n "$PKG_CONFIG"; then
 if test -n "$PKG_CONFIG" && \
 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$SV_MODULE_VERSION_TEST\""; } >&5
 ($PKG_CONFIG --exists --print-errors "$SV_MODULE_VERSION_TEST") 2>&5
 ac_status=$?
 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
-pkg_cv_id3tag_LIBS=`$PKG_CONFIG --libs "$SV_MODULE_VERSION_TEST" 2>/dev/null`
+pkg_cv_X11_LIBS=`$PKG_CONFIG --libs "$SV_MODULE_VERSION_TEST" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
 fi
 else
 _pkg_short_errors_supported=yes
 else
 _pkg_short_errors_supported=no
 fi
 if test $_pkg_short_errors_supported = yes; then
-	        id3tag_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$SV_MODULE_VERSION_TEST" 2>&1`
+	        X11_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$SV_MODULE_VERSION_TEST" 2>&1`
 else
-	        id3tag_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$SV_MODULE_VERSION_TEST" 2>&1`
+	        X11_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$SV_MODULE_VERSION_TEST" 2>&1`
 fi
 	# Put the nasty error message in config.log where it belongs
-	echo "$id3tag_PKG_ERRORS" >&5
+	echo "$X11_PKG_ERRORS" >&5
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5
 $as_echo "$as_me: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&6;}
 elif test $pkg_failed = untried; then
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5
 $as_echo "$as_me: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&6;}
 else
-	id3tag_CFLAGS=$pkg_cv_id3tag_CFLAGS
+	X11_CFLAGS=$pkg_cv_X11_CFLAGS
-	id3tag_LIBS=$pkg_cv_id3tag_LIBS
+	X11_LIBS=$pkg_cv_X11_LIBS
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-	HAVES="$HAVES $SV_MODULE_HAVE";CXXFLAGS="$CXXFLAGS $id3tag_CFLAGS";LIBS="$LIBS $id3tag_LIBS";SV_MODULE_FAILED=""
+	HAVES="$HAVES $SV_MODULE_HAVE";CXXFLAGS="$CXXFLAGS $X11_CFLAGS";LIBS="$LIBS $X11_LIBS";SV_MODULE_FAILED=""
 fi
 fi
 if test -n "$SV_MODULE_FAILED"; then
 as_ac_Header=`$as_echo "ac_cv_header_$SV_MODULE_HEADER" | $as_tr_sh`
 ac_fn_cxx_check_header_mongrel "$LINENO" "$SV_MODULE_HEADER" "$as_ac_Header" "$ac_includes_default"
 fi
 fi
 fi
-# Link in -lX11 if it exists -- this is for the X error handler
-SV_MODULE_MODULE=X11
-SV_MODULE_VERSION_TEST="x11 >= 1.0.0"
-SV_MODULE_HEADER=X11/X.h
-SV_MODULE_LIB=x11
-SV_MODULE_FUNC=XGetErrorText
-SV_MODULE_HAVE=HAVE_$(echo X11 | tr 'a-z' 'A-Z')
-SV_MODULE_FAILED=1
-if test -n "$X11_LIBS" ; then
-{ $as_echo "$as_me:${as_lineno-$LINENO}: User set ${SV_MODULE_MODULE}_LIBS explicitly, skipping test for $SV_MODULE_MODULE" >&5
-$as_echo "$as_me: User set ${SV_MODULE_MODULE}_LIBS explicitly, skipping test for $SV_MODULE_MODULE" >&6;}
-CXXFLAGS="$CXXFLAGS $X11_CFLAGS"
-LIBS="$LIBS $X11_LIBS"
-SV_MODULE_FAILED=""
-fi
-if test -z "$SV_MODULE_VERSION_TEST" ; then
-SV_MODULE_VERSION_TEST=$SV_MODULE_MODULE
-fi
-if test -n "$SV_MODULE_FAILED" && test -n "$PKG_CONFIG"; then
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for X11" >&5
-$as_echo_n "checking for X11... " >&6; }
-if test -n "$X11_CFLAGS"; then
-pkg_cv_X11_CFLAGS="$X11_CFLAGS"
-elif test -n "$PKG_CONFIG"; then
-if test -n "$PKG_CONFIG" && \
-{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$SV_MODULE_VERSION_TEST\""; } >&5
-($PKG_CONFIG --exists --print-errors "$SV_MODULE_VERSION_TEST") 2>&5
-ac_status=$?
-$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-test $ac_status = 0; }; then
-pkg_cv_X11_CFLAGS=`$PKG_CONFIG --cflags "$SV_MODULE_VERSION_TEST" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
-else
-pkg_failed=yes
-fi
-else
-pkg_failed=untried
-fi
-if test -n "$X11_LIBS"; then
-pkg_cv_X11_LIBS="$X11_LIBS"
-elif test -n "$PKG_CONFIG"; then
-if test -n "$PKG_CONFIG" && \
-{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$SV_MODULE_VERSION_TEST\""; } >&5
-($PKG_CONFIG --exists --print-errors "$SV_MODULE_VERSION_TEST") 2>&5
-ac_status=$?
-$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-test $ac_status = 0; }; then
-pkg_cv_X11_LIBS=`$PKG_CONFIG --libs "$SV_MODULE_VERSION_TEST" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
-else
-pkg_failed=yes
-fi
-else
-pkg_failed=untried
-fi
-if test $pkg_failed = yes; then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-_pkg_short_errors_supported=yes
-else
-_pkg_short_errors_supported=no
-fi
-if test $_pkg_short_errors_supported = yes; then
-	        X11_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$SV_MODULE_VERSION_TEST" 2>&1`
-else
-	        X11_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$SV_MODULE_VERSION_TEST" 2>&1`
-fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$X11_PKG_ERRORS" >&5
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5
-$as_echo "$as_me: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&6;}
-elif test $pkg_failed = untried; then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5
-$as_echo "$as_me: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&6;}
-else
-	X11_CFLAGS=$pkg_cv_X11_CFLAGS
-	X11_LIBS=$pkg_cv_X11_LIBS
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-	HAVES="$HAVES $SV_MODULE_HAVE";CXXFLAGS="$CXXFLAGS $X11_CFLAGS";LIBS="$LIBS $X11_LIBS";SV_MODULE_FAILED=""
-fi
-fi
-if test -n "$SV_MODULE_FAILED"; then
-as_ac_Header=`$as_echo "ac_cv_header_$SV_MODULE_HEADER" | $as_tr_sh`
-ac_fn_cxx_check_header_mongrel "$LINENO" "$SV_MODULE_HEADER" "$as_ac_Header" "$ac_includes_default"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
-HAVES="$HAVES $SV_MODULE_HAVE";SV_MODULE_FAILED=""
-else
-{ $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find header $SV_MODULE_HEADER for optional module $SV_MODULE_MODULE" >&5
-$as_echo "$as_me: Failed to find header $SV_MODULE_HEADER for optional module $SV_MODULE_MODULE" >&6;}
-fi
-if test -z "$SV_MODULE_FAILED"; then
-if test -n "$SV_MODULE_LIB"; then
-as_ac_Lib=`$as_echo "ac_cv_lib_$SV_MODULE_LIB''_$SV_MODULE_FUNC" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $SV_MODULE_FUNC in -l$SV_MODULE_LIB" >&5
-$as_echo_n "checking for $SV_MODULE_FUNC in -l$SV_MODULE_LIB... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
-$as_echo_n "(cached) " >&6
-else
-ac_check_lib_save_LIBS=$LIBS
-LIBS="-l$SV_MODULE_LIB  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-/* Override any GCC internal prototype to avoid an error.
-Use char because int might match the return type of a GCC
-builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $SV_MODULE_FUNC ();
-int
-main ()
-{
-return $SV_MODULE_FUNC ();
-;
-return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
-eval "$as_ac_Lib=yes"
-else
-eval "$as_ac_Lib=no"
-fi
-rm -f core conftest.err conftest.$ac_objext \
-conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-eval ac_res=\$$as_ac_Lib
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
-LIBS="$LIBS -l$SV_MODULE_LIB"
-else
-{ $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find library $SV_MODULE_LIB for optional module $SV_MODULE_MODULE" >&5
-$as_echo "$as_me: Failed to find library $SV_MODULE_LIB for optional module $SV_MODULE_MODULE" >&6;}
-fi
-fi
-fi
-fi

Mercurial > hg > sonic-visualiser

comparison configure @ 560:358541da1cd8