Changeset 2825


Ignore:
Timestamp:
Sep 10, 2012, 8:20:27 AM (9 years ago)
Author:
Peter
Message:

upgrade to autoconf macro archive 2012.09.08

Location:
trunk/m4
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/m4/ax_append_compile_flags.m4

    r2724 r2825  
    5555#   exception to the GPL to apply to your modified version as well.
    5656
    57 #serial 2
     57#serial 3
    5858
    5959AC_DEFUN([AX_APPEND_COMPILE_FLAGS],
    60 [for flag in $1; do
     60[AC_REQUIRE([AX_CHECK_COMPILE_FLAG])
     61AC_REQUIRE([AX_APPEND_FLAG])
     62for flag in $1; do
    6163  AX_CHECK_COMPILE_FLAG([$flag], [AX_APPEND_FLAG([$flag], [$2])], [], [$3])
    6264done
  • trunk/m4/ax_append_link_flags.m4

    r2724 r2825  
    5353#   exception to the GPL to apply to your modified version as well.
    5454
    55 #serial 2
     55#serial 3
    5656
    5757AC_DEFUN([AX_APPEND_LINK_FLAGS],
    58 [for flag in $1; do
     58[AC_REQUIRE([AX_CHECK_LINK_FLAG])
     59AC_REQUIRE([AX_APPEND_FLAG])
     60for flag in $1; do
    5961  AX_CHECK_LINK_FLAG([$flag], [AX_APPEND_FLAG([$flag], [m4_default([$2], [LDFLAGS])])], [], [$3])
    6062done
  • trunk/m4/ax_boost_system.m4

    r2782 r2825  
    3232#   warranty.
    3333
    34 #serial 14
     34#serial 15
    3535
    3636AC_DEFUN([AX_BOOST_SYSTEM],
     
    8484      LDFLAGS_SAVE=$LDFLAGS
    8585            if test "x$ax_boost_user_system_lib" = "x"; then
    86                 for libextension in `ls $BOOSTLIBDIR/libboost_system*.so* $BOOSTLIBDIR/libboost_system*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_system.*\)\.so.*$;\1;' -e 's;^lib\(boost_system.*\)\.a*$;\1;'` ; do
     86                for libextension in `ls $BOOSTLIBDIR/libboost_system*.a* $BOOSTLIBDIR/libboost_system*.so* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_system.*\)\.\(so\|a\).*$;\1;' | tac` ; do
    8787                     ax_lib=${libextension}
    8888            AC_CHECK_LIB($ax_lib, exit,
     
    9191        done
    9292                if test "x$link_system" != "xyes"; then
    93                 for libextension in `ls $BOOSTLIBDIR/boost_system*.{dll,a}* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_system.*\)\.dll.*$;\1;' -e 's;^\(boost_system.*\)\.a*$;\1;'` ; do
     93                for libextension in `ls $BOOSTLIBDIR/boost_system*.{dll,a}* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_system.*\)\.\(dll\|a\).*$;\1;' | tac` ; do
    9494                     ax_lib=${libextension}
    9595            AC_CHECK_LIB($ax_lib, exit,
  • trunk/m4/ax_boost_thread.m4

    r2767 r2825  
    3131#   warranty.
    3232
    33 #serial 23
     33#serial 25
    3434
    3535AC_DEFUN([AX_BOOST_THREAD],
     
    105105                        esac
    106106            if test "x$ax_boost_user_thread_lib" = "x"; then
    107                 for libextension in `ls $BOOSTLIBDIR/libboost_thread*.so* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_thread.*\)\.so.*$;\1;'` `ls $BOOSTLIBDIR/libboost_thread*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_thread.*\)\.a*$;\1;'`; do
     107                for libextension in `ls $BOOSTLIBDIR/libboost_thread*.so* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_thread.*\)\.so.*$;\1;'` `ls $BOOSTLIBDIR/libboost_thread*.dylib* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(libboost_thread.*\)\.dylib.*$;\1;'` `ls $BOOSTLIBDIR/libboost_thread*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_thread.*\)\.a.*$;\1;'`; do
    108108                     ax_lib=${libextension}
    109109            AC_CHECK_LIB($ax_lib, exit,
     
    112112        done
    113113                if test "x$link_thread" != "xyes"; then
    114                 for libextension in `ls $BOOSTLIBDIR/boost_thread*.dll* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_thread.*\)\.dll.*$;\1;'` `ls $BOOSTLIBDIR/boost_thread*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_thread.*\)\.a*$;\1;'` ; do
     114                for libextension in `ls $BOOSTLIBDIR/boost_thread*.dll* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_thread.*\)\.dll.*$;\1;'` `ls $BOOSTLIBDIR/boost_thread*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_thread.*\)\.a.*$;\1;'` ; do
    115115                     ax_lib=${libextension}
    116116            AC_CHECK_LIB($ax_lib, exit,
Note: See TracChangeset for help on using the changeset viewer.