Mercurial > emacs
changeset 106807:8f9c3a09d55a
Explicitly check for and link to -lXrender.
See http://lists.gnu.org/archive/html/emacs-devel/2010-01/msg00656.html
* configure.in: Explicitly check for and link to -lXrender.
| author | Chong Yidong <cyd@stupidchicken.com> |
|---|---|
| date | Tue, 12 Jan 2010 11:25:08 -0500 |
| parents | 311d96e388e8 |
| children | 390461140f6c 66202b6a2be3 |
| files | ChangeLog configure configure.in |
| diffstat | 3 files changed, 84 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Tue Jan 12 19:10:51 2010 +0900 +++ b/ChangeLog Tue Jan 12 11:25:08 2010 -0500 @@ -1,3 +1,7 @@ +2010-01-12 Chong Yidong <cyd@stupidchicken.com> + + * configure.in: Explicitly check for and link to -lXrender. + 2010-01-12 Glenn Morris <rgm@gnu.org> * INSTALL.BZR, README: Use bug-gnu-emacs rather than emacs-pretest-bug
--- a/configure Tue Jan 12 19:10:51 2010 +0900 +++ b/configure Tue Jan 12 11:25:08 2010 -0500 @@ -13663,12 +13663,85 @@ HAVE_XFT=no fi - if test "$HAVE_XFT" != no; then + ## Because xftfont.c uses XRenderQueryExtension, we also + ## need to link to -lXrender. + HAVE_XRENDER=no + { $as_echo "$as_me:$LINENO: checking for XRenderQueryExtension in -lXrender" >&5 +$as_echo_n "checking for XRenderQueryExtension in -lXrender... " >&6; } +if test "${ac_cv_lib_Xrender_XRenderQueryExtension+set}" = set; then + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lXrender $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char XRenderQueryExtension (); +int +main () +{ +return XRenderQueryExtension (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + ac_cv_lib_Xrender_XRenderQueryExtension=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_Xrender_XRenderQueryExtension=no +fi + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xrender_XRenderQueryExtension" >&5 +$as_echo "$ac_cv_lib_Xrender_XRenderQueryExtension" >&6; } +if test $ac_cv_lib_Xrender_XRenderQueryExtension = yes; then + HAVE_XRENDER=yes +fi + + if test "$HAVE_XFT" != no && test "$HAVE_XRENDER" != no; then OLD_CPPFLAGS="$CPPFLAGS" OLD_CFLAGS="$CFLAGS" OLD_LIBS="$LIBS" CPPFLAGS="$CPPFLAGS $XFT_CFLAGS" CFLAGS="$CFLAGS $XFT_CFLAGS" + XFT_LIBS="-lXrender $XFT_LIBS" LIBS="$XFT_LIBS $LIBS" if test "${ac_cv_header_X11_Xft_Xft_h+set}" = set; then { $as_echo "$as_me:$LINENO: checking for X11/Xft/Xft.h" >&5
--- a/configure.in Tue Jan 12 19:10:51 2010 +0900 +++ b/configure.in Tue Jan 12 11:25:08 2010 -0500 @@ -1984,12 +1984,17 @@ if test "x${with_xft}" != "xno"; then PKG_CHECK_MODULES(XFT, xft >= 0.13.0, , HAVE_XFT=no) - if test "$HAVE_XFT" != no; then + ## Because xftfont.c uses XRenderQueryExtension, we also + ## need to link to -lXrender. + HAVE_XRENDER=no + AC_CHECK_LIB(Xrender, XRenderQueryExtension, HAVE_XRENDER=yes) + if test "$HAVE_XFT" != no && test "$HAVE_XRENDER" != no; then OLD_CPPFLAGS="$CPPFLAGS" OLD_CFLAGS="$CFLAGS" OLD_LIBS="$LIBS" CPPFLAGS="$CPPFLAGS $XFT_CFLAGS" CFLAGS="$CFLAGS $XFT_CFLAGS" + XFT_LIBS="-lXrender $XFT_LIBS" LIBS="$XFT_LIBS $LIBS" AC_CHECK_HEADER(X11/Xft/Xft.h, AC_CHECK_LIB(Xft, XftFontOpen, HAVE_XFT=yes, , $XFT_LIBS))