From ba1bd68a4f6e039f754cbb85ce05e855c81fc09c Mon Sep 17 00:00:00 2001
From: inv <inv@opencascade.com>
Date: Fri, 24 Dec 2010 07:48:46 +0000
Subject: [PATCH] Merge from V6_2_BR 23/12/2010

---
 Makefile.am                          | 2 +-
 configure.ac                         | 4 ++++
 doc/docutils/Makefile.am             | 7 ++-----
 doc/docutils/{conf.py => conf.py.in} | 4 ++--
 4 files changed, 9 insertions(+), 8 deletions(-)
 rename doc/docutils/{conf.py => conf.py.in} (99%)

diff --git a/Makefile.am b/Makefile.am
index 81e796864..b0bedc313 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -41,7 +41,7 @@ endif
 
 DIST_SUBDIRS= salome_adm idl src doc bin resources
 
-DISTCLEANFILES = a.out local-install.sh
+DISTCLEANFILES = a.out local-install.sh hack_libtool
 
 salomeinclude_DATA = KERNEL_version.h
 
diff --git a/configure.ac b/configure.ac
index 9b3df1dd4..f751526a1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -519,6 +519,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
@@ -536,6 +539,7 @@ AC_OUTPUT([ \
   bin/Makefile \
   bin/VERSION \
   doc/Makefile \
+  doc/docutils/conf.py \
   doc/salome/Makefile \
   doc/salome/tui/Makefile \
   doc/salome/tui/doxyfile \
diff --git a/doc/docutils/Makefile.am b/doc/docutils/Makefile.am
index 840cd9958..dbed1cc91 100644
--- a/doc/docutils/Makefile.am
+++ b/doc/docutils/Makefile.am
@@ -49,7 +49,7 @@ htm:
 	mkdir -p html doctrees
 	PYTHONPATH=$(SPHINX_PYTHONPATH):${PYTHONPATH} \
 	LD_LIBRARY_PATH=$(SPHINX_LD_LIBRARY_PATH):${LD_LIBRARY_PATH} \
-	$(SPHINXBUILD) -W -b html $(ALLSPHINXOPTS) html
+	$(SPHINXBUILD) -c $(top_builddir)/doc/docutils -W -b html $(ALLSPHINXOPTS) html
 	@echo
 	@echo "Build finished. The HTML pages are in html."
 
@@ -57,7 +57,7 @@ latex:
 	mkdir -p latex doctrees
 	PYTHONPATH=$(SPHINX_PYTHONPATH):${PYTHONPATH} \
 	LD_LIBRARY_PATH=$(SPHINX_LD_LIBRARY_PATH):${LD_LIBRARY_PATH} \
-	$(SPHINXBUILD) -W -b latex $(ALLSPHINXOPTS) latex
+	$(SPHINXBUILD) -c $(top_builddir)/doc/docutils -W -b latex $(ALLSPHINXOPTS) latex
 	@echo
 	@echo "Build finished; the LaTeX files are in latex."
 	@echo "Run \`make all-pdf' or \`make all-ps' in that directory to" \
@@ -74,9 +74,6 @@ RSTFILES= \
 
 EXTRA_DIST+= $(RSTFILES)
 
-EXTRA_DIST+= \
-	conf.py 
-
 install-data-local: html/index.html
 	test -z $(pydocdir) || mkdir -p $(DESTDIR)$(pydocdir)
 	if test -d "html"; then b=; else b="$(srcdir)/"; fi; \
diff --git a/doc/docutils/conf.py b/doc/docutils/conf.py.in
similarity index 99%
rename from doc/docutils/conf.py
rename to doc/docutils/conf.py.in
index 8cc5fcec0..cea4f5734 100644
--- a/doc/docutils/conf.py
+++ b/doc/docutils/conf.py.in
@@ -54,9 +54,9 @@ copyright = '2010 EDF R&D'
 # built documents.
 #
 # The short X.Y version.
-version = '6.2.0'
+version = '@VERSION@'
 # The full version, including alpha/beta/rc tags.
-release = '6.2.0'
+release = '@VERSION@'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
-- 
2.39.2