Salome HOME
projects
/
samples
/
pyhello.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Join modifications from branch OCC_development_for_3_2_0a2
[samples/pyhello.git]
/
build_configure
diff --git
a/build_configure
b/build_configure
index 573a23bb35af1e8270d77d38ce2ac26d6eaea717..f2ef6da018628081bf187daec392f125c572a2fd 100755
(executable)
--- a/
build_configure
+++ b/
build_configure
@@
-20,6
+20,14
@@
if test ! -d "${KERNEL_ROOT_DIR}"; then
exit
fi
exit
fi
+########################################################################
+# Test if the GUI_ROOT_DIR is set correctly
+
+if test ! -d "${GUI_ROOT_DIR}"; then
+ echo "failed : GUI_ROOT_DIR variable is not correct !"
+ exit
+fi
+
########################################################################
# find_in - utility function
#
########################################################################
# find_in - utility function
#
@@
-49,6
+57,7
@@
find_in()
case $1 in
*/CVS) return ;;
case $1 in
*/CVS) return ;;
+ */adm_local/*) return ;;
*) ;;
esac
*) ;;
esac
@@
-128,9
+137,9
@@
echo "./salome_adm/unix/make_module \\" >> configure.in_tmp1
touch configure.in_tmp2
find_in . configure.in_tmp2
touch configure.in_tmp2
find_in . configure.in_tmp2
-sed -e '/^.
\/
salome_adm/d' \
+sed -e '/^.
..
salome_adm/d' \
-e '/configure.in/d' \
-e '/configure.in/d' \
- -e '/^.
\/
adm_local/d' \
+ -e '/^.
..
adm_local/d' \
-e 's/.in / /' \
configure.in_tmp2 >> configure.in_tmp1
-e 's/.in / /' \
configure.in_tmp2 >> configure.in_tmp1
@@
-194,7
+203,8
@@
else
echo -n "Creating 'configure' script ... "
fi
echo -n "Creating 'configure' script ... "
fi
-aclocal --acdir=adm_local/unix/config_files -I ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files
+aclocal -I adm_local/unix/config_files -I ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files \
+ -I ${GUI_ROOT_DIR}/adm_local/unix/config_files
if autoconf
then
echo "done"
if autoconf
then
echo "done"