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.

ChangeLog

+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:

ChangeLog.pre-2-0

+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:

ChangeLog.pre-2-10

+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:

ChangeLog.pre-2-2

+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:

ChangeLog.pre-2-4

+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:

ChangeLog.pre-2-6

+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:

ChangeLog.pre-2-8

+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:

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

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@
 

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@