Read default popt aliases again (rhbz#473167)

- makes testsuite depend on local aliases but using default popt config
  is widely documented and needs to work, testsuite needs a better method
  of disabling it if necessary

diff --git a/lib/poptALL.c b/lib/poptALL.c
index ca5d8b2..7bc3a92 100644 (file)
--- a/lib/poptALL.c
+++ b/lib/poptALL.c
@@ -343,9 +343,7 @@ rpmcliInit(int argc, char *const argv[], struct poptOption * optionsTable)
        (void) poptReadConfigFile(optCon, poptfile);
        free(poptfile);
     }
-#if RPM_USES_POPTREADDEFAULTCONFIG
     (void) poptReadDefaultConfig(optCon, 1);
-#endif
     poptSetExecPath(optCon, rpmConfigDir(), 1);
 
     /* Process all options, whine if unknown. */

diff --git a/rpmqv.c b/rpmqv.c
index cd8f2ee..895d88c 100644 (file)
--- a/rpmqv.c
+++ b/rpmqv.c
@@ -267,9 +267,7 @@ int main(int argc, char *argv[])
        (void) poptReadConfigFile(optCon, poptfile);
        free(poptfile);
     }
-#if RPM_USES_POPTREADDEFAULTCONFIG
     (void) poptReadDefaultConfig(optCon, 1);
-#endif
     poptSetExecPath(optCon, rpmConfigDir(), 1);
 
     while ((arg = poptGetNextOpt(optCon)) > 0) {