Attachment #28475 for bug #29889




    [if test "$enableval" = yes;  then
        use_berkeleydb=yes
        BERKELEYOBJS='lpberkeleydbreader.$(OBJEXT)'
	BERKELEYLIBS='-ldb_cxx-4.1'
     fi],
    [])

if test "$use_berkeleydb" = yes; then
    AC_CHECK_HEADER([db4.1/db_cxx.h],[],
                 AC_MSG_ERROR([Berkeley DB library not found]))
    AC_CHECK_HEADER([db_cxx.h],[],
                 AC_MSG_ERROR([Berkeley DB includes not found]))
fi 

AC_SUBST(BERKELEYOBJS)
AC_SUBST(BERKELEYLIBS)

AC_CONFIG_FILES([src/longplayer])

Lines 17-24 Link Here

(-)lplayer-0.99.3.orig/src/Makefile.am (-2 / +2 lines)
17	#lplayer_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(XMMS_LIBS)	17	#lplayer_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(XMMS_LIBS)
18		18
19	# the libraries to link against.	19	# the libraries to link against.
20	lplayer_LDADD = @BERKELEYOBJS@ $(LIB_QT) $(LIB_X11)	20	lplayer_LDADD = $(BERKELEYOBJS) $(BERKELEYLIBS) $(LIB_QT) $(LIB_X11)
21	lplayer_DEPENDENCIES = @BERKELEYOBJS@	21	lplayer_DEPENDENCIES = $(BERKELEYOBJS)
22	# for kde...	22	# for kde...
23	#lplayer_LDADD = $(LIB_KFILE) $(LIB_KDEPRINT)	23	#lplayer_LDADD = $(LIB_KFILE) $(LIB_KDEPRINT)
24		24

Lines 48-53 Link Here

(-)lplayer-0.99.3.orig/src/Makefile.in (-2 / +3 lines)
48	AUTOMAKE = @AUTOMAKE@	48	AUTOMAKE = @AUTOMAKE@
49	AWK = @AWK@	49	AWK = @AWK@
50	BERKELEYOBJS = @BERKELEYOBJS@	50	BERKELEYOBJS = @BERKELEYOBJS@
		51	BERKELEYLIBS = @BERKELEYLIBS@
51	CC = @CC@	52	CC = @CC@
52	CCDEPMODE = @CCDEPMODE@	53	CCDEPMODE = @CCDEPMODE@
53	CFLAGS = @CFLAGS@	54	CFLAGS = @CFLAGS@
Lines 213-220 Link Here
213	#lplayer_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(XMMS_LIBS)	214	#lplayer_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(XMMS_LIBS)
214		215
215	# the libraries to link against.	216	# the libraries to link against.
216	lplayer_LDADD = @BERKELEYOBJS@ $(LIB_QT) $(LIB_X11)	217	lplayer_LDADD = $(BERKELEYOBJS) $(BERKELEYLIBS) $(LIB_QT) $(LIB_X11)
217	lplayer_DEPENDENCIES = @BERKELEYOBJS@	218	lplayer_DEPENDENCIES = $(BERKELEYOBJS)
218		219
219	# for kde...	220	# for kde...
220	#lplayer_LDADD = $(LIB_KFILE) $(LIB_KDEPRINT)	221	#lplayer_LDADD = $(LIB_KFILE) $(LIB_KDEPRINT)

Lines 1-4 Link Here

(-)lplayer-0.99.3.orig/src/lpberkeleydbreader.cpp (-1 / +1 lines)
1	#include <db_cxx.h>	1	#include <db4.1/db_cxx.h>
2	#include <cstring>	2	#include <cstring>
3	#include <iostream>//FIXME: temporary	3	#include <iostream>//FIXME: temporary
4	#include <sstream>	4	#include <sstream>

Return to bug 29889

Lines 19-34 Link Here

(-)lplayer-0.99.3.orig/configure.in.in (-3 / +3 lines)
19	[if test "$enableval" = yes; then	19	[if test "$enableval" = yes; then
20	use_berkeleydb=yes	20	use_berkeleydb=yes
21	BERKELEYOBJS='lpberkeleydbreader.$(OBJEXT)'	21	BERKELEYOBJS='lpberkeleydbreader.$(OBJEXT)'
		22	BERKELEYLIBS='-ldb_cxx-4.1'
22	fi],	23	fi],
23	[])	24	[])
24		25
25	if test "$use_berkeleydb" = yes; then	26	if test "$use_berkeleydb" = yes; then
26	AC_CHECK_LIB([db_cxx], [main], [],	27	AC_CHECK_HEADER([db4.1/db_cxx.h],[],
27	AC_MSG_ERROR([Berkeley DB library not found]))
28	AC_CHECK_HEADER([db_cxx.h],[],
29	AC_MSG_ERROR([Berkeley DB includes not found]))	28	AC_MSG_ERROR([Berkeley DB includes not found]))
30	fi	29	fi
31		30
32	AC_SUBST(BERKELEYOBJS)	31	AC_SUBST(BERKELEYOBJS)
		32	AC_SUBST(BERKELEYLIBS)
33		33
34	AC_CONFIG_FILES([src/longplayer])	34	AC_CONFIG_FILES([src/longplayer])