- (dtucker) [configure.ac] Check for headers before libraries for openssl an

   zlib, which should make the errors slightly more meaningful on platforms
   where there's separate "-devel" packages for those.

diff --git a/ChangeLog b/ChangeLog
index 2c4129e3e92f1c1b87b6c6771ddb9401cfb965d8..fc42b578593d1154de1da19fcb5ad38fef00b8ae 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+20090817
+ - (dtucker) [configure.ac] Check for headers before libraries for openssl an
+   zlib, which should make the errors slightly more meaningful on platforms
+   where there's separate "-devel" packages for those.
+
 20090729
  - (tim) [contrib/cygwin/ssh-user-config] Change script to call correct error
    function. Patch from Corinna Vinschen.

diff --git a/configure.ac b/configure.ac
index 4b065193427d99d39f4974fc83310dbb2ad70e98..089c2e3e979e0ebb7dc2d219e9289c4babc992f8 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -982,6 +982,7 @@ AC_ARG_WITH(zlib,
        fi ]
 )
 
+AC_CHECK_HEADER([zlib.h], ,AC_MSG_ERROR([*** zlib.h missing - please install first or check config.log ***]))
 AC_CHECK_LIB(z, deflate, ,
        [
                saved_CPPFLAGS="$CPPFLAGS"
@@ -1002,7 +1003,6 @@ AC_CHECK_LIB(z, deflate, ,
                )
        ]
 )
-AC_CHECK_HEADER([zlib.h], ,AC_MSG_ERROR([*** zlib.h missing - please install first or check config.log ***]))
 
 AC_ARG_WITH(zlib-version-check,
        [  --without-zlib-version-check Disable zlib version check],
@@ -1895,6 +1895,8 @@ AC_TRY_LINK_FUNC(RAND_add, AC_DEFINE(HAVE_OPENSSL, 1,
                        LDFLAGS="-L/usr/local/ssl/lib ${saved_LDFLAGS}"
                fi
                CPPFLAGS="-I/usr/local/ssl/include ${saved_CPPFLAGS}"
+               AC_CHECK_HEADER([openssl/opensslv.h], ,
+                   AC_MSG_ERROR([*** OpenSSL headers missing - please install first or check config.log ***]))
                AC_TRY_LINK_FUNC(RAND_add, AC_DEFINE(HAVE_OPENSSL),
                        [
                                AC_MSG_ERROR([*** Can't find recent OpenSSL libcrypto (see config.log for details) ***])