Description: no PATH_XTRA
 Don't configure for PATH_XTRA, but link to freetype2.
Author: NIIBE Yutaka <gniibe@fsij.org>
Reviewed-By: NIIBE Yutaka <gniibe@fsij.org>
Last-Update: 2013-01-21

--- a/glgd/Makefile.in
+++ b/glgd/Makefile.in
@@ -29,9 +29,9 @@
 # NB: cc and various flags must match the ones used to compile Gauche,
 # so the make invocator shouldn't casually override them.
 CC       = @CC@
-CFLAGS   = @DEFS@ @CFLAGS@ @X_CFLAGS@ `gauche-config -I` `gauche-config --so-cflags` $(GTKGL_CFLAGS)
+CFLAGS   = @DEFS@ @CFLAGS@ `gauche-config -I` `gauche-config --so-cflags` $(GTKGL_CFLAGS)
 LDFLAGS  = $(GTKGL_LDFLAGS) @LDFLAGS@ `gauche-config -L` `gauche-config --so-ldflags`
-LIBS     = $(GTKGL_LIBS) @LIBS@ `gauche-config -l` @X_LIBS@ @X_PRE_LIBS@ -lXext -lX11
+LIBS     = $(GTKGL_LIBS) @LIBS@ `gauche-config -l`
 GOSH     = @GOSH@
 GAUCHE_CONFIG = @GAUCHE_CONFIG@
 INSTALL  = @GAUCHE_INSTALL@
@@ -47,6 +47,8 @@
 GTKGL_LDFLAGS = `pkg-config --libs-only-L gtkglext-1.0`
 GTKGL_LIBS    = $(PANGOFT2) `pkg-config --libs-only-l gtkglext-1.0`
 
+FREETYPE_CFLAGS  = `pkg-config --cflags freetype2`
+
 ARCHFILES = gauche-glgd.$(SOEXT)
 SCMFILES = glgd.scm
 SCMFILEDIR = $(top_srcdir)/lib/gtk
--- a/gtkgl/Makefile.in
+++ b/gtkgl/Makefile.in
@@ -28,9 +28,9 @@
 # NB: cc and various flags must match the ones used to compile Gauche,
 # so the make invocator shouldn't casually override them.
 CC       = @CC@
-CFLAGS   = @DEFS@ @CFLAGS@ @X_CFLAGS@ `gauche-config -I` `gauche-config --so-cflags` $(GTKGL_CFLAGS)
+CFLAGS   = @DEFS@ @CFLAGS@ `gauche-config -I` `gauche-config --so-cflags` $(GTKGL_CFLAGS)
 LDFLAGS  = $(GTKGL_LDFLAGS) @LDFLAGS@ `gauche-config -L` `gauche-config --so-ldflags` 
-LIBS     = $(GTKGL_LIBS) @LIBS@ `gauche-config -l` @X_LIBS@ @X_PRE_LIBS@ -lXext -lX11
+LIBS     = $(GTKGL_LIBS) @LIBS@ `gauche-config -l`
 GOSH     = @GOSH@
 GAUCHE_CONFIG = @GAUCHE_CONFIG@
 INSTALL  = @GAUCHE_INSTALL@
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -29,9 +29,9 @@
 # NB: cc and various flags must match the ones used to compile Gauche,
 # so the make invocator shouldn't casually override them.
 CC       = @CC@
-CFLAGS   = @DEFS@ @CFLAGS@ @X_CFLAGS@ -I. `gauche-config -I` `gauche-config --so-cflags` $(GTK_CFLAGS)
+CFLAGS   = @DEFS@ @CFLAGS@ -I. `gauche-config -I` `gauche-config --so-cflags` $(GTK_CFLAGS)
 LDFLAGS  = $(GTK_LDFLAGS) @LDFLAGS@  `gauche-config -L` `gauche-config --so-ldflags` 
-LIBS     = $(GTK_LIBS) @LIBS@ `gauche-config -l` @X_LIBS@ @X_PRE_LIBS@ -lXext -lX11
+LIBS     = $(GTK_LIBS) @LIBS@ `gauche-config -l`
 GOSH     = @GOSH@
 GAUCHE_CONFIG = @GAUCHE_CONFIG@
 INSTALL  = @GAUCHE_INSTALL@