BDB

smmapdfw/Makefile.in

@@ -61,6 +61,8 @@ 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@

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 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_LDFLAGS BDB_CPPFLAGS 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)
                   ;;
                 *)
-                  LDFLAGS="$LDFLAGS -L$withval -rpath$withval"
+                  BDB_LDFLAGS="-L$withval -rpath $withval"
                   ;;
             esac
 
@@ -1883,7 +1883,7 @@ echo "$as_me: error: Need bdb-inc-dir" >&2;}
                 yes)
                   ;;
                 *)
-                  CPPFLAGS="$CPPFLAGS -I$withval"
+                  BDB_CPPFLAGS="-I$withval"
                   ;;
             esac
 
@@ -21191,6 +21191,8 @@ done
 
 
 
+
+
                                                             ac_config_files="$ac_config_files Makefile libsmmapdfw/Makefile smmapd/Makefile modules/test/Makefile modules/verify/Makefile modules/cyrus/Makefile"
 
 
@@ -21869,6 +21871,8 @@ 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

smmapdfw/configure.ac

@@ -31,7 +31,7 @@ AC_ARG_WITH(bdb-lib-dir,
                 yes)
                   ;;
                 *)
-                  LDFLAGS="$LDFLAGS -L$withval -rpath$withval"
+                  BDB_LDFLAGS="-L$withval -rpath $withval"
                   ;;
             esac ]
 )
@@ -48,7 +48,7 @@ AC_ARG_WITH(bdb-inc-dir,
                 yes)
                   ;;
                 *)
-                  CPPFLAGS="$CPPFLAGS -I$withval"
+                  BDB_CPPFLAGS="-I$withval"
                   ;;
             esac ]
 )
@@ -115,6 +115,8 @@ AC_CHECK_FUNCS([inet_ntoa memset select socket strchr strdup strerror strrchr st
 
 
 
+AC_SUBST(BDB_LDFLAGS)
+AC_SUBST(BDB_CPPFLAGS)
 AC_CONFIG_FILES([Makefile libsmmapdfw/Makefile smmapd/Makefile modules/test/Makefile modules/verify/Makefile modules/cyrus/Makefile])
 
 AC_OUTPUT

smmapdfw/libsmmapdfw/Makefile.in

@@ -61,6 +61,8 @@ 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@

smmapdfw/modules/cyrus/Makefile.in

@@ -61,6 +61,8 @@ 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@

smmapdfw/modules/test/Makefile.in

@@ -61,6 +61,8 @@ 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@

smmapdfw/modules/verify/Makefile.am

@@ -3,3 +3,6 @@ libverify_worker_la_SOURCES = verify_worker.c
 libverify_worker_la_LIBADD = ../../libsmmapdfw/libsmmapdfw.la
 
 INCLUDES = -I../../libsmmapdfw
+LDFLAGS = $(LDFLAGS) @BDB_LDFLAGS@
+CPPFLAGS = $(CPPFLAGS) @BDB_CPPFLAGS@
+

smmapdfw/modules/verify/Makefile.in

@@ -61,6 +61,8 @@ 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@
@@ -91,6 +93,8 @@ libverify_worker_la_SOURCES = verify_worker.c
 libverify_worker_la_LIBADD = ../../libsmmapdfw/libsmmapdfw.la
 
 INCLUDES = -I../../libsmmapdfw
+LDFLAGS = $(LDFLAGS) @BDB_LDFLAGS@
+CPPFLAGS = $(CPPFLAGS) @BDB_CPPFLAGS@
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../../config.h
 CONFIG_CLEAN_FILES = 
@@ -98,8 +102,6 @@ LTLIBRARIES =  $(lib_LTLIBRARIES)
 
 
 DEFS = @DEFS@ -I. -I$(srcdir) -I../..
-CPPFLAGS = @CPPFLAGS@
-LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@
 libverify_worker_la_LDFLAGS = 
 libverify_worker_la_DEPENDENCIES =  ../../libsmmapdfw/libsmmapdfw.la

smmapdfw/smmapd/Makefile.in

@@ -61,6 +61,8 @@ 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@