Changes to find openssl for Mac OS X using Homebrew

configure

@@ -7134,7 +7134,7 @@ if test x$check_for_ssl = xyes; then
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL headers" >&5
 $as_echo_n "checking for SSL headers... " >&6; }
 	found_ssl=no
-	for dir in $ssl_inc_dir $ssl_dir /usr/local/openssl /usr/local/ssl /usr/lib/ssl /usr/ssl /usr/pkg /usr/local /usr /usr/freeware/lib/openssl /usr/sfw/include; do
+	for dir in $ssl_inc_dir $ssl_dir /usr/local/openssl /usr/local/opt/openssl /usr/local/ssl /usr/lib/ssl /usr/ssl /usr/pkg /usr/local /usr /usr/freeware/lib/openssl /usr/sfw/include; do
 		ssldir="$dir"
 		if test -f "$dir/include/openssl/ssl.h"; then
 			found_ssl=yes
@@ -7173,10 +7173,11 @@ $as_echo_n "checking for SSL headers... " >&6; }
 				{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL libraries" >&5
 $as_echo_n "checking for SSL libraries... " >&6; }
 		found_ssl=no
-		for dir in $ssl_lib_dir $ssl_dir /usr/lib64 /usr/lib /usr/lib/x86_64-linux-gnu \
-					/usr/lib/i386-linux-gnu /usr/local/lib /usr/lib/ssl /usr/ssl/lib \
-					/usr/openssl/lib /usr/pkg/lib /usr/freeware/lib/openssl \
-					/usr/sfw/lib /opt/freeware/lib; do
+		for dir in $ssl_lib_dir $ssl_dir $ssl_dir/lib $ssl_dir/lib64 /usr/lib64 \
+					/usr/lib /usr/lib/x86_64-linux-gnu /usr/lib/i386-linux-gnu \
+					/usr/local/lib /usr/lib/ssl /usr/ssl/lib /usr/openssl/lib \
+					/usr/pkg/lib /usr/freeware/lib/openssl /usr/sfw/lib \
+					/opt/freeware/lib; do
 			ssllibdir="$dir"
 			if test "`uname -s`" = "Darwin" ; then
 				soext="dylib"
@@ -7220,7 +7221,7 @@ else
   ;;
   *)
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR$ssldir/sbin/openssl$PATH_SEPARATOR$ssldir/bin/openssl
+for as_dir in $ssldir/sbin/openssl$PATH_SEPARATOR$ssldir/bin/openssl$PATH_SEPARATOR$PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.

configure.ac

@@ -337,7 +337,7 @@ dnl Modified version of Mark Ethan Trostler's macro <trostler@juniper.net>
 if test x$check_for_ssl = xyes; then
 	AC_MSG_CHECKING(for SSL headers)
 	found_ssl=no
-	for dir in $ssl_inc_dir $ssl_dir /usr/local/openssl /usr/local/ssl /usr/lib/ssl /usr/ssl /usr/pkg /usr/local /usr /usr/freeware/lib/openssl /usr/sfw/include; do
+	for dir in $ssl_inc_dir $ssl_dir /usr/local/openssl /usr/local/opt/openssl /usr/local/ssl /usr/lib/ssl /usr/ssl /usr/pkg /usr/local /usr /usr/freeware/lib/openssl /usr/sfw/include; do
 		ssldir="$dir"
 		if test -f "$dir/include/openssl/ssl.h"; then
 			found_ssl=yes
@@ -376,10 +376,11 @@ if test x$check_for_ssl = xyes; then
 		dnl Now try and find SSL libraries
 		AC_MSG_CHECKING(for SSL libraries)
 		found_ssl=no
-		for dir in $ssl_lib_dir $ssl_dir /usr/lib64 /usr/lib /usr/lib/x86_64-linux-gnu \
-					/usr/lib/i386-linux-gnu /usr/local/lib /usr/lib/ssl /usr/ssl/lib \
-					/usr/openssl/lib /usr/pkg/lib /usr/freeware/lib/openssl \
-					/usr/sfw/lib /opt/freeware/lib; do
+		for dir in $ssl_lib_dir $ssl_dir $ssl_dir/lib $ssl_dir/lib64 /usr/lib64 \
+					/usr/lib /usr/lib/x86_64-linux-gnu /usr/lib/i386-linux-gnu \
+					/usr/local/lib /usr/lib/ssl /usr/ssl/lib /usr/openssl/lib \
+					/usr/pkg/lib /usr/freeware/lib/openssl /usr/sfw/lib \
+					/opt/freeware/lib; do
 			ssllibdir="$dir"
 			if test "`uname -s`" = "Darwin" ; then
 				soext="dylib"
@@ -406,7 +407,7 @@ if test x$check_for_ssl = xyes; then
 
 			AC_DEFINE_UNQUOTED(HAVE_SSL,[1],[Have SSL support])
 	
-			AC_PATH_PROG(sslbin,openssl,value-if-not-found,$PATH$PATH_SEPARATOR$ssldir/sbin/openssl$PATH_SEPARATOR$ssldir/bin/openssl)
+			AC_PATH_PROG(sslbin,openssl,value-if-not-found,$ssldir/sbin/openssl$PATH_SEPARATOR$ssldir/bin/openssl$PATH_SEPARATOR$PATH)
 
 			dnl Generate DH parameters
 			if test -f "$sslbin"; then