add AS=CC and ASFLAGS=CFLAGS substitutions so that gtk+ can be built with

2001-10-11  James Henstridge  <james@daa.com.au>

        * configure.in: add AS=CC and ASFLAGS=CFLAGS substitutions so
        that gtk+ can be built with automake 1.5 while not breaking
        things for automake 1.4.

ChangeLog

+2001-10-11  James Henstridge  <james@daa.com.au>
+
+	* configure.in: add AS=CC and ASFLAGS=CFLAGS substitutions so
+	that gtk+ can be built with automake 1.5 while not breaking
+	things for automake 1.4.
+
 Wed Oct 10 12:48:38 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkmain.c (gtk_init_check): Call setlocale (LC_ALL, "").

ChangeLog.pre-2-0

+2001-10-11  James Henstridge  <james@daa.com.au>
+
+	* configure.in: add AS=CC and ASFLAGS=CFLAGS substitutions so
+	that gtk+ can be built with automake 1.5 while not breaking
+	things for automake 1.4.
+
 Wed Oct 10 12:48:38 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkmain.c (gtk_init_check): Call setlocale (LC_ALL, "").

ChangeLog.pre-2-10

+2001-10-11  James Henstridge  <james@daa.com.au>
+
+	* configure.in: add AS=CC and ASFLAGS=CFLAGS substitutions so
+	that gtk+ can be built with automake 1.5 while not breaking
+	things for automake 1.4.
+
 Wed Oct 10 12:48:38 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkmain.c (gtk_init_check): Call setlocale (LC_ALL, "").

ChangeLog.pre-2-2

+2001-10-11  James Henstridge  <james@daa.com.au>
+
+	* configure.in: add AS=CC and ASFLAGS=CFLAGS substitutions so
+	that gtk+ can be built with automake 1.5 while not breaking
+	things for automake 1.4.
+
 Wed Oct 10 12:48:38 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkmain.c (gtk_init_check): Call setlocale (LC_ALL, "").

ChangeLog.pre-2-4

+2001-10-11  James Henstridge  <james@daa.com.au>
+
+	* configure.in: add AS=CC and ASFLAGS=CFLAGS substitutions so
+	that gtk+ can be built with automake 1.5 while not breaking
+	things for automake 1.4.
+
 Wed Oct 10 12:48:38 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkmain.c (gtk_init_check): Call setlocale (LC_ALL, "").

ChangeLog.pre-2-6

+2001-10-11  James Henstridge  <james@daa.com.au>
+
+	* configure.in: add AS=CC and ASFLAGS=CFLAGS substitutions so
+	that gtk+ can be built with automake 1.5 while not breaking
+	things for automake 1.4.
+
 Wed Oct 10 12:48:38 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkmain.c (gtk_init_check): Call setlocale (LC_ALL, "").

ChangeLog.pre-2-8

+2001-10-11  James Henstridge  <james@daa.com.au>
+
+	* configure.in: add AS=CC and ASFLAGS=CFLAGS substitutions so
+	that gtk+ can be built with automake 1.5 while not breaking
+	things for automake 1.4.
+
 Wed Oct 10 12:48:38 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkmain.c (gtk_init_check): Call setlocale (LC_ALL, "").

configure.in

@@ -102,6 +102,12 @@ AM_CONFIG_HEADER(config.h)
 dnl Initialize libtool
 AM_PROG_LIBTOOL
 
+dnl Set AS and ASFLAGS so that automake 1.5 will be happy
+AS="\${CC}"
+ASFLAGS="\${CFLAGS}"
+AC_SUBST(AS)
+AC_SUBST(ASFLAGS)
+
 dnl Initialize maintainer mode
 AM_MAINTAINER_MODE