cvs commit: apache-apr/apr configure.in

1999-06-11 Thread bjh
bjh 99/06/11 00:05:22

  Modified:apr  configure.in
  Log:
  It turns out AC_CHECK_PROGS doesn't like absolute paths so use another method
  do ensure /bin/sh is the prefered sh.
  
  Revision  ChangesPath
  1.19  +6 -1  apache-apr/apr/configure.in
  
  Index: configure.in
  ===
  RCS file: /home/cvs/apache-apr/apr/configure.in,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- configure.in  1999/06/10 16:55:57 1.18
  +++ configure.in  1999/06/11 07:05:21 1.19
  @@ -14,7 +14,12 @@
   AC_PROG_RANLIB
   AC_CHECK_PROG(RM, rm, rm)
   AC_CHECK_PROG(AR, ar, ar)
  -AC_CHECK_PROGS(SH, /bin/sh sh)
  +
  +# Use /bin/sh if it exists, otherwise go looking for sh in the path
  +if (test -z $SH -a -e /bin/sh); then
  +  SH=/bin/sh
  +fi
  +AC_CHECK_PROG(SH, sh, sh)
   
   dnl Checks for libraries.
   
  
  
  


cvs commit: apache-apr/apr/network_io/os2 poll.c

1999-06-11 Thread bjh
bjh 99/06/11 00:23:07

  Modified:apr/file_io/os2 fileio.h
   apr/locks/os2 Makefile.in
   apr/network_io/os2 poll.c
  Log:
  Fix a few warnings in OS/2 code
  
  Revision  ChangesPath
  1.2   +1 -0  apache-apr/apr/file_io/os2/fileio.h
  
  Index: fileio.h
  ===
  RCS file: /home/cvs/apache-apr/apr/file_io/os2/fileio.h,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- fileio.h  1999/06/04 13:13:19 1.1
  +++ fileio.h  1999/06/11 07:22:41 1.2
  @@ -88,6 +88,7 @@
   ap_status_t file_cleanup(void *);
   mode_t get_fileperms(ap_fileperms_t);
   long os2date2unix( FDATE os2date, FTIME os2time );
  +int os2errno( ULONG oserror );
   
   #endif  /* ! FILE_IO_H */
   
  
  
  
  1.2   +1 -1  apache-apr/apr/locks/os2/Makefile.in
  
  Index: Makefile.in
  ===
  RCS file: /home/cvs/apache-apr/apr/locks/os2/Makefile.in,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Makefile.in   1999/06/04 16:40:04 1.1
  +++ Makefile.in   1999/06/11 07:22:52 1.2
  @@ -10,7 +10,7 @@
   [EMAIL PROTECTED]@ $(LDLIBS)
   INCDIR=../../include
   INCDIR1=../../../include
  -INCDIR2=../../file_io/unix
  +INCDIR2=../../file_io/os2
   INCLUDES=-I$(INCDIR) -I$(INCDIR1) -I$(INCDIR2) -I.
   
   LIB=../lock.a
  
  
  
  1.2   +2 -2  apache-apr/apr/network_io/os2/poll.c
  
  Index: poll.c
  ===
  RCS file: /home/cvs/apache-apr/apr/network_io/os2/poll.c,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- poll.c1999/06/04 16:15:56 1.1
  +++ poll.c1999/06/11 07:23:01 1.2
  @@ -57,8 +57,9 @@
   #include networkio.h
   #include apr_network_io.h
   #include apr_general.h
  +#include apr_lib.h
   
  -/*  OS/2 R4 doesn't have a poll function, implement using select */
  +/*  OS/2 doesn't have a poll function, implement using select */

   ap_status_t ap_setup_poll(ap_context_t *cont, ap_int32_t num, struct 
pollfd_t **new)
   {
  @@ -90,7 +91,6 @@
   int i;
   int rv = 0, maxfd = 0;
   time_t starttime;
  -char test = 'T';
   struct timeval tv;
   fd_set readfds, writefds, exceptfds;
   
  
  
  


cvs commit: apache-1.3 STATUS

1999-06-11 Thread jim
jim 99/06/11 06:18:58

  Modified:.STATUS
  Log:
  Add some available patches
  
  Revision  ChangesPath
  1.713 +10 -4 apache-1.3/STATUS
  
  Index: STATUS
  ===
  RCS file: /export/home/cvs/apache-1.3/STATUS,v
  retrieving revision 1.712
  retrieving revision 1.713
  diff -u -r1.712 -r1.713
  --- STATUS1999/06/09 18:23:38 1.712
  +++ STATUS1999/06/11 13:18:57 1.713
  @@ -1,5 +1,5 @@
 1.3 STATUS:
  -  Last modified at [$Date: 1999/06/09 18:23:38 $]
  +  Last modified at [$Date: 1999/06/11 13:18:57 $]
   
   Release:
   
  @@ -91,6 +91,11 @@
   
   Available Patches:
   
  +* Mathijs Maassen [EMAIL PROTECTED] path to disable the initial
  +  check/stat of DocumentRoot.
  +Message-ID: [EMAIL PROTECTED]
  + Status: Jim +1 (will add to docs)
  +
   * Stipe Tolj's Cygwin32 port
PR#: 2936
   Status: Lars +1 (on concept)
  @@ -111,9 +116,10 @@
   * Tony Finch's patch to support mass virtual hosting
Message-ID: [EMAIL PROTECTED]
Message-ID: [EMAIL PROTECTED]
  - Status: Dean +1, Randy +1, Lars +1 (if someone writes the docs)
  -Jim +1
  - (On hold until Tony revamps the mass-vhosting docco)
  + Message-ID: [EMAIL PROTECTED]
  + Status: Dean +1, Randy +1, Jim +1
  + Previous Status: Dean +1, Randy +1, Jim +1,
  + Lars +1 (if someone writes the docs)
   
   * Brian Havard's patch to remove dependency of mod_auth_dbm on mod_auth.
 (PR#2598)