|
Line
Link Here
|
| 0 |
-- Makefile.in |
0 |
++ Makefile.in |
|
Lines 29-35
Link Here
|
| 29 |
# for CFLAGS |
29 |
# for CFLAGS |
| 30 |
WARN_FLAGS := -Wall -Wmissing-prototypes -Wstrict-prototypes -Wpointer-arith |
30 |
WARN_FLAGS := -Wall -Wmissing-prototypes -Wstrict-prototypes -Wpointer-arith |
| 31 |
LFS_FLAGS := -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 |
31 |
LFS_FLAGS := -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 |
| 32 |
X11_FLAGS := @X_CFLAGS@ @XFT_FLAGS@ -I/usr/X11R6/include/X11/fonts |
32 |
X11_FLAGS := @X_CFLAGS@ @XFT_CFLAGS@ -I/usr/X11R6/include/X11/fonts |
| 33 |
LIB_FLAGS := -I. -I./vbistuff -I./x11 \ |
33 |
LIB_FLAGS := -I. -I./vbistuff -I./x11 \ |
| 34 |
-I$(srcdir)/jwz -I$(srcdir)/common -I$(srcdir)/console \ |
34 |
-I$(srcdir)/jwz -I$(srcdir)/common -I$(srcdir)/console \ |
| 35 |
-I$(srcdir)/x11 -I$(srcdir)/structs \ |
35 |
-I$(srcdir)/x11 -I$(srcdir)/structs \ |
| 36 |
-- configure.ac |
36 |
++ configure.ac |
|
Lines 136-150
Link Here
|
| 136 |
XFT_FLAGS="" |
136 |
XFT_FLAGS="" |
| 137 |
XFT_LIBS="" |
137 |
XFT_LIBS="" |
| 138 |
if test "$enable_xft" != "no"; then |
138 |
if test "$enable_xft" != "no"; then |
| 139 |
AC_MSG_CHECKING(for Xft) |
139 |
PKG_CHECK_MODULES([XFT], [xft fontconfig], [AC_DEFINE([HAVE_XFT], [1], ["have xft"])]) |
| 140 |
if test -x "`which pkg-config 2>/dev/null`" && pkg-config xft; then |
|
|
| 141 |
XFT_FLAGS="`pkg-config --cflags xft`" |
| 142 |
XFT_LIBS="`pkg-config --libs xft`" |
| 143 |
AC_DEFINE(HAVE_XFT,1,"have xft") |
| 144 |
AC_MSG_RESULT(yes) |
| 145 |
else |
| 146 |
AC_MSG_RESULT(no) |
| 147 |
fi |
| 148 |
fi |
140 |
fi |
| 149 |
else |
141 |
else |
| 150 |
ATHENA="" |
142 |
ATHENA="" |
|
Lines 161-167
Link Here
|
| 161 |
AC_SUBST(SUBS) |
153 |
AC_SUBST(SUBS) |
| 162 |
AC_SUBST(TOOLS) |
154 |
AC_SUBST(TOOLS) |
| 163 |
AC_SUBST(LDLIBS) |
155 |
AC_SUBST(LDLIBS) |
| 164 |
AC_SUBST(XFT_FLAGS) |
156 |
AC_SUBST(XFT_CFLAGS) |
| 165 |
AC_SUBST(XFT_LIBS) |
157 |
AC_SUBST(XFT_LIBS) |
| 166 |
|
158 |
|
| 167 |
AC_CHECK_LIB(jpeg, jpeg_start_compress, JPEG="found",,) |
159 |
AC_CHECK_LIB(jpeg, jpeg_start_compress, JPEG="found",,) |
