Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 316329 | Differences between
and this patch

Collapse All | Expand All

(-)configure.ac.orig (-1 / +13 lines)
Lines 70-76 Link Here
70
This drawing library can be downloaded at http://www.boutell.com/gd])])
70
This drawing library can be downloaded at http://www.boutell.com/gd])])
71
AC_CHECK_LIB([kpathsea], [kpse_set_program_name],, 
71
AC_CHECK_LIB([kpathsea], [kpse_set_program_name],, 
72
             AC_MSG_ERROR([cannot find/use libkpathsea]))
72
             AC_MSG_ERROR([cannot find/use libkpathsea]))
73
74
AC_ARG_ENABLE(t1lib, AS_HELP_STRING([--disable-t1lib], []), [check_t1=$enableval], [check_t1=yes])
75
76
if test "$check_t1" = yes; then
73
AC_CHECK_LIB([t1], [T1_InitLib])
77
AC_CHECK_LIB([t1], [T1_InitLib])
78
AC_CHECK_HEADERS([t1lib.h])
79
fi
80
74
PSFONTS_O=""
81
PSFONTS_O=""
75
if test "$ac_cv_lib_t1_T1_InitLib" = yes; then
82
if test "$ac_cv_lib_t1_T1_InitLib" = yes; then
76
  PSFONTS_O="t1.o"
83
  PSFONTS_O="t1.o"
Lines 81-93 Link Here
81
AC_HEADER_STDC
88
AC_HEADER_STDC
82
AC_CHECK_HEADERS([gd.h png.h kpathsea/kpathsea.h],,
89
AC_CHECK_HEADERS([gd.h png.h kpathsea/kpathsea.h],,
83
		 [AC_MSG_ERROR([cannot find/use $ac_header])])
90
		 [AC_MSG_ERROR([cannot find/use $ac_header])])
84
AC_CHECK_HEADERS([t1lib.h libgen.h])
91
AC_CHECK_HEADERS([libgen.h])
92
93
AC_ARG_ENABLE(freetype, AS_HELP_STRING([--disable-freetype], []), [check_ft=$enableval], [check_ft=yes])
94
95
if test "$check_ft" = yes; then
85
AC_CHECK_FT2(,[CFLAGS="$FT2_CFLAGS $CFLAGS"
96
AC_CHECK_FT2(,[CFLAGS="$FT2_CFLAGS $CFLAGS"
86
	LIBS="$FT2_LIBS $LIBS"
97
	LIBS="$FT2_LIBS $LIBS"
87
	PSFONTS_O="$PSFONTS_O sfd.o ft.o"	
98
	PSFONTS_O="$PSFONTS_O sfd.o ft.o"	
88
	AC_DEFINE(HAVE_FT2, 1, [Define to 1 if you have freetype2])
99
	AC_DEFINE(HAVE_FT2, 1, [Define to 1 if you have freetype2])
89
	ac_have_freetype2="yes"],
100
	ac_have_freetype2="yes"],
90
	[ac_have_freetype2="no"])
101
	[ac_have_freetype2="no"])
102
fi
91
if test -n "$PSFONTS_O"; then
103
if test -n "$PSFONTS_O"; then
92
  PSFONTS_O="$PSFONTS_O enc.o fontmap.o tfm.o"
104
  PSFONTS_O="$PSFONTS_O enc.o fontmap.o tfm.o"
93
fi
105
fi

Return to bug 316329