From: Arran Cudbard-Bell Date: Wed, 17 Apr 2019 19:03:40 +0000 (-0400) Subject: Don't need eap-fast configure script anymore X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=81a4eed4e049da3dd4f04d839b1e41e65094b6be;p=thirdparty%2Ffreeradius-server.git Don't need eap-fast configure script anymore Our minimum OpenSSL version is now 1.0.2 --- diff --git a/src/modules/rlm_eap/types/rlm_eap_fast/.gitignore b/src/modules/rlm_eap/types/rlm_eap_fast/.gitignore deleted file mode 100644 index 01a5daa3cc5..00000000000 --- a/src/modules/rlm_eap/types/rlm_eap_fast/.gitignore +++ /dev/null @@ -1 +0,0 @@ -all.mk diff --git a/src/modules/rlm_eap/types/rlm_eap_fast/all.mk.in b/src/modules/rlm_eap/types/rlm_eap_fast/all.mk similarity index 92% rename from src/modules/rlm_eap/types/rlm_eap_fast/all.mk.in rename to src/modules/rlm_eap/types/rlm_eap_fast/all.mk index e5af0c4802f..beeb26cf264 100644 --- a/src/modules/rlm_eap/types/rlm_eap_fast/all.mk.in +++ b/src/modules/rlm_eap/types/rlm_eap_fast/all.mk @@ -1,4 +1,4 @@ -TARGETNAME := @targetname@ +TARGETNAME := rlm_eap_fast ifneq "$(OPENSSL_LIBS)" "" TARGET := $(TARGETNAME).a diff --git a/src/modules/rlm_eap/types/rlm_eap_fast/configure.ac b/src/modules/rlm_eap/types/rlm_eap_fast/configure.ac deleted file mode 100644 index e52e7545902..00000000000 --- a/src/modules/rlm_eap/types/rlm_eap_fast/configure.ac +++ /dev/null @@ -1,104 +0,0 @@ -# -# Autoconf input file. -# -# Version: $Id$ -# - -AC_PREREQ([2.53]) -AC_INIT(rlm_eap_fast.c) -AC_REVISION($Revision$) -AC_DEFUN(modname,[rlm_eap_fast]) - -mod_ldflags= -mod_cflags= - -if test x$with_[]modname != xno; then - - dnl ############################################################ - dnl # Check for command line options - dnl ############################################################ - dnl extra argument: --with-openssl-lib-dir - openssl_lib_dir= - AC_ARG_WITH(openssl-lib-dir, - [ --with-openssl-lib-dir=DIR directory for LDAP library files []], - [ case "$withval" in - no) - AC_MSG_ERROR(Need openssl-lib-dir) - ;; - yes) - ;; - *) - openssl_lib_dir="$withval" - ;; - esac ] - ) - - dnl extra argument: --with-openssl-include-dir - openssl_include_dir= - AC_ARG_WITH(openssl-include-dir, - [ --with-openssl-include-dir=DIR directory for LDAP include files []], - [ case "$withval" in - no) - AC_MSG_ERROR(Need openssl-include-dir) - ;; - yes) - ;; - *) - openssl_include_dir="$withval" - ;; - esac ] - ) - - dnl ############################################################ - dnl # Check for header files - dnl ############################################################ - - smart_try_dir=$openssl_include_dir - FR_SMART_CHECK_INCLUDE(openssl/ec.h) - if test "$ac_cv_header_openssl_ec_h" != "yes"; then - fail="$fail openssl/ec.h" - fi - - smart_try_dir=$openssl_lib_dir - FR_SMART_CHECK_LIB(crypto, EVP_CIPHER_CTX_new) - if test "x$ac_cv_lib_crypto_EVP_CIPHER_CTX_new" != "xyes"; then - fail="libssl" - fi - - AC_EGREP_CPP(yes, - [#include - #if (OPENSSL_VERSION_NUMBER >= 0x01000100fL) - yes - #endif - ], - [ - AC_MSG_CHECKING([for OpenSSL version >= 1.0.1a]) - AC_MSG_RESULT(yes) - ], - [ - AC_MSG_CHECKING([for OpenSSL version >= 1.0.1a]) - AC_MSG_RESULT(no) - fail="openssl>1.0.1" - ] - ) - - targetname=modname -else - targetname= - echo \*\*\* module modname is disabled. -fi - -if test x"$fail" != x""; then - if test x"${enable_strict_dependencies}" = x"yes"; then - AC_MSG_ERROR([set --without-]modname[ to disable it explicitly.]) - else - AC_MSG_WARN([silently not building ]modname[.]) - AC_MSG_WARN([FAILURE: ]modname[ requires: $fail.]) - targetname="" - fi -fi - -AC_SUBST(mod_ldflags) -AC_SUBST(mod_cflags) -AC_SUBST(targetname) -AC_OUTPUT(all.mk)