diff options
| author | DRC <dcommander@users.sourceforge.net> | 2011-11-07 22:57:47 +0000 |
|---|---|---|
| committer | DRC <dcommander@users.sourceforge.net> | 2011-11-07 22:57:47 +0000 |
| commit | c6c436e9faaca220a0b58027badf08a0907e3589 (patch) | |
| tree | 05e8a833452b970247c69fc68e189fa22f823942 | |
| parent | 3aefcbea3306388f914ede67ad15247ddcc5570c (diff) | |
| download | tigervnc-c6c436e9faaca220a0b58027badf08a0907e3589.tar.gz tigervnc-c6c436e9faaca220a0b58027badf08a0907e3589.zip | |
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
| -rwxr-xr-x | unix/build-xorg | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/unix/build-xorg b/unix/build-xorg index 6aee9b71..2cbb9d3a 100755 --- a/unix/build-xorg +++ b/unix/build-xorg @@ -123,6 +123,18 @@ build () # 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 @@ build () 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 @@ build () $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 |