comparison configure.ac @ 4969:cbe181529c34

Automatic merge
author Ben Wing <ben@xemacs.org>
date Wed, 03 Feb 2010 21:46:21 -0600
parents b90f8cf474e0 a6c778975d7d
children 97c45e3ad810
comparison
equal deleted inserted replaced
4968:4d35e52790f8 4969:cbe181529c34
3205 AC_CHECK_FUNCS(FcConfigGetRescanInterval) 3205 AC_CHECK_FUNCS(FcConfigGetRescanInterval)
3206 AC_CHECK_FUNCS(FcConfigSetRescanInterval) 3206 AC_CHECK_FUNCS(FcConfigSetRescanInterval)
3207 dnl #### detect fontconfig properly!!!! 3207 dnl #### detect fontconfig properly!!!!
3208 with_fontconfig=yes 3208 with_fontconfig=yes
3209 AC_DEFINE(HAVE_FONTCONFIG) 3209 AC_DEFINE(HAVE_FONTCONFIG)
3210 AC_DEFINE(USE_XFT) 3210 AC_DEFINE(HAVE_XFT)
3211 dnl Due to interactions with other libraries, must postpone AC_DEFINE 3211 dnl Due to interactions with other libraries, must postpone AC_DEFINE
3212 dnl of USE_XFT_MENUBARS, USE_XFT_TABS, and USE_XFT_GAUGES. 3212 dnl of HAVE_XFT_MENUBARS, HAVE_XFT_TABS, and HAVE_XFT_GAUGES.
3213 unset xft_includes_found 3213 unset xft_includes_found
3214 fi 3214 fi
3215 fi 3215 fi
3216 3216
3217 fi dnl $with_x11 = yes 3217 fi dnl $with_x11 = yes
4164 test "$with_menubars" = "motif" && AC_DEFINE(LWLIB_MENUBARS_MOTIF) 4164 test "$with_menubars" = "motif" && AC_DEFINE(LWLIB_MENUBARS_MOTIF)
4165 test "$with_scrollbars" = "motif" && AC_DEFINE(LWLIB_SCROLLBARS_MOTIF) 4165 test "$with_scrollbars" = "motif" && AC_DEFINE(LWLIB_SCROLLBARS_MOTIF)
4166 test "$with_dialogs" = "motif" && AC_DEFINE(LWLIB_DIALOGS_MOTIF) 4166 test "$with_dialogs" = "motif" && AC_DEFINE(LWLIB_DIALOGS_MOTIF)
4167 test "$with_widgets" = "motif" && AC_DEFINE(LWLIB_WIDGETS_MOTIF) 4167 test "$with_widgets" = "motif" && AC_DEFINE(LWLIB_WIDGETS_MOTIF)
4168 4168
4169 test "$with_xft_menubars" = "yes" && AC_DEFINE(USE_XFT_MENUBARS) 4169 test "$with_xft_menubars" = "yes" && AC_DEFINE(HAVE_XFT_MENUBARS)
4170 test "$with_xft_tabs" = "yes" && AC_DEFINE(USE_XFT_TABS) 4170 test "$with_xft_tabs" = "yes" && AC_DEFINE(HAVE_XFT_TABS)
4171 test "$with_xft_gauges" = "yes" && AC_DEFINE(USE_XFT_GAUGES) 4171 test "$with_xft_gauges" = "yes" && AC_DEFINE(HAVE_XFT_GAUGES)
4172 4172
4173 dnl ---------------------- 4173 dnl ----------------------
4174 dnl Mule-dependent options 4174 dnl Mule-dependent options
4175 dnl ---------------------- 4175 dnl ----------------------
4176 4176