RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: rpm Date: 23-Jun-2016 00:48:32
Branch: rpm-5_4 Handle: 2016062222483200
Modified files: (Branch: rpm-5_4)
rpm CHANGES configure.ac
Log:
- autofu: default db-utils seaches to $PATH.
Summary:
Revision Changes Path
1.3501.2.495+1 -0 rpm/CHANGES
2.472.2.149 +16 -16 rpm/configure.ac
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.3501.2.494 -r1.3501.2.495 CHANGES
--- rpm/CHANGES 19 Jun 2016 08:53:45 -0000 1.3501.2.494
+++ rpm/CHANGES 22 Jun 2016 22:48:32 -0000 1.3501.2.495
@@ -1,4 +1,5 @@
5.4.17 -> 5.4.18:
+ - jbj: autofu: default db-utils seaches to $PATH.
- jbj: gnulib: stub in include from gnulib/*.h before /usr/include.
- jbj: gnulib: stub in merge gnulib -> librpmmisc.
- jbj: cygwin: fix: move glob/fnmatch from rpmio->misc to remove linkage
loops.
@@ .
patch -p0 <<'@@ .'
Index: rpm/configure.ac
============================================================================
$ cvs diff -u -r2.472.2.148 -r2.472.2.149 configure.ac
--- rpm/configure.ac 19 Jun 2016 08:53:46 -0000 2.472.2.148
+++ rpm/configure.ac 22 Jun 2016 22:48:32 -0000 2.472.2.149
@@ -1098,22 +1098,22 @@
AC_PATH_PROG(__CPIO, cpio, /bin/cpio, $MYPATH)
AC_PATH_PROG(__CURL, curl, %{_bindir}/curl, $MYPATH)
AC_PATH_PROG(__CVS, cvs, %{_bindir}/cvs, $MYPATH)
-AC_PATH_PROG(__DB_ARCHIVE, ${DBXY}_archive, %{_bindir}/${DBXY}_archive,
$MYPATH)
-AC_PATH_PROG(__DB_CHECKPOINT, ${DBXY}_checkpoint,
%{_bindir}/${DBXY}_checkpoint, $MYPATH)
-AC_PATH_PROG(__DB_DEADLOCK, ${DBXY}_deadlock, %{_bindir}/${DBXY}_deadlock,
$MYPATH)
-AC_PATH_PROG(__DB_DUMP, ${DBXY}_dump, %{_bindir}/${DBXY}_dump, $MYPATH)
-AC_PATH_PROG(__DB_HOTBACKUP, ${DBXY}_hotbackup,
%{_bindir}/${DBXY}_hotbackup, $MYPATH)
-AC_PATH_PROG(__DB_LOAD, ${DBXY}_load, %{_bindir}/${DBXY}_load, $MYPATH)
-AC_PATH_PROG(__DB_LOG_VERIFY, ${DBXY}_log_verify,
%{_bindir}/${DBXY}_log_verify, $MYPATH)
-AC_PATH_PROG(__DB_PRINTLOG, ${DBXY}_printlog, %{_bindir}/${DBXY}_printlog,
$MYPATH)
-AC_PATH_PROG(__DB_RECOVER, ${DBXY}_recover, %{_bindir}/${DBXY}_recover,
$MYPATH)
-AC_PATH_PROG(__DB_REPLICATE, ${DBXY}_replicate,
%{_bindir}/${DBXY}_replicate, $MYPATH)
-AC_PATH_PROG(__DBSQL, ${DBXY}sql, %{_bindir}/${DBXY}sql, $MYPATH)
-AC_PATH_PROG(__DB_SQL_CODEGEN, ${DBXY}_sql_codegen,
%{_bindir}/${DBXY}_sql_codegen, $MYPATH)
-AC_PATH_PROG(__DB_STAT, ${DBXY}_stat, %{_bindir}/${DBXY}_stat, $MYPATH)
-AC_PATH_PROG(__DB_TUNER, ${DBXY}_tuner, %{_bindir}/${DBXY}_tuner, $MYPATH)
-AC_PATH_PROG(__DB_UPGRADE, ${DBXY}_upgrade, %{_bindir}/${DBXY}_upgrade,
$MYPATH)
-AC_PATH_PROG(__DB_VERIFY, ${DBXY}_verify, %{_bindir}/${DBXY}_verify, $MYPATH)
+AC_PATH_PROGS(__DB_ARCHIVE, [${DBXY}_archive db_archive], db_archive,
$MYPATH)
+AC_PATH_PROGS(__DB_CHECKPOINT, [${DBXY}_checkpoint db_checkpoint],
db_checkpoint, $MYPATH)
+AC_PATH_PROGS(__DB_DEADLOCK, [${DBXY}_deadlock db_deadlock], db_deadlock,
$MYPATH)
+AC_PATH_PROGS(__DB_DUMP, [${DBXY}_dump db_dump], db_dump, $MYPATH)
+AC_PATH_PROGS(__DB_HOTBACKUP, [${DBXY}_hotbackup db_hootbackup],
db_hotbackup, $MYPATH)
+AC_PATH_PROGS(__DB_LOAD, [${DBXY}_load db_load], db_load, $MYPATH)
+AC_PATH_PROGS(__DB_LOG_VERIFY, [${DBXY}_log_verify db_log_verify],
db_log_verify, $MYPATH)
+AC_PATH_PROGS(__DB_PRINTLOG, [${DBXY}_printlog db_printlog], db_printlog,
$MYPATH)
+AC_PATH_PROGS(__DB_RECOVER, [${DBXY}_recover db_recover], db_recover,
$MYPATH)
+AC_PATH_PROGS(__DB_REPLICATE, [${DBXY}_replicate db_replicate],
db_replicate, $MYPATH)
+AC_PATH_PROGS(__DBSQL, [${DBXY}sql dbsql], dbsql, $MYPATH)
+AC_PATH_PROGS(__DB_SQL_CODEGEN, [${DBXY}_sql_codegen db_sql_codegen],
db_sql_codegen, $MYPATH)
+AC_PATH_PROGS(__DB_STAT, [${DBXY}_stat db_stat], db_stat, $MYPATH)
+AC_PATH_PROGS(__DB_TUNER, [${DBXY}_tuner db_tuner], db_tuner, $MYPATH)
+AC_PATH_PROGS(__DB_UPGRADE, [${DBXY}_upgrade db_upgrade], db_upgrade,
$MYPATH)
+AC_PATH_PROGS(__DB_VERIFY, [${DBXY}_verify db_verify], db_verify, $MYPATH)
AC_PATH_PROG(__DIFF, diff, /bin/diff, $MYPATH)
AC_PATH_PROG(__DITTO, ditto, %{_bindir}/ditto, $MYPATH)
AC_PATH_PROG(__FILE, file, %{_bindir}/file, $MYPATH)
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
