RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Ralf S. Engelschall
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: popt Date: 02-Jul-2007 10:58:48
Branch: HEAD Handle: 2007070209584800
Modified files:
popt configure.ac poptconfig.c
Log:
Before attempting to read the hard-coded /etc/popt file try to read in
the installation-prefix-aware <sysconfdir>/popt, please.
Summary:
Revision Changes Path
1.19 +4 -0 popt/configure.ac
1.29 +3 -0 popt/poptconfig.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: popt/configure.ac
============================================================================
$ cvs diff -u -r1.18 -r1.19 configure.ac
--- popt/configure.ac 15 Jun 2007 14:06:06 -0000 1.18
+++ popt/configure.ac 2 Jul 2007 08:58:48 -0000 1.19
@@ -105,6 +105,10 @@
AM_GNU_GETTEXT([external])
+popt_sysconfdir="${sysconfdir}"
+eval "popt_sysconfdir=\"${popt_sysconfdir}\"" # expand contained ${prefix}
+AC_DEFINE_UNQUOTED([POPT_SYSCONFDIR], ["$popt_sysconfdir"], [Full path to
default POPT configuration directory])
+
POPT_SOURCE_PATH="`pwd`"
AC_DEFINE_UNQUOTED(POPT_SOURCE_PATH, "$POPT_SOURCE_PATH",
[Full path to popt top_srcdir.])
@@ .
patch -p0 <<'@@ .'
Index: popt/poptconfig.c
============================================================================
$ cvs diff -u -r1.28 -r1.29 poptconfig.c
--- popt/poptconfig.c 14 Jun 2007 13:31:10 -0000 1.28
+++ popt/poptconfig.c 2 Jul 2007 08:58:48 -0000 1.29
@@ -173,6 +173,9 @@
if (con->appName == NULL) return 0;
+ rc = poptReadConfigFile(con, POPT_SYSCONFDIR "/popt");
+ if (rc) return rc;
+
rc = poptReadConfigFile(con, "/etc/popt");
if (rc) return rc;
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
