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

                        [RT #19343]

diff --git a/CHANGES b/CHANGES
index 77ff718486a0f6892ad0e1cd8fcce84026812d05..d24af2d50fd75b08e50d90deac5643922507fd09 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -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]
 

diff --git a/configure b/configure
index 02c0abc14052b5ff3b7c9e69404c576440301856..d30274c3490ea9aca68cca2906d368c2b896bf1f 100755 (executable)
--- a/configure
+++ b/configure
@@ -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"

diff --git a/configure.in b/configure.in
index 2fb78bcfc8a824e4a8613dc9ef6baa5be124d217..6af9ba99a7fc0161f4fbf35c50ac2db1b99a398a 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -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"