Changeset 2022


Ignore:
Timestamp:
Aug 5, 2009, 12:39:33 AM (11 years ago)
Author:
Peter
Message:

assert if language is not C++ rather than putting C++ on the LANG stack. refs #553

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/m4/yat.m4

    r2021 r2022  
    202202    CPPFLAGS="$CPPFLAGS $YAT_CPPFLAGS"
    203203    CXXFLAGS="$CXXFLAGS $YAT_CXXFLAGS"
    204     AC_LANG_PUSH(C++)
     204    AC_LANG_ASSERT([C++])
    205205    # checking for Vector, which uses both GSL and Boost
    206206    AC_CHECK_HEADER([yat/utility/Vector.h],
     
    239239    CPPFLAGS=$ac_yat_save_CPPFLAGS
    240240    CXXFLAGS=$ac_yat_save_CXXFLAGS
    241     AC_LANG_POP(C++)
    242241  fi
    243242
     
    258257    LDFLAGS="$LDFLAGS $YAT_LDFLAGS"
    259258    LIBS="$LIBS $YAT_LIBS"
    260     AC_LANG_PUSH(C++)
     259    AC_LANG_ASSERT([C++])
    261260    AC_MSG_CHECKING([for utility::version(void) in yat])
    262261    AC_LINK_IFELSE([AC_LANG_PROGRAM([[@%:@include <string>
     
    278277                          [YAT_LA_FILE=`$yat_config --yat-la-file`;])
    279278                    AC_SUBST(YAT_LA_FILE)],
    280                     YAT_LT_ADD=`$yat_config --link-libtool`
     279                    YAT_LT_ADD=`$yat_config --link-libtool`;
    281280                    AC_SUBST(YAT_LT_ADD)],
    282281                   [ac_yat_ok="no";
     
    289288    LDFLAGS=$ac_yat_save_LDFLAGS
    290289    LIBS=$ac_yat_save_LIBS
    291     AC_LANG_POP(C++)
    292290  fi
    293291
  • trunk/test/yat_m4_test2.sh

    r1856 r2022  
    4646  ./configure --without-yat
    4747fi
    48 echo "$me: running make Makefile"
    4948make Makefile
    5049
Note: See TracChangeset for help on using the changeset viewer.