diff options
| author | Waldemar Brodkorb <wbx@uclibc-ng.org> | 2015-05-15 21:40:58 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@uclibc-ng.org> | 2015-05-15 21:40:58 +0200 |
| commit | 88dc317d5510827a551697805c5d167d3ecb0975 (patch) | |
| tree | 844617488fd1dc07aaccac5f680cb73a66622939 /package/freeradius-server/patches/patch-configure_ac | |
| parent | dff2d49e4342587e3d4c2f578eacfdc0e4089cca (diff) | |
| parent | 0a1c8865d1e019c19639108b2ae1cf53eb863f31 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/freeradius-server/patches/patch-configure_ac')
| -rw-r--r-- | package/freeradius-server/patches/patch-configure_ac | 72 |
1 files changed, 36 insertions, 36 deletions
diff --git a/package/freeradius-server/patches/patch-configure_ac b/package/freeradius-server/patches/patch-configure_ac index c3901ee32..e107143de 100644 --- a/package/freeradius-server/patches/patch-configure_ac +++ b/package/freeradius-server/patches/patch-configure_ac @@ -1,38 +1,38 @@ ---- freeradius-server-3.0.2.orig/configure.ac 2014-03-21 13:27:25.000000000 +0100 -+++ freeradius-server-3.0.2/configure.ac 2014-04-24 13:10:35.000000000 +0200 -@@ -932,35 +932,6 @@ if test "x$WITH_OPENSSL" = xyes; then - OPENSSL_INCLUDE="-DOPENSSL_NO_KRB5" +--- freeradius-server-3.0.8.orig/configure.ac 2015-04-22 19:21:34.000000000 +0200 ++++ freeradius-server-3.0.8/configure.ac 2015-05-13 12:57:21.000000000 +0200 +@@ -1146,35 +1146,6 @@ if test "x$WITH_OPENSSL" = xyes; then + dnl # + old_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$OPENSSL_CPPFLAGS $CPPFLAGS" +- +- dnl # +- dnl # Now check that the header versions match the library +- dnl # +- AC_MSG_CHECKING([OpenSSL library and header version consistency]) +- AC_RUN_IFELSE( +- [AC_LANG_PROGRAM( +- [[ +- #include <stdio.h> +- #include <openssl/opensslv.h> +- #include <openssl/crypto.h> +- ]], +- [[ +- printf("library: %lx header: %lx... ", (unsigned long) SSLeay(), (unsigned long) OPENSSL_VERSION_NUMBER); +- if (SSLeay() == OPENSSL_VERSION_NUMBER) { +- return 0; +- } else { +- return 1; +- } +- ]] +- )], +- [ +- AC_MSG_RESULT(yes) +- ], +- [ +- AC_MSG_RESULT(no) +- AC_MSG_FAILURE([OpenSSL library version does not match header version]) +- ] +- ) + CPPFLAGS="$old_CPPFLAGS" fi -- dnl # -- dnl # Now check that the header versions match the library -- dnl # -- AC_MSG_CHECKING([OpenSSL library and header version consistency]) -- AC_RUN_IFELSE( -- [AC_LANG_PROGRAM( -- [[ -- #include <stdio.h> -- #include <openssl/opensslv.h> -- #include <openssl/crypto.h> -- ]], -- [[ -- if (SSLeay() == OPENSSL_VERSION_NUMBER) { -- return 0; -- } else { -- printf("library: %lx header: %lx... ", (unsigned long) SSLeay(), (unsigned long) OPENSSL_VERSION_NUMBER); -- return 1; -- } -- ]] -- )], -- [ -- AC_MSG_RESULT(yes) -- ], -- [ -- AC_MSG_RESULT(no) -- AC_MSG_FAILURE([OpenSSL library version does not match header version]) -- ] -- ) -- - if test "x$OPENSSL_LIBS" = x; then - LIBS=$old_LIBS - LDFLAGS="$old_LDFLAGS" |