summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2011-03-16 21:52:35 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2011-03-16 21:52:35 (GMT)
commit8505034247b36d808537dadb29a0a4916dc311f8 (patch)
treed5450178a7a18eb31edf0414cde675dc2531505b
parentf3ed602dfb502e47a0ceabf22ecadb0c3a706fc8 (diff)
downloadtk-8505034247b36d808537dadb29a0a4916dc311f8.zip
tk-8505034247b36d808537dadb29a0a4916dc311f8.tar.gz
tk-8505034247b36d808537dadb29a0a4916dc311f8.tar.bz2
autoconf-2.59
-rw-r--r--ChangeLog4
-rwxr-xr-xunix/configure20
2 files changed, 14 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog
index 8f13854..f6d5e96 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2011-03-16 Jan Nijtmans <nijtmans@users.sf.net>
+
+ * unix/configure (autoconf-2.59)
+
2011-03-12 Jan Nijtmans <nijtmans@users.sf.net>
* win/tkWin32Dll.c: Eliminate unneeded _TkFinalize wrapper.
diff --git a/unix/configure b/unix/configure
index d4da75b..8317953 100755
--- a/unix/configure
+++ b/unix/configure
@@ -10948,9 +10948,9 @@ fi
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
@@ -10968,11 +10968,11 @@ extern "C"
#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;
}
@@ -10999,20 +10999,20 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
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