[inseparable changes from match from perl-5.003_98 to perl-5.003_99]

[p5sagit/p5-mst-13.2.git] / Configure

diff --git a/Configure b/Configure
index 64dd01c..5b2a376 100755 (executable)
--- a/Configure
+++ b/Configure
@@ -85,6 +85,9 @@ done
 PATH=.$p_$PATH
 export PATH
 
+: This should not matter in a script, but apparently it does sometimes
+unset CDPATH
+
 : Sanity checks
 if test ! -t 0; then
        echo "Say 'sh $me', not 'sh <$me'"
@@ -4726,6 +4729,9 @@ xxx=''
 tmp_shrpenv=''
 if "$useshrplib"; then
     case "$osname" in 
+       aix)
+               # We'll set it in Makefile.SH...
+               ;;
        solaris|netbsd)
                xxx="-R $shrpdir"
                ;;
@@ -8256,13 +8262,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