diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | ChangeLog.pre-2-0 | 4 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 4 | ||||
| -rw-r--r-- | ChangeLog.pre-2-2 | 4 | ||||
| -rw-r--r-- | ChangeLog.pre-2-4 | 4 | ||||
| -rw-r--r-- | ChangeLog.pre-2-6 | 4 | ||||
| -rw-r--r-- | ChangeLog.pre-2-8 | 4 | ||||
| -rw-r--r-- | configure.in | 11 | ||||
| -rw-r--r-- | gdk/linux-fb/Makefile.am | 6 | ||||
| -rw-r--r-- | modules/linux-fb/Makefile.am | 5 |
10 files changed, 44 insertions, 6 deletions
@@ -1,3 +1,7 @@ +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> * gdk/linux-fb/Makefile.am: diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index b10aac88b3..19a41dd5fd 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,7 @@ +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> * gdk/linux-fb/Makefile.am: diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index b10aac88b3..19a41dd5fd 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,7 @@ +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> * gdk/linux-fb/Makefile.am: diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index b10aac88b3..19a41dd5fd 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,7 @@ +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> * gdk/linux-fb/Makefile.am: diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index b10aac88b3..19a41dd5fd 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,7 @@ +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> * gdk/linux-fb/Makefile.am: diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index b10aac88b3..19a41dd5fd 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,7 @@ +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> * gdk/linux-fb/Makefile.am: diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index b10aac88b3..19a41dd5fd 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,7 @@ +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> * gdk/linux-fb/Makefile.am: 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 diff --git a/gdk/linux-fb/Makefile.am b/gdk/linux-fb/Makefile.am index 95c4a3079e..0fcdf7f0a9 100644 --- a/gdk/linux-fb/Makefile.am +++ b/gdk/linux-fb/Makefile.am @@ -8,7 +8,7 @@ INCLUDES = @STRIP_BEGIN@ \ -I$(top_srcdir) \ -I$(top_srcdir)/gdk \ -I$(top_builddir)/gdk \ - `freetype-config --cflags`\ + @FREETYPE_CFLAGS@ \ @GTK_DEBUG_FLAGS@ \ @GTK_XIM_FLAGS@ \ @GTK_LOCALE_FLAGS@ \ @@ -18,8 +18,8 @@ INCLUDES = @STRIP_BEGIN@ \ LDFLAGS = @STRIP_BEGIN@ \ @GLIB_LIBS@ \ - @PANGO_CFLAGS@ \ - `freetype-config --libs` \ + @PANGO_LIBS@ \ + @FREETYPE_LIBS@ \ -lm \ @STRIP_END@ diff --git a/modules/linux-fb/Makefile.am b/modules/linux-fb/Makefile.am index 97c0bbf44a..acb7579e23 100644 --- a/modules/linux-fb/Makefile.am +++ b/modules/linux-fb/Makefile.am @@ -6,7 +6,7 @@ INCLUDES = @STRIP_BEGIN@ \ -I$(top_srcdir)/gdk \ -I$(top_builddir)/gdk \ -I$(top_srcdir)/gdk/linux-fb \ - `freetype-config --cflags`\ + @FREETYPE_CFLAGS@ \ @GTK_DEBUG_FLAGS@ \ @GTK_XIM_FLAGS@ \ @GTK_LOCALE_FLAGS@ \ @@ -17,8 +17,7 @@ INCLUDES = @STRIP_BEGIN@ \ LDFLAGS = @STRIP_BEGIN@ \ @GLIB_LIBS@ \ @PANGO_CFLAGS@ \ - -L/gnome2/lib \ - `freetype-config --libs` \ + @FREETYPE_LIBS@ \ -lm \ @STRIP_END@ |