X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=config_files%2Ffreetype-2.3.7.sh;h=9993c87e9aa7932113838c9174632e70666dead5;hb=260bf6b42efe9e30501c4e6e99b013da3fe34f77;hp=24c7ffe3813b56fcb9e49e6e4ea58c34401a31f8;hpb=1469c8b2cb6141448201bd744569a102ed80dd74;p=tools%2Finstall.git

diff --git a/config_files/freetype-2.3.7.sh b/config_files/freetype-2.3.7.sh
index 24c7ffe..9993c87 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=' -fPIC m64'"
+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}
 
@@ -115,6 +116,7 @@ check_jb tar xfz ${SOURCE_DIR}/${PRODUCT}.tar.gz -C ${PRODUCT_DIR}
 
 ### modifing la files
 cd ${PRODUCT_DIR}/lib
+sed -i "s%^libdir='\(.*\)'%libdir='${PRODUCT_DIR}/lib'%g;" libfreetype.la
 
 # to generate environment script for sources
 try_preinstalled