Changeset 2021


Ignore:
Timestamp:
Aug 4, 2009, 5:09:47 AM (11 years ago)
Author:
Peter
Message:

fixes #525 and #518

Added a variable YAT_LT_ADD in YAT_CHECK_LIB. Made YAT_LA_FILE also
work with old (0.5) yat-config.

fixed a bug in _YAT_ACTION so $3 is executed and not $2 when appropriate.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/m4/yat.m4

    r1854 r2021  
    2424#     AC_SUBST(YAT_LIBS)
    2525#     AC_SUBST(YAT_LA_FILE)
     26#     AC_SUBST(YAT_LT_ADD)
    2627#
    2728#   defines:
     
    7273#
    7374#     Compile a small program and link it to yat. On success call
    74 #     AC_SUBST(YAT_LDFLAGS), AC_SUBST(YAT_LIBS), and
    75 #     AC_SUBST(YAT_LA_FILE), and define HAVE_YAT, and execute
     75#     AC_SUBST(YAT_LDFLAGS), AC_SUBST(YAT_LIBS), AC_SUBST(YAT_LT_ADD),
     76#     and AC_SUBST(YAT_LA_FILE), and define HAVE_YAT, and execute
    7677#     ACTION-IF-FOUND. On failure execute ACTION-IF-NOT-FOUND.
    7778#
     
    104105
    105106#
    106 # serial 2  # version number of yat.m4
     107# serial 3  # version number of yat.m4
    107108#
    108109# see http://www.gnu.org/software/automake/manual/automake.html#Serials
     
    272273                    AC_SUBST(YAT_LDFLAGS)
    273274                    AC_SUBST(YAT_LIBS)
    274                     YAT_LA_FILE=`$yat_config --link-libtool`;
     275                    # be compatible with yat-config 0.5.x
     276                    AS_IF([$yat_config --atleast-version=0.6],
     277                          [YAT_LA_FILE=`$yat_config --link-libtool`;],
     278                          [YAT_LA_FILE=`$yat_config --yat-la-file`;])
    275279                    AC_SUBST(YAT_LA_FILE)],
     280                    YAT_LT_ADD=`$yat_config --link-libtool`
     281                    AC_SUBST(YAT_LT_ADD)],
    276282                   [ac_yat_ok="no";
    277283                    AC_MSG_RESULT([no])
     
    299305  AS_IF([test "x$yat_ac_want_yat" = "xno"],[],
    300306        [$1],[m4_default([$2], [:])],
    301         [m4_default([$2], [:])])
     307        [m4_default([$3], [:])])
    302308])
Note: See TracChangeset for help on using the changeset viewer.