--- doorman-0.8.orig/configure	Sat Jul 31 18:21:52 2004
+++ doorman-0.8/configure	Sat Jan 29 04:23:00 2005
@@ -7476,13 +7476,13 @@
 ldflags_tmp=$LDFLAGS
 
 LDFLAGS="$ldflags_tmp -L/usr/local/lib"
-echo "$as_me:$LINENO: checking for library containing db_create" >&5
-echo $ECHO_N "checking for library containing db_create... $ECHO_C" >&6
-if test "${ac_cv_search_db_create+set}" = set; then
+echo "$as_me:$LINENO: checking for library containing db_create_4001" >&5
+echo $ECHO_N "checking for library containing db_create_4001... $ECHO_C" >&6
+if test "${ac_cv_search_db_create_4001+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_func_search_save_LIBS=$LIBS
-ac_cv_search_db_create=no
+ac_cv_search_db_create_4001=no
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -7496,11 +7496,11 @@
 #endif
 /* We use char because int might match the return type of a gcc2
    builtin and then its argument prototype would still apply.  */
-char db_create ();
+char db_create_4001 ();
 int
 main ()
 {
-db_create ();
+db_create_4001 ();
   ;
   return 0;
 }
@@ -7527,7 +7527,7 @@
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_cv_search_db_create="none required"
+  ac_cv_search_db_create_4001="none required"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -7535,7 +7535,7 @@
 fi
 rm -f conftest.err conftest.$ac_objext \
       conftest$ac_exeext conftest.$ac_ext
-if test "$ac_cv_search_db_create" = no; then
+if test "$ac_cv_search_db_create_4001" = no; then
   for ac_lib in db4 db-4 db3 db; do
     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
     cat >conftest.$ac_ext <<_ACEOF
@@ -7551,11 +7551,11 @@
 #endif
 /* We use char because int might match the return type of a gcc2
    builtin and then its argument prototype would still apply.  */
-char db_create ();
+char db_create_4001 ();
 int
 main ()
 {
-db_create ();
+db_create_4001 ();
   ;
   return 0;
 }
@@ -7582,7 +7582,7 @@
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_cv_search_db_create="-l$ac_lib"
+  ac_cv_search_db_create_4001="-l$ac_lib"
 break
 else
   echo "$as_me: failed program was:" >&5
@@ -7595,21 +7595,21 @@
 fi
 LIBS=$ac_func_search_save_LIBS
 fi
-echo "$as_me:$LINENO: result: $ac_cv_search_db_create" >&5
-echo "${ECHO_T}$ac_cv_search_db_create" >&6
-if test "$ac_cv_search_db_create" != no; then
-  test "$ac_cv_search_db_create" = "none required" || LIBS="$ac_cv_search_db_create $LIBS"
+echo "$as_me:$LINENO: result: $ac_cv_search_db_create_4001" >&5
+echo "${ECHO_T}$ac_cv_search_db_create_4001" >&6
+if test "$ac_cv_search_db_create_4001" != no; then
+  test "$ac_cv_search_db_create_4001" = "none required" || LIBS="$ac_cv_search_db_create_4001 $LIBS"
 
 else
   LDFLAGS=$ldflags_tmp
-    unset ac_cv_search_db_create
-    echo "$as_me:$LINENO: checking for library containing db_create" >&5
-echo $ECHO_N "checking for library containing db_create... $ECHO_C" >&6
-if test "${ac_cv_search_db_create+set}" = set; then
+    unset ac_cv_search_db_create_4001
+    echo "$as_me:$LINENO: checking for library containing db_create_4001" >&5
+echo $ECHO_N "checking for library containing db_create_4001... $ECHO_C" >&6
+if test "${ac_cv_search_db_create_4001+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_func_search_save_LIBS=$LIBS
-ac_cv_search_db_create=no
+ac_cv_search_db_create_4001=no
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -7623,11 +7623,11 @@
 #endif
 /* We use char because int might match the return type of a gcc2
    builtin and then its argument prototype would still apply.  */
-char db_create ();
+char db_create_4001 ();
 int
 main ()
 {
-db_create ();
+db_create_4001 ();
   ;
   return 0;
 }
@@ -7654,7 +7654,7 @@
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_cv_search_db_create="none required"
+  ac_cv_search_db_create_4001="none required"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -7662,7 +7662,7 @@
 fi
 rm -f conftest.err conftest.$ac_objext \
       conftest$ac_exeext conftest.$ac_ext
-if test "$ac_cv_search_db_create" = no; then
+if test "$ac_cv_search_db_create_4001" = no; then
   for ac_lib in db4 db-4 db3 db; do
     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
     cat >conftest.$ac_ext <<_ACEOF
@@ -7678,11 +7678,11 @@
 #endif
 /* We use char because int might match the return type of a gcc2
    builtin and then its argument prototype would still apply.  */
-char db_create ();
+char db_create_4001 ();
 int
 main ()
 {
-db_create ();
+db_create_4001 ();
   ;
   return 0;
 }
@@ -7709,7 +7709,7 @@
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_cv_search_db_create="-l$ac_lib"
+  ac_cv_search_db_create_4001="-l$ac_lib"
 break
 else
   echo "$as_me: failed program was:" >&5
@@ -7722,20 +7722,20 @@
 fi
 LIBS=$ac_func_search_save_LIBS
 fi
-echo "$as_me:$LINENO: result: $ac_cv_search_db_create" >&5
-echo "${ECHO_T}$ac_cv_search_db_create" >&6
-if test "$ac_cv_search_db_create" != no; then
-  test "$ac_cv_search_db_create" = "none required" || LIBS="$ac_cv_search_db_create $LIBS"
+echo "$as_me:$LINENO: result: $ac_cv_search_db_create_4001" >&5
+echo "${ECHO_T}$ac_cv_search_db_create_4001" >&6
+if test "$ac_cv_search_db_create_4001" != no; then
+  test "$ac_cv_search_db_create_4001" = "none required" || LIBS="$ac_cv_search_db_create_4001 $LIBS"
 
 else
   LDFLAGS="$ldflags_tmp -L/usr/local/lib"
-        echo "$as_me:$LINENO: checking for library containing db_open" >&5
-echo $ECHO_N "checking for library containing db_open... $ECHO_C" >&6
-if test "${ac_cv_search_db_open+set}" = set; then
+        echo "$as_me:$LINENO: checking for library containing db_open_4001" >&5
+echo $ECHO_N "checking for library containing db_open_4001... $ECHO_C" >&6
+if test "${ac_cv_search_db_open_4001+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_func_search_save_LIBS=$LIBS
-ac_cv_search_db_open=no
+ac_cv_search_db_open_4001=no
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -7749,11 +7749,11 @@
 #endif
 /* We use char because int might match the return type of a gcc2
    builtin and then its argument prototype would still apply.  */
-char db_open ();
+char db_open_4001 ();
 int
 main ()
 {
-db_open ();
+db_open_4001 ();
   ;
   return 0;
 }
@@ -7780,7 +7780,7 @@
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_cv_search_db_open="none required"
+  ac_cv_search_db_open_4001="none required"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -7788,7 +7788,7 @@
 fi
 rm -f conftest.err conftest.$ac_objext \
       conftest$ac_exeext conftest.$ac_ext
-if test "$ac_cv_search_db_open" = no; then
+if test "$ac_cv_search_db_open_4001" = no; then
   for ac_lib in db3 db-3 db2 db; do
     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
     cat >conftest.$ac_ext <<_ACEOF
@@ -7804,11 +7804,11 @@
 #endif
 /* We use char because int might match the return type of a gcc2
    builtin and then its argument prototype would still apply.  */
-char db_open ();
+char db_open_4001 ();
 int
 main ()
 {
-db_open ();
+db_open_4001 ();
   ;
   return 0;
 }
@@ -7835,7 +7835,7 @@
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_cv_search_db_open="-l$ac_lib"
+  ac_cv_search_db_open_4001="-l$ac_lib"
 break
 else
   echo "$as_me: failed program was:" >&5
@@ -7848,21 +7848,21 @@
 fi
 LIBS=$ac_func_search_save_LIBS
 fi
-echo "$as_me:$LINENO: result: $ac_cv_search_db_open" >&5
-echo "${ECHO_T}$ac_cv_search_db_open" >&6
-if test "$ac_cv_search_db_open" != no; then
-  test "$ac_cv_search_db_open" = "none required" || LIBS="$ac_cv_search_db_open $LIBS"
+echo "$as_me:$LINENO: result: $ac_cv_search_db_open_4001" >&5
+echo "${ECHO_T}$ac_cv_search_db_open_4001" >&6
+if test "$ac_cv_search_db_open_4001" != no; then
+  test "$ac_cv_search_db_open_4001" = "none required" || LIBS="$ac_cv_search_db_open_4001 $LIBS"
 
 else
   LDFLAGS=$ldflags_tmp
-            unset ac_cv_search_db_open
-            echo "$as_me:$LINENO: checking for library containing db_open" >&5
-echo $ECHO_N "checking for library containing db_open... $ECHO_C" >&6
-if test "${ac_cv_search_db_open+set}" = set; then
+            unset ac_cv_search_db_open_4001
+            echo "$as_me:$LINENO: checking for library containing db_open_4001" >&5
+echo $ECHO_N "checking for library containing db_open_4001... $ECHO_C" >&6
+if test "${ac_cv_search_db_open_4001+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_func_search_save_LIBS=$LIBS
-ac_cv_search_db_open=no
+ac_cv_search_db_open_4001=no
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -7876,11 +7876,11 @@
 #endif
 /* We use char because int might match the return type of a gcc2
    builtin and then its argument prototype would still apply.  */
-char db_open ();
+char db_open_4001 ();
 int
 main ()
 {
-db_open ();
+db_open_4001 ();
   ;
   return 0;
 }
@@ -7907,7 +7907,7 @@
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_cv_search_db_open="none required"
+  ac_cv_search_db_open_4001="none required"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -7915,7 +7915,7 @@
 fi
 rm -f conftest.err conftest.$ac_objext \
       conftest$ac_exeext conftest.$ac_ext
-if test "$ac_cv_search_db_open" = no; then
+if test "$ac_cv_search_db_open_4001" = no; then
   for ac_lib in db3 db-3 db2 db; do
     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
     cat >conftest.$ac_ext <<_ACEOF
@@ -7931,11 +7931,11 @@
 #endif
 /* We use char because int might match the return type of a gcc2
    builtin and then its argument prototype would still apply.  */
-char db_open ();
+char db_open_4001 ();
 int
 main ()
 {
-db_open ();
+db_open_4001 ();
   ;
   return 0;
 }
@@ -7962,7 +7962,7 @@
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_cv_search_db_open="-l$ac_lib"
+  ac_cv_search_db_open_4001="-l$ac_lib"
 break
 else
   echo "$as_me: failed program was:" >&5
@@ -7975,10 +7975,10 @@
 fi
 LIBS=$ac_func_search_save_LIBS
 fi
-echo "$as_me:$LINENO: result: $ac_cv_search_db_open" >&5
-echo "${ECHO_T}$ac_cv_search_db_open" >&6
-if test "$ac_cv_search_db_open" != no; then
-  test "$ac_cv_search_db_open" = "none required" || LIBS="$ac_cv_search_db_open $LIBS"
+echo "$as_me:$LINENO: result: $ac_cv_search_db_open_4001" >&5
+echo "${ECHO_T}$ac_cv_search_db_open_4001" >&6
+if test "$ac_cv_search_db_open_4001" != no; then
+  test "$ac_cv_search_db_open_4001" = "none required" || LIBS="$ac_cv_search_db_open_4001 $LIBS"
 
 fi
 
@@ -7992,7 +7992,7 @@
 fi
 
 
-for ac_func in db_open
+for ac_func in db_open_4001
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
 echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -8094,7 +8094,7 @@
 done
 
 
-for ac_func in db_create
+for ac_func in db_create_4001
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
 echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -8196,7 +8196,7 @@
 done
 
 
-for ac_func in db_strerror
+for ac_func in db_strerror_4001
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
 echo "$as_me:$LINENO: checking for $ac_func" >&5