Added Les Aker's changes: Look for glibtoolize if libtoolize is not available (for Macs). Added USE_GPG_AGENT option for .fwknoprc
This commit is contained in:
parent
8078b0ec1f
commit
5f598bbf7f
@ -12,7 +12,16 @@ fi
|
|||||||
if [ ! -d config ]; then
|
if [ ! -d config ]; then
|
||||||
mkdir config
|
mkdir config
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if which libtoolize &> /dev/null ; then
|
||||||
libtoolize --automake --copy --force
|
libtoolize --automake --copy --force
|
||||||
|
elif which glibtoolize &> /dev/null ; then
|
||||||
|
glibtoolize --automake --copy --force
|
||||||
|
else
|
||||||
|
echo 'No libtoolize or glibtoolize found!'
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
aclocal -I config
|
aclocal -I config
|
||||||
autoheader
|
autoheader
|
||||||
automake --add-missing --copy
|
automake --add-missing --copy
|
||||||
|
|||||||
@ -321,6 +321,12 @@ parse_rc_param(fko_cli_options_t *options, const char *var, char * val)
|
|||||||
if(val[0] == 'y' || val[0] == 'Y')
|
if(val[0] == 'y' || val[0] == 'Y')
|
||||||
options->use_gpg = 1;
|
options->use_gpg = 1;
|
||||||
}
|
}
|
||||||
|
/* Use GPG Agent ? */
|
||||||
|
else if(CONF_VAR_IS(var, "USE_GPG_AGENT"))
|
||||||
|
{
|
||||||
|
if(val[0] == 'y' || val[0] == 'Y')
|
||||||
|
options->use_gpg_agent = 1;
|
||||||
|
}
|
||||||
/* GPG Recipient */
|
/* GPG Recipient */
|
||||||
else if(CONF_VAR_IS(var, "GPG_RECIPIENT"))
|
else if(CONF_VAR_IS(var, "GPG_RECIPIENT"))
|
||||||
{
|
{
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user