[AC sjt-xft] Small fixes to configure.ac
APPROVE COMMIT sjt-xft
Malcolm -- the hunk for xaw3d -> 3d is absolutely necessary for
--with-athena=3d to work.
I don't know what's going on with the AC_DEFINE_UNQUOTED -> AC_DEFINE
hunk. Without the patch, autocough randomly complains about
AC_DEFINE_UNQUOTED being undefined, if I run it again it usually
completes without comment, but then leaves AC_DEFINE_UNQUOTED as a
literal in configure, which of course chokes and dies when it gets
there. yagh. Please review; maybe it's preferable to revert to
Aidan's code there (from before my previous patch), but that's doing
the test in the wrong place, IMHO.
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/ChangeLog,v
retrieving revision 1.418.2.7
diff -u -U0 -r1.418.2.7 ChangeLog
--- ChangeLog 19 Feb 2005 14:43:30 -0000 1.418.2.7
+++ ChangeLog 20 Feb 2005 11:54:06 -0000
＠＠ -0,0 +1,5 ＠＠
+2005-02-20 Stephen J. Turnbull <stephen(a)xemacs.org>
+
+ * configure.ac (athena): Spells as 3d, not xaw3d, in declaration.
+ (sound): quickfix: AC_DEFINE, not AC_DEFINE_UNQUOTED, at top level.
+
Index: configure.ac
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/configure.ac,v
retrieving revision 1.1.14.5
diff -u -r1.1.14.5 configure.ac
--- configure.ac 19 Feb 2005 14:43:30 -0000 1.1.14.5
+++ configure.ac 20 Feb 2005 11:54:17 -0000
＠＠ -868,7 +868,7 ＠＠
XE_KEYWORD_ARG_WITH([athena],
AC_HELP_STRING([--with-athena],[Use TYPE Athena widgets (xaw, 3d, next, 95, or xpm).]),
-[],[],[xaw,xaw3d,next,95,xpm])dnl
+[],[],[xaw,3d,next,95,xpm])dnl
XE_KEYWORD_ARG_WITH([xim],[],[],[],[yes,no,xlib,motif])dnl
＠＠ -4827,7 +4827,8 ＠＠
if test "$sound_found" = "yes"; then
need_miscplay=yes
XE_ADD_OBJS(linuxplay.o)
- [AC_DEFINE_UNQUOTED(SOUNDCARD_H_FILE, "${dir}/soundcard.h")]
+ dnl I don't understand, but autoconf chokes on AC_DEFINE_UNQUOTED here
+ AC_DEFINE(SOUNDCARD_H_FILE, "${dir}/soundcard.h")
fi
fi
--
Institute of Policy and Planning Sciences http://turnbull.sk.tsukuba.ac.jp
University of Tsukuba Tennodai 1-1-1 Tsukuba 305-8573 JAPAN
Ask not how you can "do" free software business;
ask what your business can "do for" free software.