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

                        under Solaris.

diff --git a/CHANGES b/CHANGES
index a28aefe9d31aa9d95fb9e436719ceb355d735706..e00e7329d38d073a24ca628e206fa522d912efa7 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 d48e5015456c662edd46c182862febd0ac067b3c..51230f2b0b371ef14f1ab07fbefe1550cad0e620 100755 (executable)
--- a/configure
+++ b/configure
@@ -14,7 +14,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 #
-# $Id: configure,v 1.284.2.19.2.67 2006/11/10 00:00:29 marka Exp $
+# $Id: configure,v 1.284.2.19.2.68 2006/11/10 18:31:16 marka Exp $
 #
 # Portions Copyright (C) 1996-2001  Nominum, Inc.
 #
@@ -29,7 +29,7 @@
 # WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
 # OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-# From configure.in Revision: 1.294.2.23.2.72 .
+# From configure.in Revision: 1.294.2.23.2.73 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.59.
 #
@@ -4819,7 +4819,7 @@ else
   use_openssl="auto"
 fi;
 
-openssldirs="/usr /usr/local /usr/local/ssl /usr/pkg"
+openssldirs="/usr /usr/local /usr/local/ssl /usr/pkg /usr/sfw"
 if test "$use_openssl" = "auto"
 then
        for d in $openssldirs

diff --git a/configure.in b/configure.in
index a32948e31d62f0bbb56ef479d227fa6a6d303e5a..050a2722314c664fcfa09a78e814d55f733c791a 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -18,7 +18,7 @@ AC_DIVERT_PUSH(1)dnl
 esyscmd([sed "s/^/# /" COPYRIGHT])dnl
 AC_DIVERT_POP()dnl
 
-AC_REVISION($Revision: 1.294.2.23.2.72 $)
+AC_REVISION($Revision: 1.294.2.23.2.73 $)
 
 AC_INIT(lib/dns/name.c)
 AC_PREREQ(2.13)
@@ -364,7 +364,7 @@ AC_ARG_WITH(openssl,
                           (Required for DNSSEC)],
     use_openssl="$withval", use_openssl="auto")
 
-openssldirs="/usr /usr/local /usr/local/ssl /usr/pkg"
+openssldirs="/usr /usr/local /usr/local/ssl /usr/pkg /usr/sfw"
 if test "$use_openssl" = "auto"
 then
        for d in $openssldirs