diff options
| -rwxr-xr-x | configure | 197 | ||||
| -rw-r--r-- | configure.ac | 60 | ||||
| -rw-r--r-- | pith/pine.hlp | 6 |
3 files changed, 64 insertions, 199 deletions
@@ -692,6 +692,7 @@ LIPO NMEDIT DSYMUTIL MANIFEST_TOOL +RANLIB ac_ct_AR AR DLLTOOL @@ -705,7 +706,6 @@ EGREP GREP SED LIBTOOL -RANLIB LN_S am__fastdepCC_FALSE am__fastdepCC_TRUE @@ -4827,98 +4827,6 @@ fi test -n "$AWK" && break done -if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. -set dummy ${ac_tool_prefix}ranlib; 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_prog_RANLIB+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$RANLIB"; then - ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. -else -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_prog_RANLIB="${ac_tool_prefix}ranlib" - $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 - -fi -fi -RANLIB=$ac_cv_prog_RANLIB -if test -n "$RANLIB"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5 -$as_echo "$RANLIB" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_RANLIB"; then - ac_ct_RANLIB=$RANLIB - # Extract the first word of "ranlib", so it can be a program name with args. -set dummy ranlib; 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_prog_ac_ct_RANLIB+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_RANLIB"; then - ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. -else -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_prog_ac_ct_RANLIB="ranlib" - $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 - -fi -fi -ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB -if test -n "$ac_ct_RANLIB"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5 -$as_echo "$ac_ct_RANLIB" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - if test "x$ac_ct_RANLIB" = x; then - RANLIB=":" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - RANLIB=$ac_ct_RANLIB - fi -else - RANLIB="$ac_cv_prog_RANLIB" -fi - case `pwd` in *\ * | *\ *) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5 @@ -17657,10 +17565,6 @@ fi if test "x$alpine_SSLTYPE" != "xnone" ; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking if OpenSSL is LibreSSL" >&5 $as_echo_n "checking if OpenSSL is LibreSSL... " >&6; } - if test "$cross_compiling" = yes; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cross compiling: not checking" >&5 -$as_echo "$as_me: WARNING: cross compiling: not checking" >&2;} -else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -17670,16 +17574,20 @@ else #include <stdint.h> #endif /* HAVE_STDINT_H */ #include <openssl/ssl.h> -int main(void) { - if (LIBRESSL_VERSION_NUMBER >= 0x20000000L) - exit(0); +int +main () +{ - exit(2); -} +#if OPENSSL_VERSION_NUMBER < 0x20000000L +#error +#endif + ; + return 0; +} _ACEOF -if ac_fn_c_try_run "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO"; then : { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } alpine_SSLPROVIDER="libressl" @@ -17689,19 +17597,12 @@ else $as_echo "no" >&6; } fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi if test "x$alpine_SSLTYPE" != "xnone" -a "x$alpine_SSLPROVIDER" != "xlibressl" ; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking Openssl library version >= 1.0.0c" >&5 $as_echo_n "checking Openssl library version >= 1.0.0c... " >&6; } - if test "$cross_compiling" = yes; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cross compiling: not checking" >&5 -$as_echo "$as_me: WARNING: cross compiling: not checking" >&2;} -else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -17711,16 +17612,20 @@ else #include <stdint.h> #endif /* HAVE_STDINT_H */ #include <openssl/ssl.h> -int main(void) { - if (OPENSSL_VERSION_NUMBER >= 0x1000003fL) - exit(0); +int +main () +{ - exit(2); -} +#if OPENSSL_VERSION_NUMBER < 0x1000003fL +#error +#endif + ; + return 0; +} _ACEOF -if ac_fn_c_try_run "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO"; then : { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } alpine_SSLPROVIDER="openssl" @@ -17728,10 +17633,7 @@ $as_echo "yes" >&6; } else alpine_SSLTYPE="none" fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext if test "x$alpine_SSLTYPE" = "xnone" ; then as_fn_error $? "Install openssl version >= 1.0.0c" "$LINENO" 5 @@ -17742,10 +17644,6 @@ fi if test "x$alpine_SSLTYPE" != "xnone" -a "x$alpine_SSLPROVIDER" != "xlibressl" ; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking Openssl library version >= 1.1.0" >&5 $as_echo_n "checking Openssl library version >= 1.1.0... " >&6; } - if test "$cross_compiling" = yes; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cross compiling: not checking" >&5 -$as_echo "$as_me: WARNING: cross compiling: not checking" >&2;} -else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -17755,16 +17653,20 @@ else #include <stdint.h> #endif /* HAVE_STDINT_H */ #include <openssl/ssl.h> -int main(void) { - if (OPENSSL_VERSION_NUMBER >= 0x10100000L) - exit(0); +int +main () +{ - exit(2); -} +#if OPENSSL_VERSION_NUMBER < 0x10100000L +#error +#endif + ; + return 0; +} _ACEOF -if ac_fn_c_try_run "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO"; then : { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } alpine_SSLVERSION="new" @@ -17775,10 +17677,7 @@ else $as_echo "no" >&6; } alpine_SSLVERSION="old" fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi if test "x$alpine_SSLTYPE" != "xnone" ; then @@ -18779,35 +18678,13 @@ else for base in /usr /usr/local ; do for dir in ${TCL_VERSIONS} ; do - as_ac_File=`$as_echo "ac_cv_file_$base/include/$dir/tcl.h" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $base/include/$dir/tcl.h" >&5 -$as_echo_n "checking for $base/include/$dir/tcl.h... " >&6; } -if eval \${$as_ac_File+:} false; then : - $as_echo_n "(cached) " >&6 -else - test "$cross_compiling" = yes && - as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5 -if test -r "$base/include/$dir/tcl.h"; then - eval "$as_ac_File=yes" -else - eval "$as_ac_File=no" -fi -fi -eval ac_res=\$$as_ac_File - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -if eval test \"x\$"$as_ac_File"\" = x"yes"; then : - - found=yes - -fi - - if test "$found" = "yes" ; then + if test -f $base/include/$dir/tcl.h ; then CPPFLAGS="$CPPFLAGS -I$base/include/$dir" + found=yes break fi done - if test "$found" = "yes" ; then + if test "x$found" = "xyes" ; then break fi done diff --git a/configure.ac b/configure.ac index 4c05832c..f72532f9 100644 --- a/configure.ac +++ b/configure.ac @@ -18,7 +18,7 @@ AC_PREREQ([2.69]) AC_REVISION([Rev:23 by chappa@washington.edu]) dnl Alpine Version Number is in $srcdir/VERSION -AC_INIT([alpine],[m4_normalize(m4_include(VERSION))],[chappa@washington.edu]) +AC_INIT([alpine],[m4_esyscmd(tr -d \\n < VERSION)],[chappa@washington.edu]) AC_CONFIG_SRCDIR([include/system.h]) AC_CONFIG_HEADERS([include/config.h]) @@ -44,7 +44,6 @@ AC_PROG_INSTALL AC_PROG_MAKE_SET AC_PROG_LN_S AC_PROG_AWK -AC_PROG_RANLIB LT_INIT AC_SUBST([LIBTOOL_DEPS]) @@ -1365,22 +1364,18 @@ fi dnl Check if openssl = LibreSSL if test "x$alpine_SSLTYPE" != "xnone" ; then AC_MSG_CHECKING([if OpenSSL is LibreSSL]) - AC_RUN_IFELSE( - [AC_LANG_SOURCE([[ + AC_TRY_COMPILE([ #include <stdio.h> #include <stdlib.h> #if HAVE_STDINT_H #include <stdint.h> #endif /* HAVE_STDINT_H */ #include <openssl/ssl.h> -int main(void) { - - if (LIBRESSL_VERSION_NUMBER >= 0x20000000L) - exit(0); - - exit(2); -} - ]])], + ],[ +#if OPENSSL_VERSION_NUMBER < 0x20000000L +#error +#endif + ], [ AC_MSG_RESULT(yes) alpine_SSLPROVIDER="libressl" ], @@ -1392,22 +1387,18 @@ fi dnl Check Openssl/LibreSSL version first if test "x$alpine_SSLTYPE" != "xnone" -a "x$alpine_SSLPROVIDER" != "xlibressl" ; then AC_MSG_CHECKING([Openssl library version >= 1.0.0c]) - AC_RUN_IFELSE( - [AC_LANG_SOURCE([[ + AC_TRY_COMPILE([ #include <stdio.h> #include <stdlib.h> #if HAVE_STDINT_H #include <stdint.h> #endif /* HAVE_STDINT_H */ #include <openssl/ssl.h> -int main(void) { - - if (OPENSSL_VERSION_NUMBER >= 0x1000003fL) - exit(0); - - exit(2); -} - ]])], + ],[ +#if OPENSSL_VERSION_NUMBER < 0x1000003fL +#error +#endif + ], [ AC_MSG_RESULT(yes) alpine_SSLPROVIDER="openssl" ], @@ -1423,22 +1414,18 @@ fi dnl Now check if we are working with version 1.1.0 of openssl if test "x$alpine_SSLTYPE" != "xnone" -a "x$alpine_SSLPROVIDER" != "xlibressl" ; then AC_MSG_CHECKING([Openssl library version >= 1.1.0]) - AC_RUN_IFELSE( - [AC_LANG_SOURCE([[ + AC_TRY_COMPILE([ #include <stdio.h> #include <stdlib.h> #if HAVE_STDINT_H #include <stdint.h> #endif /* HAVE_STDINT_H */ #include <openssl/ssl.h> -int main(void) { - - if (OPENSSL_VERSION_NUMBER >= 0x10100000L) - exit(0); - - exit(2); -} - ]])], + ],[ +#if OPENSSL_VERSION_NUMBER < 0x10100000L +#error +#endif + ], [ AC_MSG_RESULT(yes) alpine_SSLVERSION="new" CFLAGS="$CFLAGS -DOPENSSL_1_1_0 -DOPENSSL_API_COMPAT=0x10100000L" @@ -1641,16 +1628,13 @@ TCL_VERSIONS="${TCL_VERSIONS_DOT} ${TCL_VERSIONS_NODOT} tcl" [ for base in /usr /usr/local ; do for dir in ${TCL_VERSIONS} ; do - AC_CHECK_FILE([$base/include/$dir/tcl.h], - [ - found=yes - ]) - if test "$found" = "yes" ; then + if test -f $base/include/$dir/tcl.h ; then CPPFLAGS="$CPPFLAGS -I$base/include/$dir" + found=yes break fi done - if test "$found" = "yes" ; then + if test "x$found" = "xyes" ; then break fi done diff --git a/pith/pine.hlp b/pith/pine.hlp index 3a623f4e..28c3ee87 100644 --- a/pith/pine.hlp +++ b/pith/pine.hlp @@ -140,7 +140,7 @@ with help text for the config screen and the composer that didn't have any reasonable place to be called from. Dummy change to get revision in pine.hlp ============= h_revision ================= -Alpine Commit 227 2017-11-13 00:00:45 +Alpine Commit 228 2017-11-19 11:37:59 ============= h_news ================= <HTML> <HEAD> @@ -185,6 +185,10 @@ Based on code provided by Maciej W. Rozycki. <LI> Add -dict option to PC-Pico, which allows users to choose a dictionary when spelling. Sample usage: -dict "en_US, de_DE, fr_FR". + +<LI> Improvements to the configure stage of compilation. Some of +these contributed by Helmut Grohne. See +<A href="https://bugs.debian.org/876164">Bug 876164</A> in Debian. </UL> <P> |