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

	* configure.in: Call AC_CONFIG_HEADER with config.h:config.in.
	* configure: Rebuild.
	* Makefile.in (stamp-h): Set CONFIG_HEADERS to config.h:config.in
	when calling config.status.

6 files changed, 12 insertions, 49 deletions

diff --git a/bfd/.Sanitize b/bfd/.Sanitize
index 311aca5..db25ce5 100644
--- a/bfd/.Sanitize
+++ b/bfd/.Sanitize
@@ -96,7 +96,7 @@ coffgen.c
 cofflink.c
 coffswap.h
 config.bfd
-config.h.in
+config.in
 configure
 configure.bat
 configure.host
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 9870638..1d5d221 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,5 +1,11 @@
 Thu Sep  7 12:48:01 1995  Ian Lance Taylor  <ian@cygnus.com>
 
+	* config.in: Rename from config.h.in.
+	* configure.in: Call AC_CONFIG_HEADER with config.h:config.in.
+	* configure: Rebuild.
+	* Makefile.in (stamp-h): Set CONFIG_HEADERS to config.h:config.in
+	when calling config.status.
+
 	* Makefile.in (do_distclean): Remove config.h and stamp-h.
 	(Makefile): Just rebuild Makefile.
 	(config.h, stamp-h): New targets.
diff --git a/bfd/Makefile.in b/bfd/Makefile.in
index a70ef0f..8d7f967 100644
--- a/bfd/Makefile.in
+++ b/bfd/Makefile.in
@@ -477,8 +477,8 @@ Makefile: Makefile.in config.status
 	CONFIG_FILES=Makefile CONFIG_HEADERS= $(SHELL) ./config.status
 
 config.h: stamp-h ; @true
-stamp-h: config.h.in config.status
-	CONFIG_FILES= CONFIG_HEADERS=config.h $(SHELL) ./config.status
+stamp-h: config.in config.status
+	CONFIG_FILES= CONFIG_HEADERS=config.h:config.in $(SHELL) ./config.status
 
 config.status: configure configure.host config.bfd
 	$(SHELL) config.status --recheck
diff --git a/bfd/config.h.in b/bfd/config.h.in
deleted file mode 100644
index 0e14247..0000000
--- a/bfd/config.h.in
+++ /dev/null
@@ -1,43 +0,0 @@
-/* config.h.in.  Generated automatically from configure.in by autoheader.  */
-
-/* Do we need to use the b modifier when opening binary files?  */
-#undef USE_BINARY_FOPEN
-
-/* Whether malloc must be declared even if <stdlib.h> is included.  */
-#undef NEED_DECLARATION_MALLOC
-
-/* Whether free must be declared even if <stdlib.h> is included.  */
-#undef NEED_DECLARATION_FREE
-
-/* Name of host specific header file to include in trad-core.c.  */
-#undef TRAD_HEADER
-
-/* Define if you have the fcntl function.  */
-#undef HAVE_FCNTL
-
-/* Define if you have the <fcntl.h> header file.  */
-#undef HAVE_FCNTL_H
-
-/* Define if you have the <stddef.h> header file.  */
-#undef HAVE_STDDEF_H
-
-/* Define if you have the <stdlib.h> header file.  */
-#undef HAVE_STDLIB_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/file.h> header file.  */
-#undef HAVE_SYS_FILE_H
-
-/* Define if you have the <sys/procfs.h> header file.  */
-#undef HAVE_SYS_PROCFS_H
-
-/* Define if you have the <time.h> header file.  */
-#undef HAVE_TIME_H
-
-/* Define if you have the <unistd.h> header file.  */
-#undef HAVE_UNISTD_H
diff --git a/bfd/configure b/bfd/configure
index ec4e70f..3d0008a 100755
--- a/bfd/configure
+++ b/bfd/configure
@@ -1500,7 +1500,7 @@ done
 ac_given_srcdir=$srcdir
 ac_given_INSTALL="$INSTALL"
 
-trap 'rm -fr `echo "Makefile doc/Makefile config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
+trap 'rm -fr `echo "Makefile doc/Makefile config.h:config.in" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
 
 # Protect against being on the right side of a sed subst in config.status. 
 sed 's/%@/@@/; s/@%/@@/; s/%g$/@g/; /@g$/s/[\\\\&%]/\\\\&/g; 
@@ -1628,7 +1628,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
diff --git a/bfd/configure.in b/bfd/configure.in
index 39eea25..edc089d 100644
--- a/bfd/configure.in
+++ b/bfd/configure.in
@@ -19,7 +19,7 @@ AC_ARG_ENABLE(targets,
   *)        enable_targets=$enableval ;;
 esac])dnl
 
-AC_CONFIG_HEADER(config.h)
+AC_CONFIG_HEADER(config.h:config.in)
 
 AC_CONFIG_AUX_DIR(`cd $srcdir/..;pwd`)
 AC_CANONICAL_SYSTEM