-#!/bin/bash
+#!/bin/sh
#
# Tool for updating list of .in file for the SALOME project
# and regenerating configure script
#
+# It may be called with --with-kernel[=yes,no] or --without-kernel
+# option, default is --with-kernel=yes
+#
# Author : Marc Tajchman - CEA
# Date : 10/10/2002
# $Header$
CONF_DIR=`echo $0 | sed -e "s,[^/]*$,,;s,/$,,;s,^$,.,"`
########################################################################
-# Test if the KERNEL_ROOT_DIR is set correctly
+# Check --with-kernel option
+
+MED_WITH_KERNEL=""
+
+for option
+do
+ case $option in
+ -with-kernel | --with-kernel)
+ MED_WITH_KERNEL="yes"
+ break;;
+ -without-kernel | --without-kernel | -with-kernel=no | --with-kernel=no)
+ MED_WITH_KERNEL="no"
+ break;;
+ esac
+done
+
+
+########################################################################
+# Test if the GUI_ROOT_DIR is set correctly if GUI required
-if test ! -d "${KERNEL_ROOT_DIR}"; then
- echo "failed : KERNEL_ROOT_DIR variable is not correct !"
+if test ! -d "${GUI_ROOT_DIR}"; then
+ echo "failed : GUI_ROOT_DIR variable is not correct !"
exit
fi
-# Test if the KERNEL_SRC is set correctly
-
-#if test ! -d "${KERNEL_SRC}"; then
-# echo "failed : KERNEL_SRC variable is not correct !"
-# exit
-#fi
########################################################################
# find_in - utility function
#
find_in()
{
- local i
- local f=$2
+ i=0
+ f=$2
# if the first argument is not a directory, returns
case $1 in
*/CVS) return ;;
+ */adm_local/*) return ;;
*) ;;
esac
#
# Common part of the configure.in file
#
-chmod u+w configure.in.base
-if ! \cp -f configure.in.base configure.in_tmp1
+if \cp -f configure.in.base configure.in_tmp1
then
+ echo
+ chmod u+w configure.in_tmp1
+else
echo
echo "error : can't create files in" ${CONF_DIR}
echo "aborting ..."
- chmod u-w configure.in.base
exit
fi
chmod u-w configure.in.base
\rm -f ${CONF_DIR}/salome_adm
fi
+# insert header and AC_INIT(src) which must go before anything else
+cat > configure.in_tmp1 <<EOF
+#
+# PLEASE DO NOT MODIFY configure.in FILE
+#
+# ALL CHANGES WILL BE DISCARDED BY THE NEXT
+# build_configure COMMAND
+#
+# CHANGES MUST BE MADE IN configure.in.base FILE
+#
+#
+# Author : Marc Tajchman (CEA)
+# Date : 28/06/2001
+# Modified by : Patrick GOLDBRONN (CEA)
+# Modified by : Marc Tajchman (CEA)
+#
+# Created from configure.in.base
+#
+
+AC_INIT(src)
+
+EOF
+
+# initialize MED_WITH_KERNEL
+echo "MED_WITH_KERNEL=${MED_WITH_KERNEL}" >> configure.in_tmp1
+
+# insert the configure.in.base
+cat configure.in.base >> configure.in_tmp1
+
# make a link allowing AC_OUTPUT to find the salome_adm/.../*.in files
-echo "" >> configure.in_tmp1
-echo 'ln -fs ${KERNEL_ROOT_DIR}/salome_adm ${ROOT_SRCDIR}/salome_adm' >> configure.in_tmp1
+echo "" >> configure.in_tmp1
+echo 'if test ${MED_WITH_KERNEL} = yes; then' >> configure.in_tmp1
+echo ' ln -fs ${KERNEL_ROOT_DIR}/salome_adm ${ROOT_SRCDIR}/.' >> configure.in_tmp1
+echo 'else' >> configure.in_tmp1
+echo ' ln -fs ${ROOT_SRCDIR}/adm_local_without_kernel ${ROOT_SRCDIR}/salome_adm' >> configure.in_tmp1
+echo 'fi' >> configure.in_tmp1
-echo "" >> configure.in_tmp1
-echo "AC_OUTPUT([ \\" >> configure.in_tmp1
#
# List of .in files in the adm/unix directory
# These files MUST be on top of AC_OUTPUT list so we
# put them "manually"
#
-
+# Attention, l'ordre d'entrée des fichiers doit être choisi avec
+# précision
+#
+echo "" >> configure.in_tmp1
+echo "AC_OUTPUT([ \\" >> configure.in_tmp1
echo " ./salome_adm/unix/SALOMEconfig.h \\" >> configure.in_tmp1
-echo " ./salome_adm/unix/F77config.h \\" >> configure.in_tmp1
-echo " ./salome_adm/unix/sstream \\" >> configure.in_tmp1
-echo " ./salome_adm/unix/depend \\" >> configure.in_tmp1
-echo " ./adm_local/unix/make_omniorb \\" >> configure.in_tmp1
-echo " ./salome_adm/unix/envScript \\" >> configure.in_tmp1
-echo " ./adm_local/unix/make_commence \\" >> configure.in_tmp1
-echo " ./salome_adm/unix/make_conclude \\" >> configure.in_tmp1
-echo " ./salome_adm/unix/make_module \\" >> configure.in_tmp1
+echo " ./salome_adm/unix/sstream \\" >> configure.in_tmp1
+echo " ./salome_adm/unix/depend \\" >> configure.in_tmp1
+echo " ])" >> configure.in_tmp1
+echo "" >> configure.in_tmp1
+echo 'if test $MED_WITH_KERNEL = yes; then' >> configure.in_tmp1
+echo "{" >> configure.in_tmp1
+echo "AC_OUTPUT([ \\" >> configure.in_tmp1
+echo " ./salome_adm/unix/F77config.h \\" >> configure.in_tmp1
+echo " ./adm_local/unix/make_omniorb \\" >> configure.in_tmp1
+echo " ./salome_adm/unix/envScript \\" >> configure.in_tmp1
+echo " ])" >> configure.in_tmp1
+echo "}" >> configure.in_tmp1
+echo "fi" >> configure.in_tmp1
+echo "" >> configure.in_tmp1
+echo "AC_OUTPUT([ \\" >> configure.in_tmp1
+echo " ./salome_adm/unix/make_module \\" >> configure.in_tmp1
+
+# _CS_gbo Pour assurer ls construction correct de la chaîne de
+# dépendance, il apparaît nécessaire de surcharger le make_conclude
+# (resp. make_commence) pardéfaut, c'est à dire le make_conclude de
+# salome_adm, par le make_conclude (resp. make_commence) du module,
+# c'est à dire le make_conclude (resp. make_commence) du répertoire
+# adm_local
+echo " ./adm_local/unix/make_commence \\" >> configure.in_tmp1
+echo " ./adm_local/unix/make_conclude \\" >> configure.in_tmp1
\rm -f configure.in_tmp2 configure.in_tmp3
touch configure.in_tmp2
+
find_in . configure.in_tmp2
-sed '/^.salome_adm/d' configure.in_tmp2 > configure.in_tmp3
-sed '/configure.in/d' configure.in_tmp3 > configure.in_tmp2
-sed 's/.in / /' configure.in_tmp2 >> configure.in_tmp1
-echo "])" >> configure.in_tmp1
+# _CS_gbo_100204 Mise à jour du filtre pour prise en compte des
+# restrictions imposées par les versions récente de autoconf.
+ sed -e '/^...salome_adm/d' \
+ -e '/configure.in/d' \
+ -e 's/.in / /' configure.in_tmp2 >> configure.in_tmp1
+
+echo " ])" >> configure.in_tmp1
+
# delete the link created for AC_OUTPUT
-echo "" >> configure.in_tmp1
#echo 'rm -f ${ROOT_SRCDIR}/salome_adm' >> configure.in_tmp1
\mv configure.in_tmp1 configure.in_new
\rm -f configure.in_tmp2 configure.in_tmp3
fi
else
echo -n "Updating 'configure.in' file ... "
- if ! \cp configure.in configure.in_old >& /dev/null
+ if \cp configure.in configure.in_old >& /dev/null
then
echo
+ else
+ echo
echo
echo "Can't backup previous configure.in"
echo -n "Continue (you will not be able to revert) - (Y/N) ? "
echo -n "Creating 'configure' script ... "
fi
-aclocal --acdir=adm_local/unix/config_files -I ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files
+if test "x${MED_WITH_KERNEL}" != "xno"; then
+ AUX_CONFIG_DIR=${KERNEL_ROOT_DIR}/salome_adm/unix/config_files
+else
+ AUX_CONFIG_DIR=adm_local_without_kernel/unix/config_files
+fi
+
+aclocal -I adm_local/unix/config_files -I ${AUX_CONFIG_DIR} -I ${GUI_ROOT_DIR}/adm_local/unix/config_files
if autoconf
then
echo "done"
