Changeset 3424

Timestamp:

Sep 28, 2015, 1:08:12 AM (8 years ago)

Author:

Peter

Message:

upgrade to autoconf-archive-2015.09.25

Location:

trunk/m4

Files:

• ax_append_flag.m4 (modified) (2 diffs)
• ax_boost_base.m4 (modified) (3 diffs)

trunk/m4/ax_append_flag.m4

@@ -50 +50 @@
 #   exception to the GPL to apply to your modified version as well.
 
-#serial 5
+#serial 6
 
 AC_DEFUN([AX_APPEND_FLAG],
@@ -60 +60 @@
     [*" $1 "*], [AC_RUN_LOG([: FLAGS already contains $1])],
     [
-     AS_VAR_APPEND(FLAGS," $1")
+     AS_VAR_APPEND(FLAGS,[" $1"])
      AC_RUN_LOG([: FLAGS="$FLAGS"])
     ])

trunk/m4/ax_boost_base.m4

@@ -34 +34 @@
 #   warranty.
 
-#serial 25
+#serial 26
 
 AC_DEFUN([AX_BOOST_BASE],
@@ -174 +174 @@
     dnl built and installed without the --layout=system option or for a staged(not installed) version
     if test "x$succeeded" != "xyes"; then
+        CPPFLAGS="$CPPFLAGS_SAVED"
+        LDFLAGS="$LDFLAGS_SAVED"
+        BOOST_CPPFLAGS=
+        BOOST_LDFLAGS=
         _version=0
         if test "$ac_boost_path" != ""; then
@@ -186 +190 @@
                     BOOST_CPPFLAGS="-I$ac_boost_path/include/boost-$VERSION_UNDERSCORE"
                 done
+                dnl if nothing found search for layout used in Windows distributions
+                if test -z "$BOOST_CPPFLAGS"; then
+                    if test -d "$ac_boost_path/boost" && test -r "$ac_boost_path/boost"; then
+                        BOOST_CPPFLAGS="-I$ac_boost_path"
+                    fi
+                fi
             fi
         else