Commit afc9cce1 authored by Sven Neumann's avatar Sven Neumann Committed by Sven Neumann

check for freetype-config and set FREETYPE_LIBS.

2003-07-22  Sven Neumann  <sven@gimp.org>

	* configure.in: check for freetype-config and set FREETYPE_LIBS.

	* app/Makefile.am: link explicitely against freetype.
parent e1bdbd9f
2003-07-22 Sven Neumann <sven@gimp.org>
* configure.in: check for freetype-config and set FREETYPE_LIBS.
* app/Makefile.am: link explicitely against freetype.
2003-07-22 Sven Neumann <sven@gimp.org>
* app/composite/gimp-composite.[ch]: gimp_composite_dispatch()
......@@ -86,11 +86,12 @@ gimp_1_3_LDADD = \
$(top_builddir)/libgimpmodule/libgimpmodule-$(LT_RELEASE).la \
$(top_builddir)/libgimpwidgets/libgimpwidgets-$(LT_RELEASE).la \
$(GTK_LIBS) \
$(PANGOFT2_LIBS) \
$(LIBART_LIBS) \
$(PANGOFT2_LIBS) \
$(FONTCONFIG_LIBS) \
$(FREETYPE_LIBS) \
$(GIMP_THREAD_LIBS) \
$(GIMP_MP_LIBS) \
$(FONTCONFIG_LIBS) \
$(INTLLIBS) \
$(REGEXREPL)
......
......@@ -314,6 +314,10 @@ if test x$GDK_PIXBUF_CSOURCE = xno; then
AC_MSG_ERROR(Could not find gdk-pixbuf-csource in your PATH)
fi
PKG_CHECK_MODULES(LIBART, libart-2.0)
AC_SUBST(LIBART_CFLAGS)
AC_SUBST(LIBART_LIBS)
PKG_CHECK_MODULES(PANGOFT2, pangoft2 >= $PANGOFT2_REQUIRED_VERSION,,
AC_MSG_ERROR([Test for PangoFT2 failed.
*** We require Pango with the optional support for FreeType2 compiled in.
......@@ -321,12 +325,17 @@ PKG_CHECK_MODULES(PANGOFT2, pangoft2 >= $PANGOFT2_REQUIRED_VERSION,,
AC_SUBST(PANGOFT2_CFLAGS)
AC_SUBST(PANGOFT2_LIBS)
PKG_CHECK_MODULES(LIBART, libart-2.0)
AC_SUBST(LIBART_CFLAGS)
AC_SUBST(LIBART_LIBS)
PKG_CHECK_MODULES(FONTCONFIG, fontconfig >= 1.0.1, have_fontconfig=true, :)
AC_PATH_PROG(FREETYPE_CONFIG, freetype-config, no)
if test "x$FREETYPE_CONFIG" != "xno" ; then
AC_MSG_CHECKING(FREETYPE_LIBS)
FREETYPE_LIBS=`$FREETYPE_CONFIG --libs`
AC_MSG_RESULT($FREETYPE_LIBS)
fi
AC_SUBST(FREETYPE_LIBS)
##########################################
# Check for some special functions we need
##########################################
......
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