f11cf96be0cac329eab7c1f72187c143f657b852
[openwrt/svn-archive/archive.git] / XOrg / misc / freetype / patches / configure.patch
1
2 #
3 # Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
4 #
5
6 Index: freetype-2.1.8/builds/unix/configure.ac
7 ===================================================================
8 --- freetype-2.1.8.orig/builds/unix/configure.ac 2004-04-14 04:49:11.000000000 -0400
9 +++ freetype-2.1.8/builds/unix/configure.ac 2005-03-12 03:14:23.000000000 -0500
10 @@ -111,8 +111,8 @@
11 # Check for system zlib
12
13 AC_ARG_WITH([zlib],
14 - dnl don't quote AS_HELP_STRING!
15 - AS_HELP_STRING([--without-zlib],
16 + dnl don't quote AC_HELP_STRING!
17 + AC_HELP_STRING([--without-zlib],
18 [use internal zlib instead of system-wide]))
19 if test x$with_zlib != xno && test -z "$LIBZ"; then
20 AC_CHECK_LIB([z], [gzsetparams], [AC_CHECK_HEADER([zlib.h], [LIBZ='-lz'])])
21 @@ -127,7 +127,7 @@
22 # Whether to use Mac OS resource-based fonts or not
23
24 AC_ARG_WITH([old-mac-fonts],
25 - dnl don't quote AS_HELP_STRING!
26 - AS_HELP_STRING([--with-old-mac-fonts],
27 + dnl don't quote AC_HELP_STRING!
28 + AC_HELP_STRING([--with-old-mac-fonts],
29 [allow Mac resource-based fonts to be used]))
30 if test x$with_old_mac_fonts = xyes; then
31 Index: freetype-2.1.8/builds/unix/unix-cc.in
32 ===================================================================
33 --- freetype-2.1.8.orig/builds/unix/unix-cc.in 2003-11-09 03:37:13.000000000 -0500
34 +++ freetype-2.1.8/builds/unix/unix-cc.in 2005-03-12 18:37:24.613693760 -0500
35 @@ -14,9 +14,11 @@
36
37 CC := @CC@
38 COMPILER_SEP := $(SEP)
39 +SHELL := @SHELL@
40 +top_builddir := $(BUILD_DIR)
41
42 ifndef LIBTOOL
43 - LIBTOOL := $(BUILD_DIR)/libtool
44 + LIBTOOL := @LIBTOOL@
45 endif
46
47