Make this build with db4. This fixes the first problem in PR 36617.

5 files changed, 183 insertions, 90 deletions

diff --git a/security/PAM/distinfo b/security/PAM/distinfo
index 673e4f167d1..22a08012bea 100644
--- a/security/PAM/distinfo
+++ b/security/PAM/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.15 2006/10/10 03:20:48 ben Exp $
+$NetBSD: distinfo,v 1.16 2007/07/09 03:51:33 minskim Exp $
 
 SHA1 (Linux-PAM-0.77.tar.gz) = 58dff29aec3c0b6a9e9b53af6fb643056ce0f304
 RMD160 (Linux-PAM-0.77.tar.gz) = 15391ed7bed7b506bb391608b735332d0391580c
 Size (Linux-PAM-0.77.tar.gz) = 442569 bytes
 SHA1 (patch-aa) = 99f4889c24ff71a9e40e0e913d6071b78a326877
-SHA1 (patch-ab) = 19e8f38c500d46778af56f797682d14d1e586bf9
-SHA1 (patch-ac) = a7c153cdec1e3d7f09bb4a6a0f1d572d184231eb
+SHA1 (patch-ab) = 8f0ba8b8390a67ffc9a7cf0ea33522e3e5603428
+SHA1 (patch-ac) = 4b956ff74eae3b61c3f33699087666f64fe7f467
 SHA1 (patch-ad) = 336101bd1779715eac39f4ef5e923745defd438f
 SHA1 (patch-ae) = 58c67c5ba430d2c5788717c6c7373dbf84d7b424
 SHA1 (patch-af) = 10917af14f4bfd27c7872144ca215efdfe68d132
@@ -22,9 +22,10 @@ SHA1 (patch-ap) = 0a923b67a909dde6f72129b0c853088f9d48bd91
 SHA1 (patch-aq) = 91587c5b9c6587221708247decb0e82f665ae2bf
 SHA1 (patch-ar) = b8072ebbc1a38c26d44c0e087a2b8b93f1eb7768
 SHA1 (patch-as) = e4fdfef53c097985c2aa8ff8225fed1caa812c10
-SHA1 (patch-at) = 48d8874962407ad79a84aa8610d3ff490af2fe4b
+SHA1 (patch-at) = 5ac29da5019df10beae09874ef61559f16097a7b
 SHA1 (patch-au) = 6c1327faf2ec9f1ff74f01443075852bf94f3788
 SHA1 (patch-av) = 98c7b6ea2ba655cb405492eddba2f9d246b08817
 SHA1 (patch-aw) = d56fd3ca5093af306b0ceab5f81cb7bc6fd237de
 SHA1 (patch-ax) = 16f4ef37306f05a9792684440a802bed727b03df
 SHA1 (patch-ay) = 8e40db2360bec88a22cd661c813f4a7f9a906f34
+SHA1 (patch-az) = 4083bdfc19ee7d528a27fce0339b666c58f73583
diff --git a/security/PAM/patches/patch-ab b/security/PAM/patches/patch-ab
index 0395a281a86..bc69ccb515b 100644
--- a/security/PAM/patches/patch-ab
+++ b/security/PAM/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.5 2006/10/10 03:20:48 ben Exp $
+$NetBSD: patch-ab,v 1.6 2007/07/09 03:51:33 minskim Exp $
 
---- configure.in.orig	2002-07-09 02:17:13.000000000 -0400
+--- configure.in.orig	2002-07-08 23:17:13.000000000 -0700
 +++ configure.in
 @@ -157,6 +157,10 @@ AC_ARG_ENABLE(lckpwdf,
  	WITH_LCKPWDF=no, WITH_LCKPWDF=yes)
@@ -30,7 +30,17 @@ $NetBSD: patch-ab,v 1.5 2006/10/10 03:20:48 ben Exp $
  	HAVE_LIBCRYPT=no)
  AC_SUBST(HAVE_LIBCRYPT)
  AC_CHECK_LIB(util, logwtmp, HAVE_LIBUTIL=yes ; AC_DEFINE(HAVE_LIBUTIL),
-@@ -240,6 +248,13 @@ AC_CHECK_HEADERS(fcntl.h limits.h malloc
+@@ -215,6 +223,9 @@ if test x$HAVE_LIBDB != xyes ; then
+ 	HAVE_LIBDB=no)
+ fi
+ AC_SUBST(HAVE_LIBDB)
++AC_CHECK_LIB(db4, db_create, HAVE_LIBDB4=yes ; AC_DEFINE(HAVE_LIBDB4),
++	HAVE_LIBDB4=no)
++AC_SUBST(HAVE_LIBDB4)
+ AC_CHECK_LIB(fl, yylex, yyterminate, HAVE_LIBFL=yes ; AC_DEFINE(HAVE_LIBFL),
+ 	HAVE_LIBFL=no)
+ AC_SUBST(HAVE_LIBFL)
+@@ -240,6 +251,13 @@ AC_CHECK_HEADERS(fcntl.h limits.h malloc
  dnl Linux wants features.h in some of the source files.
  AC_CHECK_HEADERS(features.h)
  
@@ -44,7 +54,7 @@ $NetBSD: patch-ab,v 1.5 2006/10/10 03:20:48 ben Exp $
  dnl For module/pam_cracklib
  AC_CHECK_HEADERS(crypt.h)
  
-@@ -257,7 +272,7 @@ dnl being found.
+@@ -257,7 +275,7 @@ dnl being found.
  
  dnl Look for cracklib dictionary
  AC_MSG_CHECKING(path to cracklib dictionary)
diff --git a/security/PAM/patches/patch-ac b/security/PAM/patches/patch-ac
index 3e79097a5da..4263e6f2b48 100644
--- a/security/PAM/patches/patch-ac
+++ b/security/PAM/patches/patch-ac
@@ -1,6 +1,6 @@
-$NetBSD: patch-ac,v 1.5 2006/10/10 03:20:48 ben Exp $
+$NetBSD: patch-ac,v 1.6 2007/07/09 03:51:33 minskim Exp $
 
---- configure.orig	2002-07-09 02:17:13.000000000 -0400
+--- configure.orig	2002-07-08 23:17:13.000000000 -0700
 +++ configure
 @@ -47,6 +47,8 @@ ac_help="$ac_help
  ac_help="$ac_help
@@ -11,9 +11,9 @@ $NetBSD: patch-ac,v 1.5 2006/10/10 03:20:48 ben Exp $
    --with-mailspool         path to mail spool directory
                             [default _PATH_MAILDIR if defined in paths.h, otherwise /var/spool/mail]"
  
-@@ -1168,6 +1170,14 @@ else
-   WITH_LCKPWDF=yes
- fi
+@@ -1170,8 +1172,17 @@ fi
+ 
+ 
  
 +# Check whether --enable-crack or --disable-crack was given.
 +if test "${enable_crack+set}" = set; then
@@ -23,37 +23,43 @@ $NetBSD: patch-ac,v 1.5 2006/10/10 03:20:48 ben Exp $
 +  WITH_CRACK=yes
 +fi
 +
- 
- 
++
  echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-@@ -1461,6 +1471,7 @@ fi
+-echo "configure:1175: checking how to run the C preprocessor" >&5
++echo "configure:1186: checking how to run the C preprocessor" >&5
+ # On Suns, sometimes $CPP names a directory.
+ if test -n "$CPP" && test -d "$CPP"; then
+   CPP=
+@@ -1461,8 +1472,9 @@ fi
   
  
  
 +if test "$WITH_CRACK" = "yes"; then
  echo $ac_n "checking for FascistCheck in -lcrack""... $ac_c" 1>&6
- echo "configure:1466: checking for FascistCheck in -lcrack" >&5
+-echo "configure:1466: checking for FascistCheck in -lcrack" >&5
++echo "configure:1478: checking for FascistCheck in -lcrack" >&5
  ac_lib_var=`echo crack'_'FascistCheck | sed 'y%./+-%__p_%'`
-@@ -1504,12 +1515,15 @@ else
-   echo "$ac_t""no" 1>&6
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -1505,11 +1517,14 @@ else
  HAVE_LIBCRACK=no
  fi
+ 
 +else
 +HAVE_LIBCRACK=no
 +fi
  
  
- 
 -echo $ac_n "checking for fcrypt in -lcrypt""... $ac_c" 1>&6
 -echo "configure:1512: checking for fcrypt in -lcrypt" >&5
 -ac_lib_var=`echo crypt'_'fcrypt | sed 'y%./+-%__p_%'`
 +echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6
-+echo "configure:1512: checking for crypt in -lcrypt" >&5
++echo "configure:1527: checking for crypt in -lcrypt" >&5
 +ac_lib_var=`echo crypt'_'crypt | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -1521,10 +1535,10 @@ cat > conftest.$ac_ext <<EOF
+@@ -1521,13 +1536,13 @@ cat > conftest.$ac_ext <<EOF
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
      builtin and then its argument prototype would still apply.  */
@@ -65,100 +71,85 @@ $NetBSD: patch-ac,v 1.5 2006/10/10 03:20:48 ben Exp $
 +crypt()
  ; return 0; }
  EOF
- if { (eval echo configure:1531: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-@@ -2312,7 +2326,7 @@ fi
- done
- 
- 
--for ac_hdr in crypt.h
-+for ac_hdr in termios.h
- do
- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-@@ -2353,7 +2367,7 @@ fi
- done
- 
+-if { (eval echo configure:1531: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:1546: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -1733,8 +1748,53 @@ fi
  
--for ac_hdr in ndbm.h db.h
-+for ac_hdr in shadow.h
- do
- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-@@ -2393,6 +2407,143 @@ else
  fi
- done
  
-+for ac_func in getspnam
-+do
-+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-+echo "configure:2400: checking for $ac_func" >&5
-+if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
++echo $ac_n "checking for db_create in -ldb4""... $ac_c" 1>&6
++echo "configure:1753: checking for db_create in -ldb4" >&5
++ac_lib_var=`echo db4'_'db_create | sed 'y%./+-%__p_%'`
++if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
 +  echo $ac_n "(cached) $ac_c" 1>&6
 +else
-+  cat > conftest.$ac_ext <<EOF
-+#line 2405 "configure"
++  ac_save_LIBS="$LIBS"
++LIBS="-ldb4  $LIBS"
++cat > conftest.$ac_ext <<EOF
++#line 1761 "configure"
 +#include "confdefs.h"
-+/* System header to define __stub macros and hopefully few prototypes,
-+    which can conflict with char $ac_func(); below.  */
-+#include <assert.h>
 +/* Override any gcc2 internal prototype to avoid an error.  */
 +/* We use char because int might match the return type of a gcc2
 +    builtin and then its argument prototype would still apply.  */
-+char $ac_func();
++char db_create();
 +
 +int main() {
-+
-+/* The GNU C library defines this for functions which it implements
-+    to always fail with ENOSYS.  Some functions are actually named
-+    something starting with __ and the normal name is an alias.  */
-+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-+choke me
-+#else
-+$ac_func();
-+#endif
-+
++db_create()
 +; return 0; }
 +EOF
-+if { (eval echo configure:2428: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:1772: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 +  rm -rf conftest*
-+  eval "ac_cv_func_$ac_func=yes"
++  eval "ac_cv_lib_$ac_lib_var=yes"
 +else
 +  echo "configure: failed program was:" >&5
 +  cat conftest.$ac_ext >&5
 +  rm -rf conftest*
-+  eval "ac_cv_func_$ac_func=no"
++  eval "ac_cv_lib_$ac_lib_var=no"
 +fi
 +rm -f conftest*
-+fi
++LIBS="$ac_save_LIBS"
 +
-+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
++fi
++if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
 +  echo "$ac_t""yes" 1>&6
-+    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-+  cat >> confdefs.h <<EOF
-+#define $ac_tr_func 1
++  HAVE_LIBDB4=yes ; cat >> confdefs.h <<\EOF
++#define HAVE_LIBDB4 1
 +EOF
-+ 
++
 +else
 +  echo "$ac_t""no" 1>&6
++HAVE_LIBDB4=no
 +fi
-+done
 +
 +
-+for ac_hdr in crypt.h
+ echo $ac_n "checking for yylex in -lfl""... $ac_c" 1>&6
+-echo "configure:1738: checking for yylex in -lfl" >&5
++echo "configure:1798: checking for yylex in -lfl" >&5
+ ac_lib_var=`echo fl'_'yylex | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -2312,6 +2372,143 @@ fi
+ done
+ 
+ 
++for ac_hdr in termios.h
 +do
 +ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 +echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-+echo "configure:2457: checking for $ac_hdr" >&5
++echo "configure:2380: checking for $ac_hdr" >&5
 +if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
 +  echo $ac_n "(cached) $ac_c" 1>&6
 +else
 +  cat > conftest.$ac_ext <<EOF
-+#line 2462 "configure"
++#line 2385 "configure"
 +#include "confdefs.h"
 +#include <$ac_hdr>
 +EOF
 +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-+{ (eval echo configure:2467: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:2390: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 +if test -z "$ac_err"; then
 +  rm -rf conftest*
@@ -185,21 +176,21 @@ $NetBSD: patch-ac,v 1.5 2006/10/10 03:20:48 ben Exp $
 +done
 +
 +
-+for ac_hdr in ndbm.h db.h
++for ac_hdr in shadow.h
 +do
 +ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 +echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-+echo "configure:2498: checking for $ac_hdr" >&5
++echo "configure:2421: checking for $ac_hdr" >&5
 +if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
 +  echo $ac_n "(cached) $ac_c" 1>&6
 +else
 +  cat > conftest.$ac_ext <<EOF
-+#line 2503 "configure"
++#line 2426 "configure"
 +#include "confdefs.h"
 +#include <$ac_hdr>
 +EOF
 +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-+{ (eval echo configure:2508: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:2431: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 +if test -z "$ac_err"; then
 +  rm -rf conftest*
@@ -225,17 +216,81 @@ $NetBSD: patch-ac,v 1.5 2006/10/10 03:20:48 ben Exp $
 +fi
 +done
 +
- HAVE_NDBM_H=$ac_cv_header_ndbm_h
- 
- 
-@@ -2439,8 +2590,8 @@ done
++for ac_func in getspnam
++do
++echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
++echo "configure:2460: checking for $ac_func" >&5
++if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  cat > conftest.$ac_ext <<EOF
++#line 2465 "configure"
++#include "confdefs.h"
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char $ac_func(); below.  */
++#include <assert.h>
++/* Override any gcc2 internal prototype to avoid an error.  */
++/* We use char because int might match the return type of a gcc2
++    builtin and then its argument prototype would still apply.  */
++char $ac_func();
++
++int main() {
++
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
++choke me
++#else
++$ac_func();
++#endif
++
++; return 0; }
++EOF
++if { (eval echo configure:2488: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++  rm -rf conftest*
++  eval "ac_cv_func_$ac_func=yes"
++else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  eval "ac_cv_func_$ac_func=no"
++fi
++rm -f conftest*
++fi
++
++if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
++  echo "$ac_t""yes" 1>&6
++    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
++  cat >> confdefs.h <<EOF
++#define $ac_tr_func 1
++EOF
++ 
++else
++  echo "$ac_t""no" 1>&6
++fi
++done
++
++
+ for ac_hdr in crypt.h
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+@@ -2439,8 +2636,8 @@ done
  
  
  echo $ac_n "checking path to cracklib dictionary""... $ac_c" 1>&6
 -echo "configure:2443: checking path to cracklib dictionary" >&5
 -DICT_DIR_CANDIDATES="/usr/lib /usr/share/dict /usr/share/lib \
-+echo "configure:2580: checking path to cracklib dictionary" >&5
++echo "configure:2640: checking path to cracklib dictionary" >&5
 +DICT_DIR_CANDIDATES="${prefix}/libdata /usr/lib /usr/share/dict /usr/share/lib \
    /usr/local/lib /usr/local/share/lib"
  DICT_FILE_CANDIDATES="pw_dict cracklib_dict"
  CRACKLIB_DICTPATH=""
+@@ -3646,6 +3843,7 @@ s%@HAVE_LIBCRYPT@%$HAVE_LIBCRYPT%g
+ s%@HAVE_LIBUTIL@%$HAVE_LIBUTIL%g
+ s%@HAVE_LIBNDBM@%$HAVE_LIBNDBM%g
+ s%@HAVE_LIBDB@%$HAVE_LIBDB%g
++s%@HAVE_LIBDB4@%$HAVE_LIBDB4%g
+ s%@HAVE_LIBFL@%$HAVE_LIBFL%g
+ s%@HAVE_LIBNSL@%$HAVE_LIBNSL%g
+ s%@HAVE_LIBPWDB@%$HAVE_LIBPWDB%g
diff --git a/security/PAM/patches/patch-at b/security/PAM/patches/patch-at
index ac08892e660..12e8f2d1b2d 100644
--- a/security/PAM/patches/patch-at
+++ b/security/PAM/patches/patch-at
@@ -1,8 +1,16 @@
-$NetBSD: patch-at,v 1.5 2004/11/19 14:54:55 jlam Exp $
+$NetBSD: patch-at,v 1.6 2007/07/09 03:51:33 minskim Exp $
 
---- Make.Rules.in.orig	2002-06-27 00:04:54.000000000 -0400
+--- Make.Rules.in.orig	2002-06-26 21:04:54.000000000 -0700
 +++ Make.Rules.in
-@@ -75,10 +75,14 @@ WITH_MEMORY_DEBUG=@WITH_MEMORY_DEBUG@
+@@ -49,6 +49,7 @@ HAVE_LIBUTIL=@HAVE_LIBUTIL@
+ HAVE_NDBM_H=@HAVE_NDBM_H@
+ HAVE_LIBNDBM=@HAVE_LIBNDBM@
+ HAVE_LIBDB=@HAVE_LIBDB@
++HAVE_LIBDB4=@HAVE_LIBDB4@
+ HAVE_LIBFL=@HAVE_LIBFL@
+ HAVE_LIBNSL=@HAVE_LIBNSL@
+ HAVE_LIBPWDB=@HAVE_LIBPWDB@
+@@ -75,10 +76,14 @@ WITH_MEMORY_DEBUG=@WITH_MEMORY_DEBUG@
  WITH_LIBDEBUG=@WITH_LIBDEBUG@
  WITH_PAMLOCKING=@WITH_PAMLOCKING@
  WITH_LCKPWDF=@WITH_LCKPWDF@
@@ -21,7 +29,7 @@ $NetBSD: patch-at,v 1.5 2004/11/19 14:54:55 jlam Exp $
  
  # Location of libraries when installed on the system
  FAKEROOT=@FAKEROOT@
-@@ -104,7 +108,7 @@ LIBDL=@LIBDL@
+@@ -104,7 +109,7 @@ LIBDL=@LIBDL@
  MKDIR=@MKDIR@
  INSTALL=@INSTALL@
  RANLIB=@RANLIB@
diff --git a/security/PAM/patches/patch-az b/security/PAM/patches/patch-az
new file mode 100644
index 00000000000..cf1ea8f23c1
--- /dev/null
+++ b/security/PAM/patches/patch-az
@@ -0,0 +1,19 @@
+$NetBSD: patch-az,v 1.4 2007/07/09 03:51:33 minskim Exp $
+
+--- modules/pam_userdb/Makefile.orig	2007-07-08 13:43:37.000000000 -0700
++++ modules/pam_userdb/Makefile
+@@ -20,9 +20,14 @@ ifeq ($(HAVE_LIBDB),yes)
+  WHICH_DB=db
+  MODULE_SIMPLE_EXTRALIBS = -ldb
+ else
++ifeq ($(HAVE_LIBDB4),yes)
++ WHICH_DB=db4
++ MODULE_SIMPLE_EXTRALIBS = -ldb4
++else
+  WHICH_DB=none
+ endif
+ endif
++endif
+ 
+ ifeq ($(WHICH_DB),none)
+