Re: [ft-devel] last fixes for forthcoming release

[mpsuzuki]

Hi,

On Mon, 27 Feb 2006 22:57:13 +0100 (CET)
Werner LEMBERG <address@hidden> wrote:
>> The interface functions in ftgxval and ftotval return errors safely,
>> when libfreetype is built without gxvalid and otvalid. So, I think,
>> ftgxval/ftotval should be enabled always, [...]
>
>I agree.  Please change this.

Thank you, I changed ftgxval.c in modules.cfg by default.

>> But, now I found that modules.cfg disables ftgxval.
>> ft2demos/Makefile should be capable for such cases?
>
>Maybe, but I think it's not an urgent problem.

Following is my idea:

1. ft2demos/Makefile includes modules.cfg to check
   whether ftgxval.c and ftotval.c are built /or not.

2. Rule to build ftvalid is quoted by conditionals.

Index: Makefile
===================================================================
RCS file: /cvsroot/freetype/ft2demos/Makefile,v
retrieving revision 1.33
diff -u -r1.33 Makefile
--- Makefile    1 Feb 2006 21:17:54 -0000       1.33
+++ Makefile    28 Feb 2006 01:27:48 -0000
@@ -36,6 +36,20 @@
 endif
 
 
+######################################################################
+#
+# MODULES_CFG points to the current `modules.cfg' to use.  It is defined
+# by default as $(TOP_DIR)/modules.cfg.
+#
+ifndef MODULES_CFG
+  MODULES_CFG := $(TOP_DIR)/modules.cfg
+endif
+
+ifeq ($(wildcard $(MODULES_CFG)),)
+  no_modules_cfg := 1
+endif
+
+
 ####################################################################
 #
 # Check that we have a working `config.mk' in the above directory.
@@ -62,6 +76,10 @@
   #
   include $(CONFIG_MK)
 
+  ifndef no_modules_cfg
+    include $(MODULES_CFG)
+  endif
+
   have_makefile := $(strip $(wildcard Makefile))
 
   ifeq ($(PLATFORM),unix)
@@ -229,11 +247,20 @@
   #
   # The list of demonstration programs to build.
   #
-  EXES := ftlint ftmemchk ftdump testname fttimer ftbench ftchkwd ftvalid
+  EXES := ftlint ftmemchk ftdump testname fttimer ftbench ftchkwd
 
   # Comment out the next line if you don't have a graphics subsystem.
   EXES += ftview ftmulti ftstring ftgamma
 
+  # ftvalid requires ftgxval.c and ftotval.c
+  #
+  ifneq ($(findstring ftgxval.c,$(BASE_EXTENSIONS)),)
+    ifneq ($(findstring ftotval.c,$(BASE_EXTENSIONS)),)
+      EXES += ftvalid
+    endif
+  endif
+
+
   # Only uncomment the following lines if the truetype driver was
   # compiled with TT_CONFIG_OPTION_BYTECODE_INTERPRETER defined.
   #