merge emacs-23

2 files changed, 5 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 6b3c5bc3ab4..26da194f228 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2011-02-19  Chong Yidong  <cyd@stupidchicken.com>
+
+        * Makefile.in (prefix-args${EXEEXT}): Compile with ALL_CFLAGS.
+
 2011-02-17  Kenichi Handa  <handa@m17n.org>
 
         * font.c (font_open_entity): Be sure to set scaled_pixel_size.
diff --git a/src/Makefile.in b/src/Makefile.in
index e92f2bb3b85..7d936144583 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -979,7 +979,7 @@ temacs${EXEEXT}: $(LOCALCPP) $(STARTFILES) stamp-oldxmenu ${obj} ${otherobj} pre
    often contain options that have to do with using Emacs''s crt0,
    which are only good with temacs.  */
 prefix-args${EXEEXT}: prefix-args.o $(config_h)
-        $(CC) $(LDFLAGS) prefix-args.o -o prefix-args
+        $(CC) $(ALL_CFLAGS) $(LDFLAGS) prefix-args.o -o prefix-args
 
 #if defined (HAVE_X_WINDOWS) && defined (HAVE_X11) && defined (HAVE_MENUS) && ! defined (USE_GTK)