Fix problem with autoconf wrapper on Debian Etch 4.0

diff --git a/adm_local/unix/make_commence.in b/adm_local/unix/make_commence.in
index 2d3f80699deea594eaa1315bba9b015805d68675..19c8b68f711bd8ee7e8c5b23e83b74b3e1d26d2b 100644 (file)
--- a/adm_local/unix/make_commence.in
+++ b/adm_local/unix/make_commence.in
@@ -258,10 +258,10 @@ ifneq ($(top_srcdir),$(srcdir))
 configure: $(top_srcdir)/configure
 endif
 
-$(top_srcdir)/configure: $(top_srcdir)/configure.in $(top_srcdir)/aclocal.m4
+$(top_srcdir)/configure: $(top_srcdir)/configure.ac $(top_srcdir)/aclocal.m4
        cd $(top_srcdir) ; autoconf
 
-$(top_srcdir)/configure.in: $(top_srcdir)/configure.in.base
+$(top_srcdir)/configure.ac: $(top_srcdir)/configure.in.base
        cd $(top_srcdir) && ./build_configure
        
 ACLOCAL_SRC = \

diff --git a/build_configure b/build_configure
index fcff55aa4d99f67a9cb4542abaed753addce709c..cf7a2a4dbc3a3bf6f9292cafe5007d7642fa4293 100755 (executable)
--- a/build_configure
+++ b/build_configure
@@ -135,13 +135,13 @@ find_in()
 
 #######################################################################
 # Generate list of .in files (Makefile.in, config.h.in, etc)
-# appending it in file configure.in
+# appending it in file configure.ac
 
 cd ${CONF_DIR}
 ABS_CONF_DIR=`pwd`
 
 #
-# Common part of the configure.in file
+# Common part of the configure.ac file
 #
 chmod u+w configure.in.base
 if ! \cp -f configure.in.base configure.in_tmp1 
@@ -187,6 +187,7 @@ find_in . configure.in_tmp2
 
 sed -e '/^...salome_adm/d'    \
     -e '/configure.in/d'      \
+    -e '/configure.ac/d'      \
     -e '/^...adm_local/d'     \
     -e 's/.in / /'            \
     configure.in_tmp2  >>  configure.in_tmp1
@@ -200,27 +201,27 @@ echo "" >> configure.in_tmp1
 
 
 ########################################################################
-# Create new (or replace old) configure.in file
+# Create new (or replace old) configure.ac file
 # Print a message if the file is write protected
 #
 
 echo
-if test ! -f configure.in
+if test ! -f configure.ac
 then
-       echo -n "Creating new file 'configure.in' ... "
-       if \mv configure.in_new configure.in >& /dev/null
+       echo -n "Creating new file 'configure.ac' ... "
+       if \mv configure.in_new configure.ac >& /dev/null
        then
                echo "done"
        else
                echo "error, check your file permissions"
        fi
 else
-       echo -n "Updating 'configure.in' file ... "
-       if ! \cp configure.in configure.in_old >& /dev/null
+       echo -n "Updating 'configure.ac' file ... "
+       if ! \cp configure.ac configure.in_old >& /dev/null
        then
                echo
                echo
-               echo "Can't backup previous configure.in"
+               echo "Can't backup previous configure.ac"
                echo -n "Continue (you will not be able to revert) - (Y/N) ? "
                read R
                 case "x$R" in
@@ -230,13 +231,13 @@ else
                echo
                echo -n "                                 "
        fi
-       if \cp configure.in_new configure.in >& /dev/null
+       if \cp configure.in_new configure.ac >& /dev/null
        then
                 \rm  -f configure.in_new
                echo "done"
        else
                echo
-               echo "error, can't update previous configure.in"
+               echo "error, can't update previous configure.ac"
        fi
 fi