--- configure.in.orig	Fri Nov  3 19:29:51 2000
+++ configure.in	Fri Nov  3 19:29:28 2000
@@ -143,7 +143,7 @@
 )
 AC_LANG_SAVE
 AC_LANG_CPLUSPLUS
-AC_CHECK_HEADER(iostream.h iomanip.h)
+AC_CHECK_HEADERS(iostream.h iomanip.h)
 
 dnl Check for functions.
 AC_FUNC_MEMCMP
--- Makefile.am.orig	Fri Nov  3 19:29:40 2000
+++ Makefile.am	Fri Nov  3 19:30:12 2000
@@ -32,7 +32,7 @@
 popt_subdir = 
 endif
 
-SUBDIRS =  . m4 $(popt_subdir) $(zlib_subdir) doc include src examples
+SUBDIRS =  . m4 doc include src examples
 DIST_SUBDIRS = . m4 popt zlib doc include src examples
 
 INCLUDES = @ID3LIB_DEBUG_FLAGS@
