diff options
| author | joe <joe@61a7d7f5-40b7-0310-9c16-bb0ea8cb1845> | 2006-02-11 23:49:22 +0000 |
|---|---|---|
| committer | joe <joe@61a7d7f5-40b7-0310-9c16-bb0ea8cb1845> | 2006-02-11 23:49:22 +0000 |
| commit | 58e255d175c8b51a23fa2cb084f815279f4dc0e0 (patch) | |
| tree | 1190d5c2e474c6a6f9d4260d96c642d741305074 | |
| parent | b6d069d6e34141eec0b1f8017b2c2c8591ffe0c5 (diff) | |
| download | neon-58e255d175c8b51a23fa2cb084f815279f4dc0e0.tar.gz | |
Merge r869, r881 from trunk:
* macros/neon.m4 (NEON_SSL): Try linking -lssl with -ldl if it fails
without; helps for static OpenSSL 0.9.8 on systems without pkg-config.
* test/run.sh: Set MALLOC_PERTURB_ to enable glibc malloc
randomization.
git-svn-id: http://svn.webdav.org/repos/projects/neon/branches/0.25.x@884 61a7d7f5-40b7-0310-9c16-bb0ea8cb1845
| -rw-r--r-- | macros/neon.m4 | 4 | ||||
| -rw-r--r-- | test/run.sh | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/macros/neon.m4 b/macros/neon.m4 index 01072b9..8eae709 100644 --- a/macros/neon.m4 +++ b/macros/neon.m4 @@ -842,9 +842,9 @@ yes|openssl) [AC_MSG_NOTICE(using SSL library configuration from pkg-config) CPPFLAGS="$CPPFLAGS ${NE_SSL_CFLAGS}" NEON_LIBS="$NEON_LIBS ${NE_SSL_LIBS}"], - [# libcrypto may require -ldl if using the OpenSSL ENGINE branch + [# Either OpenSSL library may require -ldl if built with dynamic engine support NE_SEARCH_LIBS(RSA_new, crypto, -ldl) - NE_SEARCH_LIBS(SSL_library_init, ssl)]) + NE_SEARCH_LIBS(SSL_library_init, ssl, -ldl)]) AC_CHECK_HEADERS(openssl/ssl.h openssl/opensslv.h,, [AC_MSG_ERROR([OpenSSL headers not found, cannot enable SSL support])]) diff --git a/test/run.sh b/test/run.sh index f05c321..bfee42a 100644 --- a/test/run.sh +++ b/test/run.sh @@ -5,10 +5,10 @@ rm -f debug.log child.log ulimit -c unlimited ulimit -v 10240 -# enable an safety-checking malloc in glibc which will abort() if -# heap corruption is detected. +# Enable glibc heap consistency checks, and memory randomization. MALLOC_CHECK_=2 -export MALLOC_CHECK_ +MALLOC_PERTURB_=`expr $RANDOM % 255 2>/dev/null` +export MALLOC_CHECK_ MALLOC_PERTURB_ for f in $*; do if ${HARNESS} ./$f ${SRCDIR}; then |