diff options
Diffstat (limited to 'aclocal.m4')
| -rw-r--r-- | aclocal.m4 | 111 |
1 files changed, 102 insertions, 9 deletions
diff --git a/aclocal.m4 b/aclocal.m4 index 8ec5d7d5..aae0dfdd 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -4,7 +4,7 @@ dnl and Jim Spath <jspath@mail.bcpl.lib.md.us> dnl and Philippe De Muyter <phdm@macqel.be> dnl dnl Created: 1997/1/28 -dnl Updated: 2004/10/17 +dnl Updated: 2005/1/1 dnl dnl The autoconf used in Lynx development is GNU autoconf 2.13 or 2.52, patched dnl by Tom Dickey. See your local GNU archives, and this URL: @@ -866,7 +866,7 @@ if test "$cf_cv_bool_defs" = no ; then fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_BUILD_CC version: 3 updated: 2004/02/17 20:55:59 +dnl CF_BUILD_CC version: 4 updated: 2004/11/27 16:03:59 dnl ----------- dnl If we're cross-compiling, allow the user to override the tools and their dnl options. The configure script is oriented toward identifying the host @@ -910,6 +910,12 @@ if test "$cross_compiling" = yes ; then # this assumes we're on Unix. BUILD_EXEEXT= BUILD_OBJEXT=o + + if ( test "$BUILD_CC" = "$CC" || test "$BUILD_CC" = '$(CC)' ) ; then + AC_MSG_ERROR([Cross-build requires two compilers. +Use --with-build-cc to specify the native compiler.]) + fi + else : ${BUILD_CC:='$(CC)'} : ${BUILD_CPP:='$(CPP)'} @@ -1232,6 +1238,36 @@ fi ])dnl dnl --------------------------------------------------------------------------- +dnl CF_CHECK_TYPE version: 1 updated: 2005/01/01 12:49:48 +dnl ------------- +dnl Add a 3rd parameter to AC_CHECK_TYPE, working around autoconf 2.5x's +dnl deliberate incompatibility. +dnl $1 = name of type to check for +dnl $2 = default type +dnl $3 = additional #include's and related preprocessor lines. +AC_DEFUN([CF_CHECK_TYPE], +[ +ifdef([m4_version_compare],[ + AC_CHECK_TYPE([$1],ac_cv_type_$1=yes,ac_cv_type_$1=no,[$3]) + ],[ + AC_MSG_CHECKING(for $1) + AC_TRY_COMPILE([ +#if STDC_HEADERS +#include <stdlib.h> +#include <stddef.h> +#endif +$3 +],[ + static $1 dummy; if (sizeof(dummy)) return 0; else return 1;], + ac_cv_type_$1=yes, + ac_cv_type_$1=no) + AC_MSG_RESULT($ac_cv_type_$1) +])dnl +if test $ac_cv_type_$1 = no; then + AC_DEFINE($1, $2) +fi +])dnl +dnl --------------------------------------------------------------------------- dnl CF_COLOR_CURSES version: 6 updated: 2002/10/27 18:21:42 dnl --------------- dnl Check if curses supports color. (Note that while SVr3 curses supports @@ -1810,7 +1846,7 @@ done ]) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_FIND_LIBRARY version: 7 updated: 2000/04/13 21:38:04 +dnl CF_FIND_LIBRARY version: 8 updated: 2004/11/23 20:14:58 dnl --------------- dnl Look for a non-standard library, given parameters for AC_TRY_LINK. We dnl prefer a standard location, and use -L options only if we do not find the @@ -1820,7 +1856,7 @@ dnl $2 = library class, usually the same as library name dnl $3 = includes dnl $4 = code fragment to compile/link dnl $5 = corresponding function-name -dnl $6 = flag, nonnull if failure causes an error-exit +dnl $6 = flag, nonnull if failure should not cause an error-exit dnl dnl Sets the variable "$cf_libdir" as a side-effect, so we can see if we had dnl to use a -L option. @@ -2177,7 +2213,7 @@ if test "$GCC" = yes ; then fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_GCC_WARNINGS version: 16 updated: 2004/07/23 14:40:34 +dnl CF_GCC_WARNINGS version: 18 updated: 2004/12/03 20:51:07 dnl --------------- dnl Check if the compiler supports useful warning options. There's a few that dnl we don't use, simply because they're too noisy: @@ -2198,8 +2234,27 @@ dnl If $with_ext_const is "yes", add a check for -Wwrite-strings dnl AC_DEFUN([CF_GCC_WARNINGS], [ +AC_REQUIRE([CF_INTEL_COMPILER]) AC_REQUIRE([CF_GCC_VERSION]) -if test "$GCC" = yes +if test "$INTEL_COMPILER" = yes +then +# The "-wdXXX" options suppress warnings: +# remark #1419: external declaration in primary source file +# remark #193: zero used for undefined preprocessing identifier +# remark #593: variable "curs_sb_left_arrow" was set but never used +# remark #810: conversion from "int" to "Dimension={unsigned short}" may lose significant bits +# remark #869: parameter "tw" was never referenced +# remark #981: operands are evaluated in unspecified order +# warning #269: invalid format string conversion + EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall \ + -wd1419 \ + -wd193 \ + -wd279 \ + -wd593 \ + -wd810 \ + -wd869 \ + -wd981" +elif test "$GCC" = yes then cat > conftest.$ac_ext <<EOF #line __oline__ "configure" @@ -2350,7 +2405,7 @@ if test "$cf_x509_support" = yes ; then fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_GNU_SOURCE version: 3 updated: 2000/10/29 23:30:53 +dnl CF_GNU_SOURCE version: 4 updated: 2004/12/03 20:43:00 dnl ------------- dnl Check if we must define _GNU_SOURCE to get a reasonable value for dnl _XOPEN_SOURCE, upon which many POSIX definitions depend. This is a defect @@ -2360,6 +2415,9 @@ dnl dnl Well, yes we could work around it... AC_DEFUN([CF_GNU_SOURCE], [ +AC_REQUIRE([CF_INTEL_COMPILER]) + +if test "$INTEL_COMPILER" = no ; then AC_CACHE_CHECK(if we must define _GNU_SOURCE,cf_cv_gnu_source,[ AC_TRY_COMPILE([#include <sys/types.h>],[ #ifndef _XOPEN_SOURCE @@ -2378,6 +2436,7 @@ make an error ]) ]) test "$cf_cv_gnu_source" = yes && CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE" +fi ])dnl dnl --------------------------------------------------------------------------- dnl CF_HEADER_PATH version: 8 updated: 2002/11/10 14:46:59 @@ -2462,6 +2521,40 @@ else fi ])dnl dnl --------------------------------------------------------------------------- +dnl CF_INTEL_COMPILER version: 1 updated: 2004/12/03 20:27:48 +dnl ----------------- +dnl Check if the given compiler is really the Intel compiler for Linux. +dnl It tries to imitate gcc, but does not return an error when it finds a +dnl mismatch between prototypes, e.g., as exercised by CF_MISSING_CHECK. +dnl +dnl This macro should be run "soon" after AC_PROG_CC, to ensure that it is +dnl not mistaken for gcc. +AC_DEFUN([CF_INTEL_COMPILER],[ +AC_REQUIRE([AC_PROG_CC]) + +INTEL_COMPILER=no + +if test "$GCC" = yes ; then + case $host_os in + linux*|gnu*) + AC_MSG_CHECKING(if this is really Intel compiler) + cf_save_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -no-gcc" + AC_TRY_COMPILE([],[ +#ifdef __INTEL_COMPILER +#else +make an error +#endif +],[INTEL_COMPILER=yes +cf_save_CFLAGS="$cf_save_CFLAGS -we147 -no-gcc" +],[]) + CFLAGS="$cf_save_CFLAGS" + AC_MSG_RESULT($INTEL_COMPILER) + ;; + esac +fi +])dnl +dnl --------------------------------------------------------------------------- dnl CF_LASTLOG version: 4 updated: 2002/10/27 23:21:42 dnl ---------- dnl Check for header defining _PATH_LASTLOG, or failing that, see if the lastlog @@ -4464,7 +4557,7 @@ AC_TRY_LINK([ test $cf_cv_need_xopen_extension = yes && CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE_EXTENDED" ])dnl dnl --------------------------------------------------------------------------- -dnl CF_XOPEN_SOURCE version: 14 updated: 2004/10/17 10:43:13 +dnl CF_XOPEN_SOURCE version: 15 updated: 2004/11/23 15:41:32 dnl --------------- dnl Try to get _XOPEN_SOURCE defined properly that we can use POSIX functions, dnl or adapt to the vendor's definitions to get equivalent functionality. @@ -4489,7 +4582,7 @@ freebsd*) #(vi hpux*) #(vi CPPFLAGS="$CPPFLAGS -D_HPUX_SOURCE" ;; -irix6.*) #(vi +irix[[56]].*) #(vi CPPFLAGS="$CPPFLAGS -D_SGI_SOURCE" ;; linux*|gnu*) #(vi |