summaryrefslogtreecommitdiff
path: root/fonts/fontforge/patches/patch-ae
blob: 2a74b8e1e6637016ceb8234117c9142612c298bb (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
$NetBSD: patch-ae,v 1.17 2008/11/21 18:54:19 adam Exp $

--- configure.orig	2008-11-15 15:16:49.000000000 +0100
+++ configure
@@ -21813,8 +21813,8 @@ if test $ac_cv_file__usr_include_libxml2
   CFLAGS="$CFLAGS -I/usr/include/libxml2/"
 else
 
- { echo "$as_me:$LINENO: checking for /usr/local/include/libxml2/libxml" >&5
-echo $ECHO_N "checking for /usr/local/include/libxml2/libxml... $ECHO_C" >&6; }
+ { echo "$as_me:$LINENO: checking for ${PREFIX}/include/libxml2/libxml" >&5
+echo $ECHO_N "checking for ${PREFIX}/include/libxml2/libxml... $ECHO_C" >&6; }
 if test "${ac_cv_file__usr_local_include_libxml2_libxml+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -21822,7 +21822,7 @@ else
   { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
 echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
    { (exit 1); exit 1; }; }
-if test -r "/usr/local/include/libxml2/libxml"; then
+if test -r "${PREFIX}/include/libxml2/libxml"; then
   ac_cv_file__usr_local_include_libxml2_libxml=yes
 else
   ac_cv_file__usr_local_include_libxml2_libxml=no
@@ -21831,7 +21831,7 @@ fi
 { echo "$as_me:$LINENO: result: $ac_cv_file__usr_local_include_libxml2_libxml" >&5
 echo "${ECHO_T}$ac_cv_file__usr_local_include_libxml2_libxml" >&6; }
 if test $ac_cv_file__usr_local_include_libxml2_libxml = yes; then
-  CFLAGS="$CFLAGS -I/usr/local/include -I/usr/local/include/libxml2/"
+  CFLAGS="$CFLAGS -I${PREFIX}/include -I${PREFIX}/include/libxml2/"
 else
   cat >>confdefs.h <<\_ACEOF
 #define _NO_LIBXML 1
@@ -24099,9 +24099,9 @@ else
   :
 fi
 
-  if test "$pan_headers" != "" >& /dev/null ; then
+  if test "$pan_headers" != "" 2> /dev/null ; then
     gww_haspango="done"
-  elif pkg-config --libs pangoxft >& /dev/null ; then
+  elif pkg-config --libs pangoxft 2> /dev/null ; then
     gww_CFLAGS="$CFLAGS"
     CFLAGS="$CFLAGS $X_CFLAGS"
     { echo "$as_me:$LINENO: checking for X11/Xft/Xft.h" >&5
@@ -24169,7 +24169,7 @@ if test "$gww_haspango" = "yes" ; then
  CFLAGS="$CFLAGS `pkg-config --cflags pangoxft`"
 fi
 if test "$gww_haspango" = "yes" -a "$gww_hascairo" = "yes" ; then
-  if pkg-config --libs pangocairo >& /dev/null ; then
+  if pkg-config --libs pangocairo 2> /dev/null ; then
     gww_haspangocairo="yes"
     CFLAGS="$CFLAGS `pkg-config --cflags pangocairo`"
   fi
@@ -26602,7 +26602,7 @@ if test "$gww_has_gettext" = "yes" >/dev
 
  cat </dev/null >$ac_confdir/po/Makefile.in
  echo 'prefix = @prefix@' >> $ac_confdir/po/Makefile.in
- echo 'localedir = $(prefix)/share/locale' >> $ac_confdir/po/Makefile.in
+ echo 'localedir = ${PREFIX}/${PKGLOCALEDIR}/locale' >> $ac_confdir/po/Makefile.in
  echo 'INSTALL = @INSTALL@' >> $ac_confdir/po/Makefile.in
  echo 'INSTALL_DATA = @INSTALL_DATA@' >> $ac_confdir/po/Makefile.in
  echo '' >> $ac_confdir/po/Makefile.in