httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From orlikow...@apache.org
Subject cvs commit: apache-1.3/src/modules/standard mod_auth_dbm.c mod_rewrite.h
Date Wed, 21 Mar 2001 03:09:46 GMT
orlikowski    01/03/20 19:09:46

  Modified:    src/helpers find-dbm-lib
               src/modules/standard mod_auth_dbm.c mod_rewrite.h
  Log:
  The diagnosis of the location of ndbm.h was broken for mod_rewrite and
  mod_auth_dbm on some systems using glibc 2.2 (i.e. SuSE 7.1).
  
  PR: 6929
  
  Revision  Changes    Path
  1.11      +5 -1      apache-1.3/src/helpers/find-dbm-lib
  
  Index: find-dbm-lib
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/helpers/find-dbm-lib,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- find-dbm-lib	2000/12/12 23:24:03	1.10
  +++ find-dbm-lib	2001/03/21 03:09:45	1.11
  @@ -17,8 +17,12 @@
   		    DBM_LIB="-ldbm"
   		elif ./helpers/TestCompile lib ndbm dbm_open; then
   		    DBM_LIB="-lndbm"
  +		    if ./helpers/TestCompile lib db1 dbm_open; then
  +			# Red Hat needs this; ndbm.h lives in db1
  +			CFLAGS="$CFLAGS -I/usr/include/db1"
  +		    fi
   		elif ./helpers/TestCompile lib db1 dbm_open; then
  -		    # For Red Hat 7
  +		    # For Red Hat 7, if not handled by the ndbm case above
   		    DBM_LIB="-ldb1"
   		    CFLAGS="$CFLAGS -I/usr/include/db1"
   		fi
  
  
  
  1.53      +0 -3      apache-1.3/src/modules/standard/mod_auth_dbm.c
  
  Index: mod_auth_dbm.c
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/modules/standard/mod_auth_dbm.c,v
  retrieving revision 1.52
  retrieving revision 1.53
  diff -u -r1.52 -r1.53
  --- mod_auth_dbm.c	2001/01/15 17:05:38	1.52
  +++ mod_auth_dbm.c	2001/03/21 03:09:45	1.53
  @@ -80,9 +80,6 @@
   #define dbm_open sdbm_open
   #define dbm_fetch sdbm_fetch
   #define dbm_close sdbm_close
  -#elif defined(__GLIBC__) && defined(__GLIBC_MINOR__) \
  -    && __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 1
  -#include <db1/ndbm.h>
   #else
   #include <ndbm.h>
   #endif
  
  
  
  1.79      +0 -5      apache-1.3/src/modules/standard/mod_rewrite.h
  
  Index: mod_rewrite.h
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/modules/standard/mod_rewrite.h,v
  retrieving revision 1.78
  retrieving revision 1.79
  diff -u -r1.78 -r1.79
  --- mod_rewrite.h	2001/01/18 22:31:44	1.78
  +++ mod_rewrite.h	2001/03/21 03:09:45	1.79
  @@ -130,12 +130,7 @@
        * so we also need to know the file extension
        */
   #ifndef NO_DBM_REWRITEMAP
  -#if defined(__GLIBC__) && defined(__GLIBC_MINOR__) \
  -    && __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 1
  -#include <db1/ndbm.h>
  -#else
   #include <ndbm.h>
  -#endif
   #if defined(DBM_SUFFIX)
   #define NDBM_FILE_SUFFIX DBM_SUFFIX
   #elif defined(__FreeBSD__) || (defined(DB_LOCK) && defined(DB_SHMEM))
  
  
  

Mime
View raw message