2550. [bug] Check --with-openssl=<path> finds <openssl/opensslv.h>.

[RT #19343]
This commit is contained in:
Mark Andrews
2009-02-15 22:58:35 +00:00
parent 7c3032def3
commit bcc6edc534
3 changed files with 14 additions and 3 deletions
+3
View File
@@ -1,3 +1,6 @@
2550. [bug] Check --with-openssl=<path> finds <openssl/opensslv.h>.
[RT #19343]
2549. [port] linux: define NR_OPEN if not currently defined.
[RT #19344]
Vendored
+7 -2
View File
@@ -14,7 +14,7 @@
# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE.
#
# $Id: configure,v 1.339.18.87 2009/01/19 02:04:24 marka Exp $
# $Id: configure,v 1.339.18.88 2009/02/15 22:58:35 marka Exp $
#
# Portions Copyright (C) 1996-2001 Nominum, Inc.
#
@@ -29,7 +29,7 @@
# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
# From configure.in Revision: 1.355.18.92 .
# From configure.in Revision: 1.355.18.94 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.62.
#
@@ -22771,6 +22771,11 @@ $as_echo "not found" >&6; }
$as_echo "$as_me: error: OpenSSL was not found in any of $openssldirs; use --with-openssl=/path" >&2;}
{ (exit 1); exit 1; }; }
fi
elif ! test -f "$use_openssl"/include/openssl/opensslv.h
then
{ { $as_echo "$as_me:$LINENO: error: \"$use_openssl/include/openssl/opensslv.h\" not found" >&5
$as_echo "$as_me: error: \"$use_openssl/include/openssl/opensslv.h\" not found" >&2;}
{ (exit 1); exit 1; }; }
fi
USE_OPENSSL='-DOPENSSL'
if test "$use_openssl" = "/usr"
+4 -1
View File
@@ -18,7 +18,7 @@ AC_DIVERT_PUSH(1)dnl
esyscmd([sed "s/^/# /" COPYRIGHT])dnl
AC_DIVERT_POP()dnl
AC_REVISION($Revision: 1.355.18.93 $)
AC_REVISION($Revision: 1.355.18.94 $)
AC_INIT(lib/dns/name.c)
AC_PREREQ(2.59)
@@ -499,6 +499,9 @@ case "$use_openssl" in
AC_MSG_ERROR(
[OpenSSL was not found in any of $openssldirs; use --with-openssl=/path])
fi
elif ! test -f "$use_openssl"/include/openssl/opensslv.h
then
AC_MSG_ERROR(["$use_openssl/include/openssl/opensslv.h" not found])
fi
USE_OPENSSL='-DOPENSSL'
if test "$use_openssl" = "/usr"