cvs commit: apr/test Makefile.in

[dr...@apache.org]

dreid       01/01/01 18:20:18

  Modified:    .        configure.in
               test     Makefile.in
  Log:
  Allow the tests that use shared objects to run on BeOS.  This is
  intended only as a stop gap until we libtool APR.
  
  Revision  Changes    Path
  1.198     +3 -0      apr/configure.in
  
  Index: configure.in
  ===================================================================
  RCS file: /home/cvs/apr/configure.in,v
  retrieving revision 1.197
  retrieving revision 1.198
  diff -u -r1.197 -r1.198
  --- configure.in	2000/12/30 20:56:34	1.197
  +++ configure.in	2001/01/02 02:20:17	1.198
  @@ -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)
   
   dnl #----------------------------- Checking for Shared Memory Support 
   echo $ac_n "${nl}Checking for Shared Memory Support...${nl}"
  
  
  
  1.33      +3 -2      apr/test/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apr/test/Makefile.in,v
  retrieving revision 1.32
  retrieving revision 1.33
  diff -u -r1.32 -r1.33
  --- Makefile.in	2000/12/07 02:58:16	1.32
  +++ Makefile.in	2001/01/02 02:20:18	1.33
  @@ -7,6 +7,7 @@
   INCDIR=../include
   INCLUDES=-I$(INCDIR)
   MKDEP=../helpers/mkdep.sh
  +SO_LDFLAG=@SO_LDFLAG@
   
   TARGETS= client@EXEEXT@ \
   	sendfile@EXEEXT@ \
  @@ -61,10 +62,10 @@
   	$(CC) $(CFLAGS) -o testoc@EXEEXT@ 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 
   
   testargs@EXEEXT@: testargs.o
   	$(CC) $(CFLAGS) -o testargs@EXEEXT@ testargs.o $(LDFLAGS)