[PATCH] Re: Xft merge CVS will not build on my system
robert delius royar <xemacs(a)frinabulax.org> writes:
Mac OSX 10.4.3 system with gcc-4.01
Darwin 8.3.0 Darwin Kernel Version 8.3.0: Mon Oct 3 20:04:04 PDT 2005;
root:xnu-792.6.22.obj~2/RELEASE_PPC Power Macintosh powerpc
XEmacs 21.5-b23 "daikon" (+CVS-20051125) configured for
`powerpc-apple-darwin8.3.0'.
Note, I removed the ", )" at line 2343 of configure just to get the
configure to work.
Compiling with --with-xft=none still works.
Compiling with --with-xft=all, --with-xft=emacs, or without xft (i.e. no
--with-xft in configure command) fails.
Here is a more complete patch. Feel free to rewrite changelog in
proper English.
Cheers,
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/ChangeLog,v
retrieving revision 1.474
diff -u -r1.474 ChangeLog
--- ChangeLog 2005/11/26 11:45:47 1.474
+++ ChangeLog 2005/11/26 18:34:24
＠＠ -1,3 +1,10 ＠＠
+2005-11-26 Jérôme Marant <jerome(a)marant.org>
+
+ * configure.ac: Remove bogus extra parameters to XE_COMPLEX_ARG usage
+ for xft.
+ (XE_PARSE_COMPLEX_OPTION): Consider `yes' parameter to --with-* options
+ as equivalent to `all'.
+
2005-11-26 Stephen J. Turnbull <stephen(a)xemacs.org>
Merge Xft.
Index: configure.ac
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/configure.ac,v
retrieving revision 1.23
diff -u -r1.23 configure.ac
--- configure.ac 2005/11/26 11:45:48 1.23
+++ configure.ac 2005/11/26 18:35:24
＠＠ -426,7 +426,7 ＠＠
_[$1]_found=""
case "$x" in
n | no | non | none ) _[$1]_all_default=no ;;
- a | al | all | both ) _[$1]_all_default=yes ;;
+ a | al | all | both | y | ye | yes ) _[$1]_all_default=yes ;;
esac
if test -z "$_[$1]_all_default"; then
＠＠ -643,7 +643,6 ＠＠
XE_COMPLEX_OPTION([menubars],[yes]),
XE_COMPLEX_OPTION([tabs],[yes]),
XE_COMPLEX_OPTION([gauges],[yes])])
- [], [])
XE_MERGED_ARG([gtk],
AC_HELP_STRING([--with-gtk],[Support GTK on the X Window System. (EXPERIMENTAL)]),
[true], [with_gtk=no])
--
Jérôme Marant