blob: f3b0e9c5b28f28a86494af1a8f4d991b934bc022 (
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
|
$NetBSD: patch-configure,v 1.2 2018/05/05 23:17:33 dholland Exp $
- check more aggressively for XInput 2.1 to fix native X netbsd-6 build
- freetype2 upstream removed freetype-config; use pkg-config instead
--- configure.orig 2015-03-12 14:42:02.000000000 +0000
+++ configure
@@ -1519,7 +1519,7 @@ Optional Packages:
zlib headers installed in DIR
--with-zlib-libdir=DIR zlib library installed in DIR
--with-system-freetype2 use installed freetype2 headers and library
- (requires freetype-config)
+ (requires pkg-config)
--with-default-gs-lib-path=PATH
set default path for finding font aliases to PATH
--with-default-dvips-path=CMD
@@ -15845,6 +15845,9 @@ LDFLAGS="$X_LIBS $LDFLAGS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <X11/extensions/XInput2.h>
+#ifndef XIScrollClass
+ bollocks
+#endif
int
main ()
{
@@ -18955,9 +18958,9 @@ esac
else
FT2_CONFIG="$ac_cv_prog_FT2_CONFIG"
fi
-if $FT2_CONFIG --ftversion >/dev/null 2>&1; then
- FREETYPE2_INCLUDES=`$FT2_CONFIG --cflags`
- FREETYPE2_LIBS=`$FT2_CONFIG --libs`
+if $PKG_CONFIG --version >/dev/null 2>&1; then
+ FREETYPE2_INCLUDES=`$PKG_CONFIG --cflags freetype2`
+ FREETYPE2_LIBS=`$PKG_CONFIG --libs freetype2`
elif test "x$need_freetype2:$with_system_freetype2" = xyes:yes; then
as_fn_error $? "did not find freetype-config required for system freetype2 library" "$LINENO" 5
fi
|
