$NetBSD: patch-ab,v 1.7 2007/01/13 21:58:24 wiz Exp $

--- configure.orig	2006-04-28 19:53:45.000000000 +0000
+++ configure
@@ -6484,9 +6484,9 @@ else
 fi;
 
   if test "$with_flac" != "no"; then
-    echo "$as_me:$LINENO: checking for FLAC__seekable_stream_decoder_new in -lFLAC" >&5
-echo $ECHO_N "checking for FLAC__seekable_stream_decoder_new in -lFLAC... $ECHO_C" >&6
-if test "${ac_cv_lib_FLAC_FLAC__seekable_stream_decoder_new+set}" = set; then
+    echo "$as_me:$LINENO: checking for FLAC__stream_decoder_new in -lFLAC" >&5
+echo $ECHO_N "checking for FLAC__stream_decoder_new in -lFLAC... $ECHO_C" >&6
+if test "${ac_cv_lib_FLAC_FLAC__stream_decoder_new+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -6504,11 +6504,11 @@ extern "C"
 #endif
 /* We use char because int might match the return type of a gcc2
    builtin and then its argument prototype would still apply.  */
-char FLAC__seekable_stream_decoder_new ();
+char FLAC__stream_decoder_new ();
 int
 main ()
 {
-FLAC__seekable_stream_decoder_new ();
+FLAC__stream_decoder_new ();
   ;
   return 0;
 }
@@ -6534,20 +6534,20 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_cv_lib_FLAC_FLAC__seekable_stream_decoder_new=yes
+  ac_cv_lib_FLAC_FLAC__stream_decoder_new=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_lib_FLAC_FLAC__seekable_stream_decoder_new=no
+ac_cv_lib_FLAC_FLAC__stream_decoder_new=no
 fi
 rm -f 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_decoder_new" >&5
-echo "${ECHO_T}$ac_cv_lib_FLAC_FLAC__seekable_stream_decoder_new" >&6
-if test $ac_cv_lib_FLAC_FLAC__seekable_stream_decoder_new = yes; then
+echo "$as_me:$LINENO: result: $ac_cv_lib_FLAC_FLAC__stream_decoder_new" >&5
+echo "${ECHO_T}$ac_cv_lib_FLAC_FLAC__stream_decoder_new" >&6
+if test $ac_cv_lib_FLAC_FLAC__stream_decoder_new = yes; then
    FLAC_LIBS="-lFLAC -lm"
                    flac_found=yes
 else
@@ -6669,9 +6669,9 @@ fi
 
   fi
   if test x"$flac_found" = xyes ; then
-    echo "$as_me:$LINENO: checking for FLAC__seekable_stream_decoder_skip_single_frame in -lFLAC" >&5
-echo $ECHO_N "checking for FLAC__seekable_stream_decoder_skip_single_frame in -lFLAC... $ECHO_C" >&6
-if test "${ac_cv_lib_FLAC_FLAC__seekable_stream_decoder_skip_single_frame+set}" = set; then
+    echo "$as_me:$LINENO: checking for FLAC__stream_decoder_skip_single_frame in -lFLAC" >&5
+echo $ECHO_N "checking for FLAC__stream_decoder_skip_single_frame in -lFLAC... $ECHO_C" >&6
+if test "${ac_cv_lib_FLAC_FLAC__stream_decoder_skip_single_frame+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -6689,11 +6689,11 @@ extern "C"
 #endif
 /* We use char because int might match the return type of a gcc2
    builtin and then its argument prototype would still apply.  */
-char FLAC__seekable_stream_decoder_skip_single_frame ();
+char FLAC__stream_decoder_skip_single_frame ();
 int
 main ()
 {
-FLAC__seekable_stream_decoder_skip_single_frame ();
+FLAC__stream_decoder_skip_single_frame ();
   ;
   return 0;
 }
@@ -6719,20 +6719,20 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_cv_lib_FLAC_FLAC__seekable_stream_decoder_skip_single_frame=yes
+  ac_cv_lib_FLAC_FLAC__stream_decoder_skip_single_frame=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_lib_FLAC_FLAC__seekable_stream_decoder_skip_single_frame=no
+ac_cv_lib_FLAC_FLAC__stream_decoder_skip_single_frame=no
 fi
 rm -f 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_decoder_skip_single_frame" >&5
-echo "${ECHO_T}$ac_cv_lib_FLAC_FLAC__seekable_stream_decoder_skip_single_frame" >&6
-if test $ac_cv_lib_FLAC_FLAC__seekable_stream_decoder_skip_single_frame = yes; then
+echo "$as_me:$LINENO: result: $ac_cv_lib_FLAC_FLAC__stream_decoder_skip_single_frame" >&5
+echo "${ECHO_T}$ac_cv_lib_FLAC_FLAC__stream_decoder_skip_single_frame" >&6
+if test $ac_cv_lib_FLAC_FLAC__stream_decoder_skip_single_frame = yes; then
    flac_decoder_skip_found=yes
 else
    flac_decoder_skip_found=no
@@ -8620,7 +8620,7 @@ if test "${ac_cv_lib_magic_magic_open+se
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lmagic  $LIBS"
+LIBS="-lmagic -lz $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -8678,7 +8678,7 @@ fi
 echo "$as_me:$LINENO: result: $ac_cv_lib_magic_magic_open" >&5
 echo "${ECHO_T}$ac_cv_lib_magic_magic_open" >&6
 if test $ac_cv_lib_magic_magic_open = yes; then
-   MAGIC_LIBS="-lmagic"
+   MAGIC_LIBS="-lmagic -lz"
 fi