Build fixes from Lars Hecking.

diff --git a/imap/Makefile.am b/imap/Makefile.am
index 03b42d4260e933ebae25355508c1854b88642e44..85e8b12445eb6cdb6e1d068ec0f9f96b9730299c 100644 (file)
--- a/imap/Makefile.am
+++ b/imap/Makefile.am
@@ -4,6 +4,8 @@ AUTOMAKE_OPTIONS = foreign
 
 EXTRA_DIST = BUGS TODO
 
+AM_CPPFLAGS = -I../intl
+
 noinst_LIBRARIES = libimap.a
 noinst_HEADERS = imap_private.h imap_socket.h md5.h message.h
 

diff --git a/makedoc.c b/makedoc.c
index 0cddffe608b1676b1773e81e47e95bd18668decf..fab1bd46e6235208c9ad91312cc0219e9e2b6933 100644 (file)
--- a/makedoc.c
+++ b/makedoc.c
@@ -45,6 +45,17 @@
 # include <getopt.h>
 #endif
 
+#ifndef HAVE_STRERROR
+#ifndef STDC_HEADERS
+extern int sys_nerr;
+extern char *sys_errlist[];
+#endif
+
+#define strerror(x) ((x) > 0 && (x) < sys_nerr) ? sys_errlist[(x)] : 0
+#endif /* !HAVE_STRERROR */
+
+extern int optind;
+
 #define BUFFSIZE 2048
 
 enum output_formats_t