Cope with a <db.h> that isn't related to DB

private-msgid: 199704241728.UAA09951@alpha.hut.fi

1 files changed, 7 insertions, 3 deletions

diff --git a/Configure b/Configure
index 64dd01cf51..0dbe17c8fe 100755
--- a/Configure
+++ b/Configure
@@ -8256,13 +8256,17 @@ $define)
 #include <db.h>
 main()
 {
-#ifdef DB_VERSION_MAJOR
+#ifdef DB_VERSION_MAJOR	/* DB version >= 2: not yet. */
     printf("You have Berkeley DB Version %d.%d\n",
 		DB_VERSION_MAJOR, DB_VERSION_MINOR);
     printf("Perl currently only supports up to version 1.86.\n");
-    exit(1);
+    exit(2);
 #else
-    exit(0);
+#if defined(_DB_H_) && defined(BTREEMAGIC) && defined(HASHMAGIC)
+    exit(0);	/* DB version < 2: the coast is clear. */
+#else
+    exit(1);	/* <db.h> not Berkeley DB? */
+#endif
 #endif
 }
 EOCP