Mercurial > emacs
comparison configure @ 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 | 8c60b70f9505 |
children | d189e0755f30 |
comparison
equal
deleted
inserted
replaced
106806:311d96e388e8 | 106807:8f9c3a09d55a |
---|---|
13661 : | 13661 : |
13662 else | 13662 else |
13663 HAVE_XFT=no | 13663 HAVE_XFT=no |
13664 fi | 13664 fi |
13665 | 13665 |
13666 if test "$HAVE_XFT" != no; then | 13666 ## Because xftfont.c uses XRenderQueryExtension, we also |
13667 ## need to link to -lXrender. | |
13668 HAVE_XRENDER=no | |
13669 { $as_echo "$as_me:$LINENO: checking for XRenderQueryExtension in -lXrender" >&5 | |
13670 $as_echo_n "checking for XRenderQueryExtension in -lXrender... " >&6; } | |
13671 if test "${ac_cv_lib_Xrender_XRenderQueryExtension+set}" = set; then | |
13672 $as_echo_n "(cached) " >&6 | |
13673 else | |
13674 ac_check_lib_save_LIBS=$LIBS | |
13675 LIBS="-lXrender $LIBS" | |
13676 cat >conftest.$ac_ext <<_ACEOF | |
13677 /* confdefs.h. */ | |
13678 _ACEOF | |
13679 cat confdefs.h >>conftest.$ac_ext | |
13680 cat >>conftest.$ac_ext <<_ACEOF | |
13681 /* end confdefs.h. */ | |
13682 | |
13683 /* Override any GCC internal prototype to avoid an error. | |
13684 Use char because int might match the return type of a GCC | |
13685 builtin and then its argument prototype would still apply. */ | |
13686 #ifdef __cplusplus | |
13687 extern "C" | |
13688 #endif | |
13689 char XRenderQueryExtension (); | |
13690 int | |
13691 main () | |
13692 { | |
13693 return XRenderQueryExtension (); | |
13694 ; | |
13695 return 0; | |
13696 } | |
13697 _ACEOF | |
13698 rm -f conftest.$ac_objext conftest$ac_exeext | |
13699 if { (ac_try="$ac_link" | |
13700 case "(($ac_try" in | |
13701 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
13702 *) ac_try_echo=$ac_try;; | |
13703 esac | |
13704 eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" | |
13705 $as_echo "$ac_try_echo") >&5 | |
13706 (eval "$ac_link") 2>conftest.er1 | |
13707 ac_status=$? | |
13708 grep -v '^ *+' conftest.er1 >conftest.err | |
13709 rm -f conftest.er1 | |
13710 cat conftest.err >&5 | |
13711 $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
13712 (exit $ac_status); } && { | |
13713 test -z "$ac_c_werror_flag" || | |
13714 test ! -s conftest.err | |
13715 } && test -s conftest$ac_exeext && { | |
13716 test "$cross_compiling" = yes || | |
13717 $as_test_x conftest$ac_exeext | |
13718 }; then | |
13719 ac_cv_lib_Xrender_XRenderQueryExtension=yes | |
13720 else | |
13721 $as_echo "$as_me: failed program was:" >&5 | |
13722 sed 's/^/| /' conftest.$ac_ext >&5 | |
13723 | |
13724 ac_cv_lib_Xrender_XRenderQueryExtension=no | |
13725 fi | |
13726 | |
13727 rm -rf conftest.dSYM | |
13728 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | |
13729 conftest$ac_exeext conftest.$ac_ext | |
13730 LIBS=$ac_check_lib_save_LIBS | |
13731 fi | |
13732 { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xrender_XRenderQueryExtension" >&5 | |
13733 $as_echo "$ac_cv_lib_Xrender_XRenderQueryExtension" >&6; } | |
13734 if test $ac_cv_lib_Xrender_XRenderQueryExtension = yes; then | |
13735 HAVE_XRENDER=yes | |
13736 fi | |
13737 | |
13738 if test "$HAVE_XFT" != no && test "$HAVE_XRENDER" != no; then | |
13667 OLD_CPPFLAGS="$CPPFLAGS" | 13739 OLD_CPPFLAGS="$CPPFLAGS" |
13668 OLD_CFLAGS="$CFLAGS" | 13740 OLD_CFLAGS="$CFLAGS" |
13669 OLD_LIBS="$LIBS" | 13741 OLD_LIBS="$LIBS" |
13670 CPPFLAGS="$CPPFLAGS $XFT_CFLAGS" | 13742 CPPFLAGS="$CPPFLAGS $XFT_CFLAGS" |
13671 CFLAGS="$CFLAGS $XFT_CFLAGS" | 13743 CFLAGS="$CFLAGS $XFT_CFLAGS" |
13744 XFT_LIBS="-lXrender $XFT_LIBS" | |
13672 LIBS="$XFT_LIBS $LIBS" | 13745 LIBS="$XFT_LIBS $LIBS" |
13673 if test "${ac_cv_header_X11_Xft_Xft_h+set}" = set; then | 13746 if test "${ac_cv_header_X11_Xft_Xft_h+set}" = set; then |
13674 { $as_echo "$as_me:$LINENO: checking for X11/Xft/Xft.h" >&5 | 13747 { $as_echo "$as_me:$LINENO: checking for X11/Xft/Xft.h" >&5 |
13675 $as_echo_n "checking for X11/Xft/Xft.h... " >&6; } | 13748 $as_echo_n "checking for X11/Xft/Xft.h... " >&6; } |
13676 if test "${ac_cv_header_X11_Xft_Xft_h+set}" = set; then | 13749 if test "${ac_cv_header_X11_Xft_Xft_h+set}" = set; then |