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

Outputs PREFIX to configuration (consider passing Configure* to settings())

Browse Source
This commit is contained in:
Pierre Pronchery 2006-08-31 10:31:23 +00:00
parent 0088809b6a
commit 9e866e122f
1 changed files with 45 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
src/settings.c
View File

@ -24,9 +24,9 @@ String * sSettingsType[ST_LAST+1] =
/* functions */ /* functions */
/* settings */ /* settings */
static int _settings_do(Prefs * prefs, String const * directory, static int _settings_do(Prefs * prefs, Config * config,
String const * package, String const * version, String const * directory, String const * package,
String const * extension); String const * version, String const * extension);
int settings(Prefs * prefs, Config * config, String const * directory, int settings(Prefs * prefs, Config * config, String const * directory,
String const * package, String const * version) String const * package, String const * version)
{ {
@ -43,7 +43,8 @@ int settings(Prefs * prefs, Config * config, String const * directory,
continue; continue;
c = p[i]; c = p[i];
p[i] = '\0'; p[i] = '\0';
ret |= _settings_do(prefs, directory, package, version, p); ret |= _settings_do(prefs, config, directory, package, version,
p);
if(c == '\0') if(c == '\0')
break; break;
p[i] = c; p[i] = c;
@ -53,11 +54,13 @@ int settings(Prefs * prefs, Config * config, String const * directory,
return ret; return ret;
} }
static int _do_h(FILE * fp, String const * package, String const * version); static int _do_h(Prefs * prefs, Config * config, FILE * fp,
static int _do_sh(FILE * fp, String const * package, String const * version); String const * package, String const * version);
static int _settings_do(Prefs * prefs, String const * directory, static int _do_sh(Prefs * prefs, Config * config, FILE * fp,
String const * package, String const * version, String const * package, String const * version);
String const * extension) static int _settings_do(Prefs * prefs, Config * config,
String const * directory, String const * package,
String const * version, String const * extension)
{ {
int ret = 0; int ret = 0;
int i; int i;
@ -84,39 +87,51 @@ static int _settings_do(Prefs * prefs, String const * directory,
return 1; return 1;
} }
if((fp = fopen(filename, "w")) == NULL) if((fp = fopen(filename, "w")) == NULL)
ret |= configure_error(filename, 1); configure_error(filename, 0);
else string_delete(filename);
{ if(fp == NULL)
return 1;
if(prefs->flags & PREFS_v) if(prefs->flags & PREFS_v)
printf("%s%s%s%s\n", "Creating config.", extension, printf("%s%s%s%s\n", "Creating config.", extension, " in ",
" in ", directory); directory);
switch(i) switch(i)
{ {
case ST_H: case ST_H:
ret |= _do_h(fp, package, version); ret |= _do_h(prefs, config, fp, package, version);
break; break;
case ST_SH: case ST_SH:
ret |= _do_sh(fp, package, version); ret |= _do_sh(prefs, config, fp, package, version);
break; break;
default: default:
/* FIXME warn user? */
break; break;
} }
fclose(fp); fclose(fp);
}
string_delete(filename);
return ret; return ret;
} }
static int _do_h(FILE * fp, String const * package, String const * version) static int _do_h(Prefs * prefs, Config * config, FILE * fp,
String const * package, String const * version)
{ {
char const * p;
fprintf(fp, "%s%s%s%s%s%s", "#define PACKAGE \"", package, "\"\n", fprintf(fp, "%s%s%s%s%s%s", "#define PACKAGE \"", package, "\"\n",
"#define VERSION \"", version, "\"\n"); "#define VERSION \"", version, "\"\n");
if((p = prefs->prefix) != NULL || (p = config_get(config, "", "prefix"))
!= NULL)
fprintf(fp, "%s%s%s", "\n#define PREFIX \"", p, "\"\n");
return 0; return 0;
} }
static int _do_sh(FILE * fp, String const * package, String const * version) static int _do_sh(Prefs * prefs, Config * config, FILE * fp,
String const * package, String const * version)
{ {
char const * p;
fprintf(fp, "%s%s%s%s%s%s", "PACKAGE=\"", package, "\"\n", fprintf(fp, "%s%s%s%s%s%s", "PACKAGE=\"", package, "\"\n",
"VERSION=\"", version, "\"\n"); "VERSION=\"", version, "\"\n");
if((p = prefs->prefix) != NULL || (p = config_get(config, "", "prefix"))
!= NULL)
fprintf(fp, "%s%s%s", "\nPREFIX=\"", p, "\"\n");
return 0; return 0;
} }