diff options
| author | Rob Austein <sra@hactrn.net> | 2010-12-30 06:26:50 +0000 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2010-12-30 06:26:50 +0000 |
| commit | 6f6eefa8183c9d91c7c3f36925e14e68083dc735 (patch) | |
| tree | cee329901f0a91433ffead6502305d9574c59247 | |
| parent | c77b919f75c23040f38b6771d122476d9fa12e12 (diff) | |
Previous defaults didn't build on Ubuntu 10.04 or Mac OS X, so tweak
defaults and try again.
svn path=/configure; revision=3589
| -rwxr-xr-x | configure | 24 | ||||
| -rw-r--r-- | configure.ac | 20 |
2 files changed, 18 insertions, 26 deletions
@@ -4242,11 +4242,11 @@ $as_echo "$using_gnu_ld" >&6; } { $as_echo "$as_me:$LINENO: checking whether building Python extension will require shared OpenSSL libraries" >&5 $as_echo_n "checking whether building Python extension will require shared OpenSSL libraries... " >&6; } -if test $using_gnu_ld = yes && test "$ac_cv_sizeof_long" -gt 4 +if test $using_gnu_ld = yes && test "$ac_cv_sizeof_long" -eq 4 then - need_openssl_shared=yes -else need_openssl_shared=no +else + need_openssl_shared=yes fi { $as_echo "$as_me:$LINENO: result: $need_openssl_shared" >&5 $as_echo "$need_openssl_shared" >&6; } @@ -4455,21 +4455,17 @@ fi - if test "x$have_python_h" = "xyes" && test $need_openssl_shared = yes + { $as_echo "$as_me:$LINENO: checking whether we need pywrap" >&5 +$as_echo_n "checking whether we need pywrap... " >&6; } + if ldd $PYTHON 2>&5 | $GREP 'libcrypto' >/dev/null 2>&1 then - { $as_echo "$as_me:$LINENO: checking whether Python links against libcrypto" >&5 -$as_echo_n "checking whether Python links against libcrypto... " >&6; } - if ldd $PYTHON 2>&5 | $PYTHON -c 'import sys; sys.exit("libcrypto" not in sys.stdin.read())' - then - need_pywrap=yes - else - need_pywrap=no - fi - { $as_echo "$as_me:$LINENO: result: $need_pywrap" >&5 -$as_echo "$need_pywrap" >&6; } + need_pywrap=yes + need_openssl_shared=yes else need_pywrap=no fi + { $as_echo "$as_me:$LINENO: result: $need_pywrap" >&5 +$as_echo "$need_pywrap" >&6; } { $as_echo "$as_me:$LINENO: checking for Django" >&5 $as_echo_n "checking for Django... " >&6; } diff --git a/configure.ac b/configure.ac index 610107e7..33dd409c 100644 --- a/configure.ac +++ b/configure.ac @@ -95,11 +95,11 @@ fi AC_MSG_RESULT([$using_gnu_ld]) AC_MSG_CHECKING([whether building Python extension will require shared OpenSSL libraries]) -if test $using_gnu_ld = yes && test "$ac_cv_sizeof_long" -gt 4 +if test $using_gnu_ld = yes && test "$ac_cv_sizeof_long" -eq 4 then - need_openssl_shared=yes -else need_openssl_shared=no +else + need_openssl_shared=yes fi AC_MSG_RESULT([$need_openssl_shared]) @@ -129,19 +129,15 @@ else [have_python_h=yes], [have_python_h=no]) - if test "x$have_python_h" = "xyes" && test $need_openssl_shared = yes + AC_MSG_CHECKING([whether we need pywrap]) + if ldd $PYTHON 2>&AS_MESSAGE_LOG_FD | $GREP 'libcrypto' >/dev/null 2>&1 then - AC_MSG_CHECKING([whether Python links against libcrypto]) - if ldd $PYTHON 2>&AS_MESSAGE_LOG_FD | $PYTHON -c 'import sys; sys.exit("libcrypto" not in sys.stdin.read())' - then - need_pywrap=yes - else - need_pywrap=no - fi - AC_MSG_RESULT([$need_pywrap]) + need_pywrap=yes + need_openssl_shared=yes else need_pywrap=no fi + AC_MSG_RESULT([$need_pywrap]) AC_MSG_CHECKING([for Django]) if $PYTHON -c 'import django' 2>/dev/null |