Merge from V6_2_BR 23/12/2010

diff --git a/Makefile.am b/Makefile.am
index 71f40ee16015e1afb1ab4f5183348f372927ddae..3f87e72cc5ac85de220f8bf7f01b4f418ef1dbb6 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -43,7 +43,7 @@ SUBDIRS = idl adm_local resources src bin doc
 
 DIST_SUBDIRS = idl adm_local resources src bin doc 
 
-DISTCLEANFILES = a.out aclocal.m4 configure local-install.sh
+DISTCLEANFILES = a.out aclocal.m4 configure local-install.sh hack_libtool
 
 salomeinclude_DATA = BLSURFPLUGIN_version.h
 

diff --git a/configure.ac b/configure.ac
index 69c7ba82c879330efd62125f53f0e8f25d84be14..fe01836b816e3e6dfd5b7c681203e03b177d8651 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -412,6 +412,9 @@ sed -i "s%^CC=\"\(.*\)\"%hack_libtool (){ \n\
   $(pwd)/hack_libtool \1 \"\$[@]\" \n\
 }\n\
 CC=\"hack_libtool\"%g" libtool
+sed -i "s%\(\s*\)for searchdir in \$newlib_search_path \$lib_search_path \$sys_lib_search_path \$shlib_search_path; do%\1searchdirs=\"\$newlib_search_path \$lib_search_path \$sys_lib_search_path \$shlib_search_path\"\n\1for searchdir in \$searchdirs; do%g" libtool
+sed -i "s%\(\s*\)searchdirs=\"\$newlib_search_path \$lib_search_path \(.*\)\"%\1searchdirs=\"\$newlib_search_path \$lib_search_path\"\n\1sss_beg=\"\"\n\1sss_end=\"\2\"%g" libtool
+sed -i "s%\(\s*\)\(for searchdir in \$searchdirs; do\)%\1for sss in \$searchdirs; do\n\1  if ! test -d \$sss; then continue; fi\n\1  ssss=\$(cd \$sss; pwd)\n\1  if test \"\$ssss\" != \"\" \&\& test -d \$ssss; then\n\1    case \$ssss in\n\1      /usr/lib | /usr/lib64 ) ;;\n\1      * ) sss_beg=\"\$sss_beg \$ssss\" ;;\n\1    esac\n\1  fi\n\1done\n\1searchdirs=\"\$sss_beg \$sss_end\"\n\1\2%g" libtool
 ],[])
 
 # This list is initiated using autoscan and must be updated manually