Author: hartmannathan
Date: Thu Jan 28 03:38:39 2021
New Revision: 1885960
URL: http://svn.apache.org/viewvc?rev=1885960&view=rev
Log:
On the 1.14.x-r1881534-no-crlf backport branch:
Merge r1881534 from trunk, but manually fix the line endings (replace several
accidental CRLF with LF).
Modified:
subversion/branches/1.14.x-r1881534-no-crlf/build/ac-macros/macosx.m4
Modified: subversion/branches/1.14.x-r1881534-no-crlf/build/ac-macros/macosx.m4
URL:
http://svn.apache.org/viewvc/subversion/branches/1.14.x-r1881534-no-crlf/build/ac-macros/macosx.m4?rev=1885960&r1=1885959&r2=1885960&view=diff
==============================================================================
--- subversion/branches/1.14.x-r1881534-no-crlf/build/ac-macros/macosx.m4
(original)
+++ subversion/branches/1.14.x-r1881534-no-crlf/build/ac-macros/macosx.m4 Thu
Jan 28 03:38:39 2021
@@ -23,22 +23,25 @@ dnl SVN_LIB_MACHO_ITERATE
dnl Check for _dyld_image_name and _dyld_image_header availability
AC_DEFUN(SVN_LIB_MACHO_ITERATE,
[
- AC_MSG_CHECKING([for Mach-O dynamic module iteration functions])
- AC_RUN_IFELSE([AC_LANG_PROGRAM([[
- #include <mach-o/dyld.h>
- #include <mach-o/loader.h>
- ]],[[
- const struct mach_header *header = _dyld_get_image_header(0);
- const char *name = _dyld_get_image_name(0);
- if (name && header) return 0;
- return 1;
- ]])],[
+ AC_CACHE_CHECK([for Mach-O dynamic module iteration functions],
+ [ac_cv_mach_o_dynamic_module_iteration_works], [
+ AC_RUN_IFELSE([AC_LANG_PROGRAM([[
+ #include <mach-o/dyld.h>
+ #include <mach-o/loader.h>
+ ]],[[
+ const struct mach_header *header = _dyld_get_image_header(0);
+ const char *name = _dyld_get_image_name(0);
+ if (name && header) return 0;
+ return 1;
+ ]])],
+ [ac_cv_mach_o_dynamic_module_iteration_works=yes],
+ [ac_cv_mach_o_dynamic_module_iteration_works=no],
+ [ac_cv_mach_o_dynamic_module_iteration_works=no])
+ ])
+ if test "$ac_cv_mach_o_dynamic_module_iteration_works" = yes; then
AC_DEFINE([SVN_HAVE_MACHO_ITERATE], [1],
[Is Mach-O low-level _dyld API available?])
- AC_MSG_RESULT([yes])
- ],[
- AC_MSG_RESULT([no])
- ])
+ fi
])
dnl SVN_LIB_MACOS_PLIST
