diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2011-03-16 21:57:27 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2011-03-16 21:57:27 (GMT) |
| commit | a18db0c067589d9274075b9464773aa5adb5a14a (patch) | |
| tree | bd72950cbeb4645c77c9d6f99c4bab42369d7b44 | |
| parent | deadbb96eb3e47967e4e03efb065c09ad6078979 (diff) | |
| parent | 945260a7f4c0710fdbef8851183478d94a7b526a (diff) | |
| download | tk-a18db0c067589d9274075b9464773aa5adb5a14a.zip tk-a18db0c067589d9274075b9464773aa5adb5a14a.tar.gz tk-a18db0c067589d9274075b9464773aa5adb5a14a.tar.bz2 | |
autoconf-2.59
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rwxr-xr-x | unix/configure | 20 |
2 files changed, 14 insertions, 10 deletions
@@ -1,3 +1,7 @@ +2011-03-16 Jan Nijtmans <nijtmans@users.sf.net> + + * unix/configure (autoconf-2.59) + 2011-03-12 Donal K. Fellows <dkf@users.sf.net> Remove casts from uses of ckalloc/ckfree/... now that Tcl declares diff --git a/unix/configure b/unix/configure index b1570a7..456bacd 100755 --- a/unix/configure +++ b/unix/configure @@ -10770,9 +10770,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 @@ -10790,11 +10790,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; } @@ -10821,20 +10821,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 |