From b63f6587950eb0dcb15aec5ec65d86b9f63a2683 Mon Sep 17 00:00:00 2001 From: Eduardo Chappa Date: Fri, 8 Nov 2013 22:28:20 -0700 Subject: * 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. --- autom4te.cache/output.2 | 112 ++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 94 insertions(+), 18 deletions(-) (limited to 'autom4te.cache/output.2') diff --git a/autom4te.cache/output.2 b/autom4te.cache/output.2 index 93face93..aee355b1 100644 --- a/autom4te.cache/output.2 +++ b/autom4te.cache/output.2 @@ -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 . @%:@ @@ -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 @@ -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\\" -- cgit v1.2.3-70-g09d2