From d02af667205c3c47decd2e4c1d94f354686d6792 Mon Sep 17 00:00:00 2001 From: Michael Steinert Date: Thu, 24 May 2012 20:03:44 -0600 Subject: Update polarssl.m4 1. Update license to match the rest of the project 2. Update library check (similar to previous change in popt.m4) Signed-off-by: Michael Steinert --- m4/polarssl.m4 | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/m4/polarssl.m4 b/m4/polarssl.m4 index 21f401f..2c87bbd 100644 --- a/m4/polarssl.m4 +++ b/m4/polarssl.m4 @@ -2,9 +2,24 @@ # # Copyright 2012 Michael Steinert # -# This file is free software; the copyright holder(s) give unlimited -# permission to copy and/or distribute it, with or without modifications, -# as long as this notice is preserved. +# Permission is hereby granted, free of charge, to any person obtaining +# a copy of this software and associated documentation files (the +# "Software"), to deal in the Software without restriction, including +# without limitation the rights to use, copy, modify, merge, publish, +# distribute, sublicense, and/or sell copies of the Software, and to +# permit persons to whom the Software is furnished to do so, subject to +# the following conditions: +# +# The above copyright notice and this permission notice shall be +# included in all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT +# SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, +# DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR +# OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR +# THE USE OR OTHER DEALINGS IN THE SOFTWARE. #serial 1 @@ -24,9 +39,9 @@ AC_CHECK_HEADERS([polarssl/ssl.h], [_ax_polarssl_h=yes],, [$POLARSSL_CFLAGS]) AS_IF([test "x$POLARSSL_LIBS" = "x"], - [AC_SEARCH_LIBS([entropy_init], [polarssl], - [POLARSSL_LIBS=-lpolarssl - _ax_polarssl_lib=yes])], + [AC_CHECK_LIB([polarssl], [entropy_init], + [POLARSSL_LIBS=-lpolarssl + _ax_polarssl_lib=yes])], [_ax_polarssl_cflags=$CFLAGS CFLAGS="$POLARSSL_CFLAGS $CFLAGS" _ax_polarssl_ldflags=$LDFLAGS -- cgit v1.2.1