2103. [port] Add /usr/sfw to list of locations for OpenSSL

                        under Solaris.

diff --git a/CHANGES b/CHANGES
index 5cb2264afeb59ce3e20e4c78c3c9453e8a309977..c9f4b61033113fd9af04403aba5de5cd7745b129 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+2103.  [port]          Add /usr/sfw to list of locations for OpenSSL
+                       under Solaris.
+
 2102.  [port]          Silence solaris 10 warnings.
 
 2101.  [bug]           OpenSSL version checks were not quite right.

diff --git a/configure b/configure
index 5be18f273867f5fcf0d794f4d6e7746048695406..024ad0f6f2cfed11e11a189160c8d38c17fafe9b 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 1.294.2.71 .
+# From configure.in Revision: 1.294.2.73 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.59.
 #
@@ -4720,7 +4720,7 @@ echo "${ECHO_T}no" >&6
                if test "$use_openssl" = "yes"
                then
                        # User did not specify a path - guess it
-                       openssldirs="/usr /usr/local /usr/local/ssl /usr/pkg"
+                       openssldirs="/usr /usr/local /usr/local/ssl /usr/pkg /usr/sfw"
                        for d in $openssldirs
                        do
                                if test -f $d/include/openssl/opensslv.h

diff --git a/configure.in b/configure.in
index 8d187a3cb8a140096d0e35617f92e5e95df27d68..90335a55cc718ca06ac3cf3c74bf404f772e21a4 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-AC_REVISION($Revision: 1.294.2.72 $)
+AC_REVISION($Revision: 1.294.2.73 $)
 
 AC_INIT(lib/dns/name.c)
 AC_PREREQ(2.13)
@@ -337,7 +337,7 @@ case "$use_openssl" in
                if test "$use_openssl" = "yes"
                then
                        # User did not specify a path - guess it
-                       openssldirs="/usr /usr/local /usr/local/ssl /usr/pkg"
+                       openssldirs="/usr /usr/local /usr/local/ssl /usr/pkg /usr/sfw"
                        for d in $openssldirs
                        do
                                if test -f $d/include/openssl/opensslv.h