Attachment #80349 for bug #123578

Lines 11-17 Link Here

(-)clapf-0.3.23.orig/bayes.c (-1 / +1 lines)
11	#include <arpa/inet.h>	11	#include <arpa/inet.h>
12	#include <fcntl.h>	12	#include <fcntl.h>
13	#include <unistd.h>	13	#include <unistd.h>
14	#include <cdb.h>	14	#include <tinycdb.h>
15	#include <math.h>	15	#include <math.h>
16	#include <ctype.h>	16	#include <ctype.h>
17	#include "misc.h"	17	#include "misc.h"







for ac_header in tinycdb.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
if eval "test \"\${$as_ac_Header+set}\" = set"; then


done

    echo "$as_me:$LINENO: checking for main in -ltinycdb" >&5
echo $ECHO_N "checking for main in -ltinycdb... $ECHO_C" >&6
if test "${ac_cv_lib_cdb_main+set}" = set; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
else
  ac_check_lib_save_LIBS=$LIBS
LIBS="-ltinycdb  $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h.  */
_ACEOF

echo "$as_me:$LINENO: result: $ac_cv_lib_cdb_main" >&5
echo "${ECHO_T}$ac_cv_lib_cdb_main" >&6
if test $ac_cv_lib_cdb_main = yes; then
  echo "$as_me:$LINENO: checking for cdb_find in -ltinycdb" >&5
echo $ECHO_N "checking for cdb_find in -ltinycdb... $ECHO_C" >&6
if test "${ac_cv_lib_cdb_cdb_find+set}" = set; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
else
  ac_check_lib_save_LIBS=$LIBS
LIBS="-ltinycdb  $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h.  */
_ACEOF


    have_antispam="yes"

        antispam_libs="-lm -ltinycdb"

    defs="-DHAVE_ANTISPAM"
    objs="hash.o bayes.o decoder.o parser.o"




for ac_header in mysql/mysql.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
if eval "test \"\${$as_ac_Header+set}\" = set"; then




    AC_HAVE_LIBRARY(m, AC_CHECK_LIB(m, fabs), have_math=yes, ""; exit)

    dnl tinycdb
    AC_CHECK_HEADERS(tinycdb.h)
    AC_HAVE_LIBRARY(tinycdb, AC_CHECK_LIB(cdb, cdb_find, have_tinycdb=yes, echo "you need the tinycdb package"; exit))

    have_antispam="yes"

    dnl antispam_libs="-lm -lcrypto -ltinycdb"
    antispam_libs="-lm -ltinycdb"

    defs="-DHAVE_ANTISPAM"
    objs="hash.o bayes.o decoder.o parser.o"

Lines 3-8 Link Here

(-)clapf-0.3.23.orig/Makefile.in (-2 / +3 lines)
3	prefix = @prefix@	3	prefix = @prefix@
4	exec_prefix = @exec_prefix@	4	exec_prefix = @exec_prefix@
5	bindir = @bindir@	5	bindir = @bindir@
		6	sbindir = @sbindir@
6	sysconfdir = @sysconfdir@	7	sysconfdir = @sysconfdir@
7	mandir = @mandir@	8	mandir = @mandir@
8		9
Lines 74-81 Link Here
74		75
75		76
76	install:	77	install:
77	$(INSTALL) -d $(DESTDIR)$(bindir)	78	$(INSTALL) -d $(DESTDIR)$(sbindir)
78	$(INSTALL) -m 0755 clapf $(DESTDIR)$(bindir)	79	$(INSTALL) -m 0755 clapf $(DESTDIR)$(sbindir)
79	$(INSTALL) -d $(DESTDIR)$(sysconfdir)	80	$(INSTALL) -d $(DESTDIR)$(sysconfdir)
80	$(INSTALL) -m 0644 example.conf $(DESTDIR)$(sysconfdir)/clapf.conf	81	$(INSTALL) -m 0644 example.conf $(DESTDIR)$(sysconfdir)/clapf.conf
81	$(INSTALL) -d $(DESTDIR)$(mandir)/man1	82	$(INSTALL) -d $(DESTDIR)$(mandir)/man1

Return to bug 123578

Lines 3738-3744 Link Here

(-)clapf-0.3.23.orig/configure (-9 / +9 lines)
3738		3738
3739		3739
3740		3740
3741	for ac_header in cdb.h	3741	for ac_header in tinycdb.h
3742	do	3742	do
3743	as_ac_Header=`echo "ac_cv_header_$ac_header" \| $as_tr_sh`	3743	as_ac_Header=`echo "ac_cv_header_$ac_header" \| $as_tr_sh`
3744	if eval "test \"\${$as_ac_Header+set}\" = set"; then	3744	if eval "test \"\${$as_ac_Header+set}\" = set"; then
Lines 3887-3899 Link Here
3887		3887
3888	done	3888	done
3889		3889
3890	echo "$as_me:$LINENO: checking for main in -lcdb" >&5	3890	echo "$as_me:$LINENO: checking for main in -ltinycdb" >&5
3891	echo $ECHO_N "checking for main in -lcdb... $ECHO_C" >&6	3891	echo $ECHO_N "checking for main in -ltinycdb... $ECHO_C" >&6
3892	if test "${ac_cv_lib_cdb_main+set}" = set; then	3892	if test "${ac_cv_lib_cdb_main+set}" = set; then
3893	echo $ECHO_N "(cached) $ECHO_C" >&6	3893	echo $ECHO_N "(cached) $ECHO_C" >&6
3894	else	3894	else
3895	ac_check_lib_save_LIBS=$LIBS	3895	ac_check_lib_save_LIBS=$LIBS
3896	LIBS="-lcdb $LIBS"	3896	LIBS="-ltinycdb $LIBS"
3897	cat >conftest.$ac_ext <<_ACEOF	3897	cat >conftest.$ac_ext <<_ACEOF
3898	/* confdefs.h. */	3898	/* confdefs.h. */
3899	_ACEOF	3899	_ACEOF
Lines 3946-3958 Link Here
3946	echo "$as_me:$LINENO: result: $ac_cv_lib_cdb_main" >&5	3946	echo "$as_me:$LINENO: result: $ac_cv_lib_cdb_main" >&5
3947	echo "${ECHO_T}$ac_cv_lib_cdb_main" >&6	3947	echo "${ECHO_T}$ac_cv_lib_cdb_main" >&6
3948	if test $ac_cv_lib_cdb_main = yes; then	3948	if test $ac_cv_lib_cdb_main = yes; then
3949	echo "$as_me:$LINENO: checking for cdb_find in -lcdb" >&5	3949	echo "$as_me:$LINENO: checking for cdb_find in -ltinycdb" >&5
3950	echo $ECHO_N "checking for cdb_find in -lcdb... $ECHO_C" >&6	3950	echo $ECHO_N "checking for cdb_find in -ltinycdb... $ECHO_C" >&6
3951	if test "${ac_cv_lib_cdb_cdb_find+set}" = set; then	3951	if test "${ac_cv_lib_cdb_cdb_find+set}" = set; then
3952	echo $ECHO_N "(cached) $ECHO_C" >&6	3952	echo $ECHO_N "(cached) $ECHO_C" >&6
3953	else	3953	else
3954	ac_check_lib_save_LIBS=$LIBS	3954	ac_check_lib_save_LIBS=$LIBS
3955	LIBS="-lcdb $LIBS"	3955	LIBS="-ltinycdb $LIBS"
3956	cat >conftest.$ac_ext <<_ACEOF	3956	cat >conftest.$ac_ext <<_ACEOF
3957	/* confdefs.h. */	3957	/* confdefs.h. */
3958	_ACEOF	3958	_ACEOF
Lines 4022-4028 Link Here
4022		4022
4023	have_antispam="yes"	4023	have_antispam="yes"
4024		4024
4025	antispam_libs="-lm -lcdb"	4025	antispam_libs="-lm -ltinycdb"
4026		4026
4027	defs="-DHAVE_ANTISPAM"	4027	defs="-DHAVE_ANTISPAM"
4028	objs="hash.o bayes.o decoder.o parser.o"	4028	objs="hash.o bayes.o decoder.o parser.o"
Lines 4032-4038 Link Here
4032		4032
4033		4033
4034		4034
4035	for ac_header in mysql.h	4035	for ac_header in mysql/mysql.h
4036	do	4036	do
4037	as_ac_Header=`echo "ac_cv_header_$ac_header" \| $as_tr_sh`	4037	as_ac_Header=`echo "ac_cv_header_$ac_header" \| $as_tr_sh`
4038	if eval "test \"\${$as_ac_Header+set}\" = set"; then	4038	if eval "test \"\${$as_ac_Header+set}\" = set"; then

Lines 60-72 Link Here

(-)clapf-0.3.23.orig/configure.in (-4 / +4 lines)
60	AC_HAVE_LIBRARY(m, AC_CHECK_LIB(m, fabs), have_math=yes, ""; exit)	60	AC_HAVE_LIBRARY(m, AC_CHECK_LIB(m, fabs), have_math=yes, ""; exit)
61		61
62	dnl tinycdb	62	dnl tinycdb
63	AC_CHECK_HEADERS(cdb.h)	63	AC_CHECK_HEADERS(tinycdb.h)
64	AC_HAVE_LIBRARY(cdb, AC_CHECK_LIB(cdb, cdb_find, have_tinycdb=yes, echo "you need the tinycdb package"; exit))	64	AC_HAVE_LIBRARY(tinycdb, AC_CHECK_LIB(cdb, cdb_find, have_tinycdb=yes, echo "you need the tinycdb package"; exit))
65		65
66	have_antispam="yes"	66	have_antispam="yes"
67		67
68	dnl antispam_libs="-lm -lcrypto -lcdb"	68	dnl antispam_libs="-lm -lcrypto -ltinycdb"
69	antispam_libs="-lm -lcdb"	69	antispam_libs="-lm -ltinycdb"
70		70
71	defs="-DHAVE_ANTISPAM"	71	defs="-DHAVE_ANTISPAM"
72	objs="hash.o bayes.o decoder.o parser.o"	72	objs="hash.o bayes.o decoder.o parser.o"