Mercurial > hg > xemacs-beta

comparison configure.ac @ 3158:a61bf7b32988

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[xemacs-hg @ 2005-12-22 17:10:07 by michaels] 2005-12-13 Mike Sperber <mike@xemacs.org> * configure.ac: Move the checks for the Xft-associated library out of a conditional.
author michaels
date Thu, 22 Dec 2005 17:10:07 +0000
parents 71959ba52b08
children 78cf83b934a0
comparison
equal deleted inserted replaced
3157:44a63e4a23cd 3158:a61bf7b32988
3435 c_switch_site="$c_switch_site -I${freetype_include_top}" 3435 c_switch_site="$c_switch_site -I${freetype_include_top}"
3436 AC_CHECK_HEADERS([freetype/config/ftheader.h], 3436 AC_CHECK_HEADERS([freetype/config/ftheader.h],
3437 [xft_includes_found=yes], 3437 [xft_includes_found=yes],
3438 [c_switch_site=$save_c_switch_site]) 3438 [c_switch_site=$save_c_switch_site])
3439 fi 3439 fi
3440 done 3440 done])
3441 if test "$xft_includes_found" != "yes"; then 3441 if test "$xft_includes_found" != "yes"; then
3442 XE_DIE(["Unable to find headers for --with-xft"]) 3442 XE_DIE(["Unable to find headers for --with-xft"])
3443 else 3443 else
3444 AC_CHECK_LIB(Xrender, XRenderQueryExtension, XE_PREPEND(-lXrender, libs_x), 3444 AC_CHECK_LIB(Xrender, XRenderQueryExtension, XE_PREPEND(-lXrender, libs_x),
3445 [XE_DIE(["Unable to find libXrender for --with-xft"])]) 3445 [XE_DIE(["Unable to find libXrender for --with-xft"])])
3446 AC_CHECK_LIB(fontconfig, FcPatternCreate, XE_PREPEND(-lfontconfig, libs_x), 3446 AC_CHECK_LIB(fontconfig, FcPatternCreate, XE_PREPEND(-lfontconfig, libs_x),
3447 [XE_DIE(["Unable to find libfontconfig for --with-xft"])]) 3447 [XE_DIE(["Unable to find libfontconfig for --with-xft"])])
3448 AC_CHECK_LIB(Xft, XftFontOpen, XE_PREPEND(-lXft, libs_x), 3448 AC_CHECK_LIB(Xft, XftFontOpen, XE_PREPEND(-lXft, libs_x),
3449 [XE_DIE(["Unable to find libXft for --with-xft"])]) 3449 [XE_DIE(["Unable to find libXft for --with-xft"])])
3450 AC_DEFINE(USE_XFT) 3450 AC_DEFINE(USE_XFT)
3451 dnl Due to interactions with other libraries, must postpone AC_DEFINE 3451 dnl Due to interactions with other libraries, must postpone AC_DEFINE
3452 dnl of USE_XFT_MENUBARS, USE_XFT_TABS, and USE_XFT_GAUGE. 3452 dnl of USE_XFT_MENUBARS, USE_XFT_TABS, and USE_XFT_GAUGE.
3453 unset xft_includes_found 3453 unset xft_includes_found
3454 fi 3454 fi
3455 ])
3456 fi 3455 fi
3457 3456
3458 fi dnl $with_x11 = yes 3457 fi dnl $with_x11 = yes
3459 3458
3460 if test "$with_msw" != "no"; then 3459 if test "$with_msw" != "no"; then