2008-03-17 09:46:08 +01:00
|
|
|
--- configure.orig 2008-03-17 11:36:38.000000000 +0300
|
|
|
|
+++ configure 2008-03-17 11:38:49.000000000 +0300
|
2008-03-15 15:16:30 +01:00
|
|
|
@@ -20552,70 +20552,9 @@
|
|
|
|
{ echo "$as_me:$LINENO: checking for SSL" >&5
|
|
|
|
echo $ECHO_N "checking for SSL... $ECHO_C" >&6; }
|
2008-03-11 22:13:53 +01:00
|
|
|
|
|
|
|
-if test -n "$PKG_CONFIG"; then
|
|
|
|
- if test -n "$SSL_CFLAGS"; then
|
|
|
|
- pkg_cv_SSL_CFLAGS="$SSL_CFLAGS"
|
|
|
|
- else
|
|
|
|
- if test -n "$PKG_CONFIG" && \
|
|
|
|
- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"openssl\"") >&5
|
|
|
|
- ($PKG_CONFIG --exists --print-errors "openssl") 2>&5
|
|
|
|
- ac_status=$?
|
|
|
|
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
|
|
- (exit $ac_status); }; then
|
|
|
|
- pkg_cv_SSL_CFLAGS=`$PKG_CONFIG --cflags "openssl" 2>/dev/null`
|
|
|
|
-else
|
|
|
|
- pkg_failed=yes
|
|
|
|
-fi
|
|
|
|
- fi
|
|
|
|
-else
|
|
|
|
- pkg_failed=untried
|
|
|
|
-fi
|
|
|
|
-if test -n "$PKG_CONFIG"; then
|
|
|
|
- if test -n "$SSL_LIBS"; then
|
|
|
|
- pkg_cv_SSL_LIBS="$SSL_LIBS"
|
|
|
|
- else
|
|
|
|
- if test -n "$PKG_CONFIG" && \
|
|
|
|
- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"openssl\"") >&5
|
|
|
|
- ($PKG_CONFIG --exists --print-errors "openssl") 2>&5
|
|
|
|
- ac_status=$?
|
|
|
|
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
|
|
- (exit $ac_status); }; then
|
|
|
|
- pkg_cv_SSL_LIBS=`$PKG_CONFIG --libs "openssl" 2>/dev/null`
|
|
|
|
-else
|
|
|
|
- pkg_failed=yes
|
|
|
|
-fi
|
|
|
|
- fi
|
|
|
|
-else
|
|
|
|
- pkg_failed=untried
|
|
|
|
-fi
|
|
|
|
-
|
|
|
|
-
|
|
|
|
-
|
|
|
|
-if test $pkg_failed = yes; then
|
|
|
|
-
|
|
|
|
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
|
|
|
|
- _pkg_short_errors_supported=yes
|
|
|
|
-else
|
|
|
|
- _pkg_short_errors_supported=no
|
|
|
|
-fi
|
|
|
|
- if test $_pkg_short_errors_supported = yes; then
|
|
|
|
- SSL_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "openssl"`
|
|
|
|
- else
|
|
|
|
- SSL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "openssl"`
|
|
|
|
- fi
|
|
|
|
- # Put the nasty error message in config.log where it belongs
|
|
|
|
- echo "$SSL_PKG_ERRORS" >&5
|
|
|
|
-
|
|
|
|
- { echo "$as_me:$LINENO: result: no" >&5
|
|
|
|
-echo "${ECHO_T}no" >&6; }
|
|
|
|
- have_openssl="no"
|
2008-03-17 09:46:08 +01:00
|
|
|
|
2008-03-11 22:13:53 +01:00
|
|
|
-elif test $pkg_failed = untried; then
|
|
|
|
- have_openssl="no"
|
2008-03-17 09:46:08 +01:00
|
|
|
-
|
2008-03-11 22:13:53 +01:00
|
|
|
-else
|
|
|
|
- SSL_CFLAGS=$pkg_cv_SSL_CFLAGS
|
|
|
|
- SSL_LIBS=$pkg_cv_SSL_LIBS
|
2008-03-15 15:16:30 +01:00
|
|
|
+ SSL_CFLAGS=""
|
|
|
|
+ SSL_LIBS="-lssl -lcrypto"
|
|
|
|
{ echo "$as_me:$LINENO: result: yes" >&5
|
|
|
|
echo "${ECHO_T}yes" >&6; }
|
2008-03-11 22:13:53 +01:00
|
|
|
|
2008-03-17 09:46:08 +01:00
|
|
|
@@ -20623,13 +20562,9 @@
|
|
|
|
cat >>confdefs.h <<\_ACEOF
|
|
|
|
#define USE_OPENSSL 1
|
|
|
|
_ACEOF
|
|
|
|
-
|
|
|
|
- requirements_ecore_con="$requirements_ecore_con openssl"
|
2008-03-15 15:16:30 +01:00
|
|
|
# no need to add it to req_ecore_ipc, since they
|
|
|
|
# depends on ecore_con anyway.
|
|
|
|
have_openssl="yes"
|
|
|
|
-
|
2008-03-11 22:13:53 +01:00
|
|
|
-fi
|
2008-03-15 15:16:30 +01:00
|
|
|
fi
|
2008-03-11 22:13:53 +01:00
|
|
|
|
|
|
|
want_curl="yes"
|