Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Added Les Aker's changes: Look for glibtoolize if libtoolize is not a…

…vailable (for Macs). Added USE_GPG_AGENT option for .fwknoprc
  • Loading branch information...
commit 5f598bbf7f7ed8af8c2b60cd272922f6889aac81 1 parent 8078b0e
@damienstuart damienstuart authored
Showing with 16 additions and 1 deletion.
  1. +10 −1 autogen.sh
  2. +6 −0 client/config_init.c
View
11 autogen.sh
@@ -12,7 +12,16 @@ fi
if [ ! -d config ]; then
mkdir config
fi
-libtoolize --automake --copy --force
+
+if which libtoolize &> /dev/null ; then
+ 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
autoheader
automake --add-missing --copy
View
6 client/config_init.c
@@ -321,6 +321,12 @@ parse_rc_param(fko_cli_options_t *options, const char *var, char * val)
if(val[0] == 'y' || val[0] == 'Y')
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 */
else if(CONF_VAR_IS(var, "GPG_RECIPIENT"))
{
Please sign in to comment.
Something went wrong with that request. Please try again.