2 files changed, 27 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index 493eddd33..3035eca05 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+20070304
+ - (djm) [configure.ac] add a --without-openssl-header-check option to
+   configure, as some platforms (OS X) ship OpenSSL headers whose version
+   does not match that of the shipping library. ok dtucker@
+
 20070303
  - (dtucker) [regress/agent-ptrace.sh] Make ttrace gdb error a little more
    general to cover newer gdb versions on HP-UX.
@@ -2794,4 +2799,4 @@
    OpenServer 6 and add osr5bigcrypt support so when someone migrates
    passwords between UnixWare and OpenServer they will still work. OK dtucker@
 
-$Id: ChangeLog,v 1.4629 2007/03/02 22:42:23 dtucker Exp $
+$Id: ChangeLog,v 1.4630 2007/03/05 00:51:27 djm Exp $
diff --git a/configure.ac b/configure.ac
index b6a25c9e0..a2b236355 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-# $Id: configure.ac,v 1.371 2007/03/02 06:50:04 dtucker Exp $
+# $Id: configure.ac,v 1.372 2007/03/05 00:51:27 djm Exp $
 #
 # Copyright (c) 1999-2004 Damien Miller
 #
@@ -15,7 +15,7 @@
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 AC_INIT(OpenSSH, Portable, openssh-unix-dev@mindrot.org)
-AC_REVISION($Revision: 1.371 $)
+AC_REVISION($Revision: 1.372 $)
 AC_CONFIG_SRCDIR([ssh.c])
 
 AC_CONFIG_HEADER(config.h)
@@ -1857,6 +1857,14 @@ int main(void) {
         ]
 )
 
+AC_ARG_WITH(openssl-header-check,
+        [  --without-openssl-header-check Disable OpenSSL version consistency check],
+        [  if test "x$withval" = "xno" ; then
+                openssl_check_nonfatal=1
+           fi
+        ]
+)
+
 # Sanity check OpenSSL headers
 AC_MSG_CHECKING([whether OpenSSL's headers match the library])
 AC_RUN_IFELSE(
@@ -1870,9 +1878,18 @@ int main(void) { exit(SSLeay() == OPENSSL_VERSION_NUMBER ? 0 : 1); }
         ],
         [
                 AC_MSG_RESULT(no)
-                AC_MSG_ERROR([Your OpenSSL headers do not match your library.
-Check config.log for details.
+                if test "x$openssl_check_nonfatal" = "x"; then
+                        AC_MSG_ERROR([Your OpenSSL headers do not match your
+library. Check config.log for details.
+If you are sure your installation is consistent, you can disable the check
+by running "./configure --without-openssl-header-check".
+Also see contrib/findssl.sh for help identifying header/library mismatches.
+])
+                else
+                        AC_MSG_WARN([Your OpenSSL headers do not match your
+library. Check config.log for details.
 Also see contrib/findssl.sh for help identifying header/library mismatches.])
+                fi
         ],
         [
                 AC_MSG_WARN([cross compiling: not checking])