Changeset 1386 for trunk


Ignore:
Timestamp:
Jul 1, 2011, 2:48:24 AM (9 years ago)
Author:
Peter Johansson
Message:

latest version of autoconf archive macro

Location:
trunk/m4
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/m4/ax_check_flag.m4

    r1385 r1386  
    7272#   exception to the GPL to apply to your modified version as well.
    7373
    74 #serial 2
     74#serial 3
    7575
    7676AC_DEFUN([AX_CHECK_PREPROC_FLAG],
     
    8181  CPPFLAGS="$CPPFLAGS $4 $1"
    8282  AC_PREPROC_IFELSE([AC_LANG_PROGRAM()],
    83     [AS_VAR_SET([CACHEVAR],[yes])],
    84     [AS_VAR_SET([CACHEVAR],[no])])
     83    [AS_VAR_SET(CACHEVAR,[yes])],
     84    [AS_VAR_SET(CACHEVAR,[no])])
    8585  CPPFLAGS=$ax_check_save_flags])
    86 AS_VAR_IF([CACHEVAR], "yes",
     86AS_IF([test x"AS_VAR_GET(CACHEVAR)" = xyes],
    8787  [m4_default([$2], :)],
    8888  [m4_default([$3], :)])
     
    9797  _AC_LANG_PREFIX[]FLAGS="$[]_AC_LANG_PREFIX[]FLAGS $4 $1"
    9898  AC_COMPILE_IFELSE([AC_LANG_PROGRAM()],
    99     [AS_VAR_SET([CACHEVAR],[yes])],
    100     [AS_VAR_SET([CACHEVAR],[no])])
     99    [AS_VAR_SET(CACHEVAR,[yes])],
     100    [AS_VAR_SET(CACHEVAR,[no])])
    101101  _AC_LANG_PREFIX[]FLAGS=$ax_check_save_flags])
    102 AS_VAR_IF([CACHEVAR], "yes",
     102AS_IF([test x"AS_VAR_GET(CACHEVAR)" = xyes],
    103103  [m4_default([$2], :)],
    104104  [m4_default([$3], :)])
     
    112112  LDFLAGS="$LDFLAGS $4 $1"
    113113  AC_LINK_IFELSE([AC_LANG_PROGRAM()],
    114     [AS_VAR_SET([CACHEVAR],[yes])],
    115     [AS_VAR_SET([CACHEVAR],[no])])
     114    [AS_VAR_SET(CACHEVAR,[yes])],
     115    [AS_VAR_SET(CACHEVAR,[no])])
    116116  LDFLAGS=$ax_check_save_flags])
    117 AS_VAR_IF([CACHEVAR], "yes",
     117AS_IF([test x"AS_VAR_GET(CACHEVAR)" = xyes],
    118118  [m4_default([$2], :)],
    119119  [m4_default([$3], :)])
     
    124124AC_DEFUN([AX_APPEND_FLAG],
    125125[AC_PREREQ(2.59) dnl for _AC_LANG_PREFIX
    126 AC_REQUIRE([AC_PROG_GREP])
    127 AS_VAR_PUSHDEF([FLAGS], [m4_default($2,_AC_LANG_PREFIX[]FLAGS)])dnl
    128 AS_VAR_SET_IF([FLAGS],
    129   [AS_IF([AS_ECHO(" $[]FLAGS ") | $GREP " $1 " 2>&1 >/dev/null],
    130     [AC_RUN_LOG([: FLAGS already contains $1])],
    131     [AC_RUN_LOG([: FLAGS="$FLAGS $1"])
    132     AS_VAR_APPEND([FLAGS], [" $1"])])],
    133   [AS_VAR_SET([FLAGS],[$1])])
     126AS_VAR_PUSHDEF([FLAGS], [m4_default($2,_AC_LANG_PREFIX[FLAGS])])dnl
     127AS_VAR_SET_IF(FLAGS,
     128  [case " AS_VAR_GET(FLAGS) " in
     129    *" $1 "*)
     130      AC_RUN_LOG([: FLAGS already contains $1])
     131      ;;
     132    *)
     133      AC_RUN_LOG([: FLAGS="$FLAGS $1"])
     134      AS_VAR_SET(FLAGS, ["AS_VAR_GET(FLAGS) $1"])
     135      ;;
     136   esac],
     137  [AS_VAR_SET(FLAGS,["$1"])])
    134138AS_VAR_POPDEF([FLAGS])dnl
    135139])dnl AX_APPEND_FLAG
  • trunk/m4/yat_am_macros.m4

    r1350 r1386  
    1 ## $Id: yat_am_macros.m4 2429 2011-03-01 18:23:23Z peter $
    2 
    3 # serial 3 (yat 0.8)
     1## $Id: yat_am_macros.m4 2501 2011-06-28 00:04:02Z peter $
     2
     3# serial 4 (yat 0.8)
    44
    55m4_define([yat_am_macros_copyright], [
     
    127127# and REVISION. The latter file is supposed to contain the current
    128128# revision and a convenient way to generate this file is to the use
    129 # macro YAT_SVN_REVISION.  You need to define the following variables
     129# macro YAT_SVN_REVISION.  You need to declare the following variables
    130130# in your Makefile.am:
    131131#   BUILT_SOURCES =
     
    174174# it is a good idea to check in OUTPUT in repository because then
    175175# OUTPUT will get expected value also in 'svn export' case. You need
    176 # to defined the following variables in Makefile.am:
     176# to declare the following variables in Makefile.am:
    177177#   CONFIG_STATUS_DEPENDENCIES =
    178178#   EXTRA_DIST =
     
    207207
    208208
    209 ### Pricae Macros ###
     209### Private Macros ###
    210210
    211211# _YAT_AM_TOP(FILE)
Note: See TracChangeset for help on using the changeset viewer.