Patch 1: For apr-util/Makefile.in - Remove 'test' from SUBDIRS. 'make
clean' now works with this.

Patch 2: Add <strings.h> for various apr files. This cleans up all
apr compile warnings on Solaris (at least when compiling without -Wall).

/dale

--- /local/src/apache-dev/httpd-2.0/srclib/apr-util/Makefile.in.orig    Wed Dec 
20 18:23:42 2000
+++ /local/src/apache-dev/httpd-2.0/srclib/apr-util/Makefile.in Wed Dec 20 
18:23:51 2000
@@ -10,7 +10,7 @@
 top_builddir = @top_builddir@
 include $(top_builddir)/build/rules.mk
 
-SUBDIRS = src . test build
+SUBDIRS = src . build
 
 CLEAN_TARGETS = $(TARGET_EXPORTS)
 DISTCLEAN_TARGETS = config.cache config.log config.status config.sub \
--- apr/i18n/unix/xlate.c.orig  Wed Dec 20 19:38:25 2000
+++ apr/i18n/unix/xlate.c       Wed Dec 20 19:39:02 2000
@@ -67,6 +67,9 @@
 #ifdef HAVE_STDDEF_H
 #include <stddef.h> /* for NULL */
 #endif
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
+#endif
 #ifdef HAVE_LANGINFO_H
 #include <langinfo.h>
 #endif

--- apr/strings/apr_strings.c.orig      Wed Dec 20 19:28:40 2000
+++ apr/strings/apr_strings.c   Wed Dec 20 19:34:15 2000
@@ -59,6 +59,9 @@
 #ifdef HAVE_STDDEF_H
 #include <stddef.h> /* NULL */
 #endif
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
+#endif
 
 APR_DECLARE(char *) apr_pstrdup(apr_pool_t *a, const char *s)
 {

--- apr/passwd/apr_getpass.c.orig       Wed Dec 20 19:34:43 2000
+++ apr/passwd/apr_getpass.c    Wed Dec 20 19:35:25 2000
@@ -73,6 +73,9 @@
 #if HAVE_STDLIB_H
 #include <stdlib.h>
 #endif
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
+#endif
 
 #if defined(HAVE_TERMIOS_H) && !defined(HAVE_GETPASS)
 #include <termios.h>

--- apr/misc/unix/getuuid.c.orig        Wed Dec 20 19:36:43 2000
+++ apr/misc/unix/getuuid.c     Wed Dec 20 19:37:33 2000
@@ -66,6 +66,9 @@
 #include "apr_uuid.h"
 #include "apr_md5.h"
 #include "apr_general.h"
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
+#endif
 #ifdef HAVE_NETDB_H
 #include <netdb.h>
 #endif

Reply via email to