diff --git a/smmapdfw/Makefile.in b/smmapdfw/Makefile.in
index cc2afaf..435d9b2 100644
--- a/smmapdfw/Makefile.in
+++ b/smmapdfw/Makefile.in
@@ -86,9 +86,6 @@ RANLIB = @RANLIB@
 RC = @RC@
 STRIP = @STRIP@
 VERSION = @VERSION@
-cyrus_BUILD = @cyrus_BUILD@
-test_BUILD = @test_BUILD@
-verify_BUILD = @verify_BUILD@
 
 SUBDIRS = libsmmapdfw smmapd verify_worker test_worker cyrus_worker
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
diff --git a/smmapdfw/configure b/smmapdfw/configure
index e7ed5fe..22ffe2e 100755
--- a/smmapdfw/configure
+++ b/smmapdfw/configure
@@ -464,7 +464,7 @@ ac_includes_default="\
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO SET_MAKE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP CPP CXX CXXFLAGS ac_ct_CXX CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL BDB_LIBS verify_BUILD test_BUILD cyrus_BUILD LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO SET_MAKE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP CPP CXX CXXFLAGS ac_ct_CXX CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL BDB_LIBS LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -1035,24 +1035,17 @@ Optional Features:
   --enable-fast-install[=PKGS]
                           optimize for fast installation [default=yes]
   --disable-libtool-lock  avoid locking (might break parallel builds)
-  --enable-verify-cache   Enables the cache in the verify worker. Required a
-                          dbm implemenation. (default=yes)
-  --enable-verify-worker  Enables the sender address verification worker.
-                          (default=no)
-  --enable-test-worker    Enables the test worker (just an example).
-                          (default=no)
-  --enable-cyrus-worker   Enables the cyrus mailbox checker. (default=no)
 
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+  --with-bdb-lib-dir      Directory for Berkeley DB library files
+  --with-bdb-inc-dir      Directory for Berkeley include files
   --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
   --with-pic              try to use only PIC/non-PIC objects [default=use
                           both]
   --with-tags[=TAGS]
                           include additional configurations [automatic]
-  --with-bdb-lib-dir      Directory for Berkeley DB library files
-  --with-bdb-inc-dir      Directory for Berkeley include files
 
 Some influential environment variables:
   CC          C compiler command
@@ -1838,6 +1831,60 @@ fi
           ac_config_commands="$ac_config_commands default-1"
 
 
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+
+# Check whether --with-bdb-lib-dir or --without-bdb-lib-dir was given.
+if test "${with_bdb_lib_dir+set}" = set; then
+  withval="$with_bdb_lib_dir"
+   case "$withval" in
+                no)
+                  if test "x$ENABLE_VERIFY_CACHE" = "x1"; then
+                    { { echo "$as_me:$LINENO: error: Need bdb-lib-dir" >&5
+echo "$as_me: error: Need bdb-lib-dir" >&2;}
+   { (exit 1); exit 1; }; }
+                  fi
+                  ;;
+                yes)
+                  ;;
+                *)
+                  LDFLAGS="$LDFLAGS -L$withval"
+                  ;;
+            esac
+
+fi;
+
+
+# Check whether --with-bdb-inc-dir or --without-bdb-inc-dir was given.
+if test "${with_bdb_inc_dir+set}" = set; then
+  withval="$with_bdb_inc_dir"
+   case "$withval" in
+                no)
+                  if test "x$ENABLE_VERIFY_CACHE" = "x1"; then
+                    { { echo "$as_me:$LINENO: error: Need bdb-inc-dir" >&5
+echo "$as_me: error: Need bdb-inc-dir" >&2;}
+   { (exit 1); exit 1; }; }
+                  fi
+                  ;;
+                yes)
+                  ;;
+                *)
+                  CPPFLAGS="$CPPFLAGS -I$withval"
+                  ;;
+            esac
+
+fi;
+
+
+ENABLE_VERIFY_CACHE=1
+
+
+
 
 
 
@@ -3365,7 +3412,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 3368 "configure"' > conftest.$ac_ext
+  echo '#line 3415 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -4820,7 +4867,7 @@ fi
 
 
 # Provide some information about the compiler.
-echo "$as_me:4823:" \
+echo "$as_me:4870:" \
      "checking for Fortran 77 compiler version" >&5
 ac_compiler=`set X $ac_compile; echo $2`
 { (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
@@ -5852,11 +5899,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:5855: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:5902: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:5859: \$? = $ac_status" >&5
+   echo "$as_me:5906: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -6085,11 +6132,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:6088: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:6135: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:6092: \$? = $ac_status" >&5
+   echo "$as_me:6139: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -6145,11 +6192,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:6148: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:6195: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:6152: \$? = $ac_status" >&5
+   echo "$as_me:6199: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -8333,7 +8380,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 8336 "configure"
+#line 8383 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -8431,7 +8478,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 8434 "configure"
+#line 8481 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10608,11 +10655,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:10611: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:10658: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:10615: \$? = $ac_status" >&5
+   echo "$as_me:10662: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -10668,11 +10715,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:10671: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:10718: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:10675: \$? = $ac_status" >&5
+   echo "$as_me:10722: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -12037,7 +12084,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 12040 "configure"
+#line 12087 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12135,7 +12182,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 12138 "configure"
+#line 12185 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12962,11 +13009,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:12965: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13012: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:12969: \$? = $ac_status" >&5
+   echo "$as_me:13016: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -13022,11 +13069,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:13025: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13072: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:13029: \$? = $ac_status" >&5
+   echo "$as_me:13076: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -15067,11 +15114,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:15070: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15117: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:15074: \$? = $ac_status" >&5
+   echo "$as_me:15121: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -15300,11 +15347,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:15303: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15350: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:15307: \$? = $ac_status" >&5
+   echo "$as_me:15354: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -15360,11 +15407,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:15363: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15410: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:15367: \$? = $ac_status" >&5
+   echo "$as_me:15414: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -17548,7 +17595,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 17551 "configure"
+#line 17598 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -17646,7 +17693,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 17649 "configure"
+#line 17696 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -20892,57 +20939,6 @@ done
 
 
 
-# Check whether --with-bdb-lib-dir or --without-bdb-lib-dir was given.
-if test "${with_bdb_lib_dir+set}" = set; then
-  withval="$with_bdb_lib_dir"
-   case "$withval" in
-                no)
-                  if test "x$ENABLE_VERIFY_CACHE" = "x1"; then
-                    { { echo "$as_me:$LINENO: error: Need bdb-lib-dir" >&5
-echo "$as_me: error: Need bdb-lib-dir" >&2;}
-   { (exit 1); exit 1; }; }
-                  fi
-                  ;;
-                yes)
-                  ;;
-                *)
-                  LDFLAGS="$LDFLAGS -L$withval -R$withval"
-                  ;;
-            esac
-
-fi;
-
-
-# Check whether --with-bdb-inc-dir or --without-bdb-inc-dir was given.
-if test "${with_bdb_inc_dir+set}" = set; then
-  withval="$with_bdb_inc_dir"
-   case "$withval" in
-                no)
-                  if test "x$ENABLE_VERIFY_CACHE" = "x1"; then
-                    { { echo "$as_me:$LINENO: error: Need bdb-inc-dir" >&5
-echo "$as_me: error: Need bdb-inc-dir" >&2;}
-   { (exit 1); exit 1; }; }
-                  fi
-                  ;;
-                yes)
-                  ;;
-                *)
-                  CPPFLAGS="$CPPFLAGS -I$withval"
-                  ;;
-            esac
-
-fi;
-
-
-ENABLE_VERIFY_CACHE=1
-# Check whether --enable-verify-cache or --disable-verify-cache was given.
-if test "${enable_verify_cache+set}" = set; then
-  enableval="$enable_verify_cache"
-  if test "x$enableval" = xyes; then ENABLE_VERIFY_CACHE=1; fi
-  if test "x$enableval" = xno;  then ENABLE_VERIFY_CACHE=0; fi
-
-fi;
-
 if test "x$ENABLE_VERIFY_CACHE" = "x1"; then
 echo "$as_me:$LINENO: checking for __db_ndbm_open in -ldb" >&5
 echo $ECHO_N "checking for __db_ndbm_open in -ldb... $ECHO_C" >&6
@@ -21236,33 +21232,6 @@ cat >>confdefs.h <<_ACEOF
 _ACEOF
 
 
-verify_BUILD=
-# Check whether --enable-verify-worker or --disable-verify-worker was given.
-if test "${enable_verify_worker+set}" = set; then
-  enableval="$enable_verify_worker"
-  verify_BUILD=libverify_worker.la
-
-fi;
-
-test_BUILD=
-# Check whether --enable-test-worker or --disable-test-worker was given.
-if test "${enable_test_worker+set}" = set; then
-  enableval="$enable_test_worker"
-  test_BUILD=libtest_workers.la
-
-fi;
-
-cyrus_BUILD=
-# Check whether --enable-cyrus-worker or --disable-cyrus-worker was given.
-if test "${enable_cyrus_worker+set}" = set; then
-  enableval="$enable_cyrus_worker"
-  cyrus_BUILD=libcyrus_worker.la
-
-fi;
-
-
-
-
 
 
 
@@ -21947,9 +21916,6 @@ s,@FFLAGS@,$FFLAGS,;t t
 s,@ac_ct_F77@,$ac_ct_F77,;t t
 s,@LIBTOOL@,$LIBTOOL,;t t
 s,@BDB_LIBS@,$BDB_LIBS,;t t
-s,@verify_BUILD@,$verify_BUILD,;t t
-s,@test_BUILD@,$test_BUILD,;t t
-s,@cyrus_BUILD@,$cyrus_BUILD,;t t
 s,@LIBOBJS@,$LIBOBJS,;t t
 s,@LTLIBOBJS@,$LTLIBOBJS,;t t
 CEOF
diff --git a/smmapdfw/configure.ac b/smmapdfw/configure.ac
index e45b0c4..d0c1b1b 100644
--- a/smmapdfw/configure.ac
+++ b/smmapdfw/configure.ac
@@ -8,6 +8,76 @@ AM_MAINTAINER_MODE
 
 AM_CONFIG_HEADER(config.h)
 
+AC_LANG_C
+
+AC_ARG_WITH(bdb-lib-dir,
+            [AC_HELP_STRING(--with-bdb-lib-dir, [
+                            Directory for Berkeley DB library files])],
+            [ case "$withval" in
+                no)
+                  if test "x$ENABLE_VERIFY_CACHE" = "x1"; then  
+                    AC_MSG_ERROR(Need bdb-lib-dir)
+                  fi
+                  ;;
+                yes)
+                  ;;
+                *)
+                  LDFLAGS="$LDFLAGS -L$withval -R$withval"
+                  ;;
+            esac ]
+)
+
+AC_ARG_WITH(bdb-inc-dir,
+            [AC_HELP_STRING(--with-bdb-inc-dir, [
+                            Directory for Berkeley include files])],
+            [ case "$withval" in
+                no)
+                  if test "x$ENABLE_VERIFY_CACHE" = "x1"; then  
+                    AC_MSG_ERROR(Need bdb-inc-dir)
+                  fi
+                  ;;
+                yes)
+                  ;;
+                *)
+                  CPPFLAGS="$CPPFLAGS -I$withval"
+                  ;;
+            esac ]
+)
+
+
+ENABLE_VERIFY_CACHE=1
+dnl AC_ARG_ENABLE(verify-cache, 
+dnl               [AC_HELP_STRING(--enable-verify-cache, [ 
+dnl                               Enables the cache in the verify worker. 
+dnl                               Required a dbm implemenation.
+dnl                               (default=yes)])],
+dnl   if test "x$enableval" = xyes; then ENABLE_VERIFY_CACHE=1; fi
+dnl   if test "x$enableval" = xno;  then ENABLE_VERIFY_CACHE=0; fi
+dnl )
+
+dnl verify_BUILD=
+dnl AC_ARG_ENABLE(verify-worker,
+dnl               [AC_HELP_STRING(--enable-verify-worker, [
+dnl                               Enables the sender address verification worker.
+dnl                               (default=no)])],
+dnl   verify_BUILD=libverify_worker.la
+dnl )
+
+dnl test_BUILD=
+dnl AC_ARG_ENABLE(test-worker,
+dnl               [AC_HELP_STRING(--enable-test-worker, [
+dnl                               Enables the test worker (just an example).
+dnl                               (default=no)])],
+dnl   test_BUILD=libtest_workers.la
+dnl )
+
+dnl cyrus_BUILD=
+dnl AC_ARG_ENABLE(cyrus-worker,
+dnl               [AC_HELP_STRING(--enable-cyrus-worker, [
+dnl                               Enables the cyrus mailbox checker.
+dnl                               (default=no)])],
+dnl   cyrus_BUILD=libcyrus_worker.la
+dnl )
 
 
 
@@ -59,50 +129,6 @@ AC_CHECK_FUNCS([inet_ntoa memset select socket strchr strdup strerror strrchr st
 
 
 
-AC_ARG_WITH(bdb-lib-dir,
-            [AC_HELP_STRING(--with-bdb-lib-dir, [
-                            Directory for Berkeley DB library files])],
-            [ case "$withval" in
-                no)
-                  if test "x$ENABLE_VERIFY_CACHE" = "x1"; then  
-                    AC_MSG_ERROR(Need bdb-lib-dir)
-                  fi
-                  ;;
-                yes)
-                  ;;
-                *)
-                  LDFLAGS="$LDFLAGS -L$withval -R$withval"
-                  ;;
-            esac ]
-)
-
-AC_ARG_WITH(bdb-inc-dir,
-            [AC_HELP_STRING(--with-bdb-inc-dir, [
-                            Directory for Berkeley include files])],
-            [ case "$withval" in
-                no)
-                  if test "x$ENABLE_VERIFY_CACHE" = "x1"; then  
-                    AC_MSG_ERROR(Need bdb-inc-dir)
-                  fi
-                  ;;
-                yes)
-                  ;;
-                *)
-                  CPPFLAGS="$CPPFLAGS -I$withval"
-                  ;;
-            esac ]
-)
-
-
-ENABLE_VERIFY_CACHE=1
-AC_ARG_ENABLE(verify-cache, 
-              [AC_HELP_STRING(--enable-verify-cache, [ 
-                              Enables the cache in the verify worker. 
-                              Required a dbm implemenation.
-                              (default=yes)])],
-  if test "x$enableval" = xyes; then ENABLE_VERIFY_CACHE=1; fi
-  if test "x$enableval" = xno;  then ENABLE_VERIFY_CACHE=0; fi
-)
 
 if test "x$ENABLE_VERIFY_CACHE" = "x1"; then
 AC_CHECK_LIB([db], [__db_ndbm_open],
@@ -129,36 +155,12 @@ fi
 
 AC_DEFINE_UNQUOTED(ENABLE_VERIFY_CACHE, ${ENABLE_VERIFY_CACHE}, [enable verify cache])
 
-verify_BUILD=
-AC_ARG_ENABLE(verify-worker,
-              [AC_HELP_STRING(--enable-verify-worker, [
-                              Enables the sender address verification worker.
-                              (default=no)])],
-  verify_BUILD=libverify_worker.la
-)
-
-test_BUILD=
-AC_ARG_ENABLE(test-worker,
-              [AC_HELP_STRING(--enable-test-worker, [
-                              Enables the test worker (just an example).
-                              (default=no)])],
-  test_BUILD=libtest_workers.la
-)
-
-cyrus_BUILD=
-AC_ARG_ENABLE(cyrus-worker,
-              [AC_HELP_STRING(--enable-cyrus-worker, [
-                              Enables the cyrus mailbox checker.
-                              (default=no)])],
-  cyrus_BUILD=libcyrus_worker.la
-)
 
 
 
-
-AC_SUBST(verify_BUILD)
-AC_SUBST(test_BUILD)
-AC_SUBST(cyrus_BUILD)
+dnl AC_SUBST(verify_BUILD)
+dnl AC_SUBST(test_BUILD)
+dnl AC_SUBST(cyrus_BUILD)
 
 
 AC_CONFIG_FILES([Makefile libsmmapdfw/Makefile smmapd/Makefile test_worker/Makefile verify_worker/Makefile cyrus_worker/Makefile])
diff --git a/smmapdfw/cyrus_worker/Makefile.am b/smmapdfw/cyrus_worker/Makefile.am
index ba4e884..70d77b2 100644
--- a/smmapdfw/cyrus_worker/Makefile.am
+++ b/smmapdfw/cyrus_worker/Makefile.am
@@ -1,5 +1,4 @@
-lib_LTLIBRARIES = @cyrus_BUILD@
-EXTRA_LTLIBRARIES = libcyrus_worker.la
+lib_LTLIBRARIES = libcyrus_worker.la
 libcyrus_worker_la_SOURCES = cyrus_worker.c
 libcyrus_worker_la_LIBADD = ../libsmmapdfw/libsmmapdfw.la
 
diff --git a/smmapdfw/cyrus_worker/Makefile.in b/smmapdfw/cyrus_worker/Makefile.in
index 63930d5..023b6e6 100644
--- a/smmapdfw/cyrus_worker/Makefile.in
+++ b/smmapdfw/cyrus_worker/Makefile.in
@@ -86,12 +86,8 @@ RANLIB = @RANLIB@
 RC = @RC@
 STRIP = @STRIP@
 VERSION = @VERSION@
-cyrus_BUILD = @cyrus_BUILD@
-test_BUILD = @test_BUILD@
-verify_BUILD = @verify_BUILD@
 
-lib_LTLIBRARIES = @cyrus_BUILD@
-EXTRA_LTLIBRARIES = libcyrus_worker.la
+lib_LTLIBRARIES = libcyrus_worker.la
 libcyrus_worker_la_SOURCES = cyrus_worker.c
 libcyrus_worker_la_LIBADD = ../libsmmapdfw/libsmmapdfw.la
 
@@ -200,7 +196,7 @@ distclean-libtool:
 maintainer-clean-libtool:
 
 libcyrus_worker.la: $(libcyrus_worker_la_OBJECTS) $(libcyrus_worker_la_DEPENDENCIES)
-	$(LINK)  $(libcyrus_worker_la_LDFLAGS) $(libcyrus_worker_la_OBJECTS) $(libcyrus_worker_la_LIBADD) $(LIBS)
+	$(LINK) -rpath $(libdir) $(libcyrus_worker_la_LDFLAGS) $(libcyrus_worker_la_OBJECTS) $(libcyrus_worker_la_LIBADD) $(LIBS)
 
 tags: TAGS
 
diff --git a/smmapdfw/libsmmapdfw/Makefile.in b/smmapdfw/libsmmapdfw/Makefile.in
index 78b94da..528c861 100644
--- a/smmapdfw/libsmmapdfw/Makefile.in
+++ b/smmapdfw/libsmmapdfw/Makefile.in
@@ -86,9 +86,6 @@ RANLIB = @RANLIB@
 RC = @RC@
 STRIP = @STRIP@
 VERSION = @VERSION@
-cyrus_BUILD = @cyrus_BUILD@
-test_BUILD = @test_BUILD@
-verify_BUILD = @verify_BUILD@
 
 include_HEADERS = containers_public.h queue.h smtp.h cfg.h count.h safe_write.h sunos_comp.h dns.h smmapd.h
 lib_LTLIBRARIES = libsmmapdfw.la
diff --git a/smmapdfw/smmapd/Makefile.in b/smmapdfw/smmapd/Makefile.in
index 5978e0e..3fd9fed 100644
--- a/smmapdfw/smmapd/Makefile.in
+++ b/smmapdfw/smmapd/Makefile.in
@@ -86,9 +86,6 @@ RANLIB = @RANLIB@
 RC = @RC@
 STRIP = @STRIP@
 VERSION = @VERSION@
-cyrus_BUILD = @cyrus_BUILD@
-test_BUILD = @test_BUILD@
-verify_BUILD = @verify_BUILD@
 
 noinst_HEADERS = containers.h
 sysconf_DATA = smmapd.ini
diff --git a/smmapdfw/test_worker/Makefile.am b/smmapdfw/test_worker/Makefile.am
index 278d0d5..5d03b8b 100644
--- a/smmapdfw/test_worker/Makefile.am
+++ b/smmapdfw/test_worker/Makefile.am
@@ -1,5 +1,4 @@
-lib_LTLIBRARIES = @test_BUILD@
-EXTRA_LTLIBRARIES = libtest_workers.la
+lib_LTLIBRARIES = libtest_workers.la
 libtest_workers_la_SOURCES = test_workers.c
 libtest_workers_la_LIBADD = ../libsmmapdfw/libsmmapdfw.la
 
diff --git a/smmapdfw/test_worker/Makefile.in b/smmapdfw/test_worker/Makefile.in
index 3d1f2dc..dbf00e9 100644
--- a/smmapdfw/test_worker/Makefile.in
+++ b/smmapdfw/test_worker/Makefile.in
@@ -86,12 +86,8 @@ RANLIB = @RANLIB@
 RC = @RC@
 STRIP = @STRIP@
 VERSION = @VERSION@
-cyrus_BUILD = @cyrus_BUILD@
-test_BUILD = @test_BUILD@
-verify_BUILD = @verify_BUILD@
 
-lib_LTLIBRARIES = @test_BUILD@
-EXTRA_LTLIBRARIES = libtest_workers.la
+lib_LTLIBRARIES = libtest_workers.la
 libtest_workers_la_SOURCES = test_workers.c
 libtest_workers_la_LIBADD = ../libsmmapdfw/libsmmapdfw.la
 
@@ -200,7 +196,7 @@ distclean-libtool:
 maintainer-clean-libtool:
 
 libtest_workers.la: $(libtest_workers_la_OBJECTS) $(libtest_workers_la_DEPENDENCIES)
-	$(LINK)  $(libtest_workers_la_LDFLAGS) $(libtest_workers_la_OBJECTS) $(libtest_workers_la_LIBADD) $(LIBS)
+	$(LINK) -rpath $(libdir) $(libtest_workers_la_LDFLAGS) $(libtest_workers_la_OBJECTS) $(libtest_workers_la_LIBADD) $(LIBS)
 
 tags: TAGS
 
diff --git a/smmapdfw/verify_worker/Makefile.am b/smmapdfw/verify_worker/Makefile.am
index f1ba514..fb9fbd9 100644
--- a/smmapdfw/verify_worker/Makefile.am
+++ b/smmapdfw/verify_worker/Makefile.am
@@ -1,8 +1,6 @@
-lib_LTLIBRARIES = @verify_BUILD@
-
-EXTRA_LTLIBRARIES = libverify_worker.la
+lib_LTLIBRARIES = libverify_worker.la
 libverify_worker_la_SOURCES = verify_worker.c
-libverify_worker_la_LIBADD = ../libsmmapdfw/libsmmapdfw.la @BDB_LIBS@
+libverify_worker_la_LIBADD = ../libsmmapdfw/libsmmapdfw.la
 
 INCLUDES = -I../libsmmapdfw
 
diff --git a/smmapdfw/verify_worker/Makefile.in b/smmapdfw/verify_worker/Makefile.in
index 3cebb63..6acaac3 100644
--- a/smmapdfw/verify_worker/Makefile.in
+++ b/smmapdfw/verify_worker/Makefile.in
@@ -86,15 +86,10 @@ RANLIB = @RANLIB@
 RC = @RC@
 STRIP = @STRIP@
 VERSION = @VERSION@
-cyrus_BUILD = @cyrus_BUILD@
-test_BUILD = @test_BUILD@
-verify_BUILD = @verify_BUILD@
 
-lib_LTLIBRARIES = @verify_BUILD@
-
-EXTRA_LTLIBRARIES = libverify_worker.la
+lib_LTLIBRARIES = libverify_worker.la
 libverify_worker_la_SOURCES = verify_worker.c
-libverify_worker_la_LIBADD = ../libsmmapdfw/libsmmapdfw.la @BDB_LIBS@
+libverify_worker_la_LIBADD = ../libsmmapdfw/libsmmapdfw.la
 
 INCLUDES = -I../libsmmapdfw
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -201,7 +196,7 @@ distclean-libtool:
 maintainer-clean-libtool:
 
 libverify_worker.la: $(libverify_worker_la_OBJECTS) $(libverify_worker_la_DEPENDENCIES)
-	$(LINK)  $(libverify_worker_la_LDFLAGS) $(libverify_worker_la_OBJECTS) $(libverify_worker_la_LIBADD) $(LIBS)
+	$(LINK) -rpath $(libdir) $(libverify_worker_la_LDFLAGS) $(libverify_worker_la_OBJECTS) $(libverify_worker_la_LIBADD) $(LIBS)
 
 tags: TAGS