OpenSSH_4.3p1 configure patch

[Tim Rice]

Here is a patch to configure, & configure.ac that should
solve the problems people are having with 4.3p1.

Thanks to Corina for finding the simple solution.

-- 
Tim Rice				Multitalents	(707) 887-1469
tim at multitalents.net
-------------- next part --------------
diff -ru openssh-4.3p1/configure openssh/configure
--- openssh-4.3p1/configure	2006-02-01 03:33:51.000000000 -0800
+++ openssh/configure	2006-02-02 16:10:44.860763002 -0800
@@ -3036,6 +3036,21 @@
 
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
+echo "$as_me:$LINENO: checking for egrep" >&5
+echo $ECHO_N "checking for egrep... $ECHO_C" >&6
+if test "${ac_cv_prog_egrep+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if echo a | (grep -E '(a|b)') >/dev/null 2>&1
+    then ac_cv_prog_egrep='grep -E'
+    else ac_cv_prog_egrep='egrep'
+    fi
+fi
+echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5
+echo "${ECHO_T}$ac_cv_prog_egrep" >&6
+ EGREP=$ac_cv_prog_egrep
+
+
 # Extract the first word of "ar", so it can be a program name with args.
 set dummy ar; ac_word=$2
 echo "$as_me:$LINENO: checking for $ac_word" >&5
@@ -5640,21 +5655,6 @@
 	esac
 	# tun(4) forwarding compat code
 
-echo "$as_me:$LINENO: checking for egrep" >&5
-echo $ECHO_N "checking for egrep... $ECHO_C" >&6
-if test "${ac_cv_prog_egrep+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if echo a | (grep -E '(a|b)') >/dev/null 2>&1
-    then ac_cv_prog_egrep='grep -E'
-    else ac_cv_prog_egrep='egrep'
-    fi
-fi
-echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5
-echo "${ECHO_T}$ac_cv_prog_egrep" >&6
- EGREP=$ac_cv_prog_egrep
-
-
 echo "$as_me:$LINENO: checking for ANSI C header files" >&5
 echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
 if test "${ac_cv_header_stdc+set}" = set; then
@@ -15093,7 +15093,7 @@
 
 #include <string.h>
 #include <openssl/evp.h>
-int main(void) { exit(EVP_aes_192_cbc() == NULL || EVP_aes_256_cbc() == NULL)}
+int main(void) { exit(EVP_aes_192_cbc() == NULL || EVP_aes_256_cbc() == NULL);}
 
 _ACEOF
 rm -f conftest.$ac_objext
@@ -27440,6 +27440,7 @@
 s, at INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
 s, at INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
 s, at INSTALL_DATA@,$INSTALL_DATA,;t t
+s, at EGREP@,$EGREP,;t t
 s, at AR@,$AR,;t t
 s, at CAT@,$CAT,;t t
 s, at KILL@,$KILL,;t t
@@ -27456,7 +27457,6 @@
 s, at LOGIN_PROGRAM_FALLBACK@,$LOGIN_PROGRAM_FALLBACK,;t t
 s, at PATH_PASSWD_PROG@,$PATH_PASSWD_PROG,;t t
 s, at LD@,$LD,;t t
-s, at EGREP@,$EGREP,;t t
 s, at LIBWRAP@,$LIBWRAP,;t t
 s, at LIBEDIT@,$LIBEDIT,;t t
 s, at LIBPAM@,$LIBPAM,;t t
diff -ru openssh-4.3p1/configure.ac openssh/configure.ac
--- openssh-4.3p1/configure.ac	2006-01-29 05:22:39.000000000 -0800
+++ openssh/configure.ac	2006-02-02 16:10:29.540763142 -0800
@@ -27,6 +27,7 @@
 AC_PROG_CPP
 AC_PROG_RANLIB
 AC_PROG_INSTALL
+AC_PROG_EGREP
 AC_PATH_PROG(AR, ar)
 AC_PATH_PROG(CAT, cat)
 AC_PATH_PROG(KILL, kill)
@@ -1832,7 +1833,7 @@
 	[AC_LANG_SOURCE([[
 #include <string.h>
 #include <openssl/evp.h>
-int main(void) { exit(EVP_aes_192_cbc() == NULL || EVP_aes_256_cbc() == NULL)}
+int main(void) { exit(EVP_aes_192_cbc() == NULL || EVP_aes_256_cbc() == NULL);}
 	]])],
 	[
 		AC_MSG_RESULT(no)