User: michaels
Date: 05/12/22 18:10:08
Modified: xemacs configure.ac ChangeLog
Log:
2005-12-13 Mike Sperber <mike(a)xemacs.org>
* configure.ac: Move the checks for the Xft-associated
library out of a conditional.
Revision Changes Path
1.29 +15 -16 XEmacs/xemacs/configure.ac
Index: configure.ac
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/configure.ac,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- configure.ac 2005/12/18 17:58:55 1.28
+++ configure.ac 2005/12/22 17:10:07 1.29
@@ -3437,22 +3437,21 @@ extern Bool XRegisterIMInstantiateCallba
[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
1.484 +5 -0 XEmacs/xemacs/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/ChangeLog,v
retrieving revision 1.483
retrieving revision 1.484
diff -u -p -r1.483 -r1.484
--- ChangeLog 2005/12/18 19:05:14 1.483
+++ ChangeLog 2005/12/22 17:10:07 1.484
@@ -1,3 +1,8 @@
+2005-12-13 Mike Sperber <mike(a)xemacs.org>
+
+ * configure.ac: Move the checks for the Xft-associated
+ library out of a conditional.
+
2005-12-18 Stephen J. Turnbull <stephen(a)xemacs.org>
* XEmacs 21.5.24 "dandelion" is released.