Changeset 3424


Ignore:
Timestamp:
Sep 28, 2015, 1:08:12 AM (7 years ago)
Author:
Peter
Message:

upgrade to autoconf-archive-2015.09.25

Location:
trunk/m4
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/m4/ax_append_flag.m4

    r3378 r3424  
    5050#   exception to the GPL to apply to your modified version as well.
    5151
    52 #serial 5
     52#serial 6
    5353
    5454AC_DEFUN([AX_APPEND_FLAG],
     
    6060    [*" $1 "*], [AC_RUN_LOG([: FLAGS already contains $1])],
    6161    [
    62      AS_VAR_APPEND(FLAGS," $1")
     62     AS_VAR_APPEND(FLAGS,[" $1"])
    6363     AC_RUN_LOG([: FLAGS="$FLAGS"])
    6464    ])
  • trunk/m4/ax_boost_base.m4

    r3331 r3424  
    3434#   warranty.
    3535
    36 #serial 25
     36#serial 26
    3737
    3838AC_DEFUN([AX_BOOST_BASE],
     
    174174    dnl built and installed without the --layout=system option or for a staged(not installed) version
    175175    if test "x$succeeded" != "xyes"; then
     176        CPPFLAGS="$CPPFLAGS_SAVED"
     177        LDFLAGS="$LDFLAGS_SAVED"
     178        BOOST_CPPFLAGS=
     179        BOOST_LDFLAGS=
    176180        _version=0
    177181        if test "$ac_boost_path" != ""; then
     
    186190                    BOOST_CPPFLAGS="-I$ac_boost_path/include/boost-$VERSION_UNDERSCORE"
    187191                done
     192                dnl if nothing found search for layout used in Windows distributions
     193                if test -z "$BOOST_CPPFLAGS"; then
     194                    if test -d "$ac_boost_path/boost" && test -r "$ac_boost_path/boost"; then
     195                        BOOST_CPPFLAGS="-I$ac_boost_path"
     196                    fi
     197                fi
    188198            fi
    189199        else
Note: See TracChangeset for help on using the changeset viewer.