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

	* 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.
	* version-h.in: New file.

Index: Makefile.am
===================================================================
RCS file: /cvsroot/avr-libc/avr-libc/Makefile.am,v
retrieving revision 1.8
diff -u -p -p -r1.8 Makefile.am
--- Makefile.am	9 Mar 2004 01:32:15 -0000	1.8
+++ Makefile.am	3 Jun 2004 16:32:03 -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: acconfig.h
===================================================================
RCS file: acconfig.h
diff -N acconfig.h
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ acconfig.h	3 Jun 2004 16:32:03 -0000
@@ -0,0 +1,7 @@
address@hidden@
+
+/* Major version of library */
+#undef __AVRLIBC__
+
+/* Minor version of library */
+#undef __AVRLIBC_MINOR__
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	3 Jun 2004 16:32:04 -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.117
diff -u -p -p -r1.117 configure.in
--- configure.in	21 May 2004 16:40:30 -0000	1.117
+++ configure.in	3 Jun 2004 16:32:04 -0000
@@ -139,6 +139,10 @@ dnl NOTE: Don't put a '-' in the version
 dnl when building the package.
 dnl
 AM_INIT_AUTOMAKE(avr-libc, 1.1.0.20040521)
+AM_CONFIG_HEADER(version.h:version-h.in)
+
+AC_DEFINE(__AVRLIBC__,1)
+AC_DEFINE(__AVRLIBC_MINOR__,1)
 
 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	3 Jun 2004 16:32:04 -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
Index: version-h.in
===================================================================
RCS file: version-h.in
diff -N version-h.in
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ version-h.in	3 Jun 2004 16:32:04 -0000
@@ -0,0 +1,14 @@
+/* version-h.in.  Generated automatically from configure.in by autoheader 2.13.  */
+
+/* Name of package */
+#undef PACKAGE
+
+/* Version number of package */
+#undef VERSION
+
+
+/* Major version of library */
+#undef __AVRLIBC__
+
+/* Minor version of library */
+#undef __AVRLIBC_MINOR__