diff --git a/smmapdfw/configure b/smmapdfw/configure index c6c92f7..0aad60b 100755 --- a/smmapdfw/configure +++ b/smmapdfw/configure @@ -19140,6 +19140,72 @@ echo "$as_me:$LINENO: result: $ac_cv_lib_db___db_ndbm_open" >&5 echo "${ECHO_T}$ac_cv_lib_db___db_ndbm_open" >&6 if test $ac_cv_lib_db___db_ndbm_open = yes; then LIBS="$LIBS -ldb" +else + echo "$as_me:$LINENO: checking for __db_ndbm_open_4002 in -ldb" >&5 +echo $ECHO_N "checking for __db_ndbm_open_4002 in -ldb... $ECHO_C" >&6 +if test "${ac_cv_lib_db___db_ndbm_open_4002+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-ldb $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#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_ndbm_open_4002 (); +int +main () +{ +__db_ndbm_open_4002 (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_db___db_ndbm_open_4002=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_lib_db___db_ndbm_open_4002=no +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_lib_db___db_ndbm_open_4002" >&5 +echo "${ECHO_T}$ac_cv_lib_db___db_ndbm_open_4002" >&6 +if test $ac_cv_lib_db___db_ndbm_open_4002 = yes; then + LIBS="$LIBS -ldb" else echo "$as_me:$LINENO: checking for __db_ndbm_open in -ldb41" >&5 echo $ECHO_N "checking for __db_ndbm_open in -ldb41... $ECHO_C" >&6 @@ -19207,9 +19273,9 @@ echo "${ECHO_T}$ac_cv_lib_db41___db_ndbm_open" >&6 if test $ac_cv_lib_db41___db_ndbm_open = yes; then LIBS="$LIBS -ldb41" else - echo "$as_me:$LINENO: checking for __db_ndbm_open in -ldb42" >&5 -echo $ECHO_N "checking for __db_ndbm_open in -ldb42... $ECHO_C" >&6 -if test "${ac_cv_lib_db42___db_ndbm_open+set}" = set; then + echo "$as_me:$LINENO: checking for __db_ndbm_open_4002 in -ldb42" >&5 +echo $ECHO_N "checking for __db_ndbm_open_4002 in -ldb42... $ECHO_C" >&6 +if test "${ac_cv_lib_db42___db_ndbm_open_4002+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS @@ -19227,11 +19293,11 @@ extern "C" #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_ndbm_open (); +char __db_ndbm_open_4002 (); int main () { -__db_ndbm_open (); +__db_ndbm_open_4002 (); ; return 0; } @@ -19257,20 +19323,20 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_lib_db42___db_ndbm_open=yes + ac_cv_lib_db42___db_ndbm_open_4002=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_db42___db_ndbm_open=no +ac_cv_lib_db42___db_ndbm_open_4002=no fi rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_db42___db_ndbm_open" >&5 -echo "${ECHO_T}$ac_cv_lib_db42___db_ndbm_open" >&6 -if test $ac_cv_lib_db42___db_ndbm_open = yes; then +echo "$as_me:$LINENO: result: $ac_cv_lib_db42___db_ndbm_open_4002" >&5 +echo "${ECHO_T}$ac_cv_lib_db42___db_ndbm_open_4002" >&6 +if test $ac_cv_lib_db42___db_ndbm_open_4002 = yes; then LIBS="$LIBS -ldb42" else { { echo "$as_me:$LINENO: error: *** Berkeley DB not found" >&5 @@ -19286,6 +19352,9 @@ fi fi +fi + + echo "$as_me:$LINENO: checking for inet_aton in -lresolv" >&5 echo $ECHO_N "checking for inet_aton in -lresolv... $ECHO_C" >&6 diff --git a/smmapdfw/configure.ac b/smmapdfw/configure.ac index 7981bf9..b0ebec4 100644 --- a/smmapdfw/configure.ac +++ b/smmapdfw/configure.ac @@ -75,11 +75,14 @@ AC_CHECK_LIB(pthread, pthread_create, AC_CHECK_LIB([db], [__db_ndbm_open], [ LIBS="$LIBS -ldb" ], - AC_CHECK_LIB([db41], [__db_ndbm_open], - [ LIBS="$LIBS -ldb41" ], - AC_CHECK_LIB([db42], [__db_ndbm_open], - [ LIBS="$LIBS -ldb42" ], - [ AC_MSG_ERROR([*** Berkeley DB not found]) ] + AC_CHECK_LIB([db], [__db_ndbm_open_4002], + [ LIBS="$LIBS -ldb" ], + AC_CHECK_LIB([db41], [__db_ndbm_open], + [ LIBS="$LIBS -ldb41" ], + AC_CHECK_LIB([db42], [__db_ndbm_open_4002], + [ LIBS="$LIBS -ldb42" ], + [ AC_MSG_ERROR([*** Berkeley DB not found]) ] + ) ) ) ) diff --git a/smmapdfw/smmapd/smmapd.ini b/smmapdfw/smmapd/smmapd.ini index 14ce36b..c7dc076 100644 --- a/smmapdfw/smmapd/smmapd.ini +++ b/smmapdfw/smmapd/smmapd.ini @@ -5,17 +5,17 @@ address = 127.0.0.1 port = 8887 ; plugin_dir = /home/who/Sources/sf/smmapdfw ; plugins = test_worker1 test_worker2 verifier cyruscheck lua_worker -plugins = lua_worker +plugins = verifier [test_worker1] -obj = test_workers.so +obj = libtest_workers.so text = test worker1 handle text [test_worker2] -obj = test_workers.so +obj = libtest_workers.so [verifier] -obj = verify_worker.so +obj = libverify_worker.so timeout_result = 5 timeout_dialog = 20 cache_enabled = 1 @@ -26,14 +26,14 @@ smtp_port = 25 max_checker_threads = 100 [cyruscheck] -obj = cyrus_worker.so +obj = libcyrus_worker.so timeout = 10 sender_address = lhlo_arg = local lmtp_port = 24 [lua_worker] -obj = lua_worker.so +obj = liblua_worker.so ; load = base string table math loadlib io load = base string io lua_path = .