rse 99/06/09 04:13:55
Modified: src CHANGES
src/modules/standard mod_rewrite.h mod_auth_dbm.c
Log:
Fix ndbm.h include problems with brain-dead glibc >= 2.1 which has ndbm.h in a
non-standard db1/ subdir. We fixed it by explicitly including <db1/ndbm.h>
instead of <ndbm.h> because adding -I/usr/include/db1 isn't really correct
(because it isn't guaranteed that the glibc includes are really under
/usr/include).
Submitted by: Henri Gomez <[EMAIL PROTECTED]>
Cleaned up and corrected by: Ralf S. Engelschall
PR: 4469, 4431, 4528
Revision Changes Path
1.1374 +4 -0 apache-1.3/src/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1373
retrieving revision 1.1374
diff -u -r1.1373 -r1.1374
--- CHANGES 1999/06/09 10:44:59 1.1373
+++ CHANGES 1999/06/09 11:13:53 1.1374
@@ -1,5 +1,9 @@
Changes with Apache 1.3.7
+ *) Fix ndbm.h include problems with brain-dead glibc >= 2.1 which
+ has ndbm.h in a non-standard db1/ subdir. PR#4469, PR#4431, PR#4528
+ [Henri Gomez <[EMAIL PROTECTED]>, Ralf S. Engelschall]
+
*) Determine AP_BYTE_ORDER for ap_config_auto.h and already
use this at least for Expat. [Ralf S. Engelschall]
1.63 +8 -1 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.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- mod_rewrite.h 1999/04/22 09:54:37 1.62
+++ mod_rewrite.h 1999/06/09 11:13:55 1.63
@@ -127,8 +127,15 @@
* 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>
-#if defined(__FreeBSD__) || (defined(DB_LOCK) && defined(DB_SHMEM))
+#endif
+#if defined(DBM_SUFFIX)
+#define NDBM_FILE_SUFFIX DBM_SUFFIX
+#elif defined(__FreeBSD__) || (defined(DB_LOCK) && defined(DB_SHMEM))
#define NDBM_FILE_SUFFIX ".db"
#else
#define NDBM_FILE_SUFFIX ".pag"
1.46 +5 -0 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.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- mod_auth_dbm.c 1999/02/03 16:22:32 1.45
+++ mod_auth_dbm.c 1999/06/09 11:13:55 1.46
@@ -74,7 +74,12 @@
#include "http_core.h"
#include "http_log.h"
#include "http_protocol.h"
+#if defined(__GLIBC__) && defined(__GLIBC_MINOR__) \
+ && __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 1
+#include <db1/ndbm.h>
+#else
#include <ndbm.h>
+#endif
#include "ap_md5.h"
/*
