Eliminate dependency on libfreetype.so in legacy-friendly Xvnc build
git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4773 3789f03b-4d11-0410-bbf8-ca57d06f2519
diff --git a/unix/build-xorg b/unix/build-xorg
index 6aee9b7..2cbb9d3 100755
--- a/unix/build-xorg
+++ b/unix/build-xorg
@@ -123,6 +123,18 @@
# Build Xorg
echo "*** Building Xorg ***"
pushd xorg
+
+ # build freetype
+ echo "*** Building freetype ***"
+ pushd freetype-*
+ ./configure ${CFGHOST} --prefix=${PREFIX} --enable-static --disable-shared
+ if [ $? -ne 0 ]; then
+ echo "Failed to configure freetype."
+ exit
+ fi
+ $MAKE install
+ popd
+
for module in ${modules}; do
extraoptions=""
cd ${module}-*
@@ -138,6 +150,9 @@
if [ "${module}" = "pixman" ]; then
extraoptions="${extraoptions} --disable-gtk"
fi
+ if [ "${module}" = "libXfont"; then
+ extraoptions="${extraoptions} --with-freetype-config=${PREFIX}/bin/freetype-config"
+ fi
OLD_CFLAGS=${CFLAGS}
OLD_CXXFLAGS=${CXXFLAGS}
CFLAGS=${CFLAGS}' -fPIC'
@@ -170,17 +185,6 @@
$MAKE install
popd
- # build freetype
- echo "*** Building freetype ***"
- pushd freetype-*
- ./configure ${CFGHOST} --prefix=${PREFIX} --enable-static --disable-shared
- if [ $? -ne 0 ]; then
- echo "Failed to configure freetype."
- exit
- fi
- $MAKE install
- popd
-
popd
fi # XONLY