summaryrefslogtreecommitdiff
path: root/configure.in
diff options
context:
space:
mode:
authorElliot Lee <sopwith@src.gnome.org>2000-12-06 18:45:42 +0000
committerElliot Lee <sopwith@src.gnome.org>2000-12-06 18:45:42 +0000
commit89709dd14f4a3cdf45a40ac9b30b9911489eafca (patch)
treee9f5a9a0d11e8e9619fc2953c3e2b54c966eabf2 /configure.in
parent7fa13eaf35adf77fe945cd2972abad799832d479 (diff)
downloadgtk+-89709dd14f4a3cdf45a40ac9b30b9911489eafca.tar.gz
Detect freetype properly Make use of above.
* configure.in: Detect freetype properly * modules/basic/Makefile.am, gdk/linux-fb/Makefile.am: Make use of above.
Diffstat (limited to 'configure.in')
-rw-r--r--configure.in11
1 files changed, 11 insertions, 0 deletions
diff --git a/configure.in b/configure.in
index 822bbad073..23e45a791b 100644
--- a/configure.in
+++ b/configure.in
@@ -534,11 +534,22 @@ if test "x$gdktarget" = "xlinux-fb"; then
x_ldflags=
x_libs=
xinput_progs=
+
+ AC_PATH_PROG(FREETYPE_CONFIG, freetype-config, no)
+ if test x$FREETYPE_CONFIG = xno ; then
+ AC_MSG_ERROR([*** freetype-config not found])
+ fi
+
+ FREETYPE_CFLAGS="`$FREETYPE_CONFIG --cflags`"
+ FREETYPE_LIBS="`$FREETYPE_CONFIG --libs`"
+ CFLAGS="$CFLAGS $FREETYPE_CFLAGS"
AM_CONDITIONAL(USE_LINUX_FB, true)
else
AM_CONDITIONAL(USE_LINUX_FB, false)
fi
+AC_SUBST(FREETYPE_LIBS)
+AC_SUBST(FREETYPE_CFLAGS)
#
# Check for Pango