Fix Xrender library detection
Stephen, could you have a look at this? I needed this change to make
configure actually figure out I can do Xft.
2005-12-13 Mike Sperber <mike(a)xemacs.org>
* configure.ac: Move the checks for the Xft-associated library out
of a conditional.
--
Cheers =8-} Mike
Friede, Völkerverständigung und überhaupt blabla
Index: configure.ac
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/configure.ac,v
retrieving revision 1.26
diff -u -r1.26 configure.ac
--- configure.ac 28 Nov 2005 09:50:20 -0000 1.26
+++ configure.ac 13 Dec 2005 10:09:25 -0000
＠＠ -3413,22 +3419,21 ＠＠
[xft_includes_found=yes],
[c_switch_site=$save_c_switch_site])
fi
- done
- if test "$xft_includes_found" != "yes"; then
- XE_DIE(["Unable to find headers for --with-xft"])
- else
- AC_CHECK_LIB(Xrender, XRenderQueryExtension, XE_PREPEND(-lXrender, libs_x),
- [XE_DIE(["Unable to find libXrender for --with-xft"])])
- AC_CHECK_LIB(fontconfig, FcPatternCreate, XE_PREPEND(-lfontconfig, libs_x),
- [XE_DIE(["Unable to find libfontconfig for --with-xft"])])
- AC_CHECK_LIB(Xft, XftFontOpen, XE_PREPEND(-lXft, libs_x),
- [XE_DIE(["Unable to find libXft for --with-xft"])])
- AC_DEFINE(USE_XFT)
- dnl Due to interactions with other libraries, must postpone AC_DEFINE
- dnl of USE_XFT_MENUBARS, USE_XFT_TABS, and USE_XFT_GAUGE.
- unset xft_includes_found
- fi
-])
+ done])
+ if test "$xft_includes_found" != "yes"; then
+ XE_DIE(["Unable to find headers for --with-xft"])
+ else
+ AC_CHECK_LIB(Xrender, XRenderQueryExtension, XE_PREPEND(-lXrender, libs_x),
+ [XE_DIE(["Unable to find libXrender for --with-xft"])])
+ AC_CHECK_LIB(fontconfig, FcPatternCreate, XE_PREPEND(-lfontconfig, libs_x),
+ [XE_DIE(["Unable to find libfontconfig for --with-xft"])])
+ AC_CHECK_LIB(Xft, XftFontOpen, XE_PREPEND(-lXft, libs_x),
+ [XE_DIE(["Unable to find libXft for --with-xft"])])
+ AC_DEFINE(USE_XFT)
+ dnl Due to interactions with other libraries, must postpone AC_DEFINE
+ dnl of USE_XFT_MENUBARS, USE_XFT_TABS, and USE_XFT_GAUGE.
+ unset xft_includes_found
+ fi
fi
fi dnl $with_x11 = yes