summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorRalf Corsépius <corsepiu@fedoraproject.org>2007-09-17 11:28:27 +0200
committerRalf Corsépius <corsepiu@fedoraproject.org>2007-09-17 11:28:27 +0200
commit7484efff8e9a338e6b662c4867a5093969c75892 (patch)
tree7c966faffeea1c5a9ba69638c5030fea51c95ba7 /lib
parent53d8adadd34f94ff94121531ab8d720aac7aaa17 (diff)
downloadlibrpm-tizen-7484efff8e9a338e6b662c4867a5093969c75892.tar.gz
librpm-tizen-7484efff8e9a338e6b662c4867a5093969c75892.tar.bz2
librpm-tizen-7484efff8e9a338e6b662c4867a5093969c75892.zip
Apply poptReadDefaultConfig iff RPM_USES_POPTREADDEFAULTCONFIG is set.
Diffstat (limited to 'lib')
-rw-r--r--lib/poptALL.c2
-rw-r--r--lib/trb.c2
2 files changed, 4 insertions, 0 deletions
diff --git a/lib/poptALL.c b/lib/poptALL.c
index cd973d899..444c31311 100644
--- a/lib/poptALL.c
+++ b/lib/poptALL.c
@@ -347,7 +347,9 @@ rpmcliInit(int argc, char *const argv[], struct poptOption * optionsTable)
optCon = poptGetContext(__progname, argc, (const char **)argv, optionsTable, 0);
(void) poptReadConfigFile(optCon, LIBRPMALIAS_FILENAME);
+#if RPM_USES_POPTREADDEFAULTCONFIG
(void) poptReadDefaultConfig(optCon, 1);
+#endif
poptSetExecPath(optCon, RPMCONFIGDIR, 1);
/* Process all options, whine if unknown. */
diff --git a/lib/trb.c b/lib/trb.c
index 983665e76..6ad1cc7ba 100644
--- a/lib/trb.c
+++ b/lib/trb.c
@@ -43,7 +43,9 @@ main(int argc, const char *argv[])
optCon = poptGetContext(argv[0], argc, argv, optionsTable, 0);
(void) poptReadConfigFile(optCon, LIBRPMALIAS_FILENAME);
+#if RPM_USES_POPTREADDEFAULTCONFIG
(void) poptReadDefaultConfig(optCon, 1);
+#endif
poptSetExecPath(optCon, RPMCONFIGDIR, 1);
while ((arg = poptGetNextOpt(optCon)) > 0) {