[project @ 2003-08-18 14:54:40 by panne]

Ooops, forgot about a dozen references to configure.in... :-}

diff --git a/Makefile b/Makefile
index e14d07f..44ac9ac 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -167,7 +167,7 @@ BIN_DIST_DIRS=$($(Project)BinDistDirs)
 binary-dist:: binary-dist-pre
 
 BIN_DIST_TOP= distrib/Makefile-bin.in \
-             distrib/configure-bin.in \
+             distrib/configure-bin.ac \
              distrib/INSTALL \
              $(BIN_DIST_MAIN_DIR)/ANNOUNCE \
              $(BIN_DIST_MAIN_DIR)/VERSION \
@@ -239,7 +239,7 @@ binary-dist::
        echo "PACKAGE_LINKS = $($(Project)BinDistLinks)" >> $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/Makefile.in
        cat $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/Makefile-bin.in >> $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/Makefile.in
        @echo "Generating a shippable configure script.."
-       $(MV) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/configure-bin.in $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/configure.in 
+       $(MV) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/configure-bin.ac $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/configure.ac
        ( cd $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME); autoconf )
        if test -x $(BIN_DIST_MAIN_DIR)/mk/post-install-script ; then \
                cp $(BIN_DIST_MAIN_DIR)/mk/post-install-script \
@@ -349,7 +349,7 @@ SRC_DIST_DIR=$(shell pwd)/$(SRC_DIST_NAME)
 #
 SRC_DIST_DIRS += docs distrib $(SUBDIRS)
 SRC_DIST_FILES += \
-       configure.in config.guess config.sub configure \
+       configure.ac config.guess config.sub configure \
        aclocal.m4 acconfig.h README Makefile Makefile.config install-sh \
        mk/bootstrap.mk \
        mk/boilerplate.mk mk/config.h.in mk/config.mk.in mk/opts.mk \

diff --git a/Makefile.config b/Makefile.config
index 1d10829..ed0b3ad 100644 (file)
--- a/Makefile.config
+++ b/Makefile.config
@@ -2,9 +2,9 @@
 
 all: configure
 
-configure: configure.in aclocal.m4
+configure: configure.ac aclocal.m4
        rm -f configure.new
-       autoconf configure.in > configure.new \
+       autoconf configure.ac > configure.new \
                || ( rm -f configure.new; exit 1 )
        rm -f configure
        mv configure.new configure
@@ -15,9 +15,9 @@ configure: configure.in aclocal.m4
 
 CONFIG_H_IN = ghc/includes/config.h.in
 
-config.h.in: configure.in
+config.h.in: configure.ac
        rm -f $(CONFIG_H_IN)
-       autoheader configure.in > $(CONFIG_H_IN) \
+       autoheader configure.ac > $(CONFIG_H_IN) \
                || ( rm -f $(CONFIG_H_IN); exit 1 )
 
 # do something about autoheader

diff --git a/acconfig.h b/acconfig.h
index 708bc92..a29b824 100644 (file)
--- a/acconfig.h
+++ b/acconfig.h
@@ -3,7 +3,7 @@
    Descriptive text for the C preprocessor macros that
    the fptools configuration script can define.
    The current version may not use all of them; autoheader copies the ones
-   your configure.in uses into your configuration header file templates.
+   your configure.ac uses into your configuration header file templates.
 
    The entries are in sort -df order: alphabetical, case insensitive,
    ignoring punctuation (such as underscores).  Although this order

diff --git a/configure.ac b/configure.ac
index da94e91..64ae59c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 dnl == autoconf source for the Glasgow FP tools ==
-dnl (run "grep '^dnl \*' configure.in | sed -e 's/dnl / /g; s/\*\*/   +/g;'"
+dnl (run "grep '^dnl \*' configure.ac | sed -e 's/dnl / /g; s/\*\*/   +/g;'"
 dnl  (or some such) to see the outline of this file)
 dnl
 #

diff --git a/distrib/configure-bin.in b/distrib/configure-bin.ac
similarity index 100%
rename from distrib/configure-bin.in
rename to distrib/configure-bin.ac

diff --git a/distrib/prep-bin-dist-mingw b/distrib/prep-bin-dist-mingw
index d63e145..78f7b39 100644 (file)
--- a/distrib/prep-bin-dist-mingw
+++ b/distrib/prep-bin-dist-mingw
@@ -41,7 +41,7 @@ if ! [ -d bin/i386-unknown-mingw32 ] ; then
 fi;
 
 echo "Removing configure script files...not needed"
-rm -f config.guess config.sub configure configure.in mkdirhier
+rm -f config.guess config.sub configure configure.ac mkdirhier
 rm -f Makefile-bin.in Makefile.in aclocal.m4 install-sh
 rm -rf autom4te.cache
 

diff --git a/distrib/prep-bin-dist-mingw-args b/distrib/prep-bin-dist-mingw-args
index 950f7de..85a70f6 100644 (file)
--- a/distrib/prep-bin-dist-mingw-args
+++ b/distrib/prep-bin-dist-mingw-args
@@ -38,7 +38,7 @@ if ! [ -d bin/i386-unknown-mingw32 ] ; then
 fi;
 
 echo "Removing configure script files...not needed"
-rm -f config.guess config.sub configure configure.in mkdirhier
+rm -f config.guess config.sub configure configure.ac mkdirhier
 rm -f Makefile-bin.in Makefile.in aclocal.m4 install-sh
 rm -rf autom4te.cache
 

diff --git a/docs/building/building.sgml b/docs/building/building.sgml
index 25703f9..23c181d 100644 (file)
--- a/docs/building/building.sgml
+++ b/docs/building/building.sgml
@@ -1258,7 +1258,7 @@ $ cvs checkout nofib/spectral
          6.1.</para>
 
          <para>Autoconf builds the <command>configure</command>
-          script from <filename>configure.in</filename> and
+          script from <filename>configure.ac</filename> and
           <filename>aclocal.m4</filename>.  If you modify either of
           these files, you'll need <command>autoconf</command> to
           rebuild <filename>configure</filename>.</para>
@@ -1415,7 +1415,7 @@ $ make install
        </listitem>
 
        <listitem>
-         <para><filename>configure.in</filename>,
+         <para><filename>configure.ac</filename>,
           <filename>config.sub</filename>,
           <filename>config.guess</filename>: these files support the
           configuration process.</para>
@@ -1438,7 +1438,7 @@ $ make install
       only one project (<literal>happy</literal>, say), you must have
       a source tree whose root directory contains
       <filename>Makefile</filename>, <filename>mk/</filename>,
-      <filename>configure.in</filename>, and the project(s) you want
+      <filename>configure.ac</filename>, and the project(s) you want
       (<filename>happy/</filename> in this case).  You cannot get by
       with just the <filename>happy/</filename> directory.</para>
     </sect2>
@@ -1555,20 +1555,20 @@ $ make install
             issue the command
             <command>autoconf</command><indexterm><primary>autoconf</primary></indexterm>
             (with no arguments). This GNU program converts
-            <filename><constant>&dollar;(FPTOOLS&lowbar;TOP)</constant>/configure.in</filename>
+            <filename><constant>&dollar;(FPTOOLS&lowbar;TOP)</constant>/configure.ac</filename>
             to a shell script called
             <filename><constant>&dollar;(FPTOOLS&lowbar;TOP)</constant>/configure</filename>.
             </para>
 
            <para>Some projects, including GHC, have their own
             configure script.  If there's an
-            <constant>&dollar;(FPTOOLS&lowbar;TOP)/&lt;project&gt;/configure.in</constant>,
+            <constant>&dollar;(FPTOOLS&lowbar;TOP)/&lt;project&gt;/configure.ac</constant>,
             then you need to run <command>autoconf</command> in that
             directory too.</para>
 
            <para>Both these steps are completely
             platform-independent; they just mean that the
-            human-written file (<filename>configure.in</filename>) can
+            human-written file (<filename>configure.ac</filename>) can
             be short, although the resulting shell script,
             <command>configure</command>, and
             <filename>mk/config.h.in</filename>, are long.</para>

diff --git a/docs/coding-style.html b/docs/coding-style.html
index 250ab88..af744eb 100644 (file)
--- a/docs/coding-style.html
+++ b/docs/coding-style.html
@@ -164,7 +164,7 @@ Avoid conditional code like this:
   #endif
 </pre>
 
-Instead, add an appropriate test to the configure.in script and use
+Instead, add an appropriate test to the configure.ac script and use
 the result of that test instead. 
 
 <pre>

diff --git a/ghc/InstallShield/File Groups/Program Executable Files.fgl b/ghc/InstallShield/File Groups/Program Executable Files.fgl
index 8a380a8..91c00d9 100644 (file)
--- a/ghc/InstallShield/File Groups/Program Executable Files.fgl
+++ b/ghc/InstallShield/File Groups/Program Executable Files.fgl
@@ -6,7 +6,7 @@ Version=1.10.000
 file0=C:\TEMP\fptools\glafp-utils\mkdirhier\mkdirhier
 file1=C:\TEMP\fptools\ghc\ANNOUNCE
 file2=C:\TEMP\fptools\aclocal.m4
-file3=C:\TEMP\fptools\configure.in
+file3=C:\TEMP\fptools\configure.ac
 file4=C:\TEMP\fptools\config.status
 file5=C:\TEMP\fptools\configure
 file6=C:\TEMP\fptools\config.guess

diff --git a/ghc/configure.in b/ghc/configure.ac
similarity index 96%
rename from ghc/configure.in
rename to ghc/configure.ac
index 7a4f062..e87bae7 100644 (file)
--- a/ghc/configure.in
+++ b/ghc/configure.ac
@@ -21,7 +21,7 @@ AC_SUBST(version)
 AC_SUBST(patchlevel)
 
 dnl Uncomment links to unix docs if necessary dnl NOTE: This is a slight
-dnl hack: It needs to be synchronized with fptools/configure.in and
+dnl hack: It needs to be synchronized with fptools/configure.ac and
 dnl fptools/libraries/Makefile and should probably use target features
 dnl instead of host.
 AC_CANONICAL_HOST

diff --git a/ghc/docs/comm/rts-libs/coding-style.html b/ghc/docs/comm/rts-libs/coding-style.html
index 3b3be39..99c81d0 100644 (file)
--- a/ghc/docs/comm/rts-libs/coding-style.html
+++ b/ghc/docs/comm/rts-libs/coding-style.html
@@ -165,7 +165,7 @@ Avoid conditional code like this:
   #endif
 </pre>
 
-Instead, add an appropriate test to the configure.in script and use
+Instead, add an appropriate test to the configure.ac script and use
 the result of that test instead. 
 
 <pre>

diff --git a/mk/boilerplate.mk b/mk/boilerplate.mk
index 1066cd5..2e9f963 100644 (file)
--- a/mk/boilerplate.mk
+++ b/mk/boilerplate.mk
@@ -37,7 +37,7 @@ $(TOP)/mk/config.mk : $(TOP)/mk/config.mk.in $(TOP)/mk/config.h.in $(TOP)/config
        @echo "Running $(FPTOOLS_TOP)/config.status to update configuration info..."
        @( cd $(FPTOOLS_TOP) && ./config.status )
 
-$(TOP)/configure : $(TOP)/configure.in $(TOP)/aclocal.m4
+$(TOP)/configure : $(TOP)/configure.ac $(TOP)/aclocal.m4
        @echo "Regenerating $(FPTOOLS_TOP)/configure..."
        @( cd $(FPTOOLS_TOP) && $(MAKE) -f Makefile.config ./configure )
 

diff --git a/mk/config.h.in b/mk/config.h.in
index 5217035..b297add 100644 (file)
--- a/mk/config.h.in
+++ b/mk/config.h.in
@@ -1,10 +1,10 @@
-/* mk/config.h.in.  Generated from configure.in by autoheader.  */
+/* mk/config.h.in.  Generated from configure.ac by autoheader.  */
 /* acconfig.h
 
    Descriptive text for the C preprocessor macros that
    the fptools configuration script can define.
    The current version may not use all of them; autoheader copies the ones
-   your configure.in uses into your configuration header file templates.
+   your configure.ac uses into your configuration header file templates.
 
    The entries are in sort -df order: alphabetical, case insensitive,
    ignoring punctuation (such as underscores).  Although this order