From: inv <inv@opencascade.com>
Date: Thu, 10 Nov 2011 07:46:55 +0000 (+0000)
Subject: Update for Salome 6.4.0
X-Git-Tag: V6_4_0~28
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=d9b4048ee39ad293f5aed6d38e2af924c1142b8a;p=tools%2Finstall.git

Update for Salome 6.4.0
---

diff --git a/config_files/freetype-2.3.7.sh b/config_files/freetype-2.3.7.sh
index 24c7ffe..707edb1 100755
--- a/config_files/freetype-2.3.7.sh
+++ b/config_files/freetype-2.3.7.sh
@@ -80,7 +80,7 @@ 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=' -fPIC m64'"
+FREETYPE_CONFIGURE_OPTIONS="${FREETYPE_CONFIGURE_OPTIONS} CFLAGS='-m64 -fPIC' CPPFLAGS='-m64 -fPIC'"
 fi
 
 #congigure
diff --git a/config_files/ftgl-2.1.2.sh b/config_files/ftgl-2.1.2.sh
index 7eea489..edecfb1 100755
--- a/config_files/ftgl-2.1.2.sh
+++ b/config_files/ftgl-2.1.2.sh
@@ -82,6 +82,13 @@ 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 "
+
+if test `uname -m` = "x86_64" ; then
+FTGL_CONFIGURE_OPTIONS="${FTGL_CONFIGURE_OPTIONS} --with-gl-lib=/usr/lib64 --with-glut-lib=/usr/lib64"
+else
+FTGL_CONFIGURE_OPTIONS="${FTGL_CONFIGURE_OPTIONS} --with-gl-lib=/usr/lib --with-glut-lib=/usr/lib64"
+fi
 
 #congigure
 check_job ${PRODUCT_DIR}/CONFIGURE.LOG ./configure ${FTGL_CONFIGURE_OPTIONS}