Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Fix some problems on old platforms like Solaris 8 and 9
  • Loading branch information
Marco van Wieringen committed May 23, 2014
1 parent 14b855f commit d3ae90c
Show file tree
Hide file tree
Showing 3 changed files with 32 additions and 1 deletion.
30 changes: 30 additions & 0 deletions autoconf/configure.in
Expand Up @@ -1013,6 +1013,16 @@ if test "x$with_openssl_directory" != "xno"; then
]
)

AC_TRY_LINK(
[
include <openssl/engine.h>
] , [
ENGINE_load_pk11();
], [
AC_DEFINE(HAVE_ENGINE_LOAD_PK11, 1, [Define to 1 if OpenSSL library has ENGINE_load_pk11 available])
]
)

AC_TRY_LINK(
[
#include <openssl/evp.h>
Expand Down Expand Up @@ -2545,6 +2555,21 @@ AC_TRY_LINK(
]
)

AC_MSG_CHECKING(for compressBound in zlib library)
AC_TRY_LINK(
[
#include <zlib.h>
], [
compressBound(0);
], [
AC_MSG_RESULT(yes)
AC_DEFINE(HAVE_COMPRESS_BOUND, 1, [Define to 1 if you have compressBound])
], [
AC_MSG_RESULT(no)
]
)

AC_MSG_CHECKING(for deflate in zlib library)
LIBS="${saved_LIBS}"
CFLAGS="${saved_CFLAGS}"
CPPFLAGS="${saved_CPPFLAGS}"
Expand Down Expand Up @@ -3413,9 +3438,14 @@ solaris)
5.5|5.6)
AC_DEFINE(HAVE_OLD_SOCKOPT, 1, [Define to 1 to use the old sockopt option])
AC_DEFINE(USE_THR_SETCONCURRENCY, 1, [Define to 1 to use the thr_setconcurrency function])
AC_DEFINE(HAVE_NON_WORKING_WALKCONTEXT, 1, [Define to 1 to when walkcontext does not work])
;;
5.7|5.8)
AC_DEFINE(USE_THR_SETCONCURRENCY, 1, [Define to 1 to use the thr_setconcurrency function])
AC_DEFINE(HAVE_NON_WORKING_WALKCONTEXT, 1, [Define to 1 to when walkcontext does not work])
;;
5.9)
AC_DEFINE(HAVE_NON_WORKING_WALKCONTEXT, 1, [Define to 1 to when walkcontext does not work])
;;
*)
;;
Expand Down
2 changes: 1 addition & 1 deletion src/findlib/acl.c
Expand Up @@ -2056,7 +2056,7 @@ static bacl_exit_code solaris_build_acl_streams(JCR *jcr,
char *acl_text;

n = acl(acl_data->last_fname, GETACLCNT, 0, NULL);
if (n < MIN_ACL_ENTRIES)
if (n < MIN_ACL_ENTRIES) {
return bacl_exit_error;
}

Expand Down
1 change: 1 addition & 0 deletions src/lib/bsys.c
Expand Up @@ -1051,6 +1051,7 @@ void stack_trace()
* Support strack_trace support on Solaris when using the SUNPRO_CC compiler.
*/
#elif defined(HAVE_SUN_OS) && \
!defined(HAVE_NON_WORKING_WALKCONTEXT) && \
defined(HAVE_UCONTEXT_H) && \
defined(HAVE_DEMANGLE_H) && \
defined(HAVE_CPLUS_DEMANGLE) && \
Expand Down

0 comments on commit d3ae90c

Please sign in to comment.