Changeset 3367


Ignore:
Timestamp:
Feb 6, 2015, 7:07:22 AM (5 years ago)
Author:
Peter
Message:

update to autoconf-archive-2015-02-04. Note that m4/ax_append_flag.m4 is patched to make the case pattern work as expected/before.

Location:
trunk
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • trunk/README.developer

    r3248 r3367  
    126126specifically
    127127 * Automake 1.11 (or later), http://www.gnu.org/software/automake/
    128  * Autoconf 2.63 (or later), http://www.gnu.org/software/automake/
     128 * Autoconf 2.64 (or later), http://www.gnu.org/software/autoconf/
    129129 * Libtool 1.5 (or later), http://www.gnu.org/software/libtool/
    130130
  • trunk/configure.ac

    r3366 r3367  
    3939        [http://dev.thep.lu.se/yat])
    4040MY_VERSION
    41 AC_PREREQ(2.63)
     41AC_PREREQ([2.64])
    4242AC_CONFIG_SRCDIR([yat/utility/Matrix.h])
    4343AC_CONFIG_AUX_DIR([autotools])
  • trunk/m4/ax_append_flag.m4

    r2724 r3367  
    5050#   exception to the GPL to apply to your modified version as well.
    5151
    52 #serial 2
     52#serial 4
    5353
    5454AC_DEFUN([AX_APPEND_FLAG],
    55 [AC_PREREQ(2.59)dnl for _AC_LANG_PREFIX
    56 AS_VAR_PUSHDEF([FLAGS], [m4_default($2,_AC_LANG_PREFIX[FLAGS])])dnl
    57 AS_VAR_SET_IF(FLAGS,
    58   [case " AS_VAR_GET(FLAGS) " in
    59     *" $1 "*)
    60       AC_RUN_LOG([: FLAGS already contains $1])
    61       ;;
    62     *)
    63       AC_RUN_LOG([: FLAGS="$FLAGS $1"])
    64       AS_VAR_SET(FLAGS, ["AS_VAR_GET(FLAGS) $1"])
    65       ;;
    66    esac],
    67   [AS_VAR_SET(FLAGS,["$1"])])
     55[dnl
     56AC_PREREQ(2.64)dnl for _AC_LANG_PREFIX and AS_VAR_SET_IF
     57AS_VAR_PUSHDEF([FLAGS], [m4_default($2,_AC_LANG_PREFIX[FLAGS])])
     58AS_VAR_SET_IF(FLAGS,[
     59# there is a bug in official version (serial 4) so we patch it as below
     60  AS_CASE([" AS_VAR_GET(FLAGS) "],
     61    [*" $1 "*], [AC_RUN_LOG([: FLAGS already contains $1])],
     62dnl  AS_CASE([AS_VAR_GET(FLAGS)],
     63dnl    ["* $1 *|*$1"],[AC_RUN_LOG([: FLAGS already contains $1])],
     64    [
     65     AS_VAR_APPEND(FLAGS," $1")
     66     AC_RUN_LOG([: FLAGS="$FLAGS"])
     67    ])
     68  ],
     69  [
     70  AS_VAR_SET(FLAGS,[$1])
     71  AC_RUN_LOG([: FLAGS="$FLAGS"])
     72  ])
    6873AS_VAR_POPDEF([FLAGS])dnl
    6974])dnl AX_APPEND_FLAG
  • trunk/m4/ax_check_compile_flag.m4

    r3171 r3367  
    5656#   exception to the GPL to apply to your modified version as well.
    5757
    58 #serial 3
     58#serial 4
    5959
    6060AC_DEFUN([AX_CHECK_COMPILE_FLAG],
    61 [AC_PREREQ(2.59)dnl for _AC_LANG_PREFIX
     61[AC_PREREQ(2.64)dnl for _AC_LANG_PREFIX and AS_VAR_IF
    6262AS_VAR_PUSHDEF([CACHEVAR],[ax_cv_check_[]_AC_LANG_ABBREV[]flags_$4_$1])dnl
    6363AC_CACHE_CHECK([whether _AC_LANG compiler accepts $1], CACHEVAR, [
     
    6868    [AS_VAR_SET(CACHEVAR,[no])])
    6969  _AC_LANG_PREFIX[]FLAGS=$ax_check_save_flags])
    70 AS_IF([test x"AS_VAR_GET(CACHEVAR)" = xyes],
     70AS_VAR_IF(CACHEVAR,yes,
    7171  [m4_default([$2], :)],
    7272  [m4_default([$3], :)])
  • trunk/m4/ax_check_link_flag.m4

    r3171 r3367  
    5656#   exception to the GPL to apply to your modified version as well.
    5757
    58 #serial 3
     58#serial 4
    5959
    6060AC_DEFUN([AX_CHECK_LINK_FLAG],
    61 [AS_VAR_PUSHDEF([CACHEVAR],[ax_cv_check_ldflags_$4_$1])dnl
     61[AC_PREREQ(2.64)dnl for _AC_LANG_PREFIX and AS_VAR_IF
     62AS_VAR_PUSHDEF([CACHEVAR],[ax_cv_check_ldflags_$4_$1])dnl
    6263AC_CACHE_CHECK([whether the linker accepts $1], CACHEVAR, [
    6364  ax_check_save_flags=$LDFLAGS
     
    6768    [AS_VAR_SET(CACHEVAR,[no])])
    6869  LDFLAGS=$ax_check_save_flags])
    69 AS_IF([test x"AS_VAR_GET(CACHEVAR)" = xyes],
     70AS_VAR_IF(CACHEVAR,yes,
    7071  [m4_default([$2], :)],
    7172  [m4_default([$3], :)])
  • trunk/m4/ax_check_preproc_flag.m4

    r3171 r3367  
    5656#   exception to the GPL to apply to your modified version as well.
    5757
    58 #serial 3
     58#serial 4
    5959
    6060AC_DEFUN([AX_CHECK_PREPROC_FLAG],
    61 [AC_PREREQ(2.59)dnl for _AC_LANG_PREFIX
     61[AC_PREREQ(2.64)dnl for _AC_LANG_PREFIX and AS_VAR_IF
    6262AS_VAR_PUSHDEF([CACHEVAR],[ax_cv_check_[]_AC_LANG_ABBREV[]cppflags_$4_$1])dnl
    6363AC_CACHE_CHECK([whether _AC_LANG preprocessor accepts $1], CACHEVAR, [
     
    6868    [AS_VAR_SET(CACHEVAR,[no])])
    6969  CPPFLAGS=$ax_check_save_flags])
    70 AS_IF([test x"AS_VAR_GET(CACHEVAR)" = xyes],
     70AS_VAR_IF(CACHEVAR,yes,
    7171  [m4_default([$2], :)],
    7272  [m4_default([$3], :)])
  • trunk/m4/ax_compiler_vendor.m4

    r3331 r3367  
    4545#   exception to the GPL to apply to your modified version as well.
    4646
    47 #serial 13
     47#serial 15
    4848
    4949## Note, we have patch this macro compared to official macro as we've
     
    5555AC_DEFUN([AX_COMPILER_VENDOR],
    5656[AC_CACHE_CHECK([for _AC_LANG compiler vendor], ax_cv_[]_AC_LANG_ABBREV[]_compiler_vendor,
     57  dnl Please add if possible support to ax_compiler_version.m4
    5758  [# note: don't check for gcc first since some other compilers define __GNUC__
    5859  vendors="intel:     __ICC,__ECC,__INTEL_COMPILER
     
    6566           hp:        __HP_cc,__HP_aCC
    6667           dec:       __DECC,__DECCXX,__DECC_VER,__DECCXX_VER
    67            borland:   __BORLANDC__,__TURBOC__
     68           borland:   __BORLANDC__,__CODEGEARC__,__TURBOC__
    6869           comeau:    __COMO__
    6970           kai:       __KCC
     
    7475           watcom:    __WATCOMC__
    7576           portland:  __PGI
     77     tcc:       __TINYC__
    7678           gnu:       __GNUC__
    7779           unknown:   UNKNOWN"
Note: See TracChangeset for help on using the changeset viewer.