* config.in: Rename from config.h.in.

	* configure.in: Call AC_CONFIG_HEADER with config.h:config.in.
	Change CONFIG_HEADERS test in AC_OUTPUT accordingly.
	* configure: Rebuild.
	* Makefile.in (stamp-h): Depend upon config.in, not config.h.in.
	Set CONFIG_HEADERS to config.h:config.in.
The file name config.h.in can be used on DOS filesystems.

diff --git a/gdb/.Sanitize b/gdb/.Sanitize
index dd707b27de57de9bbf2c26187127b2c40436665f..8045207422a1c49a7baad4dd99ff886c1cb904cf 100644 (file)
--- a/gdb/.Sanitize
+++ b/gdb/.Sanitize
@@ -136,7 +136,7 @@ command.h
 complaints.c
 complaints.h
 config
-config.h.in
+config.in
 configure
 configure.in
 convex-tdep.c

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index dd56e546180030a936087b9d3fc53d71e7f83016..284905b7f96588be4377dc1ce37fa7a6f9f0fef8 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,12 @@
+Thu Mar 21 10:56:41 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+       * config.in: Rename from config.h.in.
+       * configure.in: Call AC_CONFIG_HEADER with config.h:config.in.
+       Change CONFIG_HEADERS test in AC_OUTPUT accordingly.
+       * configure: Rebuild.
+       * Makefile.in (stamp-h): Depend upon config.in, not config.h.in.
+       Set CONFIG_HEADERS to config.h:config.in.
+
 Tue Mar 19 12:47:51 1996  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
 
        * partial-stab.h (case N_ENDM):  Finish current partial symbol

diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index 23d756786c364b9957b0c8fb103121fc02e4b831..b5b5804b8d252639572799de8247b1f6563e56c4 100644 (file)
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -757,8 +757,8 @@ Makefile: Makefile.in config.status @frags@
        $(SHELL) config.status
 
 config.h: stamp-h ; @true
-stamp-h: config.h.in config.status
-       CONFIG_HEADERS=config.h:config.h.in $(SHELL) config.status
+stamp-h: config.in config.status
+       CONFIG_HEADERS=config.h:config.in $(SHELL) config.status
 
 config.status: configure
        $(SHELL) config.status --recheck

diff --git a/gdb/config.h.in b/gdb/config.h.in
deleted file mode 100644 (file)
index 98cda61..0000000
--- a/gdb/config.h.in
+++ /dev/null
@@ -1,78 +0,0 @@
-/* config.h.in.  Generated automatically from configure.in by autoheader.  */
-
-/* Define if on AIX 3.
-   System headers sometimes define this.
-   We just want to avoid a redefinition error message.  */
-#ifndef _ALL_SOURCE
-#undef _ALL_SOURCE
-#endif
-
-/* Define if the `long double' type works.  */
-#undef HAVE_LONG_DOUBLE
-
-/* Define if you have a working `mmap' system call.  */
-#undef HAVE_MMAP
-
-/* Define if on MINIX.  */
-#undef _MINIX
-
-/* Define if the system does not provide POSIX.1 features except
-   with this defined.  */
-#undef _POSIX_1_SOURCE
-
-/* Define if you need to in order for stat and other things to work.  */
-#undef _POSIX_SOURCE
-
-/* Define if the `S_IS*' macros in <sys/stat.h> do not work properly.  */
-#undef STAT_MACROS_BROKEN
-
-/* Define if you have the ANSI C header files.  */
-#undef STDC_HEADERS
-
-/* Define if fpregset_t type is available. */
-#undef HAVE_FPREGSET_T
-
-/* Define if gregset_t type is available. */
-#undef HAVE_GREGSET_T
-
-/* Define if you have the getpagesize function.  */
-#undef HAVE_GETPAGESIZE
-
-/* Define if you have the valloc function.  */
-#undef HAVE_VALLOC
-
-/* Define if you have the <limits.h> header file.  */
-#undef HAVE_LIMITS_H
-
-/* Define if you have the <link.h> header file.  */
-#undef HAVE_LINK_H
-
-/* Define if you have the <memory.h> header file.  */
-#undef HAVE_MEMORY_H
-
-/* Define if you have the <sgtty.h> header file.  */
-#undef HAVE_SGTTY_H
-
-/* Define if you have the <stddef.h> header file.  */
-#undef HAVE_STDDEF_H
-
-/* Define if you have the <string.h> header file.  */
-#undef HAVE_STRING_H
-
-/* Define if you have the <strings.h> header file.  */
-#undef HAVE_STRINGS_H
-
-/* Define if you have the <sys/procfs.h> header file.  */
-#undef HAVE_SYS_PROCFS_H
-
-/* Define if you have the <termio.h> header file.  */
-#undef HAVE_TERMIO_H
-
-/* Define if you have the <termios.h> header file.  */
-#undef HAVE_TERMIOS_H
-
-/* Define if you have the <unistd.h> header file.  */
-#undef HAVE_UNISTD_H
-
-/* Define if you have the dl library (-ldl).  */
-#undef HAVE_LIBDL

diff --git a/gdb/config.in b/gdb/config.in
new file mode 100644 (file)
index 0000000..a3f8f2e
--- /dev/null
+++ b/gdb/config.in
@@ -0,0 +1,78 @@
+/* config.in.  Generated automatically from configure.in by autoheader.  */
+
+/* Define if on AIX 3.
+   System headers sometimes define this.
+   We just want to avoid a redefinition error message.  */
+#ifndef _ALL_SOURCE
+#undef _ALL_SOURCE
+#endif
+
+/* Define if the `long double' type works.  */
+#undef HAVE_LONG_DOUBLE
+
+/* Define if you have a working `mmap' system call.  */
+#undef HAVE_MMAP
+
+/* Define if on MINIX.  */
+#undef _MINIX
+
+/* Define if the system does not provide POSIX.1 features except
+   with this defined.  */
+#undef _POSIX_1_SOURCE
+
+/* Define if you need to in order for stat and other things to work.  */
+#undef _POSIX_SOURCE
+
+/* Define if the `S_IS*' macros in <sys/stat.h> do not work properly.  */
+#undef STAT_MACROS_BROKEN
+
+/* Define if you have the ANSI C header files.  */
+#undef STDC_HEADERS
+
+/* Define if fpregset_t type is available. */
+#undef HAVE_FPREGSET_T
+
+/* Define if gregset_t type is available. */
+#undef HAVE_GREGSET_T
+
+/* Define if you have the getpagesize function.  */
+#undef HAVE_GETPAGESIZE
+
+/* Define if you have the valloc function.  */
+#undef HAVE_VALLOC
+
+/* Define if you have the <limits.h> header file.  */
+#undef HAVE_LIMITS_H
+
+/* Define if you have the <link.h> header file.  */
+#undef HAVE_LINK_H
+
+/* Define if you have the <memory.h> header file.  */
+#undef HAVE_MEMORY_H
+
+/* Define if you have the <sgtty.h> header file.  */
+#undef HAVE_SGTTY_H
+
+/* Define if you have the <stddef.h> header file.  */
+#undef HAVE_STDDEF_H
+
+/* Define if you have the <string.h> header file.  */
+#undef HAVE_STRING_H
+
+/* Define if you have the <strings.h> header file.  */
+#undef HAVE_STRINGS_H
+
+/* Define if you have the <sys/procfs.h> header file.  */
+#undef HAVE_SYS_PROCFS_H
+
+/* Define if you have the <termio.h> header file.  */
+#undef HAVE_TERMIO_H
+
+/* Define if you have the <termios.h> header file.  */
+#undef HAVE_TERMIOS_H
+
+/* Define if you have the <unistd.h> header file.  */
+#undef HAVE_UNISTD_H
+
+/* Define if you have the dl library (-ldl).  */
+#undef HAVE_LIBDL

diff --git a/gdb/configure b/gdb/configure
index f5909c1093e44dd00fa42e5515ffa77a069dc0ab..2f69a0caa36d6820251031edb7c20a497e8493bb 100755 (executable)
--- a/gdb/configure
+++ b/gdb/configure
@@ -3454,7 +3454,7 @@ done
 ac_given_srcdir=$srcdir
 ac_given_INSTALL="$INSTALL"
 
-trap 'rm -fr `echo "Makefile config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
+trap 'rm -fr `echo "Makefile config.h:config.in" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
 EOF
 cat >> $CONFIG_STATUS <<EOF
 
@@ -3605,7 +3605,7 @@ ac_eB='$%\1#\2define\3'
 ac_eC=' '
 ac_eD='%g'
 
-CONFIG_HEADERS=${CONFIG_HEADERS-"config.h"}
+CONFIG_HEADERS=${CONFIG_HEADERS-"config.h:config.in"}
 for ac_file in .. $CONFIG_HEADERS; do if test "x$ac_file" != x..; then
   # Support "outfile[:infile]", defaulting infile="outfile.in".
   case "$ac_file" in
@@ -3757,7 +3757,7 @@ echo "source ${srcdir}/.gdbinit" >> .gdbinit
 esac
 
 case x$CONFIG_HEADERS in
-xconfig.h:config.h.in)
+xconfig.h:config.in)
 echo > stamp-h ;;
 esac
 

diff --git a/gdb/configure.in b/gdb/configure.in
index b61d6a26690cdfd1f2f6e555ceb62273ace6d849..6365fbb9c0bac1832ca745d4e925e86c07220523 100644 (file)
--- a/gdb/configure.in
+++ b/gdb/configure.in
@@ -21,7 +21,7 @@ dnl Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.3)dnl
 AC_INIT(main.c)
-AC_CONFIG_HEADER(config.h)
+AC_CONFIG_HEADER(config.h:config.in)
 
 AC_PROG_CC
 AC_AIX
@@ -716,7 +716,7 @@ echo "source ${srcdir}/.gdbinit" >> .gdbinit
 esac
 
 case x$CONFIG_HEADERS in
-xconfig.h:config.h.in)
+xconfig.h:config.in)
 echo > stamp-h ;;
 esac
 ],