← Back to branch summary

~hartmans/moonshot/mech_eap-debian-dep-fix

« back to all changes in this revision

Viewing changes to acinclude.m4

  • Committer: Sam Hartman
  • Date: 2013-09-27 12:52:03 UTC
  • mfrom: (1.10.131)
  • Revision ID: git-v1:b2002998eebfaec7e080c64b7c583150478dfaa4
Merge branch 'master' into debian

Conflicts:
        libeap/Makefile.am

Show diffs side-by-side

added added

removed removed

Lines of Context:
acinclude.m4
118
118
-DEAP_SERVER_GPSK \
119
119
-DEAP_SERVER_GPSK_SHA256 \
120
120
-DIEEE8021X_EAPOL";
121
 
        EAP_LIBS="-leap -lutils -lcrypto -ltls";
 
121
        EAP_LIBS="-leap -lutils -lcrypto -ltls -lssl";
122
122
        EAP_LDFLAGS="-L$eapdir/eap_example -L$eapdir/src/utils -L$eapdir/src/crypto -L$eapdir/src/tls";
123
123
        AC_SUBST(EAP_CFLAGS)
124
124
        AC_SUBST(EAP_LDFLAGS)
252
252
fi
253
253
])dnl
254
254
 
 
255
AC_DEFUN([AX_CHECK_OPENSSL],
 
256
[AC_MSG_CHECKING(for OpenSSL)
 
257
OPENSSL_DIR=
 
258
found_openssl="no"
 
259
AC_ARG_WITH(openssl,
 
260
    AC_HELP_STRING([--with-openssl],
 
261
       [Use OpenSSL (in specified installation directory)]),
 
262
    [check_openssl_dir="$withval"],
 
263
    [check_openssl_dir=])
 
264
for dir in $check_openssl_dir $prefix /usr /usr/local ; do
 
265
   openssldir="$dir"
 
266
   if test -f "$dir/include/openssl/opensslv.h"; then
 
267
     found_openssl="yes";
 
268
     OPENSSL_DIR="${openssldir}"
 
269
     OPENSSL_CFLAGS="-I$openssldir/include";
 
270
     break;
 
271
   fi
 
272
done
 
273
AC_MSG_RESULT($found_openssl)
 
274
if test x_$found_openssl != x_yes; then
 
275
   AC_MSG_ERROR([
 
276
----------------------------------------------------------------------
 
277
  Cannot find OpenSSL libraries.
 
278
 
 
279
  Please install libssl or specify installation directory with
 
280
  --with-openssl=(dir).
 
281
----------------------------------------------------------------------
 
282
])
 
283
else
 
284
        printf "OpenSSL found in $openssldir\n";
 
285
        OPENSSL_LIBS="-lssl -lcrypto";
 
286
        OPENSSL_LDFLAGS="-L$openssldir/lib";
 
287
        AC_SUBST(OPENSSL_CFLAGS)
 
288
        AC_SUBST(OPENSSL_LDFLAGS)
 
289
        AC_SUBST(OPENSSL_LIBS)
 
290
fi
 
291
])dnl
 
292
 
255
293
AC_DEFUN([AX_CHECK_RADSEC],
256
294
[AC_MSG_CHECKING(for radsec)
257
295
RADSEC_DIR=