Folks,

I'd like to commit this small patch that allows "make test" to work
correctly on BeOS.  I know we've talked about going down the libtool route
but until then this just makes peoples lives easier on BeOS.  Any
objections?

david

Index: configure.in
===================================================================
RCS file: /home/cvs/apr/configure.in,v
retrieving revision 1.197
diff -u -r1.197 configure.in
--- configure.in        2000/12/30 20:56:34     1.197
+++ configure.in        2001/01/02 01:30:06
@@ -47,6 +47,7 @@
 AC_PROG_AWK
 AC_CHECK_PROG(RM, rm, rm)
 AC_CHECK_TOOL(AR, ar, ar)
+SO_LDFLAG="-shared"

 # This macro needs to be here in case we are on an AIX box.
 AC_AIX
@@ -105,6 +106,7 @@
        USE_MM=yes
        AC_CHECK_DEFINE(BONE_VERSION, sys/socket.h)
        eolstr="\\n"
+       SO_LDFLAG="-nostart"
        ;;
    *os390)
        OSDIR="os390"
@@ -121,6 +123,7 @@
 esac

 AC_SUBST(eolstr)
+AC_SUBST(SO_LDFLAG)


Index: test/Makefile.in
===================================================================
RCS file: /home/cvs/apr/test/Makefile.in,v
retrieving revision 1.32
diff -u -r1.32 Makefile.in
--- test/Makefile.in    2000/12/07 02:58:16     1.32
+++ test/Makefile.in    2001/01/02 01:30:14
@@ -7,6 +7,7 @@
 INCDIR=../include
 INCLUDES=-I$(INCDIR)
 MKDEP=../helpers/mkdep.sh
[EMAIL PROTECTED]@

 TARGETS= [EMAIL PROTECTED]@ \
        [EMAIL PROTECTED]@ \
@@ -61,10 +62,10 @@
        $(CC) $(CFLAGS) -o [EMAIL PROTECTED]@ testoc.o $(LDFLAGS)

 occhild.so: occhild.o
-       $(CC) -shared occhild.o -o occhild.so
+       $(CC) $(SO_LDFLAG) occhild.o -o occhild.so

 mod_test.so: mod_test.o
-       $(CC) -shared mod_test.o -o mod_test.so
+       $(CC) $(SO_LDFLAG) mod_test.o -o mod_test.so

 [EMAIL PROTECTED]@: testargs.o
        $(CC) $(CFLAGS) -o [EMAIL PROTECTED]@ testargs.o $(LDFLAGS)


Reply via email to