Merge remote-tracking branch 'origin/master'

[mech_eap.orig] / acinclude.m4

diff --git a/acinclude.m4 b/acinclude.m4
index 401ad2a..6f43261 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -17,17 +17,19 @@ AC_ARG_WITH(krb5,
        [Use krb5 (in specified installation directory)]),
     [check_krb5_dir="$withval"],
     [check_krb5_dir=])
-for dir in $check_krb5_dir $prefix /usr /usr/local ; do
+for dir in $check_krb5_dir $prefix /usr/local /usr ; do
    krb5dir="$dir"
    if test -x "$dir/bin/krb5-config"; then
      found_krb5="yes";
      if test "x$target_windows" = "xyes"; then
         KRB5_CFLAGS=-I"$check_krb5_dir/include";
-        KRB5_LIBS="-L$check_krb5_dir/lib/ -lkrb5_32 -lgssapi32";
+        KRB5_LDFLAGS="-L$check_krb5_dir/lib/";
+        KRB5_LIBS="-lkrb5_32 -lgssapi32";
         COMPILE_ET="$check_krb5_dir/bin/compile_et";
        AC_MSG_RESULT([yes])
      else
         KRB5_CFLAGS=`$dir/bin/krb5-config gssapi --cflags`;
+        KRB5_LDFLAGS="-L$dir/lib";
         KRB5_LIBS=`$dir/bin/krb5-config gssapi --libs`
 AC_MSG_RESULT([yes])
         AC_PATH_PROG(COMPILE_ET, [compile_et], [compile_et], [$dir/bin$PATH_SEPARATOr])
@@ -48,6 +50,7 @@ if test x_$found_krb5 != x_yes; then
 else
        printf "Kerberos found in $krb5dir\n";
        AC_SUBST(KRB5_CFLAGS)
+        AC_SUBST(KRB5_LDFLAGS)
        AC_SUBST(KRB5_LIBS)
        AC_SUBST(COMPILE_ET)
        AC_CHECK_LIB(krb5, GSS_C_NT_COMPOSITE_EXPORT, [AC_DEFINE_UNQUOTED([HAVE_GSS_C_NT_COMPOSITE_EXPORT], 1, [Define if GSS-API library supports recent naming extensions draft])], [], "$KRB5_LIBS")
@@ -115,7 +118,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 +252,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=