blob: 4953da5188d1d3ee6109b9fb0757bd45f4ea09b6 (
plain)
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
|
$NetBSD: patch-ab,v 1.5 2019/02/08 22:25:32 tonio Exp $
Adjust configure script to use provided awk, set options properly for
with_osx_addressbook, and eliminate vcard format.
--- configure.orig 2019-01-07 18:30:29.000000000 +0000
+++ configure
@@ -4858,22 +4858,7 @@ $as_echo "no" >&6; }
fi
-
-if test "x$AWK" != "xNONE" ; then
- AWK="$AWK"
-fi
-
-if test "x$NAWK" != "xNONE" ; then
- AWK="$NAWK"
-fi
-
-if test "x$GAWK" != "xNONE" ; then
- AWK="$GAWK"
-fi
-
-if test "x$MAWK" != "xNONE" ; then
- AWK="$MAWK"
-fi
+#use the supplied awk
@@ -6501,6 +6486,11 @@ if test "x$PERL" != xno ; then
fi
+# Check whether --with-osx-addressbook or --without-osx-addressbook was given.
+if test "${with_osx_addressbook+set}" = set; then
+ withval="$with_osx_addressbook"
+fi;
+if test x$withval = xyes; then
# m_osx_addressbook requires xcode (10.3) or projectbuilder (<10.3)
# Extract the first word of "xcodebuild", so it can be a program name with args.
set dummy xcodebuild; ac_word=$2
@@ -6593,6 +6583,11 @@ fi
fi
fi
+else
+ PBXBUILD="no"
+ XCODEBUILD="no"
+fi
+withval=""
VFORMAT="no"
ac_fn_c_check_header_mongrel "$LINENO" "vf_iface.h" "ac_cv_header_vf_iface_h" "$ac_includes_default"
@@ -6636,8 +6631,8 @@ fi
$as_echo "$ac_cv_lib_vformat_vf_read_file" >&6; }
if test "x$ac_cv_lib_vformat_vf_read_file" = xyes; then :
- MODULES="$MODULES m_vcf"
- VFORMAT="yes"
+ MODULES="$MODULES"
+# VFORMAT="yes"
fi
|
