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
|
$NetBSD: patch-cb,v 1.4 2009/07/18 13:20:01 wiz Exp $
--- configure.orig 2009-06-24 19:05:31.000000000 +0000
+++ configure
@@ -815,7 +815,6 @@ FREETYPE_CFLAGS
FREETYPE_LIBS
ft_config
ICONV_LIBS
-ARCHITECTURE
EXEEXT_FOR_BUILD
CC_FOR_BUILD
CROSS_COMPILING_FALSE
@@ -953,7 +952,6 @@ with_pic
enable_fast_install
with_gnu_ld
enable_libtool_lock
-with_arch
with_freetype_config
with_expat
with_expat_includes
@@ -1624,7 +1622,6 @@ Optional Packages:
--with-pic try to use only PIC/non-PIC objects [default=use
both]
--with-gnu-ld assume the C compiler uses GNU ld [default=no]
- --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
@@ -11933,31 +11930,6 @@ $as_echo "$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)
- { { $as_echo "$as_me:$LINENO: error: Cannot autodetect architecture in cross compile environment
- Use --with-arch=ARCH to specify architecture" >&5
-$as_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.
@@ -15026,7 +14998,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 fc-query/Makefile fc-scan/Makefile doc/Makefile doc/version.sgml test/Makefile fontconfig.spec fontconfig.pc 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 fc-query/Makefile fc-scan/Makefile doc/Makefile doc/version.sgml test/Makefile fontconfig.spec fontconfig.pc fontconfig-zip"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
@@ -15962,6 +15934,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" ;;
|
