diff options
| author | Eduardo Chappa <chappa@washington.edu> | 2013-11-08 22:28:20 -0700 |
|---|---|---|
| committer | Eduardo Chappa <chappa@washington.edu> | 2013-11-08 22:28:20 -0700 |
| commit | b63f6587950eb0dcb15aec5ec65d86b9f63a2683 (patch) | |
| tree | b74ea289a139379e6af18cb7e623aa3d9bc37121 /configure.ac | |
| parent | 7fe712882b909931088a318c08041b0e7974a000 (diff) | |
| download | alpine-b63f6587950eb0dcb15aec5ec65d86b9f63a2683.tar.xz | |
* 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.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 41 |
1 files changed, 33 insertions, 8 deletions
diff --git a/configure.ac b/configure.ac index a281da4b..ee5b50b2 100644 --- a/configure.ac +++ b/configure.ac @@ -15,7 +15,7 @@ dnl */ AC_PREREQ([2.69]) -AC_REVISION([Rev:5 by chappa@washington.edu]) +AC_REVISION([Rev:7 by chappa@washington.edu]) dnl Alpine Version Number is in $srcdir/VERSION AC_INIT([alpine],[m4_normalize(m4_include(VERSION))],[chappa@washington.edu]) @@ -52,6 +52,7 @@ AC_PATH_PROG(AR, ar, ar) AC_PATH_PROG(RM, rm, rm) AC_PATH_PROG(CP, cp, cp) AC_PATH_PROG(LN, ln, ln) +AC_PATH_PROG(LS, ls, ls) AC_PATH_PROG(SED, sed, sed) AC_PATH_PROG(MAKE, make) @@ -84,7 +85,19 @@ if test x$enable_dmalloc = "xyes" ; then AC_DEFINE(ENABLE_DMALLOC, 1, [Define enable dmalloc debugging]) fi -localedir="\${datadir}/locale" +dnl set locale. Mac is special so we deal with it separately. +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 AC_ARG_WITH(localedir, AS_HELP_STRING([--with-localedir=DIR],[Name of gettext locale directory]), [ @@ -711,12 +724,24 @@ 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/opt/openssl ; then + alpine_SSLDIR="/usr/local/opt/openssl" + alpine_SSLINCLUDE="$alpine_SSLDIR/include" + alpine_SSLLIB="$alpine_SSLDIR/lib" + alpine_SSLCERTS="$alpine_SSLDIR/certs" + alpine_SSLKEYS="$alpine_SSLDIR/private" + 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 /sw/etc/ssl ; then + alpine_SSLDIR="/sw/etc/ssl" + alpine_SSLINCLUDE="/sw/include" + alpine_SSLLIB="/sw/lib" + alpine_SSLCERTS="/sw/etc/ssl/certs" + alpine_SSLKEYS="/sw/etc/ssl/private" elif test -d /System/Library/OpenSSL ; then alpine_SSLDIR="/System/Library/OpenSSL" alpine_SSLCERTS="$alpine_SSLDIR/certs" |