]>
Commit | Line | Data |
---|---|---|
1 | --- rpm-4.4.8/configure.ac.orig 2007-04-08 16:26:29.303992000 +0200 | |
2 | +++ rpm-4.4.8/configure.ac 2007-04-08 16:35:11.461748504 +0200 | |
3 | @@ -662,7 +662,7 @@ | |
4 | ||
5 | dnl ------------------ with internal db | |
6 | AC_DEFINE(HAVE_DB3_DB_H, 1, [Define if you have the <db3/db.h> header file]) | |
7 | -WITH_DB_SUBDIR=db3 | |
8 | +WITH_DB_SUBDIR= | |
9 | WITH_INTERNAL_DB=1 | |
10 | DBLIBSRCS="db3.c" | |
11 | ||
12 | --- rpm-4.4.8/rpmdb/Makefile.am.orig 2007-02-03 19:58:47.000000000 +0100 | |
13 | +++ rpm-4.4.8/rpmdb/Makefile.am 2007-04-08 16:41:48.380367607 +0200 | |
14 | @@ -25,21 +25,17 @@ | |
15 | tjfn_LDADD = librpmdb.la | |
16 | ||
17 | pkgincdir = $(pkgincludedir) | |
18 | -pkginc_HEADERS = db.h header.h hdrinline.h rpmdb.h | |
19 | +pkginc_HEADERS = header.h hdrinline.h rpmdb.h | |
20 | noinst_HEADERS = fprint.h header_internal.h legacy.h | |
21 | ||
22 | pkgbindir = @USRLIBRPM@ | |
23 | -pkgbin_PROGRAMS = \ | |
24 | - rpmdb_archive rpmdb_checkpoint rpmdb_deadlock rpmdb_dump \ | |
25 | - rpmdb_hotbackup rpmdb_load rpmdb_printlog rpmdb_recover \ | |
26 | - rpmdb_svc rpmdb_stat rpmdb_upgrade rpmdb_verify | |
27 | ||
28 | mylibs = librpmdb.la | |
29 | ||
30 | LIBS = | |
31 | ||
32 | # XXX watchout, ../db3/libdb.la created by this Makefile may surprise | |
33 | -libdb_la = $(top_builddir)/$(WITH_DB_SUBDIR)/libdb.la | |
34 | +libdb_la = | |
35 | ||
36 | # XXX grrr, RPM_BUILD_ROOT prevents build pollution if/when -lrpm different | |
37 | LDFLAGS = -L$(RPM_BUILD_ROOT)$(usrlibdir) -L$(DESTDIR)$(usrlibdir) | |
38 | @@ -56,16 +52,13 @@ | |
39 | @WITH_POPT_LIB@ \ | |
40 | @WITH_SQLITE3_LIB@ \ | |
41 | @WITH_LIBELF_LIB@ | |
42 | -librpmdb_la_LIBADD = $(DBLIBOBJS) $(libdb_la) | |
43 | +librpmdb_la_LIBADD = $(DBLIBOBJS) -ldb | |
44 | librpmdb_la_DEPENDENCIES = $(DBLIBOBJS) $(libdb_la) | |
45 | ||
46 | if HAVE_LD_VERSION_SCRIPT | |
47 | librpmdb_la_LDFLAGS += -Wl,--version-script=$(srcdir)/librpmdb.vers | |
48 | endif | |
49 | ||
50 | -# XXX make sure that db.h symlink is generated | |
51 | -dbconfig.c $(DBLIBSRCS): db.h | |
52 | - | |
53 | dbconfig.o: $(top_srcdir)/dbconfig.c | |
54 | $(COMPILE) -o $@ -c $< | |
55 |