tests: Move Autotest compatibility macros into tests directory.

compat.at mixes compatibility for m4sh, which is used by Autoconf and Autotest, with compatibility for Autotest. It makes more sense to separate them. This moves the Autotest-only compatibility macros into an Autotest specific file. Signed-off-by: Ben Pfaff <[email protected]>
eyoung-father · Feb 26, 2016 · 47b3124 · 47b3124
1 parent fc99370
commit 47b3124
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 15 deletions.
diff --git a/m4/compat.at b/m4/compat.at
@@ -12,21 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-m4_ifndef([AT_CHECK_UNQUOTED],
-  [m4_define([AT_CHECK_UNQUOTED],
-  [_AT_CHECK([$1], [$2], AS_ESCAPE(m4_dquote(m4_expand([$3])), [""]),
-    AS_ESCAPE(m4_dquote(m4_expand([$4])),[""]), [$5], [$6])])])
-
-m4_ifndef([AT_SKIP_IF],
-  [m4_define([AT_SKIP_IF],
-    [AT_CHECK([($1) \
-    && exit 77 || exit 0], [0], [ignore], [ignore])])])
-
-m4_ifndef([AT_FAIL_IF],
-  [m4_define([AT_FAIL_IF],
-    [AT_CHECK([($1) \
-    && exit 99 || exit 0], [0], [ignore], [ignore])])])
-
 m4_ifndef([AS_VAR_COPY],
   [m4_define([AS_VAR_COPY],
     [AS_LITERAL_IF([$1[]$2], [$1=$$2], [eval $1=\$$2])])])
diff --git a/tests/ovs-macros.at b/tests/ovs-macros.at
@@ -162,3 +162,21 @@ m4_ifndef([AS_VAR_APPEND],
      }
 ])
    m4_define([AS_VAR_APPEND], [as_var_append $1 $2])])
+
+dnl Autoconf 2.63 compatibility verison of macro introduced in Autoconf 2.64:
+m4_ifndef([AT_CHECK_UNQUOTED],
+  [m4_define([AT_CHECK_UNQUOTED],
+  [_AT_CHECK([$1], [$2], AS_ESCAPE(m4_dquote(m4_expand([$3])), [""]),
+    AS_ESCAPE(m4_dquote(m4_expand([$4])),[""]), [$5], [$6])])])
+
+dnl Autoconf 2.63 compatibility verison of macro introduced in Autoconf 2.64:
+m4_ifndef([AT_SKIP_IF],
+  [m4_define([AT_SKIP_IF],
+    [AT_CHECK([($1) \
+    && exit 77 || exit 0], [0], [ignore], [ignore])])])
+
+dnl Autoconf 2.63 compatibility verison of macro introduced in Autoconf 2.64:
+m4_ifndef([AT_FAIL_IF],
+  [m4_define([AT_FAIL_IF],
+    [AT_CHECK([($1) \
+    && exit 99 || exit 0], [0], [ignore], [ignore])])])