RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  ____________________________________________________________________________

  Server: rpm5.org                         Name:   Ralf S. Engelschall
  Root:   /v/rpm/cvs                       Email:  rse@rpm5.org
  Module: rpm                              Date:   27-Jun-2007 12:52:35
  Branch: HEAD                             Handle: 2007062711523500

  Modified files:
    rpm/db3                 configure
    rpm/rpmdb               Makefile.am

  Log:
    More build environment anti-convolution efforts: replace the ugly
    rpmio/Makefile.am hacks for building a not-to-be-installed db3/libdb.la
    from rpmio/Makefile (which is done to trick GNU libtool into packing the
    libdb.la objects into librpmdb.la) with a similar hack, but now at the
    root of the "problem": Just do not pass option "-rpath" when building
    libdb-4.5.la. The effect is the same, but the ugly post-tricking is
    replaced with a simpler root-based solution.
    
    Nevertheless, the inclusion of local libraries is still a problem as it
    is done differently for "db", "lua", and "zlib". More anti-convolution
    efforts are required here, of course.

  Summary:
    Revision    Changes     Path
    1.30        +1  -1      rpm/db3/configure
    1.64        +4  -10     rpm/rpmdb/Makefile.am
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/db3/configure
  ============================================================================
  $ cvs diff -u -r1.29 -r1.30 configure
  --- rpm/db3/configure	27 Jun 2007 10:37:00 -0000	1.29
  +++ rpm/db3/configure	27 Jun 2007 10:52:35 -0000	1.30
  @@ -30,7 +30,7 @@
   mv Makefile Makefile.orig
   cat Makefile.orig | sed -e '/^install[:-]/c\
   distdir install check:\
  -' > Makefile
  +' -e 's/^\(SOFLAGS=\).*$/\1/' > Makefile
   
   mv db.h db.h.orig
   cat db.h.orig | sed \
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmdb/Makefile.am
  ============================================================================
  $ cvs diff -u -r1.63 -r1.64 Makefile.am
  --- rpm/rpmdb/Makefile.am	27 Jun 2007 10:13:28 -0000	1.63
  +++ rpm/rpmdb/Makefile.am	27 Jun 2007 10:52:35 -0000	1.64
  @@ -37,9 +37,6 @@
   
   LIBS =
   
  -# XXX watchout, ../db3/libdb.la created by this Makefile may surprise
  -libdb_la = $(top_builddir)/$(WITH_DB_SUBDIR)/libdb.la
  -
   usrlibdir = $(libdir)@MARK64@
   usrlib_LTLIBRARIES = librpmdb.la
   librpmdb_la_SOURCES = \
  @@ -49,10 +46,11 @@
   	tagname.c tagtbl.c
   librpmdb_la_LDFLAGS = -no-undefined -release $(LT_CURRENT).$(LT_REVISION)
   librpmdb_la_LIBADD = \
  -	$(DBLIBOBJS) $(libdb_la) \
  +	$(DBLIBOBJS) \
  +	$(top_builddir)/$(WITH_DB_SUBDIR)/libdb-4.5.la \
   	$(top_builddir)/rpmio/librpmio.la \
   	$(top_builddir)/misc/librpmmisc.la
  -librpmdb_la_DEPENDENCIES = $(DBLIBOBJS) $(libdb_la)
  +librpmdb_la_DEPENDENCIES = $(DBLIBOBJS)
   
   if HAVE_LD_VERSION_SCRIPT
   librpmdb_la_LDFLAGS += -Wl,--version-script=$(srcdir)/librpmdb.vers
  @@ -86,10 +84,6 @@
   db.h:
   	@ln -sf ../$(WITH_DB_SUBDIR)/db.h $@
   
  -# XXX grrr, force noinst libdb.la for db3.
  -$(libdb_la):
  -	sed -e"/^libdir=/s/^.*$$/libdir=''/" < $(top_builddir)/$(WITH_DB_SUBDIR)/libdb-4.5.la > $(libdb_la)
  -
   db_archive_SOURCES =
   db_archive_LDADD = \
   	$(top_builddir)/$(WITH_DB_SUBDIR)/db_archive.o \
  @@ -184,7 +178,7 @@
   	librpmdb.la
   
   clean-local:
  -	rm -f *.o db.h $(libdb_la)
  +	rm -f *.o db.h
   
   BUILT_SOURCES = tagtbl.c
   
  @@ .