Changeset 3171


Ignore:
Timestamp:
Mar 4, 2014, 2:12:22 AM (10 years ago)
Author:
Peter
Message:

updated to autoconf-archive-2014.02.28

Location:
trunk/m4
Files:
1 added
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/m4/ax_append_compile_flags.m4

    r2825 r3171  
    5555#   exception to the GPL to apply to your modified version as well.
    5656
    57 #serial 3
     57#serial 4
    5858
    5959AC_DEFUN([AX_APPEND_COMPILE_FLAGS],
    60 [AC_REQUIRE([AX_CHECK_COMPILE_FLAG])
    61 AC_REQUIRE([AX_APPEND_FLAG])
     60[AX_REQUIRE_DEFINED([AX_CHECK_COMPILE_FLAG])
     61AX_REQUIRE_DEFINED([AX_APPEND_FLAG])
    6262for flag in $1; do
    6363  AX_CHECK_COMPILE_FLAG([$flag], [AX_APPEND_FLAG([$flag], [$2])], [], [$3])

  • trunk/m4/ax_append_link_flags.m4

    r2825 r3171  
    5353#   exception to the GPL to apply to your modified version as well.
    5454
    55 #serial 3
     55#serial 4
    5656
    5757AC_DEFUN([AX_APPEND_LINK_FLAGS],
    58 [AC_REQUIRE([AX_CHECK_LINK_FLAG])
    59 AC_REQUIRE([AX_APPEND_FLAG])
     58[AX_REQUIRE_DEFINED([AX_CHECK_LINK_FLAG])
     59AX_REQUIRE_DEFINED([AX_APPEND_FLAG])
    6060for flag in $1; do
    6161  AX_CHECK_LINK_FLAG([$flag], [AX_APPEND_FLAG([$flag], [m4_default([$2], [LDFLAGS])])], [], [$3])

  • trunk/m4/ax_boost_base.m4

    r3105 r3171  
    3434#   warranty.
    3535
    36 #serial 21
     36#serial 23
    3737
    3838AC_DEFUN([AX_BOOST_BASE],
    … …  
    9898    esac
    9999
     100    dnl allow for real multi-arch paths e.g. /usr/lib/x86_64-linux-gnu. Give
     101    dnl them priority over the other paths since, if libs are found there, they
     102    dnl are almost assuredly the ones desired.
     103    AC_REQUIRE([AC_CANONICAL_HOST])
     104    libsubdirs="lib/${host_cpu}-${host_os} $libsubdirs"
     105
     106    case ${host_cpu} in
     107      i?86)
     108        libsubdirs="lib/i386-${host_os} $libsubdirs"
     109        ;;
     110    esac
     111
    100112    dnl first we check the system location for boost libraries
    101113    dnl this location ist chosen if boost libraries are installed with the --layout=system option

  • trunk/m4/ax_check_compile_flag.m4

    r2724 r3171  
    55# SYNOPSIS
    66#
    7 #   AX_CHECK_COMPILE_FLAG(FLAG, [ACTION-SUCCESS], [ACTION-FAILURE], [EXTRA-FLAGS])
     7#   AX_CHECK_COMPILE_FLAG(FLAG, [ACTION-SUCCESS], [ACTION-FAILURE], [EXTRA-FLAGS], [INPUT])
    88#
    99# DESCRIPTION
    … …  
    1919#   the flags: "CFLAGS EXTRA-FLAGS FLAG".  This can for example be used to
    2020#   force the compiler to issue an error when a bad flag is given.
     21#
     22#   INPUT gives an alternative input source to AC_COMPILE_IFELSE.
    2123#
    2224#   NOTE: Implementation based on AX_CFLAGS_GCC_OPTION. Please keep this
    … …  
    5456#   exception to the GPL to apply to your modified version as well.
    5557
    56 #serial 2
     58#serial 3
    5759
    5860AC_DEFUN([AX_CHECK_COMPILE_FLAG],
    … …  
    6264  ax_check_save_flags=$[]_AC_LANG_PREFIX[]FLAGS
    6365  _AC_LANG_PREFIX[]FLAGS="$[]_AC_LANG_PREFIX[]FLAGS $4 $1"
    64   AC_COMPILE_IFELSE([AC_LANG_PROGRAM()],
     66  AC_COMPILE_IFELSE([m4_default([$5],[AC_LANG_PROGRAM()])],
    6567    [AS_VAR_SET(CACHEVAR,[yes])],
    6668    [AS_VAR_SET(CACHEVAR,[no])])

  • trunk/m4/ax_check_link_flag.m4

    r2724 r3171  
    55# SYNOPSIS
    66#
    7 #   AX_CHECK_LINK_FLAG(FLAG, [ACTION-SUCCESS], [ACTION-FAILURE], [EXTRA-FLAGS])
     7#   AX_CHECK_LINK_FLAG(FLAG, [ACTION-SUCCESS], [ACTION-FAILURE], [EXTRA-FLAGS], [INPUT])
    88#
    99# DESCRIPTION
    … …  
    1919#   EXTRA-FLAGS FLAG".  This can for example be used to force the linker to
    2020#   issue an error when a bad flag is given.
     21#
     22#   INPUT gives an alternative input source to AC_LINK_IFELSE.
    2123#
    2224#   NOTE: Implementation based on AX_CFLAGS_GCC_OPTION. Please keep this
    … …  
    5456#   exception to the GPL to apply to your modified version as well.
    5557
    56 #serial 2
     58#serial 3
    5759
    5860AC_DEFUN([AX_CHECK_LINK_FLAG],
    … …  
    6163  ax_check_save_flags=$LDFLAGS
    6264  LDFLAGS="$LDFLAGS $4 $1"
    63   AC_LINK_IFELSE([AC_LANG_PROGRAM()],
     65  AC_LINK_IFELSE([m4_default([$5],[AC_LANG_PROGRAM()])],
    6466    [AS_VAR_SET(CACHEVAR,[yes])],
    6567    [AS_VAR_SET(CACHEVAR,[no])])

  • trunk/m4/ax_check_preproc_flag.m4

    r2724 r3171  
    55# SYNOPSIS
    66#
    7 #   AX_CHECK_PREPROC_FLAG(FLAG, [ACTION-SUCCESS], [ACTION-FAILURE], [EXTRA-FLAGS])
     7#   AX_CHECK_PREPROC_FLAG(FLAG, [ACTION-SUCCESS], [ACTION-FAILURE], [EXTRA-FLAGS], [INPUT])
    88#
    99# DESCRIPTION
    … …  
    1919#   "CPPFLAGS EXTRA-FLAGS FLAG".  This can for example be used to force the
    2020#   preprocessor to issue an error when a bad flag is given.
     21#
     22#   INPUT gives an alternative input source to AC_PREPROC_IFELSE.
    2123#
    2224#   NOTE: Implementation based on AX_CFLAGS_GCC_OPTION. Please keep this
    … …  
    5456#   exception to the GPL to apply to your modified version as well.
    5557
    56 #serial 2
     58#serial 3
    5759
    5860AC_DEFUN([AX_CHECK_PREPROC_FLAG],
    … …  
    6264  ax_check_save_flags=$CPPFLAGS
    6365  CPPFLAGS="$CPPFLAGS $4 $1"
    64   AC_PREPROC_IFELSE([AC_LANG_PROGRAM()],
     66  AC_PREPROC_IFELSE([m4_default([$5],[AC_LANG_PROGRAM()])],
    6567    [AS_VAR_SET(CACHEVAR,[yes])],
    6668    [AS_VAR_SET(CACHEVAR,[no])])
Note: See TracChangeset for help on using the changeset viewer.