--- configure.orig	2003-03-02 00:23:00 UTC
+++ configure
@@ -9134,6 +9134,7 @@ if test x$ac_cv_lib_z_uncompress = xno; then
 else
   ID3_NEEDZLIB_TRUE='#'
   ID3_NEEDZLIB_FALSE=
+  LIBS="-lz $LIBS"
 fi
 
 
@@ -9730,14 +9731,13 @@ fi
   if test ! x$silent = xyes; then
     exec 6>&1
   fi
-  #standalone library rules over libc
-  if test $iconv_in_iconv = 1 -o $libiconv_in_iconv = 1; then
+  if test $iconv_in_libc = 1; then
+    echo "$as_me:$LINENO: result: libc" >&5
+echo "${ECHO_T}libc" >&6
+  elif test $iconv_in_iconv = 1 -o $libiconv_in_iconv = 1; then
     echo "$as_me:$LINENO: result: libiconv" >&5
 echo "${ECHO_T}libiconv" >&6
     ICONV_LIB=-liconv
-  elif test $iconv_in_libc = 1; then
-    echo "$as_me:$LINENO: result: libc" >&5
-echo "${ECHO_T}libc" >&6
   else
     echo "$as_me:$LINENO: result: not found (panic)" >&5
 echo "${ECHO_T}not found (panic)" >&6
@@ -10296,7 +10296,7 @@ done
 
 for ac_header in \
   string                        \
-  iomanip.h                     \
+  iomanip                     \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`