Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 654814
Collapse All | Expand All

(-)file_not_specified_in_diff (-38 / +21 lines)
Line  Link Here
0
-- dia-0.97.3/configure.in
0
++ dia-0.97.3/configure.in
Lines 62-104 Link Here
62
62
63
AC_ARG_WITH(freetype,
63
AC_ARG_WITH(freetype,
64
[  --without-freetype        compile without FreeType support],,with_freetype=yes)
64
[  --without-freetype        compile without FreeType support],,with_freetype=yes)
65
if test "x$with_freetype" = "xyes"; then
65
AS_IF([test "x$with_freetype" = "xyes"],[
66
PKG_CHECK_MODULES(PANGOFT2,pangoft2,have_pangoft2=true,have_pangoft2=false)
66
	dnl freetype2.pc uses the libtool specific version number and not the
67
if test "$have_pangoft2" = "true"; then
67
	dnl package version. See
68
  dnl On Solaris with Forte C, at least, need to link app/dia with -lfreetype.
68
	dnl https://git.savannah.gnu.org/cgit/freetype/freetype2.git/tree/docs/VERSIONS.TXT
69
  dnl It's not enough that -lpangoft2 implicitly pulls it in.
69
	dnl Let's raise minimum dependency to freetype-2.4.0 because that's the
70
  have_freetype=false
70
	dnl lowest freetype libtool version I could find.
71
  AC_CHECK_LIB(freetype,FT_Init_FreeType,have_freetype=true,have_freetype=false,`freetype-config --libs`)
71
	dnl freetype-2.4.0 is from July 2010 and should be reasonably old
72
  if test "$have_freetype" = "true"; then
72
	dnl enough.
73
    dnl Need 2.0.9, as a bug was fixed for us there.
73
	PKG_CHECK_MODULES(FREETYPE, freetype2 >= 11.0.5,
74
    dnl However, freetype-config doesn't give a meaningful version, so we must
74
		[
75
    dnl do it like this.
75
			CPPFLAGS="$CPPFLAGS $FREETYPE_CFLAGS"
76
    AC_MSG_CHECKING([if FreeType version is 2.0.9 or higher])
76
			AC_DEFINE(HAVE_FREETYPE,1,[Define if you have the FreeType2 library])
77
    old_CPPFLAGS="$CPPFLAGS"
77
		],
78
    CPPFLAGS="$CPPFLAGS `freetype-config --cflags`"
78
		AC_MSG_ERROR([Need FreeType library version 2.4.0 or higher])
79
    AC_TRY_CPP([#include <ft2build.h>
79
	)
80
#include FT_FREETYPE_H
80
	PKG_CHECK_MODULES(PANGOFT2,pangoft2,
81
#if (FREETYPE_MAJOR*1000+FREETYPE_MINOR)*1000+FREETYPE_PATCH < 2000009
81
		GTK_MODULES="$GTK_MODULES pangoft2",
82
#error Freetype version too low.
82
		AC_MSG_ERROR(Can't find PangoFT2 library)
83
#endif
83
	)
84
],
84
])
85
        [AC_MSG_RESULT(yes)
86
	 FREETYPE_LIBS=`freetype-config --libs`
87
	 AC_SUBST(FREETYPE_LIBS)
88
	 FREETYPE_CFLAGS=`freetype-config --cflags`
89
	 AC_SUBST(FREETYPE_CFLAGS)
90
	 GTK_MODULES="$GTK_MODULES pangoft2"
91
	 AC_DEFINE(HAVE_FREETYPE,1,[Define if you have the FreeType2 library])]
92
    ,
93
	[AC_MSG_ERROR([Need FreeType library version 2.0.9 or higher])])
94
    CPPFLAGS="$old_CPPFLAGS"
95
  else
96
    AC_MSG_ERROR(Can't find FreeType library)
97
  fi
98
else
99
  AC_MSG_ERROR(Can't find PangoFT2 library)
100
fi
101
fi
102
AM_CONDITIONAL(WITH_FREETYPE, test "x$with_freetype" != "xno")
85
AM_CONDITIONAL(WITH_FREETYPE, test "x$with_freetype" != "xno")
103
86
104
CFLAGS="$FREETYPE_CFLAGS $CFLAGS"
87
CFLAGS="$FREETYPE_CFLAGS $CFLAGS"

Return to bug 654814