From: inv <inv@opencascade.com>
Date: Fri, 11 Nov 2011 12:55:55 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: V6_4_0~22
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=555328411b33872f5498884248c1600d50c53400;p=tools%2Finstall.git

*** empty log message ***
---

diff --git a/config_files/freetype-2.3.7.sh b/config_files/freetype-2.3.7.sh
index 707edb1..8618560 100755
--- a/config_files/freetype-2.3.7.sh
+++ b/config_files/freetype-2.3.7.sh
@@ -32,6 +32,7 @@ print_env_bin()
 cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
 export FREETYPEDIR=\${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
+export LD_LIBRARY_PATH=\${FREETYPEDIR}/lib:\${LD_LIBRARY_PATH}
 ##
 EOF
 (test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
@@ -77,12 +78,12 @@ test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
 
 cd ${PRODUCT_SRC_DIR}
 FREETYPE_CONFIGURE_OPTIONS=""
-FREETYPE_CONFIGURE_OPTIONS="${FREETYPE_CONFIGURE_OPTIONS} --enable-shared=no --prefix=${PRODUCT_DIR}"
-
 if test `uname -m` = "x86_64" ; then
 FREETYPE_CONFIGURE_OPTIONS="${FREETYPE_CONFIGURE_OPTIONS} CFLAGS='-m64 -fPIC' CPPFLAGS='-m64 -fPIC'"
 fi
 
+FREETYPE_CONFIGURE_OPTIONS="${FREETYPE_CONFIGURE_OPTIONS} --prefix=${PRODUCT_DIR}"
+
 #congigure
 check_job ${PRODUCT_DIR}/CONFIGURE.LOG ./configure ${FREETYPE_CONFIGURE_OPTIONS}
 
diff --git a/config_files/ftgl-2.1.2.sh b/config_files/ftgl-2.1.2.sh
index edecfb1..a119fb3 100755
--- a/config_files/ftgl-2.1.2.sh
+++ b/config_files/ftgl-2.1.2.sh
@@ -80,14 +80,15 @@ test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
 cd ${PRODUCT_SRC_DIR}/unix
 
 FTGL_CONFIGURE_OPTIONS=""
+
 FTGL_CONFIGURE_OPTIONS="${FTGL_CONFIGURE_OPTIONS} --enable-shared=yes --prefix=${PRODUCT_DIR}"
 FTGL_CONFIGURE_OPTIONS="${FTGL_CONFIGURE_OPTIONS} --with-freetype-prefix=${FREETYPEDIR}"
-FTGL_CONFIGURE_OPTIONS="${FTGL_CONFIGURE_OPTIONS} --with-gl-inc=/usr/include  --with-glut-inc=/usr/include "
+FTGL_CONFIGURE_OPTIONS="${FTGL_CONFIGURE_OPTIONS} --with-gl-inc=/usr/include"
 
 if test `uname -m` = "x86_64" ; then
-FTGL_CONFIGURE_OPTIONS="${FTGL_CONFIGURE_OPTIONS} --with-gl-lib=/usr/lib64 --with-glut-lib=/usr/lib64"
+FTGL_CONFIGURE_OPTIONS="${FTGL_CONFIGURE_OPTIONS} --with-gl-lib=/usr/lib64"
 else
-FTGL_CONFIGURE_OPTIONS="${FTGL_CONFIGURE_OPTIONS} --with-gl-lib=/usr/lib --with-glut-lib=/usr/lib64"
+FTGL_CONFIGURE_OPTIONS="${FTGL_CONFIGURE_OPTIONS} --with-gl-lib=/usr/lib"
 fi
 
 #congigure
diff --git a/config_files/tcltk-8.5.8.sh b/config_files/tcltk-8.5.8.sh
index 32eaacf..6949de4 100755
--- a/config_files/tcltk-8.5.8.sh
+++ b/config_files/tcltk-8.5.8.sh
@@ -173,10 +173,11 @@ check_job ${PRODUCT_DIR}/MAKEINSTALL.LOG make install
 #chmod +w ./configure
 #echo -e '/test "$no_create" = yes || ${CONFIG_SHELL-\/bin\/sh} $CONFIG_STATUS || exit 1\ns/test "$no_create" = yes || ${CONFIG_SHELL-\/bin\/sh} $CONFIG_STATUS || exit 1/test "$no_create" = yes || ${CONFIG_SHELL-\/bin\/sh} $CONFIG_STATUS || exit 0\nwq' | ed - configure 
 #INV - bug in a tclx configure 
-#cp configure configure.orig && sed "s/relid'/relid/" configure.orig > configure
-#chmod 755 ./configure
-#VRV - bug in a tclx configure 
+
 cd ${PRODUCT_SRC_DIR}/tclx8.4.0_SRC
+#INV - bug in a tclx configure 
+cp configure configure.orig && sed "s/relid'/relid/" configure.orig > configure
+chmod 755 ./configure
 
 cat >> ${PRODUCT_DIR}/CONFIGURE.LOG <<EOF
 -------------------