From b87ad716f45a80d10951fb84060b3afcee848ba5 Mon Sep 17 00:00:00 2001 From: maintenance team Date: Wed, 8 Oct 2008 10:57:59 +0000 Subject: [PATCH] Fix problem with autoconf wrapper on Debian Etch 4.0 --- adm_local/unix/make_commence.in | 4 ++-- build_configure | 23 ++++++++++++----------- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/adm_local/unix/make_commence.in b/adm_local/unix/make_commence.in index 2d3f806..19c8b68 100644 --- 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 fcff55a..cf7a2a4 100755 --- 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 -- 2.39.2