Attachment #108871 for bug #162531




AC_PROG_CPP
AC_PROG_INSTALL
AC_PROG_LN_S
AC_PROG_SYSCONFTOOL
AC_LIBLTDL_INSTALLABLE
AC_LIBTOOL_DLOPEN
AM_PROG_LIBTOOL


if test "$db" != "gdbm"
then
	for dbname in db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db
		do
			AC_CHECK_LIB($dbname, db_create_4002, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ],
			AC_CHECK_LIB($dbname, db_create_4001, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ],
			AC_CHECK_LIB($dbname, db_create_4000, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ],
			AC_CHECK_LIB($dbname, db_create, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ]))))
		done
		AC_CHECK_FUNC(db_create_4002, HAVE_BDB=1)
		AC_CHECK_FUNC(db_create_4001, HAVE_BDB=1)
		AC_CHECK_FUNC(db_create_4000, HAVE_BDB=1)
		AC_CHECK_FUNC(db_create, HAVE_BDB=1)
fi

LIBS="$saveLIBS"




dnl Checks for libraries.

saveLIBS="$LIBS"
for dbname in db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db
	do
		AC_CHECK_LIB($dbname, db_create_4002, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ],
		AC_CHECK_LIB($dbname, db_create_4001, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ],
		AC_CHECK_LIB($dbname, db_create_4000, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ],
		AC_CHECK_LIB($dbname, db_create, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ]))))
	done
FOUND_DB=0
AC_CHECK_FUNC(db_create_4002, FOUND_DB=1)
AC_CHECK_FUNC(db_create_4001, FOUND_DB=1)
AC_CHECK_FUNC(db_create_4000, FOUND_DB=1)
AC_CHECK_FUNC(db_create, FOUND_DB=1)

LIBS="$saveLIBS"


Return to bug 162531

Lines 22-28 Link Here

(-)configure.in.orig (-10 / +11 lines)
22	AC_PROG_CPP	22	AC_PROG_CPP
23	AC_PROG_INSTALL	23	AC_PROG_INSTALL
24	AC_PROG_LN_S	24	AC_PROG_LN_S
25	AC_PROG_SYSCONFTOOL
26	AC_LIBLTDL_INSTALLABLE	25	AC_LIBLTDL_INSTALLABLE
27	AC_LIBTOOL_DLOPEN	26	AC_LIBTOOL_DLOPEN
28	AM_PROG_LIBTOOL	27	AM_PROG_LIBTOOL
Lines 264-278 Link Here
264		263
265	if test "$db" != "gdbm"	264	if test "$db" != "gdbm"
266	then	265	then
267	AC_CHECK_LIB(db, dbopen, [ LIBDB=-ldb ; LIBS="-ldb $LIBS" ],	266	for dbname in db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db
268	[ AC_CHECK_LIB(db, db_open, [ LIBDB=-ldb ; LIBS="-ldb $LIBS"],	267	do
269	[ AC_CHECK_LIB(db, db_env_create,	268	AC_CHECK_LIB($dbname, db_create_4002, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ],
270	[ LIBDB=-ldb; LIBS="-ldb $LIBS"]) ]	269	AC_CHECK_LIB($dbname, db_create_4001, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ],
271	)])	270	AC_CHECK_LIB($dbname, db_create_4000, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ],
272		271	AC_CHECK_LIB($dbname, db_create, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ]))))
273	AC_CHECK_FUNC(dbopen, HAVE_BDB=1)	272	done
274	AC_CHECK_FUNC(db_open, HAVE_BDB=1)	273	AC_CHECK_FUNC(db_create_4002, HAVE_BDB=1)
275	AC_CHECK_FUNC(db_env_create, HAVE_BDB=1)	274	AC_CHECK_FUNC(db_create_4001, HAVE_BDB=1)
		275	AC_CHECK_FUNC(db_create_4000, HAVE_BDB=1)
		276	AC_CHECK_FUNC(db_create, HAVE_BDB=1)
276	fi	277	fi
277		278
278	LIBS="$saveLIBS"	279	LIBS="$saveLIBS"

Lines 21-35 Link Here

(-)bdbobj/configure.in.orig (-8 / +11 lines)
21	dnl Checks for libraries.	21	dnl Checks for libraries.
22		22
23	saveLIBS="$LIBS"	23	saveLIBS="$LIBS"
24	AC_CHECK_LIB(db, dbopen, [ LIBDB=-ldb ; LIBS="-ldb $LIBS" ],	24	for dbname in db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db
25	AC_CHECK_LIB(db, db_open, [ LIBDB=-ldb ; LIBS="-ldb $LIBS"],	25	do
26	AC_CHECK_LIB(db, db_env_create, [ LIBDB=-ldb; LIBS="-ldb $LIBS"])	26	AC_CHECK_LIB($dbname, db_create_4002, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ],
27	))	27	AC_CHECK_LIB($dbname, db_create_4001, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ],
28		28	AC_CHECK_LIB($dbname, db_create_4000, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ],
		29	AC_CHECK_LIB($dbname, db_create, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ]))))
		30	done
29	FOUND_DB=0	31	FOUND_DB=0
30	AC_CHECK_FUNC(dbopen, FOUND_DB=1)	32	AC_CHECK_FUNC(db_create_4002, FOUND_DB=1)
31	AC_CHECK_FUNC(db_open, FOUND_DB=1)	33	AC_CHECK_FUNC(db_create_4001, FOUND_DB=1)
32	AC_CHECK_FUNC(db_env_create, FOUND_DB=1)	34	AC_CHECK_FUNC(db_create_4000, FOUND_DB=1)
		35	AC_CHECK_FUNC(db_create, FOUND_DB=1)
33		36
34	LIBS="$saveLIBS"	37	LIBS="$saveLIBS"
35		38