67 lines
2.0 KiB
Diff
67 lines
2.0 KiB
Diff
--- unix/configure
|
|
+++ unix/configure
|
|
@@ -10892,9 +10892,9 @@
|
|
tk_oldLibs=$LIBS
|
|
LIBS="$tk_oldLIBS $XFT_LIBS $XLIBSW"
|
|
|
|
-echo "$as_me:$LINENO: checking for FT_New_Face in -lXft" >&5
|
|
-echo $ECHO_N "checking for FT_New_Face in -lXft... $ECHO_C" >&6
|
|
-if test "${ac_cv_lib_Xft_FT_New_Face+set}" = set; then
|
|
+echo "$as_me:$LINENO: checking for XftFontOpen in -lXft" >&5
|
|
+echo $ECHO_N "checking for XftFontOpen in -lXft... $ECHO_C" >&6
|
|
+if test "${ac_cv_lib_Xft_XftFontOpen+set}" = set; then
|
|
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
else
|
|
ac_check_lib_save_LIBS=$LIBS
|
|
@@ -10912,11 +10912,11 @@
|
|
#endif
|
|
/* We use char because int might match the return type of a gcc2
|
|
builtin and then its argument prototype would still apply. */
|
|
-char FT_New_Face ();
|
|
+char XftFontOpen ();
|
|
int
|
|
main ()
|
|
{
|
|
-FT_New_Face ();
|
|
+XftFontOpen ();
|
|
;
|
|
return 0;
|
|
}
|
|
@@ -10943,20 +10943,20 @@
|
|
ac_status=$?
|
|
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
(exit $ac_status); }; }; then
|
|
- ac_cv_lib_Xft_FT_New_Face=yes
|
|
+ ac_cv_lib_Xft_XftFontOpen=yes
|
|
else
|
|
echo "$as_me: failed program was:" >&5
|
|
sed 's/^/| /' conftest.$ac_ext >&5
|
|
|
|
-ac_cv_lib_Xft_FT_New_Face=no
|
|
+ac_cv_lib_Xft_XftFontOpen=no
|
|
fi
|
|
rm -f conftest.err conftest.$ac_objext \
|
|
conftest$ac_exeext conftest.$ac_ext
|
|
LIBS=$ac_check_lib_save_LIBS
|
|
fi
|
|
-echo "$as_me:$LINENO: result: $ac_cv_lib_Xft_FT_New_Face" >&5
|
|
-echo "${ECHO_T}$ac_cv_lib_Xft_FT_New_Face" >&6
|
|
-if test $ac_cv_lib_Xft_FT_New_Face = yes; then
|
|
+echo "$as_me:$LINENO: result: $ac_cv_lib_Xft_XftFontOpen" >&5
|
|
+echo "${ECHO_T}$ac_cv_lib_Xft_XftFontOpen" >&6
|
|
+if test $ac_cv_lib_Xft_XftFontOpen = yes; then
|
|
cat >>confdefs.h <<_ACEOF
|
|
#define HAVE_LIBXFT 1
|
|
_ACEOF
|
|
--- unix/configure.in
|
|
+++ unix/configure.in
|
|
@@ -552,7 +552,7 @@
|
|
CFLAGS="$CFLAGS $XINCLUDES $XFT_CFLAGS"
|
|
tk_oldLibs=$LIBS
|
|
LIBS="$tk_oldLIBS $XFT_LIBS $XLIBSW"
|
|
- AC_CHECK_LIB(Xft, FT_New_Face, [], [
|
|
+ AC_CHECK_LIB(Xft, XftFontOpen, [], [
|
|
found_xft=no
|
|
])
|
|
CFLAGS=$tk_oldCFlags
|