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 24c7ffe3813b56fcb9e49e6e4ea58c34401a31f8..707edb187351600265ec660b05904e36aa452d84 100755 (executable)
--- 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 7eea4892a4e69f92f7cd72220d803f6d5ca42b54..edecfb171de76b64668e5ffd39e263fca3055f83 100755 (executable)
--- 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}