X-Git-Url: http://www.project-moonshot.org/gitweb/?p=moonshot.git;a=blobdiff_plain;f=moonshot%2Facinclude.m4;fp=moonshot%2Facinclude.m4;h=ff06090c2c7cb91059e80df9e065d5936d7b2773;hp=401ad2a0d199b50b043f9adddb8acb88601d20b0;hb=67d88e629802d927e567ba3c339412ffbbd84e2e;hpb=1287abeea6c8c8148fbc41ef990b2381dc9564cd diff --git a/moonshot/acinclude.m4 b/moonshot/acinclude.m4 index 401ad2a..ff06090 100644 --- a/moonshot/acinclude.m4 +++ b/moonshot/acinclude.m4 @@ -115,7 +115,7 @@ else -DEAP_SERVER_GPSK \ -DEAP_SERVER_GPSK_SHA256 \ -DIEEE8021X_EAPOL"; - EAP_LIBS="-leap -lutils -lcrypto -ltls -lssl"; + EAP_LIBS="-leap -lutils -lcrypto -ltls"; EAP_LDFLAGS="-L$eapdir/eap_example -L$eapdir/src/utils -L$eapdir/src/crypto -L$eapdir/src/tls"; AC_SUBST(EAP_CFLAGS) AC_SUBST(EAP_LDFLAGS) @@ -249,44 +249,6 @@ fi fi ])dnl -AC_DEFUN([AX_CHECK_OPENSSL], -[AC_MSG_CHECKING(for OpenSSL) -OPENSSL_DIR= -found_openssl="no" -AC_ARG_WITH(openssl, - AC_HELP_STRING([--with-openssl], - [Use OpenSSL (in specified installation directory)]), - [check_openssl_dir="$withval"], - [check_openssl_dir=]) -for dir in $check_openssl_dir $prefix /usr /usr/local ; do - openssldir="$dir" - if test -f "$dir/include/openssl/opensslv.h"; then - found_openssl="yes"; - OPENSSL_DIR="${openssldir}" - OPENSSL_CFLAGS="-I$openssldir/include"; - break; - fi -done -AC_MSG_RESULT($found_openssl) -if test x_$found_openssl != x_yes; then - AC_MSG_ERROR([ ----------------------------------------------------------------------- - Cannot find OpenSSL libraries. - - Please install libssl or specify installation directory with - --with-openssl=(dir). ----------------------------------------------------------------------- -]) -else - printf "OpenSSL found in $openssldir\n"; - OPENSSL_LIBS="-lssl -lcrypto"; - OPENSSL_LDFLAGS="-L$openssldir/lib"; - AC_SUBST(OPENSSL_CFLAGS) - AC_SUBST(OPENSSL_LDFLAGS) - AC_SUBST(OPENSSL_LIBS) -fi -])dnl - AC_DEFUN([AX_CHECK_RADSEC], [AC_MSG_CHECKING(for radsec) RADSEC_DIR=