1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
|
--- a/build/ac-macros/macosx.m4
+++ b/build/ac-macros/macosx.m4
@@ -18,84 +18,3 @@ dnl under the License.
dnl ===================================================================
dnl
dnl Mac OS X specific checks
-
-dnl SVN_LIB_MACHO_ITERATE
-dnl Check for _dyld_image_name and _dyld_image_header availability
-AC_DEFUN(SVN_LIB_MACHO_ITERATE,
-[
- 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?])
- fi
-])
-
-dnl SVN_LIB_MACOS_PLIST
-dnl Assign variables for Mac OS property list support
-AC_DEFUN(SVN_LIB_MACOS_PLIST,
-[
- AC_MSG_CHECKING([for Mac OS property list utilities])
-
- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
- #include <AvailabilityMacros.h>
- #if !defined(MAC_OS_X_VERSION_MAX_ALLOWED) \
- || !defined(MAC_OS_X_VERSION_10_0) \
- || (MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_0)
- #error ProperyList API unavailable.
- #endif
- ]],[[]])],[
- SVN_MACOS_PLIST_LIBS="-framework CoreFoundation"
- AC_SUBST(SVN_MACOS_PLIST_LIBS)
- AC_DEFINE([SVN_HAVE_MACOS_PLIST], [1],
- [Is Mac OS property list API available?])
- AC_MSG_RESULT([yes])
- ],[
- AC_MSG_RESULT([no])
- ])
-])
-
-dnl SVN_LIB_MACOS_KEYCHAIN
-dnl Check configure options and assign variables related to Keychain support
-
-AC_DEFUN(SVN_LIB_MACOS_KEYCHAIN,
-[
- AC_ARG_ENABLE(keychain,
- AS_HELP_STRING([--disable-keychain],
- [Disable use of Mac OS KeyChain for auth credentials]),
- [enable_keychain=$enableval],[enable_keychain=yes])
-
- AC_MSG_CHECKING([for Mac OS KeyChain Services])
-
- if test "$enable_keychain" = "yes"; then
- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
- #include <AvailabilityMacros.h>
- #if !defined(MAC_OS_X_VERSION_MAX_ALLOWED) \
- || !defined(MAC_OS_X_VERSION_10_2) \
- || (MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_2)
- #error KeyChain API unavailable.
- #endif
- ]],[[]])],[
- SVN_MACOS_KEYCHAIN_LIBS="-framework Security -framework CoreServices"
- AC_SUBST(SVN_MACOS_KEYCHAIN_LIBS)
- AC_DEFINE([SVN_HAVE_KEYCHAIN_SERVICES], [1], [Is Mac OS KeyChain support enabled?])
- AC_MSG_RESULT([yes])
- ],[
- enable_keychain=no
- AC_MSG_RESULT([no])
- ])
- fi
-])
--- a/Makefile.in
+++ b/Makefile.in
@@ -56,8 +56,8 @@ SVN_XML_LIBS = @SVN_XML_LIBS@
SVN_ZLIB_LIBS = @SVN_ZLIB_LIBS@
SVN_LZ4_LIBS = @SVN_LZ4_LIBS@
SVN_UTF8PROC_LIBS = @SVN_UTF8PROC_LIBS@
-SVN_MACOS_PLIST_LIBS = @SVN_MACOS_PLIST_LIBS@
-SVN_MACOS_KEYCHAIN_LIBS = @SVN_MACOS_KEYCHAIN_LIBS@
+SVN_MACOS_PLIST_LIBS =
+SVN_MACOS_KEYCHAIN_LIBS =
LIBS = @LIBS@
|