Fix if/else scope in yow.c from Rudi

[sxemacs] / m4 / sxe-crypto.m4

diff --git a/m4/sxe-crypto.m4 b/m4/sxe-crypto.m4
index ac95002..4ae9d7d 100644 (file)
--- a/m4/sxe-crypto.m4
+++ b/m4/sxe-crypto.m4
@@ -23,7 +23,7 @@ AC_DEFUN([SXE_OPENSSL_VERSION], [dnl
        allowed_versions="0.9.7[e-z] 0.9.8* 0.9.9* 1.0.0*"
        OPENSSL_SANE_P=no
        for ver in $allowed_versions; do
-               if echo "$OPENSSL_VERSION" | grep -q "$ver"; then
+               if echo "$OPENSSL_VERSION" | ${GREP-grep} -q "$ver"; then
                        OPENSSL_SANE_P="yes"
                        break;
                fi
@@ -38,8 +38,8 @@ AC_DEFUN([SXE_TRY_OPENSSL_HISTORICAL_PREFIX], [dnl
 
        ## now append these candidates to our c_switch and ld_switch
        SXE_DUMP_LIBS
-       SXE_APPEND([$OPENSSL_CPPFLAGS], [CPPFLAGS])
-       SXE_APPEND([$OPENSSL_LDFLAGS], [LDFLAGS])
+       SXE_APPEND_UNDUP([$OPENSSL_CPPFLAGS], [CPPFLAGS])
+       SXE_APPEND_UNDUP([$OPENSSL_LDFLAGS], [LDFLAGS])
 
        ## check again
        SXE_CHECK_HEADERS([openssl/crypto.h])
@@ -68,8 +68,8 @@ AC_DEFUN([SXE_TRY_OPENSSL_BIN_PREFIX], [dnl
 
        ## now append these candidates to our c_switch and ld_switch
        SXE_DUMP_LIBS
-       SXE_APPEND([$OPENSSL_CPPFLAGS], [CPPFLAGS])
-       SXE_APPEND([$OPENSSL_LDFLAGS], [LDFLAGS])
+       SXE_APPEND_UNDUP([$OPENSSL_CPPFLAGS], [CPPFLAGS])
+       SXE_APPEND_UNDUP([$OPENSSL_LDFLAGS], [LDFLAGS])
 
        ## check again
        SXE_CHECK_HEADERS([openssl/crypto.h])
@@ -217,6 +217,9 @@ AC_DEFUN([SXE_CHECK_OPENSSL_FUNCS], [dnl
        if test x"$ac_SSLv23_server_method" = xyes; then
                AC_DEFINE([HAVE_SSLV23_SERVER_METHOD], 1, [SSLv23 server methods available])
        fi
+       if test x"$ac_ssl_verify_cert_chain" = xyes; then
+               AC_DEFINE([HAVE_SSL_VERIFY_CERT_CHAIN], 1, [ssl_verify_cert_chain available])
+       fi
        SXE_RESTORE_LIBS
 ])dnl SXE_CHECK_OPENSSL_FUNCS