Commit 89709dd1 authored by Elliot Lee's avatar Elliot Lee
Browse files

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.
parent 7fa13eaf
2000-12-06 Elliot Lee <sopwith@redhat.com>
* configure.in: Detect freetype properly
* modules/basic/Makefile.am, gdk/linux-fb/Makefile.am: Make use of above.
2000-12-06 Alexander Larsson <alexl@redhat.com> 2000-12-06 Alexander Larsson <alexl@redhat.com>
* gdk/linux-fb/Makefile.am: * gdk/linux-fb/Makefile.am:
......
2000-12-06 Elliot Lee <sopwith@redhat.com>
* configure.in: Detect freetype properly
* modules/basic/Makefile.am, gdk/linux-fb/Makefile.am: Make use of above.
2000-12-06 Alexander Larsson <alexl@redhat.com> 2000-12-06 Alexander Larsson <alexl@redhat.com>
* gdk/linux-fb/Makefile.am: * gdk/linux-fb/Makefile.am:
......
2000-12-06 Elliot Lee <sopwith@redhat.com>
* configure.in: Detect freetype properly
* modules/basic/Makefile.am, gdk/linux-fb/Makefile.am: Make use of above.
2000-12-06 Alexander Larsson <alexl@redhat.com> 2000-12-06 Alexander Larsson <alexl@redhat.com>
* gdk/linux-fb/Makefile.am: * gdk/linux-fb/Makefile.am:
......
2000-12-06 Elliot Lee <sopwith@redhat.com>
* configure.in: Detect freetype properly
* modules/basic/Makefile.am, gdk/linux-fb/Makefile.am: Make use of above.
2000-12-06 Alexander Larsson <alexl@redhat.com> 2000-12-06 Alexander Larsson <alexl@redhat.com>
* gdk/linux-fb/Makefile.am: * gdk/linux-fb/Makefile.am:
......
2000-12-06 Elliot Lee <sopwith@redhat.com>
* configure.in: Detect freetype properly
* modules/basic/Makefile.am, gdk/linux-fb/Makefile.am: Make use of above.
2000-12-06 Alexander Larsson <alexl@redhat.com> 2000-12-06 Alexander Larsson <alexl@redhat.com>
* gdk/linux-fb/Makefile.am: * gdk/linux-fb/Makefile.am:
......
2000-12-06 Elliot Lee <sopwith@redhat.com>
* configure.in: Detect freetype properly
* modules/basic/Makefile.am, gdk/linux-fb/Makefile.am: Make use of above.
2000-12-06 Alexander Larsson <alexl@redhat.com> 2000-12-06 Alexander Larsson <alexl@redhat.com>
* gdk/linux-fb/Makefile.am: * gdk/linux-fb/Makefile.am:
......
2000-12-06 Elliot Lee <sopwith@redhat.com>
* configure.in: Detect freetype properly
* modules/basic/Makefile.am, gdk/linux-fb/Makefile.am: Make use of above.
2000-12-06 Alexander Larsson <alexl@redhat.com> 2000-12-06 Alexander Larsson <alexl@redhat.com>
* gdk/linux-fb/Makefile.am: * gdk/linux-fb/Makefile.am:
......
...@@ -534,11 +534,22 @@ if test "x$gdktarget" = "xlinux-fb"; then ...@@ -534,11 +534,22 @@ if test "x$gdktarget" = "xlinux-fb"; then
x_ldflags= x_ldflags=
x_libs= x_libs=
xinput_progs= 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) AM_CONDITIONAL(USE_LINUX_FB, true)
else else
AM_CONDITIONAL(USE_LINUX_FB, false) AM_CONDITIONAL(USE_LINUX_FB, false)
fi fi
AC_SUBST(FREETYPE_LIBS)
AC_SUBST(FREETYPE_CFLAGS)
# #
# Check for Pango # Check for Pango
......
...@@ -8,7 +8,7 @@ INCLUDES = @STRIP_BEGIN@ \ ...@@ -8,7 +8,7 @@ INCLUDES = @STRIP_BEGIN@ \
-I$(top_srcdir) \ -I$(top_srcdir) \
-I$(top_srcdir)/gdk \ -I$(top_srcdir)/gdk \
-I$(top_builddir)/gdk \ -I$(top_builddir)/gdk \
`freetype-config --cflags`\ @FREETYPE_CFLAGS@ \
@GTK_DEBUG_FLAGS@ \ @GTK_DEBUG_FLAGS@ \
@GTK_XIM_FLAGS@ \ @GTK_XIM_FLAGS@ \
@GTK_LOCALE_FLAGS@ \ @GTK_LOCALE_FLAGS@ \
...@@ -18,8 +18,8 @@ INCLUDES = @STRIP_BEGIN@ \ ...@@ -18,8 +18,8 @@ INCLUDES = @STRIP_BEGIN@ \
LDFLAGS = @STRIP_BEGIN@ \ LDFLAGS = @STRIP_BEGIN@ \
@GLIB_LIBS@ \ @GLIB_LIBS@ \
@PANGO_CFLAGS@ \ @PANGO_LIBS@ \
`freetype-config --libs` \ @FREETYPE_LIBS@ \
-lm \ -lm \
@STRIP_END@ @STRIP_END@
......
...@@ -6,7 +6,7 @@ INCLUDES = @STRIP_BEGIN@ \ ...@@ -6,7 +6,7 @@ INCLUDES = @STRIP_BEGIN@ \
-I$(top_srcdir)/gdk \ -I$(top_srcdir)/gdk \
-I$(top_builddir)/gdk \ -I$(top_builddir)/gdk \
-I$(top_srcdir)/gdk/linux-fb \ -I$(top_srcdir)/gdk/linux-fb \
`freetype-config --cflags`\ @FREETYPE_CFLAGS@ \
@GTK_DEBUG_FLAGS@ \ @GTK_DEBUG_FLAGS@ \
@GTK_XIM_FLAGS@ \ @GTK_XIM_FLAGS@ \
@GTK_LOCALE_FLAGS@ \ @GTK_LOCALE_FLAGS@ \
...@@ -17,8 +17,7 @@ INCLUDES = @STRIP_BEGIN@ \ ...@@ -17,8 +17,7 @@ INCLUDES = @STRIP_BEGIN@ \
LDFLAGS = @STRIP_BEGIN@ \ LDFLAGS = @STRIP_BEGIN@ \
@GLIB_LIBS@ \ @GLIB_LIBS@ \
@PANGO_CFLAGS@ \ @PANGO_CFLAGS@ \
-L/gnome2/lib \ @FREETYPE_LIBS@ \
`freetype-config --libs` \
-lm \ -lm \
@STRIP_END@ @STRIP_END@
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment