From: vsr <vsr@opencascade.com>
Date: Fri, 24 Dec 2010 08:20:12 +0000 (+0000)
Subject: Merge from V6_2_BR 23/12/2010
X-Git-Tag: Start_BR_19998_21191~8
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=25b4e1cc0425f682da18f3af62cb159b38af9450;p=plugins%2Fhybridplugin.git

Merge from V6_2_BR 23/12/2010
---

diff --git a/Makefile.am b/Makefile.am
index c6b0224..4cbed0b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -44,7 +44,7 @@ SUBDIRS = idl adm_local resources src bin
 
 DIST_SUBDIRS = idl adm_local resources src bin 
 
-DISTCLEANFILES = a.out aclocal.m4 configure local-install.sh
+DISTCLEANFILES = a.out aclocal.m4 configure local-install.sh hack_libtool
 
 salomeinclude_DATA = GHS3DPLUGIN_version.h
 
diff --git a/configure.ac b/configure.ac
index b5161cf..05ee1a7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -401,6 +401,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