* Update to version 2.19.2

   * Update OpenSSL configuration of Mac OSX.
	* If Homebrew is installed, use it; else
	* if Macports is installed, use it; else
	* if Fink is installaed, use it; else
	* use openssl as distributed in the Mac.

1 files changed, 108 insertions, 32 deletions

diff --git a/configure b/configure
index 802be242..03748daf 100755
--- a/configure
+++ b/configure
@@ -1,7 +1,7 @@
 #! /bin/sh
-# From configure.ac Rev:5 by chappa@washington.edu.
+# From configure.ac Rev:6 by chappa@washington.edu.
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for alpine 2.19.1.
+# Generated by GNU Autoconf 2.69 for alpine 2.19.2.
 #
 # Report bugs to <chappa@washington.edu>.
 #
@@ -730,8 +730,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='alpine'
 PACKAGE_TARNAME='alpine'
-PACKAGE_VERSION='2.19.1'
-PACKAGE_STRING='alpine 2.19.1'
+PACKAGE_VERSION='2.19.2'
+PACKAGE_STRING='alpine 2.19.2'
 PACKAGE_BUGREPORT='chappa@washington.edu'
 PACKAGE_URL=''
 
@@ -818,6 +818,7 @@ GMSGFMT
 MSGFMT
 USE_NLS
 MAKE
+LS
 LN
 CP
 RM
@@ -1594,7 +1595,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures alpine 2.19.1 to adapt to many kinds of systems.
+\`configure' configures alpine 2.19.2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1664,7 +1665,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of alpine 2.19.1:";;
+     short | recursive ) echo "Configuration of alpine 2.19.2:";;
    esac
   cat <<\_ACEOF
 
@@ -1948,7 +1949,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-alpine configure 2.19.1
+alpine configure 2.19.2
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2554,7 +2555,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by alpine $as_me 2.19.1, which was
+It was created by alpine $as_me 2.19.2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3375,7 +3376,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='alpine'
- VERSION='2.19.1'
+ VERSION='2.19.2'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -5582,13 +5583,13 @@ if ${lt_cv_nm_interface+:} false; then :
 else
   lt_cv_nm_interface="BSD nm"
   echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:5585: $ac_compile\"" >&5)
+  (eval echo "\"\$as_me:5586: $ac_compile\"" >&5)
   (eval "$ac_compile" 2>conftest.err)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:5588: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval echo "\"\$as_me:5589: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:5591: output\"" >&5)
+  (eval echo "\"\$as_me:5592: output\"" >&5)
   cat conftest.out >&5
   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
     lt_cv_nm_interface="MS dumpbin"
@@ -6783,7 +6784,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 6786 "configure"' > conftest.$ac_ext
+  echo '#line 6787 "configure"' > conftest.$ac_ext
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -8312,11 +8313,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8315: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8316: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:8319: \$? = $ac_status" >&5
+   echo "$as_me:8320: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -8651,11 +8652,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8654: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8655: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:8658: \$? = $ac_status" >&5
+   echo "$as_me:8659: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -8756,11 +8757,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8759: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8760: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:8763: \$? = $ac_status" >&5
+   echo "$as_me:8764: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -8811,11 +8812,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8814: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8815: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:8818: \$? = $ac_status" >&5
+   echo "$as_me:8819: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -11179,7 +11180,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11182 "configure"
+#line 11183 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11275,7 +11276,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11278 "configure"
+#line 11279 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11668,6 +11669,47 @@ $as_echo "no" >&6; }
 fi
 
 
+# Extract the first word of "ls", so it can be a program name with args.
+set dummy ls; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_LS+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $LS in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_LS="$LS" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_LS="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  test -z "$ac_cv_path_LS" && ac_cv_path_LS="ls"
+  ;;
+esac
+fi
+LS=$ac_cv_path_LS
+if test -n "$LS"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LS" >&5
+$as_echo "$LS" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
 # Extract the first word of "sed", so it can be a program name with args.
 set dummy sed; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
@@ -13500,7 +13542,18 @@ $as_echo "#define ENABLE_DMALLOC 1" >>confdefs.h
 
 fi
 
-localedir="\${datadir}/locale"
+case $host in
+    *apple-darwin*)
+      if test -d /opt/local ; then
+	localedir="/opt/local/share/locale"
+      else
+	localedir="\${datadir}/locale"
+      fi
+      ;;
+    *)
+      localedir="\${datadir}/locale"
+      ;;
+esac
 
 # Check whether --with-localedir was given.
 if test "${with_localedir+set}" = set; then :
@@ -15584,12 +15637,35 @@ else
       ;;
     *-apple-darwin*)
       alpine_SSLTYPE="nopwd"
-      if test -d /opt/local/etc/openssl ; then
-	alpine_SSLDIR="/opt/local/etc/openssl"
-	alpine_SSLCERTS="$alpine_SSLDIR"
-	alpine_SSLKEYS="$alpine_SSLDIR"
-	alpine_SSLLIB="/usr/lib"
-	alpine_SSLINCLUDE="/usr/include/openssl"
+      if test -d /usr/local/Cellar/openssl ; then
+	alpine_SSLVERSION=""
+	if test -x /usr/local/bin/openssl ; then
+	   alpine_SSLVERSION="`/usr/local/bin/openssl version | ${AWK} '{ printf $2 }'`"
+	else
+	   alpine_TEST="`${LS} /usr/local/Cellar/openssl`"
+	   for dir in ${alpine_TEST} ; do
+	      if test -d "/usr/local/Cellar/openssl/${alpine_TEST}" ; then
+		if test -z "$alpine_SSLVERSION" -o test "/usr/local/Cellar/openssl/${alpine_TEST}" -nt "/usr/local/Cellar/openssl/${alpine_SSLVERSION}" ; then
+		   alpine_SSLVERSION="${alpine_TEST}"
+		fi
+	      fi
+	   done
+	fi
+	if test -z "${alpine_SSLVERSION}" ; then
+	  as_fn_error $? "Did not find suitable SSL version, use --with-ssl-dir to specify one" "$LINENO" 5
+	else
+	  alpine_SSLDIR="/usr/local/Cellar/openssl/$alpine_SSLVERSION"
+	  alpine_SSLINCLUDE="$alpine_SSLDIR/include"
+	  alpine_SSLLIB="$alpine_SSLDIR/lib"
+	  alpine_SSLCERTS="/usr/local/etc/openssl/certs"
+	  alpine_SSLKEYS="/usr/local/etc/openssl/private"
+	fi
+      elif test -d /opt/local/etc/openssl ; then
+	alpine_SSLDIR="/opt/local"
+	alpine_SSLINCLUDE="$alpine_SSLDIR/include"
+	alpine_SSLLIB="$alpine_SSLDIR/lib"
+	alpine_SSLCERTS="/opt/local/etc/openssl/certs"
+	alpine_SSLKEYS="/opt/local/etc/openssl/private"
       elif test -d /System/Library/OpenSSL ; then
 	alpine_SSLDIR="/System/Library/OpenSSL"
         alpine_SSLCERTS="$alpine_SSLDIR/certs"
@@ -20221,7 +20297,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by alpine $as_me 2.19.1, which was
+This file was extended by alpine $as_me 2.19.2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -20287,7 +20363,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-alpine config.status 2.19.1
+alpine config.status 2.19.2
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"