AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-11-10 10:50:10 +00:00
Code Issues Projects Releases Wiki Activity

Detect freetype properly Make use of above.

Browse Source 
* configure.in: Detect freetype properly
* modules/basic/Makefile.am, gdk/linux-fb/Makefile.am: Make use of above.
This commit is contained in:
Elliot Lee 2000-12-06 18:45:42 +00:00
parent 7fa13eaf35
commit 89709dd14f
10 changed files with 44 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

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

4
ChangeLog.pre-2-0
View File

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

4
ChangeLog.pre-2-10
View File

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

4
ChangeLog.pre-2-2
View File

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

4
ChangeLog.pre-2-4
View File

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

4
ChangeLog.pre-2-6
View File

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

4
ChangeLog.pre-2-8
View File

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

11
configure.in
View File

@ -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

6
gdk/linux-fb/Makefile.am
View File

@ -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@

5
modules/linux-fb/Makefile.am
View File

@ -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@