apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dr...@apache.org
Subject cvs commit: apr/test Makefile.in
Date Sun, 13 May 2001 10:50:08 GMT
dreid       01/05/13 03:50:08

  Modified:    include/arch/unix fileio.h
               .        configure.in
               test     Makefile.in
  Log:
  2 small changes...
  - change some defines and add an extra one (BONE7) so we build again on the
    latest BeOS beta.
  - Make the inclusion of libmm optional for the test directory so it's
    possible to build on beos and os2 with no changes required.
  Basically some cleanups..
  
  Revision  Changes    Path
  1.34      +8 -4      apr/include/arch/unix/fileio.h
  
  Index: fileio.h
  ===================================================================
  RCS file: /home/cvs/apr/include/arch/unix/fileio.h,v
  retrieving revision 1.33
  retrieving revision 1.34
  diff -u -r1.33 -r1.34
  --- fileio.h	2001/02/25 20:39:31	1.33
  +++ fileio.h	2001/05/13 10:50:04	1.34
  @@ -104,11 +104,15 @@
   #ifdef BEOS
   #include <kernel/OS.h>
   #endif
  -/* BeOS still defines fd_set in sys/socket.h so include it here.
  - * I'm not just including it as most platforms won't need it...
  - */
  +
   #if BEOS_BONE
  -#include <sys/socket.h> /* for fd_set definitions */
  + #ifndef BONE7
  +  /* prior to BONE/7 fd_set & select were defined in sys/socket.h */
  +  #include <sys/socket.h>
  + #else
  +  /* Be moved the fd_set stuff and also the FIONBIO definition... */
  +  #include <sys/ioctl.h>
  + #endif
   #endif
   /* End System headers */
   
  
  
  
  1.304     +10 -3     apr/configure.in
  
  Index: configure.in
  ===================================================================
  RCS file: /home/cvs/apr/configure.in,v
  retrieving revision 1.303
  retrieving revision 1.304
  diff -u -r1.303 -r1.304
  --- configure.in	2001/05/12 03:41:53	1.303
  +++ configure.in	2001/05/13 10:50:06	1.304
  @@ -162,7 +162,7 @@
   	APR_ADDTO(CFLAGS,-Kthread)
   	;;
   esac
  -
  +LOCAL_MM_LIB="../shmem/unix/mm/libmm.la"
   case "$OS" in
      i386-ibm-aix* | *-ibm-aix[1-2].* | *-ibm-aix3.* | *-ibm-aix4.1 | *-ibm-aix4.1.* | *-ibm-aix4.2
| *-ibm-aix4.2.*)
          OSDIR="aix"
  @@ -175,6 +175,7 @@
          APR_ADDTO(CFLAGS,-Zmt)
          OSDIR="os2"
          enable_threads="system_threads"
  +       LOCAL_MM_LIB=""
          eolstr="\\r\\n"
          file_as_socket="0"
          ;;
  @@ -185,7 +186,13 @@
          native_mmap_emul="1"
          APR_CHECK_DEFINE(BONE_VERSION, sys/socket.h)
          eolstr="\\n"
  -       file_as_socket="0"
  +       osver=`uname -r`
  +       if test "$osver"="5.0.4"; then
  +           file_as_socket="1"
  +       else
  +           file_as_socket="0"
  +       fi
  +       LOCAL_MM_LIB=""
          ;;
      *os390)
          OSDIR="os390"
  @@ -227,7 +234,6 @@
   fi
   
   if test "$enable_threads" = "no"; then
  -echo "Don't enable threads"
       threads="0"
       pthreadh="0"
       pthreadser="0"
  @@ -1121,6 +1127,7 @@
   AC_SUBST(DEFAULT_OSDIR)
   AC_SUBST(EXEEXT)
   AC_SUBST(LIBTOOL_LIBS)
  +AC_SUBST(LOCAL_MM_LIB)
   
   echo "${nl}Construct Makefiles and header files."
   MAKEFILE1="Makefile lib/Makefile strings/Makefile passwd/Makefile tables/Makefile build/Makefile"
  
  
  
  1.53      +2 -1      apr/test/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apr/test/Makefile.in,v
  retrieving revision 1.52
  retrieving revision 1.53
  diff -u -r1.52 -r1.53
  --- Makefile.in	2001/05/12 03:51:12	1.52
  +++ Makefile.in	2001/05/13 10:50:07	1.53
  @@ -28,7 +28,8 @@
   # bring in rules.mk for standard functionality
   @INCLUDE_RULES@
   
  -LOCAL_LIBS=../libapr.la ../shmem/unix/mm/libmm.la
  +LOCAL_LIBS=../libapr.la @LOCAL_MM_LIB@
  +##../shmem/unix/mm/libmm.la
   
   CLEAN_TARGETS = testfile.tmp testdso@EXEEXT@ mod_test.so
   
  
  
  

Mime
View raw message