carbon2-commit: Merge in ac-fix-2008-10-25. Fix up ChangeLogs.
changeset: 4547:66411359ce4eec5b18a399cc00452e8098a7c810
parent: 4544:dd12adb12b8f72dd2fd2b9effb97cde3277ce750
parent: 4546:71bf2c5667ba4dfece70c13c5f9fd249474f3652
user: Stephen J. Turnbull <stephen(a)xemacs.org>
date: Sat Oct 25 21:40:46 2008 +0900
files: ChangeLog configure.ac src/ChangeLog src/lisp.h
description:
Merge in ac-fix-2008-10-25. Fix up ChangeLogs.
diff -r dd12adb12b8f72dd2fd2b9effb97cde3277ce750 -r
66411359ce4eec5b18a399cc00452e8098a7c810 ChangeLog
--- a/ChangeLog Sat Oct 04 13:57:55 2008 +0900
+++ b/ChangeLog Sat Oct 25 21:40:46 2008 +0900
＠＠ -1,3 +1,7 ＠＠ 2008-08-03 Mats Lidell <matsl(a)xemacs.o
+2008-10-25 Stephen J. Turnbull <stephen(a)xemacs.org>
+
+ * configure.ac (xemacs_cc_cc_mismatch): Improve g++ detection.
+
2008-08-03 Mats Lidell <matsl(a)xemacs.org>
* configure.ac: Fix typo xft_gauge to xft_gauges
diff -r dd12adb12b8f72dd2fd2b9effb97cde3277ce750 -r
66411359ce4eec5b18a399cc00452e8098a7c810 configure.ac
--- a/configure.ac Sat Oct 04 13:57:55 2008 +0900
+++ b/configure.ac Sat Oct 25 21:40:46 2008 +0900
＠＠ -2239,18 +2239,25 ＠＠ fi
dnl If we're specifying XEMACS_CC, it'd better be in the same family
dnl as CC or the following flag calculations are bogus.
-dnl #### We may want to actually error and abort here, but I am not sure.
+dnl No error/abort; detection is too fragile.
+
+xemacs_cc_cc_mismatch=no
if test "$CC" != "$XEMACS_CC"; then
- if test "$XEMACS_CC" = "g++" -a "$GCC" !=
"yes"; then
- AC_MSG_WARN([CC and g++ are mismatched; XE_CFLAGS may be wrong])
- xemacs_cc_cc_mismatch=yes
- elif test -n "$GCC" -a "$XEMACS_CC" != "g++"; then
- AC_MSG_WARN([gcc and XEMACS_CC are mismatched; XE_CFLAGS may be wrong])
- xemacs_cc_cc_mismatch=yes
+ case "$XEMACS_CC" in
+ *g++* )
+ if test "$GCC" != "yes"; then
+ AC_MSG_WARN([CC and g++ are mismatched; XE_CFLAGS may be wrong])
+ xemacs_cc_cc_mismatch=yes ;;
+ esac
+ if test -n "$GCC"; then
+ case $XEMACS_CC in
+ *g++* )
+ ;;
+ * )
+ AC_MSG_WARN([gcc and XEMACS_CC are mismatched; XE_CFLAGS may be wrong])
+ xemacs_cc_cc_mismatch=yes ;;
+ esac
dnl #### Add other detectable mismatches here.
- else
- xemacs_cc_cc_mismatch=no
- fi
fi
dnl Calculate optimization flags. These will be off by default in beta
diff -r dd12adb12b8f72dd2fd2b9effb97cde3277ce750 -r
66411359ce4eec5b18a399cc00452e8098a7c810 src/ChangeLog
--- a/src/ChangeLog Sat Oct 04 13:57:55 2008 +0900
+++ b/src/ChangeLog Sat Oct 25 21:40:46 2008 +0900
＠＠ -1,3 +1,10 ＠＠ 2008-08-27 Aidan Kehoe <kehoea＠parhasa
+2008-10-25 Stephen J. Turnbull <stephen(a)xemacs.org>
+
+ * lisp.h (static_pro): Cast out a warning.
+ g++ 4.3 complains about the conversion of const char to char.
+ These end up in a dynarray, so we would need to define a whole new
+ class of dynarray just to handle the const char stuff.
+
2008-08-27 Aidan Kehoe <kehoea(a)parhasard.net>
* symbols.c (Fuser_variable_p):
diff -r dd12adb12b8f72dd2fd2b9effb97cde3277ce750 -r
66411359ce4eec5b18a399cc00452e8098a7c810 src/lisp.h
--- a/src/lisp.h Sat Oct 04 13:57:55 2008 +0900
+++ b/src/lisp.h Sat Oct 25 21:40:46 2008 +0900
＠＠ -3815,12 +3815,16 ＠＠ extern Lisp_Object_ptr_dynarr *staticpro
MODULE_API void staticpro_1 (Lisp_Object *, Ascbyte *);
MODULE_API void staticpro_nodump_1 (Lisp_Object *, Ascbyte *);
-#define staticpro(ptr) staticpro_1 (ptr, #ptr)
-#define staticpro_nodump(ptr) staticpro_nodump_1 (ptr, #ptr)
+/* g++ 4.3 complains about the conversion of const char to char.
+ These end up in a dynarray, so we would need to define a whole new class
+ of dynarray just to handle the const char stuff.
+ ####Check to see how hard this might be. */
+#define staticpro(ptr) staticpro_1 (ptr, (Ascbyte *) #ptr)
+#define staticpro_nodump(ptr) staticpro_nodump_1 (ptr, (Ascbyte *) #ptr)
#ifdef HAVE_SHLIB
MODULE_API void unstaticpro_nodump_1 (Lisp_Object *, Ascbyte *);
-#define unstaticpro_nodump(ptr) unstaticpro_nodump_1 (ptr, #ptr)
+#define unstaticpro_nodump(ptr) unstaticpro_nodump_1 (ptr, (Ascbyte *) #ptr)
#endif
#else
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches