2004-06-08  Theodore A. Roth  <address@hidden>

	* ChangeLog:
	* Makefile.am:
	* config-ml.in:
	* configure.in:
	* reconf:

Index: ChangeLog
===================================================================
RCS file: /cvsroot/avr-libc/avr-libc/ChangeLog,v
retrieving revision 1.293.2.59
diff -u -p -p -r1.293.2.59 ChangeLog
--- ChangeLog	25 May 2004 08:55:20 -0000	1.293.2.59
+++ ChangeLog	8 Jun 2004 23:21:41 -0000
@@ -1,3 +1,14 @@
+2004-06-04  Theodore A. Roth  <address@hidden>
+
+	* configure.in (AM_INIT_AUTOMAKE): Bump version.
+	* Makefile.am (install-data-local): Install version.h file.
+	* acconfig.h: New file.
+	* config-ml.in: When adding the Multi.tem fragment to the Makefile,
+	don't use a variable or the fragment will be added to the version.h
+	file instead of the Makefile.
+	* configure.in: Generate the version.h config header file.
+	* reconf: Run autoheader.
+
 2004-05-27  Joerg Wunsch <address@hidden>
 
 	* doc/examples/demo.c: Update for ATmega8
Index: Makefile.am
===================================================================
RCS file: /cvsroot/avr-libc/avr-libc/Makefile.am,v
retrieving revision 1.7.2.1
diff -u -p -p -r1.7.2.1 Makefile.am
--- Makefile.am	9 Mar 2004 01:44:04 -0000	1.7.2.1
+++ Makefile.am	8 Jun 2004 23:21:41 -0000
@@ -146,6 +146,7 @@ install-data-local:	install-toollibLIBRA
 	  for i in $(srcdir)/include/avr/*.h; do \
 	   $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/avr/`basename $$i`; \
 	  done; \
+	  $(INSTALL_DATA) version.h $(DESTDIR)$(tooldir)/include/avr/version.h; \
 	else true; fi
 
 # Multilib support.
Index: config-ml.in
===================================================================
RCS file: /cvsroot/avr-libc/avr-libc/config-ml.in,v
retrieving revision 1.1
diff -u -p -p -r1.1 config-ml.in
--- config-ml.in	5 Jul 2002 20:38:44 -0000	1.1
+++ config-ml.in	8 Jun 2004 23:21:41 -0000
@@ -583,9 +583,9 @@ multi-clean:
 	fi
 EOF
 
-cat ${Makefile} Multi.tem > Makefile.tem
-rm -f ${Makefile} Multi.tem
-mv Makefile.tem ${Makefile}
+cat Makefile Multi.tem > Makefile.tem
+rm -f Makefile Multi.tem
+mv Makefile.tem Makefile
 
 fi # ${ml_toplevel_p} = yes
 
Index: configure.in
===================================================================
RCS file: /cvsroot/avr-libc/avr-libc/configure.in,v
retrieving revision 1.81.2.28
diff -u -p -p -r1.81.2.28 configure.in
--- configure.in	29 Apr 2004 20:40:41 -0000	1.81.2.28
+++ configure.in	8 Jun 2004 23:21:41 -0000
@@ -138,7 +138,11 @@ AC_CANONICAL_SYSTEM
 dnl NOTE: Don't put a '-' in the version number or rpm will puke 
 dnl when building the package.
 dnl
-AM_INIT_AUTOMAKE(avr-libc, 1.0.4)
+AM_INIT_AUTOMAKE(avr-libc, 1.0.4.20040604)
+AM_CONFIG_HEADER(version.h:version-h.in)
+
+AC_DEFINE(__AVRLIBC__,1)
+AC_DEFINE(__AVRLIBC_MINOR__,0)
 
 dnl Use the AC_CHECK_TOOL macro to find also cross tools
 AC_CHECK_TOOL(AS, as, as)
Index: reconf
===================================================================
RCS file: /cvsroot/avr-libc/avr-libc/reconf,v
retrieving revision 1.4
diff -u -p -p -r1.4 reconf
--- reconf	21 Oct 2002 03:22:30 -0000	1.4
+++ reconf	8 Jun 2004 23:21:41 -0000
@@ -13,7 +13,7 @@
 #  happen during the build process.
 #
 
-export AUTOMAKE AUTOCONF ACLOCAL
+export AUTOMAKE AUTOCONF ACLOCAL AUTOHEADER
 
 status="fail"
 for AUTOMAKE in automake automake14 automake-1.4
@@ -51,6 +51,7 @@ do
 	if [ "$AUTOCONF_VER" = "2.13" ]
 	then
 		status=""
+		AUTOHEADER=autoheader`expr "$AUTOCONF" : 'autoconf\(.*\)'`
 		break
 	fi
 done
@@ -67,5 +68,6 @@ fi
 set -x
 
 ${ACLOCAL}
+${AUTOHEADER}
 ${AUTOCONF}
 ${AUTOMAKE} --foreign --add-missing --copy