dreid 99/12/19 10:10:05
Modified: src/lib/apr configure.in
src/lib/apr/file_io/beos Makefile.in
src/lib/apr/lib Makefile.in apr_md5.c
src/lib/apr/misc/beos Makefile.in
src/lib/apr/mmap/beos Makefile.in
src/lib/apr/network_io/beos Makefile.in
src/lib/apr/test Makefile.in
src/lib/apr/threadproc/beos Makefile.in
src/lib/apr/time/unix Makefile.in
Log:
The compiler for PowerPC versions of BeOS is about as pedantic as
I've ever seen so this set of patches gets it working with no
niggles. The autoconf also gives answers that don't work so these
are set to get around this problem.
Revision Changes Path
1.36 +5 -0 apache-2.0/src/lib/apr/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/configure.in,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- configure.in 1999/12/14 18:11:06 1.35
+++ configure.in 1999/12/19 18:09:59 1.36
@@ -35,6 +35,11 @@
dnl # combinations
case "$OS:$CC" in
*-hp-hpux*:cc ) CFLAGS="$CFLAGS -Ae +DAportable" ;;
+ powerpc-*-beos:mwcc* )
+ CPP="mwcc -E"
+ CC="mwcc"
+ AR="ar"
+ ;;
esac
1.8 +2 -3 apache-2.0/src/lib/apr/file_io/beos/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/beos/Makefile.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Makefile.in 1999/12/12 17:08:42 1.7
+++ Makefile.in 1999/12/19 18:10:00 1.8
@@ -9,9 +9,8 @@
[EMAIL PROTECTED]@ @OPTIM@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@ $(LIBS)
-INCDIR=../../inc
-INCDIR1=../../include -I../unix
-INCLUDES=-I$(INCDIR) -I$(INCDIR1) -I.
+INCDIR=../../include -I../unix
+INCLUDES=-I$(INCDIR) -I.
LIB=libfile.a
1.8 +3 -4 apache-2.0/src/lib/apr/lib/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/lib/Makefile.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Makefile.in 1999/12/03 15:18:26 1.7
+++ Makefile.in 1999/12/19 18:10:01 1.8
@@ -10,10 +10,9 @@
[EMAIL PROTECTED]@ @OPTIM@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@ $(LIBS)
-INCDIR=../inc
-INCDIR1=../include
-INCDIR2=../misc/@OSDIR@
-INCLUDES=-I$(INCDIR) -I$(INCDIR1) -I$(INCDIR2)
+INCDIR=../include
+INCDIR1=../misc/@OSDIR@
+INCLUDES=-I$(INCDIR) -I$(INCDIR1)
[EMAIL PROTECTED]@apr.a
1.6 +1 -1 apache-2.0/src/lib/apr/lib/apr_md5.c
Index: apr_md5.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/lib/apr_md5.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- apr_md5.c 1999/12/02 17:05:39 1.5
+++ apr_md5.c 1999/12/19 18:10:01 1.6
@@ -606,7 +606,7 @@
/*
* It's not our algorithm, so feed it to crypt() if possible.
*/
-#ifdef WIN32
+#if defined(WIN32) || defined(BEOS)
ap_cpystrn(sample, passwd, sizeof(sample) - 1);
#else
crypt_pw = crypt(passwd, hash);
1.6 +3 -4 apache-2.0/src/lib/apr/misc/beos/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/misc/beos/Makefile.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Makefile.in 1999/12/12 17:08:44 1.5
+++ Makefile.in 1999/12/19 18:10:02 1.6
@@ -8,10 +8,9 @@
[EMAIL PROTECTED]@ @OPTIM@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@ $(LIBS)
-INCDIR=../../inc
-INCDIR1=../../include
-INCDIR2=../../file_io/unix
-INCLUDES=-I$(INCDIR) -I$(INCDIR1) -I$(INCDIR2) -I.
+INCDIR=../../include
+INCDIR1=../../file_io/unix
+INCLUDES=-I$(INCDIR) -I$(INCDIR1) -I.
LIB=libmisc.a
1.5 +2 -3 apache-2.0/src/lib/apr/mmap/beos/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/mmap/beos/Makefile.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Makefile.in 1999/12/12 17:08:47 1.4
+++ Makefile.in 1999/12/19 18:10:02 1.5
@@ -9,9 +9,8 @@
[EMAIL PROTECTED]@ @OPTIM@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@ $(LIBS)
-INCDIR=../../inc
-INCDIR1=../../include -I../../file_io/unix
-INCLUDES=-I$(INCDIR) -I$(INCDIR1) -I.
+INCDIR=../../include -I../../file_io/unix
+INCLUDES=-I$(INCDIR) -I.
LIB=libmmap.a
1.6 +2 -3 apache-2.0/src/lib/apr/network_io/beos/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/beos/Makefile.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Makefile.in 1999/11/02 11:30:37 1.5
+++ Makefile.in 1999/12/19 18:10:03 1.6
@@ -8,9 +8,8 @@
[EMAIL PROTECTED]@ @OPTIM@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@ $(LIBS)
-INCDIR=../../inc
-INCDIR1=../../include -I../../file_io/unix
-INCLUDES=-I$(INCDIR) -I$(INCDIR1) -I.
+INCDIR=../../include -I../../file_io/unix
+INCLUDES=-I$(INCDIR) -I.
LIB=libnetwork.a
1.10 +1 -2 apache-2.0/src/lib/apr/test/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/test/Makefile.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Makefile.in 1999/11/22 13:48:05 1.9
+++ Makefile.in 1999/12/19 18:10:04 1.10
@@ -11,8 +11,7 @@
LIBS=-L.. -lapr @LIBS@
[EMAIL PROTECTED]@ $(LIBS)
INCDIR=../include
-INCDIR1=../../inc
-INCLUDES=-I$(INCDIR) -I$(INCDIR1)
+INCLUDES=-I$(INCDIR)
TARGETS= [EMAIL PROTECTED]@ \
[EMAIL PROTECTED]@ \
1.6 +3 -4 apache-2.0/src/lib/apr/threadproc/beos/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/beos/Makefile.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Makefile.in 1999/11/02 11:30:38 1.5
+++ Makefile.in 1999/12/19 18:10:04 1.6
@@ -8,10 +8,9 @@
[EMAIL PROTECTED]@ @OPTIM@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@ $(LIBS)
-INCDIR=../../inc
-INCDIR1=../../include
-INCDIR2=../../file_io/unix
-INCLUDES=-I$(INCDIR) -I$(INCDIR1) -I$(INCDIR2) -I.
+INCDIR=../../include
+INCDIR1=../../file_io/unix
+INCLUDES=-I$(INCDIR) -I$(INCDIR1) -I.
LIB=libthreadproc.a
1.7 +2 -3 apache-2.0/src/lib/apr/time/unix/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/time/unix/Makefile.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Makefile.in 1999/12/03 15:18:48 1.6
+++ Makefile.in 1999/12/19 18:10:05 1.7
@@ -9,9 +9,8 @@
[EMAIL PROTECTED]@ @OPTIM@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@ $(LIBS)
-INCDIR=../../inc
-INCDIR1=../../include
-INCLUDES=-I$(INCDIR) -I$(INCDIR1) -I.
+INCDIR=../../include
+INCLUDES=-I$(INCDIR) -I.
LIB=libtime.a
