Alexandre Julliard : makefiles: Don' t create font symlinks when fonts are disabled.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 0ef63e16d6d5ae3a006ee7e4375d75067ba6dbb6
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=0ef63e16d6d5ae3a006ee7e4375d75067ba6dbb6

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Sat Mar 27 11:44:13 2010 +0100

makefiles: Don't create font symlinks when fonts are disabled.

---

 aclocal.m4   |    8 +++++---
 configure    |    8 ++++++++
 configure.ac |    8 ++++----
 3 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/aclocal.m4 b/aclocal.m4
index 3a7765f..cc1d083 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -407,11 +407,13 @@ AC_DEFUN([WINE_CONFIG_EXTRA_DIR],
 
 dnl **** Create symlinks from config.status ****
 dnl
-dnl Usage: WINE_CONFIG_SYMLINK(name,target)
+dnl Usage: WINE_CONFIG_SYMLINK(name,target,enable)
 dnl
 AC_DEFUN([WINE_CONFIG_SYMLINK],[AC_REQUIRE([WINE_CONFIG_HELPERS])dnl
-AC_CONFIG_LINKS([$1:]m4_default([$2],[$1]))dnl
-m4_if([$2],,[test "$srcdir" = "." || ])wine_fn_config_symlink $1])
+m4_ifval([$3],[if test "x$[$3]" != xno; then
+])AC_CONFIG_LINKS([$1:]m4_default([$2],[$1]))dnl
+m4_if([$2],,[test "$srcdir" = "." || ])wine_fn_config_symlink $1[]m4_ifval([$3],[
+fi])])
 
 dnl **** Create a make rules file from config.status ****
 dnl
diff --git a/configure b/configure
index 3186e81..b02fe65 100755
--- a/configure
+++ b/configure
@@ -14107,14 +14107,22 @@ distclean::
 }
 ac_config_links="$ac_config_links dlls/wineps.drv/generic.ppd:dlls/wineps.drv/generic.ppd"
 test "$srcdir" = "." || wine_fn_config_symlink dlls/wineps.drv/generic.ppd
+if test "x$enable_fonts" != xno; then
 ac_config_links="$ac_config_links fonts/marlett.ttf:fonts/marlett.ttf"
 test "$srcdir" = "." || wine_fn_config_symlink fonts/marlett.ttf
+fi
+if test "x$enable_fonts" != xno; then
 ac_config_links="$ac_config_links fonts/symbol.ttf:fonts/symbol.ttf"
 test "$srcdir" = "." || wine_fn_config_symlink fonts/symbol.ttf
+fi
+if test "x$enable_fonts" != xno; then
 ac_config_links="$ac_config_links fonts/tahoma.ttf:fonts/tahoma.ttf"
 test "$srcdir" = "." || wine_fn_config_symlink fonts/tahoma.ttf
+fi
+if test "x$enable_fonts" != xno; then
 ac_config_links="$ac_config_links fonts/tahomabd.ttf:fonts/tahomabd.ttf"
 test "$srcdir" = "." || wine_fn_config_symlink fonts/tahomabd.ttf
+fi
 ac_config_links="$ac_config_links wine:tools/winewrapper"
 wine_fn_config_symlink wine
 
diff --git a/configure.ac b/configure.ac
index fc05f10..25a1313 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2134,10 +2134,10 @@ AH_TOP([#define __WINE_CONFIG_H])
 AC_CONFIG_COMMANDS([include/stamp-h], [echo timestamp > include/stamp-h])
 
 WINE_CONFIG_SYMLINK(dlls/wineps.drv/generic.ppd)
-WINE_CONFIG_SYMLINK(fonts/marlett.ttf)
-WINE_CONFIG_SYMLINK(fonts/symbol.ttf)
-WINE_CONFIG_SYMLINK(fonts/tahoma.ttf)
-WINE_CONFIG_SYMLINK(fonts/tahomabd.ttf)
+WINE_CONFIG_SYMLINK(fonts/marlett.ttf,,enable_fonts)
+WINE_CONFIG_SYMLINK(fonts/symbol.ttf,,enable_fonts)
+WINE_CONFIG_SYMLINK(fonts/tahoma.ttf,,enable_fonts)
+WINE_CONFIG_SYMLINK(fonts/tahomabd.ttf,,enable_fonts)
 WINE_CONFIG_SYMLINK(wine,tools/winewrapper)
 
 WINE_CONFIG_EXTRA_DIR(dlls/gdi32/enhmfdrv)