Skip to content

Commit

Permalink
Making nettle-dev mandatory
Browse files Browse the repository at this point in the history
  • Loading branch information
martin-belanger committed Dec 13, 2016
1 parent 8212b66 commit 7703b9d
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 3 deletions.
24 changes: 22 additions & 2 deletions configure
Original file line number Diff line number Diff line change
Expand Up @@ -14736,11 +14736,31 @@ fi
# Put the nasty error message in config.log where it belongs
echo "$NETTLE_PKG_ERRORS" >&5

use_nettle=no
as_fn_error $? "Package requirements (nettle >= 2.4) were not met:
$NETTLE_PKG_ERRORS
Consider adjusting the PKG_CONFIG_PATH environment variable if you
installed software in a non-standard prefix.
Alternatively, you may set the environment variables NETTLE_CFLAGS
and NETTLE_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details." "$LINENO" 5
elif test $pkg_failed = untried; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
use_nettle=no
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
Alternatively, you may set the environment variables NETTLE_CFLAGS
and NETTLE_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details" "$LINENO" 5; }
else
NETTLE_CFLAGS=$pkg_cv_NETTLE_CFLAGS
NETTLE_LIBS=$pkg_cv_NETTLE_LIBS
Expand Down
2 changes: 1 addition & 1 deletion configure.in
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ else
AC_MSG_RESULT(no)
fi

PKG_CHECK_MODULES(NETTLE, [nettle >= 2.4], [use_nettle=yes], [use_nettle=no])
PKG_CHECK_MODULES(NETTLE, [nettle >= 2.4], [use_nettle=yes])

if test "$use_nettle" = yes;then
CRYPTO_CFLAGS="$NETTLE_CFLAGS"
Expand Down

3 comments on commit 7703b9d

@alandekok
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure why nettle is necessary. The source already includes MD5.

Is it for the HMAC code?

I'm wary of adding new dependencies to a project which is used by dozens of applications. It can be useful to use a new library, but it can also be problematic.

@martin-belanger
Copy link
Author

@martin-belanger martin-belanger commented on 7703b9d Dec 13, 2016 via email

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@martin-belanger
Copy link
Author

@martin-belanger martin-belanger commented on 7703b9d Dec 13, 2016 via email

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.