diff options
| author | Po Lu <luangruo@yahoo.com> | 2023-03-17 19:26:16 +0800 |
|---|---|---|
| committer | Po Lu <luangruo@yahoo.com> | 2023-03-17 19:26:16 +0800 |
| commit | e7025ed689dcc1640328f7a0e2039c3c4e2d45ee (patch) | |
| tree | 7960703f174fd47fa9c1092013adf5c5fedaf2b5 /m4 | |
| parent | 2d666daaa3babeda669c39a8cfe36c4d30222512 (diff) | |
| download | emacs-e7025ed689dcc1640328f7a0e2039c3c4e2d45ee.tar.gz | |
Update Android port
* configure.ac:
* m4/ndk-build.m4 (ndk_INIT):
(ndk_LATE): Avoid AC_REQUIRE magic.
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/ndk-build.m4 | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/m4/ndk-build.m4 b/m4/ndk-build.m4 index 077781ec38c..9af681a08c8 100644 --- a/m4/ndk-build.m4 +++ b/m4/ndk-build.m4 @@ -38,7 +38,7 @@ AC_ARG_WITH([ndk_cxx], # DIR should be a directory containing the Makefile.in actually # implementing the Android NDK build system. -AC_DEFUN_ONCE([ndk_INIT], +AC_DEFUN([ndk_INIT], [ # Look for Android.mk files. ndk_module_files= @@ -347,13 +347,18 @@ AS_IF([test -n "$with_ndk_cxx"], [CXX=$with_ndk_cxx], # required C and C++ headers. AC_DEFUN([ndk_LATE], -[ +[dnl +dnl This calls AC_REQUIRE([AC_PROG_CXX]), leading to configure looking +dnl for a C++ compiler. However, the language is not restored +dnl afterwards if not `$ndk_INITIALIZED'. AS_IF([test "$ndk_INITIALIZED" = "yes"],[ AS_IF([test -n "$CXX"], [AC_LANG_PUSH([C++]) AC_CHECK_HEADER([string], [ndk_working_cxx=yes], [AC_MSG_WARN([Your C++ compiler is not properly set up, and\ the standard library headers could not be found.])]) AC_LANG_POP([C++])])]) +dnl Thus, manually switch back to C here. +AC_LANG([C]) ]) # ndk_SEARCH_MODULE(MODULE, NAME, ACTION-IF-FOUND, [ACTION-IF-NOT-FOUND]) |