$NetBSD: patch-ab,v 1.5 2007/01/13 09:18:21 wiz Exp $ --- configure.orig 2007-01-13 09:14:05.000000000 +0000 +++ configure @@ -27646,7 +27646,7 @@ rm -f conftest.mmap -if test "x$ac_cv_func_mmap_fixed_mapped" == "xyes"; then +if test "x$ac_cv_func_mmap_fixed_mapped" = "xyes"; then GST_HAVE_MMAP_TRUE= GST_HAVE_MMAP_FALSE='#' else @@ -29541,7 +29541,7 @@ rm -f core conftest.err conftest.$ac_obj echo "${ECHO_T}$flag_ok" >&6; } - if test "x$ERROR_CFLAGS" == "x" + if test "x$ERROR_CFLAGS" = "x" then { echo "$as_me:$LINENO: checking to see if compiler understands -errwarn=%all,no%E_EMPTY_DECLARATION,no%E_STATEMENT_NOT_REACHED" >&5 @@ -29621,7 +29621,7 @@ rm -f core conftest.err conftest.$ac_obj echo "${ECHO_T}$flag_ok" >&6; } - if test "x$ERROR_CFLAGS" == "x" + if test "x$ERROR_CFLAGS" = "x" then { echo "$as_me:$LINENO: checking to see if compiler understands -errwarn=%all" >&5 @@ -35186,9 +35186,9 @@ if test x$USE_FLAC = xyes; then HAVE_FLAC=no - { echo "$as_me:$LINENO: checking for FLAC__seekable_stream_encoder_new in -lFLAC" >&5 -echo $ECHO_N "checking for FLAC__seekable_stream_encoder_new in -lFLAC... $ECHO_C" >&6; } -if test "${ac_cv_lib_FLAC_FLAC__seekable_stream_encoder_new+set}" = set; then + { echo "$as_me:$LINENO: checking for FLAC__stream_encoder_new in -lFLAC" >&5 +echo $ECHO_N "checking for FLAC__stream_encoder_new in -lFLAC... $ECHO_C" >&6; } +if test "${ac_cv_lib_FLAC_FLAC__stream_encoder_new+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS @@ -35206,11 +35206,11 @@ cat >>conftest.$ac_ext <<_ACEOF #ifdef __cplusplus extern "C" #endif -char FLAC__seekable_stream_encoder_new (); +char FLAC__stream_encoder_new (); int main () { -return FLAC__seekable_stream_encoder_new (); +return FLAC__stream_encoder_new (); ; return 0; } @@ -35249,21 +35249,21 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_lib_FLAC_FLAC__seekable_stream_encoder_new=yes + ac_cv_lib_FLAC_FLAC__stream_encoder_new=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_lib_FLAC_FLAC__seekable_stream_encoder_new=no + ac_cv_lib_FLAC_FLAC__stream_encoder_new=no fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_FLAC_FLAC__seekable_stream_encoder_new" >&5 -echo "${ECHO_T}$ac_cv_lib_FLAC_FLAC__seekable_stream_encoder_new" >&6; } -if test $ac_cv_lib_FLAC_FLAC__seekable_stream_encoder_new = yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_lib_FLAC_FLAC__stream_encoder_new" >&5 +echo "${ECHO_T}$ac_cv_lib_FLAC_FLAC__stream_encoder_new" >&6; } +if test $ac_cv_lib_FLAC_FLAC__stream_encoder_new = yes; then HAVE_FLAC=yes else HAVE_FLAC=no @@ -35443,9 +35443,9 @@ fi if test x$HAVE_FLAC = xyes; then - { echo "$as_me:$LINENO: checking whether FLAC__SEEKABLE_STREAM_ENCODER_TELL_ERROR is declared" >&5 -echo $ECHO_N "checking whether FLAC__SEEKABLE_STREAM_ENCODER_TELL_ERROR is declared... $ECHO_C" >&6; } -if test "${ac_cv_have_decl_FLAC__SEEKABLE_STREAM_ENCODER_TELL_ERROR+set}" = set; then + { echo "$as_me:$LINENO: checking whether FLAC__STREAM_ENCODER_TELL_STATUS_ERROR is declared" >&5 +echo $ECHO_N "checking whether FLAC__STREAM_ENCODER_TELL_STATUS_ERROR is declared... $ECHO_C" >&6; } +if test "${ac_cv_have_decl_FLAC__STREAM_ENCODER_TELL_STATUS_ERROR+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -35455,14 +35455,14 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include +#include int main () { -#ifndef FLAC__SEEKABLE_STREAM_ENCODER_TELL_ERROR - char *p = (char *) FLAC__SEEKABLE_STREAM_ENCODER_TELL_ERROR; +#ifndef FLAC__STREAM_ENCODER_TELL_STATUS_ERROR + char *p = (char *) FLAC__STREAM_ENCODER_TELL_STATUS_ERROR; return !p; #endif @@ -35504,19 +35504,19 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_have_decl_FLAC__SEEKABLE_STREAM_ENCODER_TELL_ERROR=yes + ac_cv_have_decl_FLAC__STREAM_ENCODER_TELL_STATUS_ERROR=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_have_decl_FLAC__SEEKABLE_STREAM_ENCODER_TELL_ERROR=no + ac_cv_have_decl_FLAC__STREAM_ENCODER_TELL_STATUS_ERROR=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_FLAC__SEEKABLE_STREAM_ENCODER_TELL_ERROR" >&5 -echo "${ECHO_T}$ac_cv_have_decl_FLAC__SEEKABLE_STREAM_ENCODER_TELL_ERROR" >&6; } -if test $ac_cv_have_decl_FLAC__SEEKABLE_STREAM_ENCODER_TELL_ERROR = yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_FLAC__STREAM_ENCODER_TELL_STATUS_ERROR" >&5 +echo "${ECHO_T}$ac_cv_have_decl_FLAC__STREAM_ENCODER_TELL_STATUS_ERROR" >&6; } +if test $ac_cv_have_decl_FLAC__STREAM_ENCODER_TELL_STATUS_ERROR = yes; then HAVE_FLAC="yes" else HAVE_FLAC="no"