Mercurial > hg > xemacs-beta
comparison configure.ac @ 3354:15fb91e3a115
[xemacs-hg @ 2006-04-23 16:11:16 by stephent]
Xft/fontconfig refactoring, Part I. <87hd4ks29d.fsf@tleepslib.sk.tsukuba.ac.jp>
author | stephent |
---|---|
date | Sun, 23 Apr 2006 16:11:34 +0000 |
parents | 83ea3a38afe7 |
children | a1e20876b806 |
comparison
equal
deleted
inserted
replaced
3353:521d94807505 | 3354:15fb91e3a115 |
---|---|
667 XE_MERGED_ARG([infopath], | 667 XE_MERGED_ARG([infopath], |
668 AS_HELP_STRING([--with-infopath=PATH],[Location of info directories]), | 668 AS_HELP_STRING([--with-infopath=PATH],[Location of info directories]), |
669 [AC_DEFINE(INFOPATH_USER_DEFINED)], []) | 669 [AC_DEFINE(INFOPATH_USER_DEFINED)], []) |
670 dnl | 670 dnl |
671 XE_HELP_SUBSECTION([Window-system options]) | 671 XE_HELP_SUBSECTION([Window-system options]) |
672 dnl Enable when fontconfig support is factored out of Xft. | |
673 dnl XE_MERGED_ARG([fontconfig], | |
674 dnl AS_HELP_STRING([--with-fontconfig], | |
675 dnl [Use fontconfig library to configure fonts.], | |
676 dnl [],[]) | |
672 dnl if you change defaults, make sure to fix arg 6 of the OPTION_HELP macro. | 677 dnl if you change defaults, make sure to fix arg 6 of the OPTION_HELP macro. |
673 XE_COMPLEX_ARG([xft], | 678 XE_COMPLEX_ARG([xft], |
674 [XE_COMPLEX_OPTION_HELP_STRING([--with-xft], | 679 [XE_COMPLEX_OPTION_HELP_STRING([--with-xft], |
675 [Xft client-side font rendering and anti-aliasing], | 680 [Xft client-side font rendering and anti-aliasing], |
676 [Xft], | 681 [Xft], |
3461 [XE_DIE(["Unable to find libXrender for --with-xft"])]) | 3466 [XE_DIE(["Unable to find libXrender for --with-xft"])]) |
3462 AC_CHECK_LIB(fontconfig, FcPatternCreate, XE_PREPEND(-lfontconfig, libs_x), | 3467 AC_CHECK_LIB(fontconfig, FcPatternCreate, XE_PREPEND(-lfontconfig, libs_x), |
3463 [XE_DIE(["Unable to find libfontconfig for --with-xft"])]) | 3468 [XE_DIE(["Unable to find libfontconfig for --with-xft"])]) |
3464 AC_CHECK_LIB(Xft, XftFontOpen, XE_PREPEND(-lXft, libs_x), | 3469 AC_CHECK_LIB(Xft, XftFontOpen, XE_PREPEND(-lXft, libs_x), |
3465 [XE_DIE(["Unable to find libXft for --with-xft"])]) | 3470 [XE_DIE(["Unable to find libXft for --with-xft"])]) |
3471 dnl #### detect fontconfig properly!!!! | |
3472 with_fontconfig=yes | |
3473 AC_DEFINE(HAVE_FONTCONFIG) | |
3466 AC_DEFINE(USE_XFT) | 3474 AC_DEFINE(USE_XFT) |
3467 dnl Due to interactions with other libraries, must postpone AC_DEFINE | 3475 dnl Due to interactions with other libraries, must postpone AC_DEFINE |
3468 dnl of USE_XFT_MENUBARS, USE_XFT_TABS, and USE_XFT_GAUGE. | 3476 dnl of USE_XFT_MENUBARS, USE_XFT_TABS, and USE_XFT_GAUGE. |
3469 unset xft_includes_found | 3477 unset xft_includes_found |
3470 fi | 3478 fi |
5975 echo " - Xmu library not available; substituting equivalent routines." | 5983 echo " - Xmu library not available; substituting equivalent routines." |
5976 fi | 5984 fi |
5977 if test "$with_wmcommand" != no; then | 5985 if test "$with_wmcommand" != no; then |
5978 echo " - Handling WM_COMMAND properly." | 5986 echo " - Handling WM_COMMAND properly." |
5979 fi | 5987 fi |
5988 if test "$with_fontconfig" = "yes"; then | |
5989 echo " - Using fontconfig to manage fonts." | |
5990 fi | |
5980 if test "$with_xft_emacs" = "yes"; then | 5991 if test "$with_xft_emacs" = "yes"; then |
5981 echo " - Compiling in support for Xft antialiased fonts (EXPERIMENTAL)." | 5992 echo " - Compiling in support for Xft antialiased fonts (EXPERIMENTAL)." |
5982 fi | 5993 fi |
5983 fi | 5994 fi |
5984 if test "$need_motif" = "yes" ; then | 5995 if test "$need_motif" = "yes" ; then |