diff options
| author | Rob Austein <sra@hactrn.net> | 2011-01-20 14:21:00 +0000 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2011-01-20 14:21:00 +0000 |
| commit | 9c027d9b1c1b719ad8e57504f003aceae549563e (patch) | |
| tree | 093fa727fb5cbefb52d6bc7837d0a2a2347bc621 | |
| parent | 81fbac5c5165e53236b821e9238aafeebc4076fd (diff) | |
Yet another tweak to get right mix of static and dynamic linking.
svn path=/configure; revision=3617
| -rwxr-xr-x | configure | 15 | ||||
| -rw-r--r-- | configure.ac | 12 | ||||
| -rw-r--r-- | openssl/Makefile.in | 5 |
3 files changed, 30 insertions, 2 deletions
@@ -604,6 +604,7 @@ LIBOBJS PYWRAP_LIBDIR PYWRAP_CMD PYWRAP +OPENSSL_SO_GLOB OPENSSL_CONFIG_COMMAND TOP_LEVEL_SUBDIRS PYTHON @@ -4121,6 +4122,20 @@ $as_echo_n "checking what configuration target to use when building OpenSSL... " { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OPENSSL_CONFIG_COMMAND" >&5 $as_echo "$OPENSSL_CONFIG_COMMAND" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking what glob to use when renaming OpenSSL shared libraries" >&5 +$as_echo_n "checking what glob to use when renaming OpenSSL shared libraries... " >&6; } + case $host in + *-apple-darwin*) + OPENSSL_SO_GLOB='*.dylib' + ;; + *) + OPENSSL_SO_GLOB='*.so*' + ;; + esac + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OPENSSL_SO_GLOB" >&5 +$as_echo "$OPENSSL_SO_GLOB" >&6; } + CFLAGS="$CFLAGS -I\${abs_top_srcdir}/openssl/openssl/include" LIBS="$LIBS \${abs_top_builddir}/openssl/openssl/libssl.a \${abs_top_builddir}/openssl/openssl/libcrypto.a" else diff --git a/configure.ac b/configure.ac index ed576056..06b23933 100644 --- a/configure.ac +++ b/configure.ac @@ -257,6 +257,18 @@ then AC_SUBST(OPENSSL_CONFIG_COMMAND) AC_MSG_RESULT([$OPENSSL_CONFIG_COMMAND]) + AC_MSG_CHECKING([what glob to use when renaming OpenSSL shared libraries]) + case $host in + *-apple-darwin*) + OPENSSL_SO_GLOB='*.dylib' + ;; + *) + OPENSSL_SO_GLOB='*.so*' + ;; + esac + AC_SUBST(OPENSSL_SO_GLOB) + AC_MSG_RESULT([$OPENSSL_SO_GLOB]) + CFLAGS="$CFLAGS -I\${abs_top_srcdir}/openssl/openssl/include" LIBS="$LIBS \${abs_top_builddir}/openssl/openssl/libssl.a \${abs_top_builddir}/openssl/openssl/libcrypto.a" else diff --git a/openssl/Makefile.in b/openssl/Makefile.in index 21daf3eb..7ffc5287 100644 --- a/openssl/Makefile.in +++ b/openssl/Makefile.in @@ -4,6 +4,7 @@ VERSION = 1.0.0b OPENSSL_CONFIG_COMMAND = @OPENSSL_CONFIG_COMMAND@ OPENSSL_BUILD_DIRECTORY = ${abs_builddir}/openssl +OPENSSL_SO_GLOB = @OPENSSL_SO_GLOB@ PYWRAP_LIBDIR = @PYWRAP_LIBDIR@ abs_top_srcdir = @abs_top_srcdir@ @@ -24,9 +25,9 @@ OPTIONS = enable-rfc3779 enable-cms no-dso enable-shared --prefix=${prefix} all: openssl-${VERSION}/Makefile cd openssl-${VERSION}; ${MAKE} $@ LIBRPATH=${PYWRAP_LIBDIR} - cd openssl-${VERSION}; mkdir disabled; mv -fv *.so* disabled + cd openssl-${VERSION}; mkdir disabled; mv -fv ${OPENSSL_SO_GLOB} disabled cd openssl-${VERSION}; rm apps/openssl; cd apps; ${MAKE} $@ - cd openssl-${VERSION}; mv -fv disabled/* .; rmdir disabled + cd openssl-${VERSION}; mv -fv disabled/${OPENSSL_SO_GLOB} .; rmdir disabled ln -sf openssl-${VERSION} openssl clean: |