diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-05-04 17:46:51 +0200 |
|---|---|---|
| committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-05-04 17:46:51 +0200 |
| commit | 1e8526488f16c127e89ccd8be0df1bd33076c351 (patch) | |
| tree | 7600aea27e2999de43f42f4083a0ed395791a929 /m4/init.m4 | |
| parent | a1241883c9a783077cf51b6fc2f8b7dd4c2c900f (diff) | |
| parent | 33f4f7d391152e679232479a7dec4cc2cb90a12f (diff) | |
| download | automake-1e8526488f16c127e89ccd8be0df1bd33076c351.tar.gz | |
Merge branch 'maint'
* maint:
tests: avoid spurious failure on missing Obj C/C++ compiler
objc, objc++: test support for compilation flags
objc, objc++: add stress test
objc, objc++: test automatic dependency tracking
objc: reorganize basic tests
objc++, objc: add first semantic tests
objc++: add first basic test
news: announce initial support for Objective C++
objc++: test support for '.mm' suffix in _SOURCES entries
objc++: add documentation
objc++: initial support for Objective C++
Diffstat (limited to 'm4/init.m4')
| -rw-r--r-- | m4/init.m4 | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/m4/init.m4 b/m4/init.m4 index 97315279f..9db4eea0c 100644 --- a/m4/init.m4 +++ b/m4/init.m4 @@ -6,7 +6,7 @@ # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 18 +# serial 19 # This macro actually does too much. Some checks are only needed if # your package does certain things. But this isn't really a big deal. @@ -100,6 +100,13 @@ AC_PROVIDE_IFELSE([AC_PROG_OBJC], [_AM_DEPENDENCIES([OBJC])], [define([AC_PROG_OBJC], defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl +dnl Support for Objective C++ was only introduced in Autoconf 2.65, +dnl but we still cater to Autoconf 2.62. +m4_ifdef([AC_PROG_OBJCXX], +[AC_PROVIDE_IFELSE([AC_PROG_OBJCXX], + [_AM_DEPENDENCIES([OBJCXX])], + [define([AC_PROG_OBJCXX], + defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])])dnl ]) AC_REQUIRE([AM_SILENT_RULES])dnl dnl The 'parallel-tests' driver may need to know about EXEEXT, so add the |