* src/base/ftbase.c: <ftmac.c> is replaced by "ftmac.c"

ChangeLog

@@ -1,3 +1,13 @@
+2008-02-14  suzuki toshiya  <mpsuzuki@hiroshima-u.ac.jp>
+
+	* src/base/ftbase.c: <ftmac.c> is replaced by "ftmac.c" as other
+	inclusion styles. Now it always includes src/base/ftmac.c,
+	builds/mac/ftmac.c is never included in any configuration.
+	* builds/unix/configure.raw: Prints warning when configure is
+	executed with options to specify Carbon functionalities explicitly.
+	* docs/INSTALL.MAC: Note the legacy builds/mac/ftmac.c is not 
+	included automatically and manual replacement is required.
+
 2008-02-11  Werner Lemberg  <wl@gnu.org>
 
 	* builds/modules.mk (CLOSE_MODULE, REMOVE_MODULE), builds/detect.mk

builds/unix/configure.raw

@@ -484,7 +484,7 @@ case "$CFLAGS" in
     AC_MSG_WARN([
 *** WARNING
     FSSpec/FSRef/QuickDraw/ATS options are explicitly given,
-    thus using legacy builds/mac/ftmac.c instead of src/base/ftmac.c.
+    thus it is recommended to replace src/base/ftmac.c by builds/mac/ftmac.c.
     ])
     CFLAGS="$CFLAGS "'-I$(TOP_DIR)/builds/mac/'
     ;;

docs/INSTALL.MAC

@@ -1,6 +1,12 @@
 Please follow the instructions  in INSTALL.UNIX to install FreeType on
 Mac OS X.
 
+Currently FreeType2 functions based on some deprecated Carbon APIs
+return FT_Err_Unimplemented_Feature always, even if FreeType2 is
+configured and built on the system that deprecated Carbon APIs are
+available. To enable deprecated FreeType2 functions as far as possible,
+replace src/base/ftmac.c by builds/mac/ftmac.c.
+
 Starting with Mac OS X 10.5, gcc defaults the deployment target
 to 10.5. In previous versions of Mac OS X, this defaulted to 10.1.
 If you want your built binaries to run only on 10.5, this change

src/base/ftbase.c

@@ -32,7 +32,7 @@
 #include "ftutil.c"
 
 #if defined( __APPLE__ ) && !defined ( DARWIN_NO_CARBON )
-#include <ftmac.c>
+#include "ftmac.c"
 #endif
 
 /* END */