CVS update by malcolmp xemacs ...

[xemacs-cvs at xemacs.org]

  User: malcolmp
  Date: 06/12/28 13:56:08

  Modified:    xemacs   ChangeLog configure configure.ac
Log:
Workaround problems with autoconf 2.60's 'config.status --recheck'.

Revision  Changes    Path
1.519     +6 -0      XEmacs/xemacs/ChangeLog

Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/ChangeLog,v
retrieving revision 1.518
retrieving revision 1.519
diff -u -p -r1.518 -r1.519
--- ChangeLog	2006/12/28 12:23:57	1.518
+++ ChangeLog	2006/12/28 12:56:00	1.519
@@ -1,3 +1,9 @@
+2006-12-28  Malcolm Purvis  <malcolmp at xemacs.org>
+
+	* configure.ac: Ensure ac_configure_args contains a leading space
+	to work around problems with 'config.status --recheck' under
+	autoconf 2.60 and 2.61.
+
 2006-12-27  Malcolm Purvis  <malcolmp at xemacs.org>
 
 	* configure.ac (XE_MERGED_ARG): Register --enable and --with forms



1.290     +1 -0      XEmacs/xemacs/configure

Index: configure
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/configure,v
retrieving revision 1.289
retrieving revision 1.290
diff -u -p -r1.289 -r1.290
--- configure	2006/12/11 19:43:58	1.289
+++ configure	2006/12/28 12:56:01	1.290
@@ -39561,6 +39561,7 @@ T=""
 for W in $ac_configure_args; do if test -z "$T"; then T="$W"; else T="$T $W"; fi; done
 ac_configure_args="$T"
 
+ac_configure_args=" $ac_configure_args"
 cat >>confdefs.h <<_ACEOF
 #define EMACS_CONFIGURATION "$ac_cv_build"
 _ACEOF



1.54      +3 -0      XEmacs/xemacs/configure.ac

Index: configure.ac
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/configure.ac,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- configure.ac	2006/12/28 12:23:57	1.53
+++ configure.ac	2006/12/28 12:56:04	1.54
@@ -5815,6 +5815,9 @@ if test "$with_site_modules" = "no"; the
 fi
 
 XE_SPACE(ac_configure_args, $ac_configure_args)
+dnl Put back the leading space to work around problems with
+dnl 'config.status --recheck' under autoconf 2.60 and 2.61.
+ac_configure_args=" $ac_configure_args"
 AC_DEFINE_UNQUOTED(EMACS_CONFIGURATION, "$ac_cv_build")
 AC_DEFINE_UNQUOTED(EMACS_CONFIG_OPTIONS, "$ac_configure_args")