comparison configure @ 4152:80b3f12490a3

[xemacs-hg @ 2007-08-29 06:19:44 by michaels] 2007-08-27 Mike Sperber <mike@xemacs.org> * configure.ac: Try to use pkg-config for finding Xft includes and libraries. If that fails, search also in /usr/local.
author michaels
date Wed, 29 Aug 2007 06:19:54 +0000
parents 9aa33376bb5e
children dfd878799ef0
comparison
equal deleted inserted replaced
4151:fa9301959f02 4152:80b3f12490a3
19601 19601
19602 if test "$with_xft_emacs" = "yes"; then 19602 if test "$with_xft_emacs" = "yes"; then
19603 { echo "$as_me:$LINENO: checking for Xrender, fontconfig, and Xft" >&5 19603 { echo "$as_me:$LINENO: checking for Xrender, fontconfig, and Xft" >&5
19604 echo $ECHO_N "checking for Xrender, fontconfig, and Xft... $ECHO_C" >&6; } 19604 echo $ECHO_N "checking for Xrender, fontconfig, and Xft... $ECHO_C" >&6; }
19605 xft_includes_found=no 19605 xft_includes_found=no
19606 xft_config_prog="pkg-config xft"
19607 xft_config_ok=`$xft_config_prog --cflags 2>/dev/null`
19608 if test "$?" = 0 ; then
19609 xft_cflags=`$xft_config_prog --cflags`
19610 xft_libs=`$xft_config_prog --libs`
19611 c_switch_site="$c_switch_site $xft_cflags"
19612 ld_switch_site="$ld_switch_site $xft_libs"
19613 xft_includes_found=yes
19614 else
19606 19615
19607 for ac_header in freetype/config/ftheader.h 19616 for ac_header in freetype/config/ftheader.h
19608 do 19617 do
19609 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` 19618 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
19610 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then 19619 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
19744 #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 19753 #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
19745 _ACEOF 19754 _ACEOF
19746 xft_includes_found=yes 19755 xft_includes_found=yes
19747 else 19756 else
19748 19757
19749 for freetype_include_top in "/usr/X11R6/include/freetype2" \ 19758 for freetype_include_top in "/usr/local/include/freetype2" \
19750 "/usr/include/freetype2" 19759 "/usr/X11R6/include/freetype2" \
19751 do 19760 "/usr/include/freetype2"
19752 if test -d $freetype_include_top; then 19761 do
19753 { echo "$as_me:$LINENO: checking in ${freetype_include_top}/freetype2" >&5 19762 if test -d $freetype_include_top; then
19754 echo $ECHO_N "checking in ${freetype_include_top}/freetype2... $ECHO_C" >&6; } 19763 { echo "$as_me:$LINENO: checking in ${freetype_include_top}" >&5
19755 unset "$as_ac_Header" 19764 echo $ECHO_N "checking in ${freetype_include_top}... $ECHO_C" >&6; }
19756 save_c_switch_site="$c_switch_site" 19765 unset "$as_ac_Header"
19757 c_switch_site="$c_switch_site -I${freetype_include_top}" 19766 save_c_switch_site="$c_switch_site"
19767 c_switch_site="$c_switch_site -I${freetype_include_top}"
19758 19768
19759 for ac_header in freetype/config/ftheader.h 19769 for ac_header in freetype/config/ftheader.h
19760 do 19770 do
19761 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` 19771 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
19762 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then 19772 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
19900 c_switch_site=$save_c_switch_site 19910 c_switch_site=$save_c_switch_site
19901 fi 19911 fi
19902 19912
19903 done 19913 done
19904 19914
19905 fi 19915 fi
19906 done 19916 done
19907 fi 19917 fi
19908 19918
19909 done 19919 done
19910 19920
19921 fi
19911 if test "$xft_includes_found" != "yes"; then 19922 if test "$xft_includes_found" != "yes"; then
19912 { echo "Error:" "Unable to find headers for --with-xft" >&2; exit 1; } 19923 { echo "Error:" "Unable to find headers for --with-xft" >&2; exit 1; }
19913 else 19924 else
19914 { echo "$as_me:$LINENO: checking for XRenderQueryExtension in -lXrender" >&5 19925 { echo "$as_me:$LINENO: checking for XRenderQueryExtension in -lXrender" >&5
19915 echo $ECHO_N "checking for XRenderQueryExtension in -lXrender... $ECHO_C" >&6; } 19926 echo $ECHO_N "checking for XRenderQueryExtension in -lXrender... $ECHO_C" >&6; }