[committed] Update utils to autoconf 2.59

[Nathanael Nerode]

Committed.

Index: ChangeLog
===================================================================
RCS file: /cvs/src/src/utils/ChangeLog,v
retrieving revision 1.10
diff -u -r1.10 ChangeLog
--- ChangeLog	9 Aug 2004 02:35:56 -0000	1.10
+++ ChangeLog	9 Aug 2004 02:45:48 -0000
@@ -1,3 +1,10 @@
+2004-08-08  Nathanael Nerode  <neroden@gcc.gnu.org>
+
+	* configure.in: Update to autoconf 2.59, rename to...
+	* configure.ac: ...this.  Rename abs_* variables for accuracy.
+	* Makefile.tpl: Rename abs_srcdir for accuracy.
+	* Makefile.in, configure: Regenerate.
+
 2004-08-05  Nathanael Nerode  <neroden@gcc.gnu.org>
 
 	* Remove misc/doschk -- users should get it from upstream at
Index: configure.ac
===================================================================
RCS file: configure.ac
diff -N configure.ac
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ configure.ac	9 Aug 2004 02:45:49 -0000
@@ -0,0 +1,67 @@
+AC_INIT
+AC_PREREQ([2.59])
+AC_CONFIG_SRCDIR([Makefile.in])
+
+AC_PROG_INSTALL
+AC_CANONICAL_TARGET
+
+if test -d ${srcdir}/spu ; then
+  configdirs="spu"
+fi
+
+case "${target}" in
+  *mips*-*-pe* | *sh*-*-pe* | *arm*-*-wince | *arm*-wince-pe* )
+    if test -d ${srcdir}/wince ; then
+      configdirs="$configdirs wince"
+    fi
+    ;;
+esac
+
+all_subdirs=""
+install_subdirs=""
+mostlyclean_subdirs=""
+clean_subdirs=""
+distclean_subdirs=""
+maintainer_clean_subdirs=""
+
+for dir in $configdirs ; do
+    all_subdirs="${all_subdirs} all-$dir"
+    install_subdirs="${install_subdirs} install-$dir"
+    mostlyclean_subdirs="${mostlyclean_subdirs} mostlyclean-$dir"
+    clean_subdirs="${clean_subdirs} clean-$dir"
+    distclean_subdirs="${distclean_subdirs} distclean-$dir"
+    maintainer_clean_subdirs="${maintainer_clean_subdirs} maintainer-clean-$dir"
+done
+
+AC_SUBST([all_subdirs])
+AC_SUBST([install_subdirs])
+AC_SUBST([mostlyclean_subdirs])
+AC_SUBST([clean_subdirs])
+AC_SUBST([distclean_subdirs])
+AC_SUBST([maintainer_clean_subdirs])
+
+case "${srcdir}" in
+  [[\\/]]* | ?:[[\\/]]* ) # Absolute
+    this_srcdir=${srcdir}
+    ;;
+  *) 
+    this_srcdir="../${srcdir}"
+    ;;
+esac
+AC_SUBST([this_srcdir])
+
+case "${cache_file}" in
+  [[\\/]]* | ?:[[\\/]]* ) # Absolute
+    this_cache_file=${cache_file}
+    ;;
+  *) 
+    this_cache_file="../${cache_file}"
+    ;;
+esac
+subconfigure_args=${ac_configure_args}
+subconfigure_args="${subconfigure_args} --cache-file=${this_cache_file} --srcdir=${this_srcdir}"
+AC_SUBST([subconfigure_args])
+
+AC_CONFIG_FILES([Makefile])
+AC_OUTPUT
+
Index: configure.in
===================================================================
RCS file: configure.in
diff -N configure.in
--- configure.in	5 Aug 2004 19:36:51 -0000	1.5
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,64 +0,0 @@
-AC_INIT([Makefile.in])
-
-AC_PROG_INSTALL
-AC_CANONICAL_SYSTEM
-
-if test -d ${srcdir}/spu ; then
-  configdirs="spu"
-fi
-
-case "${target}" in
-  *mips*-*-pe* | *sh*-*-pe* | *arm*-*-wince | *arm*-wince-pe* )
-    if test -d ${srcdir}/wince ; then
-      configdirs="$configdirs wince"
-    fi
-    ;;
-esac
-
-all_subdirs=""
-install_subdirs=""
-mostlyclean_subdirs=""
-clean_subdirs=""
-distclean_subdirs=""
-maintainer_clean_subdirs=""
-
-for dir in $configdirs ; do
-    all_subdirs="${all_subdirs} all-$dir"
-    install_subdirs="${install_subdirs} install-$dir"
-    mostlyclean_subdirs="${mostlyclean_subdirs} mostlyclean-$dir"
-    clean_subdirs="${clean_subdirs} clean-$dir"
-    distclean_subdirs="${distclean_subdirs} distclean-$dir"
-    maintainer_clean_subdirs="${maintainer_clean_subdirs} maintainer-clean-$dir"
-done
-
-AC_SUBST([all_subdirs])
-AC_SUBST([install_subdirs])
-AC_SUBST([mostlyclean_subdirs])
-AC_SUBST([clean_subdirs])
-AC_SUBST([distclean_subdirs])
-AC_SUBST([maintainer_clean_subdirs])
-
-case "${srcdir}" in
-  [[\\/]]* | ?:[[\\/]]* ) # Absolute
-    abs_srcdir=${srcdir}
-    ;;
-  *) 
-    abs_srcdir="../${srcdir}"
-    ;;
-esac
-AC_SUBST([abs_srcdir])
-
-case "${cache_file}" in
-  [[\\/]]* | ?:[[\\/]]* ) # Absolute
-    abs_cache_file=${cache_file}
-    ;;
-  *) 
-    abs_cache_file="../${cache_file}"
-    ;;
-esac
-subconfigure_args=${ac_configure_args}
-subconfigure_args="${subconfigure_args} --cache-file=${abs_cache_file} --srcdir=${abs_srcdir}"
-AC_SUBST([subconfigure_args])
-
-AC_OUTPUT([Makefile])
-
Index: Makefile.tpl
===================================================================
RCS file: /cvs/src/src/utils/Makefile.tpl,v
retrieving revision 1.3
diff -u -r1.3 Makefile.tpl
--- Makefile.tpl	23 Nov 2002 04:10:00 -0000	1.3
+++ Makefile.tpl	9 Aug 2004 02:45:48 -0000
@@ -43,7 +43,7 @@
 infodir = @infodir@
 includedir = @includedir@
 srcdir = @srcdir@
-abs_srcdir = @abs_srcdir@
+this_srcdir = @this_srcdir@
 
 man1dir = $(mandir)/man1
 man2dir = $(mandir)/man2
@@ -126,6 +126,6 @@
 configure-[+subdir+]: [+subdir+]/Makefile
 [+subdir+]/Makefile: config.status
 	test -d [+subdir+] || mkdir [+subdir+] ; \
-	cd [+subdir+] && $(abs_srcdir)/[+subdir+]/configure $(subconfigure_args)/[+subdir+]
+	cd [+subdir+] && $(this_srcdir)/[+subdir+]/configure $(subconfigure_args)/[+subdir+]
 .PHONY: configure-[+subdir+]
 [+ ENDFOR subdirs +]

-- 
There are none so blind as those who will not see.