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
|
$NetBSD: patch-cb,v 1.3 2008/06/21 18:47:44 wiz Exp $
--- configure.orig 2008-06-01 02:31:02.000000000 +0000
+++ configure
@@ -893,7 +893,6 @@ CROSS_COMPILING_TRUE
CROSS_COMPILING_FALSE
CC_FOR_BUILD
EXEEXT_FOR_BUILD
-ARCHITECTURE
ICONV_LIBS
ft_config
FREETYPE_LIBS
@@ -1539,7 +1538,6 @@ Optional Packages:
--with-pic try to use only PIC/non-PIC objects [default=use
both]
--with-tags[=TAGS] include additional configurations [automatic]
- --with-arch=ARCH Force architecture to ARCH
--with-freetype-config=PROG Use FreeType configuration program PROG
--with-expat=DIR Use Expat in DIR
--with-expat-includes=DIR Use Expat includes in DIR
@@ -20587,31 +20585,6 @@ echo "${ECHO_T}$EXEEXT_FOR_BUILD" >&6; }
-
-# Check whether --with-arch was given.
-if test "${with_arch+set}" = set; then
- withval=$with_arch; arch="$withval"
-else
- arch=auto
-fi
-
-
-if test $cross_compiling = yes; then
- case "$arch" in
- auto)
- { { echo "$as_me:$LINENO: error: Cannot autodetect architecture in cross compile environment
- Use --with-arch=ARCH to specify architecture" >&5
-echo "$as_me: error: Cannot autodetect architecture in cross compile environment
- Use --with-arch=ARCH to specify architecture" >&2;}
- { (exit 1); exit 1; }; }
- ;;
- esac
-fi
-
-ARCHITECTURE=$arch
-
-
-
# Checks for header files.
@@ -23577,7 +23550,7 @@ fi
-ac_config_files="$ac_config_files Makefile fontconfig/Makefile fc-lang/Makefile fc-glyphname/Makefile fc-case/Makefile fc-arch/Makefile src/Makefile conf.d/Makefile fc-cache/Makefile fc-cat/Makefile fc-list/Makefile fc-match/Makefile doc/Makefile doc/version.sgml test/Makefile fontconfig.spec fontconfig.pc fonts.conf fontconfig-zip"
+ac_config_files="$ac_config_files Makefile fontconfig/Makefile fc-lang/Makefile fc-glyphname/Makefile fc-case/Makefile fc-arch/Makefile fc-arch/fcarch.h src/Makefile conf.d/Makefile fc-cache/Makefile fc-cat/Makefile fc-list/Makefile fc-match/Makefile doc/Makefile doc/version.sgml test/Makefile fontconfig.spec fontconfig.pc fonts.conf fontconfig-zip"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
@@ -24212,6 +24185,7 @@ do
"fc-glyphname/Makefile") CONFIG_FILES="$CONFIG_FILES fc-glyphname/Makefile" ;;
"fc-case/Makefile") CONFIG_FILES="$CONFIG_FILES fc-case/Makefile" ;;
"fc-arch/Makefile") CONFIG_FILES="$CONFIG_FILES fc-arch/Makefile" ;;
+ "fc-arch/fcarch.h") CONFIG_FILES="$CONFIG_FILES fc-arch/fcarch.h" ;;
"src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
"conf.d/Makefile") CONFIG_FILES="$CONFIG_FILES conf.d/Makefile" ;;
"fc-cache/Makefile") CONFIG_FILES="$CONFIG_FILES fc-cache/Makefile" ;;
@@ -24454,7 +24428,6 @@ CROSS_COMPILING_TRUE!$CROSS_COMPILING_TR
CROSS_COMPILING_FALSE!$CROSS_COMPILING_FALSE$ac_delim
CC_FOR_BUILD!$CC_FOR_BUILD$ac_delim
EXEEXT_FOR_BUILD!$EXEEXT_FOR_BUILD$ac_delim
-ARCHITECTURE!$ARCHITECTURE$ac_delim
ICONV_LIBS!$ICONV_LIBS$ac_delim
ft_config!$ft_config$ac_delim
FREETYPE_LIBS!$FREETYPE_LIBS$ac_delim
@@ -24487,7 +24460,7 @@ LIBOBJS!$LIBOBJS$ac_delim
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 60; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 59; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
|
