CVS update by stephent MODIFIED: xemacs ...
User: stephent
Date: 05/02/20 15:00:46
Modified: xemacs Tag: sjt-xft ChangeLog configure.ac
Log:
declare xaw3d option correctly; workaround autoconf bug
<87mztz8hc6.fsf(a)tleepslib.sk.tsukuba.ac.jp>
Revision Changes Path
No revision
No revision
1.418.2.8 +5 -0 XEmacs/xemacs/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/ChangeLog,v
retrieving revision 1.418.2.7
retrieving revision 1.418.2.8
diff -u -r1.418.2.7 -r1.418.2.8
--- ChangeLog 2005/02/19 14:43:30 1.418.2.7
+++ ChangeLog 2005/02/20 14:00:45 1.418.2.8
＠＠ -1,3 +1,8 ＠＠
+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.
+
2005-02-19 Stephen J. Turnbull <stephen(a)xemacs.org>
* configure.ac (XE_EXPAND_COMPLEX_OPTION): Use same name in comment.
1.1.14.6 +3 -2 XEmacs/xemacs/configure.ac
Index: configure.ac
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/configure.ac,v
retrieving revision 1.1.14.5
retrieving revision 1.1.14.6
diff -u -r1.1.14.5 -r1.1.14.6
--- configure.ac 2005/02/19 14:43:30 1.1.14.5
+++ configure.ac 2005/02/20 14:00:45 1.1.14.6
＠＠ -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