DeforaOS/configure
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

configure can now take care of multiple directories at once

Browse Source
This commit is contained in:
Pierre Pronchery 2010-10-18 16:20:04 +00:00
parent f906c47819
commit 974f260d1e
1 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/configure.c
View File

@ -131,8 +131,7 @@ static int _configure(Prefs * prefs, char const * directory)
return error_print(PACKAGE); return error_print(PACKAGE);
cfgr.prefs = prefs; cfgr.prefs = prefs;
_configure_detect(&cfgr); _configure_detect(&cfgr);
ret = _configure_load(prefs, directory, ca); if((ret = _configure_load(prefs, directory, ca)) == 0)
if(ret == 0)
{ {
if(prefs->flags & PREFS_n) if(prefs->flags & PREFS_n)
ret = _configure_do(&cfgr, ca); ret = _configure_do(&cfgr, ca);
@ -323,16 +322,16 @@ static int _usage(void)
_prefs_init(&prefs); _prefs_init(&prefs);
fprintf(stderr, "%s%s%s%s%s%s%s%s%s", fprintf(stderr, "%s%s%s%s%s%s%s%s%s",
"Usage: configure [-nv][options...][directory]\n\ "Usage: configure [-nv][options...][directory...]\n"
-n Do not actually write Makefiles\n\ " -n Do not actually write Makefiles\n"
-v Verbose mode\n\ " -v Verbose mode\n"
-b Binary files directory (default: \"", prefs.bindir, "\")\n\ " -b Binary files directory (default: \"", prefs.bindir, "\")\n"
-d Destination prefix (default: \"\")\n\ " -d Destination prefix (default: \"\")\n"
-i Include files directory (default: \"", prefs.includedir, "\")\n\ " -i Include files directory (default: \"", prefs.includedir, "\")\n"
-l Library files directory (default: \"", prefs.libdir, "\")\n\ " -l Library files directory (default: \"", prefs.libdir, "\")\n"
-O Force Operating System (default: auto-detected)\n\ " -O Force Operating System (default: auto-detected)\n"
-p Installation directory prefix (default: \"", prefs.prefix, "\")\n\ " -p Installation directory prefix (default: \"", prefs.prefix, "\")\n"
-S Warn about security risks\n"); " -S Warn about security risks\n");
return 1; return 1;
} }
@ -340,6 +339,7 @@ static int _usage(void)
/* main */ /* main */
int main(int argc, char * argv[]) int main(int argc, char * argv[])
{ {
int ret = 0;
Prefs prefs; Prefs prefs;
int o; int o;
@ -377,9 +377,11 @@ int main(int argc, char * argv[])
case '?': case '?':
return _usage(); return _usage();
} }
if(argc - optind > 1) if(optind == argc)
return _usage(); return _configure(&prefs, ".");
return _configure(&prefs, argc - optind == 1 ? argv[argc - 1] : "."); for(; optind < argc; optind++)
ret |= _configure(&prefs, argv[optind]);
return (ret == 0) ? 0 : 2;
} }
static void _prefs_init(Prefs * prefs) static void _prefs_init(Prefs * prefs)