- Fix openssl dependency checking in configure script.
Reported by: lippe
This commit is contained in:
parent
a9dff0bde8
commit
22e34d4816
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=209116
2 changed files with 14 additions and 27 deletions
|
@ -7,7 +7,7 @@
|
||||||
|
|
||||||
PORTNAME= con
|
PORTNAME= con
|
||||||
PORTVERSION= 0.9.9.042
|
PORTVERSION= 0.9.9.042
|
||||||
PORTREVISION= 0
|
PORTREVISION= 1
|
||||||
CATEGORIES= net
|
CATEGORIES= net
|
||||||
MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/ \
|
MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/ \
|
||||||
http://download.enlightenment.org/snapshots/2008-01-25/
|
http://download.enlightenment.org/snapshots/2008-01-25/
|
||||||
|
|
|
@ -1,18 +1,9 @@
|
||||||
--- configure.orig 2008-02-23 22:33:06.000000000 +0300
|
--- configure.orig 2008-03-15 01:32:14.000000000 +0300
|
||||||
+++ configure 2008-02-23 22:36:34.000000000 +0300
|
+++ configure 2008-03-15 01:37:43.000000000 +0300
|
||||||
@@ -20543,94 +20543,15 @@
|
@@ -20552,70 +20552,9 @@
|
||||||
if test "${enable_openssl+set}" = set; then
|
{ echo "$as_me:$LINENO: checking for SSL" >&5
|
||||||
enableval=$enable_openssl; want_openssl=$enableval
|
echo $ECHO_N "checking for SSL... $ECHO_C" >&6; }
|
||||||
|
|
||||||
-fi
|
|
||||||
-
|
|
||||||
-
|
|
||||||
-if test "x$want_openssl" = "xyes"; then
|
|
||||||
-
|
|
||||||
-pkg_failed=no
|
|
||||||
-{ echo "$as_me:$LINENO: checking for SSL" >&5
|
|
||||||
-echo $ECHO_N "checking for SSL... $ECHO_C" >&6; }
|
|
||||||
-
|
|
||||||
-if test -n "$PKG_CONFIG"; then
|
-if test -n "$PKG_CONFIG"; then
|
||||||
- if test -n "$SSL_CFLAGS"; then
|
- if test -n "$SSL_CFLAGS"; then
|
||||||
- pkg_cv_SSL_CFLAGS="$SSL_CFLAGS"
|
- pkg_cv_SSL_CFLAGS="$SSL_CFLAGS"
|
||||||
|
@ -73,25 +64,21 @@
|
||||||
-
|
-
|
||||||
-elif test $pkg_failed = untried; then
|
-elif test $pkg_failed = untried; then
|
||||||
- have_openssl="no"
|
- have_openssl="no"
|
||||||
-
|
|
||||||
-else
|
-else
|
||||||
- SSL_CFLAGS=$pkg_cv_SSL_CFLAGS
|
- SSL_CFLAGS=$pkg_cv_SSL_CFLAGS
|
||||||
- SSL_LIBS=$pkg_cv_SSL_LIBS
|
- SSL_LIBS=$pkg_cv_SSL_LIBS
|
||||||
- { echo "$as_me:$LINENO: result: yes" >&5
|
+ SSL_CFLAGS=""
|
||||||
-echo "${ECHO_T}yes" >&6; }
|
+ SSL_LIBS="-lssl -lcrypto"
|
||||||
-
|
{ echo "$as_me:$LINENO: result: yes" >&5
|
||||||
-
|
echo "${ECHO_T}yes" >&6; }
|
||||||
cat >>confdefs.h <<\_ACEOF
|
|
||||||
#define USE_OPENSSL 1
|
|
||||||
_ACEOF
|
|
||||||
|
|
||||||
- requirements_ecore_con="$requirements_ecore_con openssl"
|
@@ -20628,8 +20567,6 @@
|
||||||
# no need to add it to req_ecore_ipc, since they
|
# no need to add it to req_ecore_ipc, since they
|
||||||
# depends on ecore_con anyway.
|
# depends on ecore_con anyway.
|
||||||
have_openssl="yes"
|
have_openssl="yes"
|
||||||
|
-
|
||||||
fi
|
|
||||||
-fi
|
-fi
|
||||||
|
fi
|
||||||
|
|
||||||
want_curl="yes"
|
want_curl="yes"
|
||||||
have_curl="no"
|
|
||||||
|
|
Loading…
Reference in a new issue