diff --git a/smmapdfw/Makefile.in b/smmapdfw/Makefile.in
index db2942b..e907597 100644
--- a/smmapdfw/Makefile.in
+++ b/smmapdfw/Makefile.in
@@ -61,8 +61,6 @@ host_alias = @host_alias@
 host_triplet = @host@
 AR = @AR@
 AS = @AS@
-BDB_CPPFLAGS = @BDB_CPPFLAGS@
-BDB_LDFLAGS = @BDB_LDFLAGS@
 CC = @CC@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
diff --git a/smmapdfw/configure b/smmapdfw/configure
index dca4a15..1a8b0e4 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_LDFLAGS BDB_CPPFLAGS 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 LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -1862,7 +1862,7 @@ echo "$as_me: error: Need bdb-lib-dir" >&2;}
                 yes)
                   ;;
                 *)
-                  BDB_LDFLAGS="-L$withval -rpath $withval"
+                  LDFLAGS="-L$withval -rpath $withval"
                   ;;
             esac
 
@@ -1883,7 +1883,7 @@ echo "$as_me: error: Need bdb-inc-dir" >&2;}
                 yes)
                   ;;
                 *)
-                  BDB_CPPFLAGS="-I$withval"
+                  CPPFLAGS="-I$withval"
                   ;;
             esac
 
@@ -21192,7 +21192,6 @@ done
 
 
 
-
                                                             ac_config_files="$ac_config_files Makefile libsmmapdfw/Makefile smmapd/Makefile modules/test/Makefile modules/verify/Makefile modules/cyrus/Makefile"
 
 
@@ -21871,8 +21870,6 @@ s,@F77@,$F77,;t t
 s,@FFLAGS@,$FFLAGS,;t t
 s,@ac_ct_F77@,$ac_ct_F77,;t t
 s,@LIBTOOL@,$LIBTOOL,;t t
-s,@BDB_LDFLAGS@,$BDB_LDFLAGS,;t t
-s,@BDB_CPPFLAGS@,$BDB_CPPFLAGS,;t t
 s,@LIBOBJS@,$LIBOBJS,;t t
 s,@LTLIBOBJS@,$LTLIBOBJS,;t t
 CEOF
diff --git a/smmapdfw/libsmmapdfw/Makefile.in b/smmapdfw/libsmmapdfw/Makefile.in
index fe97279..7d8b490 100644
--- a/smmapdfw/libsmmapdfw/Makefile.in
+++ b/smmapdfw/libsmmapdfw/Makefile.in
@@ -61,8 +61,6 @@ host_alias = @host_alias@
 host_triplet = @host@
 AR = @AR@
 AS = @AS@
-BDB_CPPFLAGS = @BDB_CPPFLAGS@
-BDB_LDFLAGS = @BDB_LDFLAGS@
 CC = @CC@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
diff --git a/smmapdfw/modules/cyrus/Makefile.in b/smmapdfw/modules/cyrus/Makefile.in
index 189c0b0..31e62d2 100644
--- a/smmapdfw/modules/cyrus/Makefile.in
+++ b/smmapdfw/modules/cyrus/Makefile.in
@@ -61,8 +61,6 @@ host_alias = @host_alias@
 host_triplet = @host@
 AR = @AR@
 AS = @AS@
-BDB_CPPFLAGS = @BDB_CPPFLAGS@
-BDB_LDFLAGS = @BDB_LDFLAGS@
 CC = @CC@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
diff --git a/smmapdfw/modules/test/Makefile.in b/smmapdfw/modules/test/Makefile.in
index be5abcd..8399b97 100644
--- a/smmapdfw/modules/test/Makefile.in
+++ b/smmapdfw/modules/test/Makefile.in
@@ -61,8 +61,6 @@ host_alias = @host_alias@
 host_triplet = @host@
 AR = @AR@
 AS = @AS@
-BDB_CPPFLAGS = @BDB_CPPFLAGS@
-BDB_LDFLAGS = @BDB_LDFLAGS@
 CC = @CC@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
diff --git a/smmapdfw/modules/verify/Makefile.in b/smmapdfw/modules/verify/Makefile.in
index 021354e..0ee5760 100644
--- a/smmapdfw/modules/verify/Makefile.in
+++ b/smmapdfw/modules/verify/Makefile.in
@@ -61,8 +61,6 @@ host_alias = @host_alias@
 host_triplet = @host@
 AR = @AR@
 AS = @AS@
-BDB_CPPFLAGS = @BDB_CPPFLAGS@
-BDB_LDFLAGS = @BDB_LDFLAGS@
 CC = @CC@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
diff --git a/smmapdfw/smmapd/Makefile.in b/smmapdfw/smmapd/Makefile.in
index adccac1..d3ae351 100644
--- a/smmapdfw/smmapd/Makefile.in
+++ b/smmapdfw/smmapd/Makefile.in
@@ -61,8 +61,6 @@ host_alias = @host_alias@
 host_triplet = @host@
 AR = @AR@
 AS = @AS@
-BDB_CPPFLAGS = @BDB_CPPFLAGS@
-BDB_LDFLAGS = @BDB_LDFLAGS@
 CC = @CC@
 CXX = @CXX@
 CXXCPP = @CXXCPP@