- bump rpm/popt versions, hardwire 4.0.4 in libraries.rpm-4_0

- link rpm libraries together, move symbols to achieve forward linkage.
- use db-4.1.25, not db-4.0.14, internally.
- add rpmdb_loadcvt script, rpmdb_foo utilities.
- use current autotools,
- use splint, not lclint.

3 files changed, 6 insertions, 4 deletions

diff --git a/.lclintrc b/.splintrc
index 6a85d82..6a85d82 100644
--- a/.lclintrc
+++ b/.splintrc
diff --git a/Makefile.am b/Makefile.am
index af8113a..275a5d3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,6 +2,8 @@
 
 AUTOMAKE_OPTIONS = 1.4 foreign
 
+LINT = splint
+
 EXTRA_DIST = autogen.sh CHANGES $(man_MANS) popt.spec \
 	testit.sh test-poptrc \
 	po/*.in po/*.po po/popt.pot \
@@ -38,9 +40,9 @@ man_MANS = popt.3
 sources:
 	@echo $(libpopt_la_SOURCES:%=popt/%)
 
-.PHONY: lclint
-lclint:
-	lclint ${DEFS} ${INCLUDES} ${libpopt_la_SOURCES}
+.PHONY: lint
+lint:
+	$(LINT) ${DEFS} ${INCLUDES} ${libpopt_la_SOURCES}
 
 CVSTAG = $(PACKAGE)-$(subst .,_,$(VERSION))
 
diff --git a/configure.in b/configure.in
index a0c8e31..71fff80 100755
--- a/configure.in
+++ b/configure.in
@@ -2,7 +2,7 @@ AC_INIT(popt.h)
 AC_CANONICAL_SYSTEM
 AC_PREREQ(2.12)
 AC_CONFIG_HEADERS
-AM_INIT_AUTOMAKE(popt, 1.6.4)
+AM_INIT_AUTOMAKE(popt, 1.6.5)
 AM_CONFIG_HEADER(config.h)
 ALL_LINGUAS="cs da de es eu_ES fi fr gl hu id is it ja ko no pl pt pt_BR ro ru sk sl sr sv tr uk wa zh zh_CN.GB2312"