Enable Freetype Bitmap (Emoji) support from configure.ac

Checks freetype library version >= 17.1.11 (freetype version 2.5.2) to
enable bitmap support.

To check installed freetype library version use:
freetype-config --version

For freetype version use:
freetype-config --ftversion

Change-Id: If51a117991649e2d038c4fd965c10a859d76b6a8
Signed-off-by: Nick Holland<n.holland@partner.samsung.com>

diff --git a/build/tizen/adaptor/Makefile.am b/build/tizen/adaptor/Makefile.am
index c6c1ab44b4553758058ef2ceb2f9a2f2c6dfb2d9..8d8cffb7697f5b6d8108cf706a39b886acbaa649 100644 (file)
--- a/build/tizen/adaptor/Makefile.am
+++ b/build/tizen/adaptor/Makefile.am
@@ -315,8 +315,7 @@ libdali_adaptor_la_CXXFLAGS += \
                       $(DEVICED_CFLAGS) \
                       $(EFL_ASSIST_CFLAGS) \
                       $(NATIVE_BUFFER_CFLAGS) \
-                      $(NATIVE_BUFFER_POOL_CFLAGS) \
-                      -DFREETYPE_BITMAP_SUPPORT
+                      $(NATIVE_BUFFER_POOL_CFLAGS)
 
 libdali_adaptor_la_LIBADD += \
                       $(EFL_ASSIST_LIBS) \
@@ -327,13 +326,11 @@ endif
 if WEARABLE_PROFILE
 libdali_adaptor_la_CXXFLAGS += \
                       $(HAPTIC_CFLAGS) \
-                      $(EFL_ASSIST_CFLAGS) \
-                      -DFREETYPE_BITMAP_SUPPORT
+                      $(EFL_ASSIST_CFLAGS)
 endif
 
 if TV_PROFILE
-libdali_adaptor_la_CXXFLAGS += $(HAPTIC_CFLAGS) \
-                               -DFREETYPE_BITMAP_SUPPORT
+libdali_adaptor_la_CXXFLAGS += $(HAPTIC_CFLAGS)
 libdali_adaptor_la_LIBADD +=
 endif
 
@@ -348,10 +345,6 @@ else
 libdali_adaptor_la_LIBADD += -ljpeg
 endif
 
-if UBUNTU_PROFILE
-libdali_adaptor_la_CXXFLAGS += -DFREETYPE_BITMAP_SUPPORT
-endif
-
 tizenadaptorpublicapidir = $(devincludepath)/dali/public-api
 tizenadaptorpublicapi_HEADERS = $(public_api_header_files)
 

diff --git a/build/tizen/configure.ac b/build/tizen/configure.ac
index a42e237ee05fca4c6553a036740f02eb966cb2bb..d760e20c57ba91483eb4e90505ffc365c0899049 100644 (file)
--- a/build/tizen/configure.ac
+++ b/build/tizen/configure.ac
@@ -32,6 +32,8 @@ DALI_ADAPTOR_VERSION=dali_version
 AC_SUBST(DALI_ADAPTOR_VERSION)
 
 FREETYPE_REQUIRED=9.16.3
+# 17.1.11 = Freetype version 2.5.2
+FREETYPE_BITMAP_SUPPORT_VERSION=17.1.11
 
 PKG_CHECK_MODULES(DALICORE, dali-core)
 PKG_CHECK_MODULES(ELEMENTARY, elementary)
@@ -39,6 +41,7 @@ PKG_CHECK_MODULES(ECORE, ecore)
 PKG_CHECK_MODULES(ECORE_IPC, ecore-ipc)
 PKG_CHECK_MODULES(EXIF, libexif)
 PKG_CHECK_MODULES(FREETYPE, [freetype2 >= $FREETYPE_REQUIRED])
+PKG_CHECK_MODULES(FREETYPE_BITMAP_SUPPORT, [freetype2 >= $FREETYPE_BITMAP_SUPPORT_VERSION], [ freetype_bitmap_support=yes  ], [ freetype_bitmap_support=no ] )
 PKG_CHECK_MODULES(FONTCONFIG, fontconfig)
 PKG_CHECK_MODULES(PNG, libpng)
 PKG_CHECK_MODULES(XML, libxml-2.0)
@@ -51,6 +54,7 @@ PKG_CHECK_MODULES(TTRACE,  ttrace, AC_DEFINE(ENABLE_TTRACE, 1, [ttrace available
                   [ AC_MSG_NOTICE([Tizen Trace not avaiable]) ]
                   )
 
+
 # Check for availability of BulletPhysics
 PKG_CHECK_EXISTS(bullet, [
   BULLET_CFLAGS=`pkg-config --cflags bullet`
@@ -260,6 +264,10 @@ AC_CONFIG_FILES([
 ])
 fi
 
+if test "x$freetype_bitmap_support" = "xyes"; then
+DALI_ADAPTOR_CFLAGS="$DALI_ADAPTOR_CFLAGS -DFREETYPE_BITMAP_SUPPORT"
+fi
+
 AC_OUTPUT
 
 
@@ -271,6 +279,7 @@ Configuration
   Compile flags                     $DALI_ADAPTOR_CFLAGS
   Using Assimp Library:             $enable_assimp
   Using JPEG Turbo Library:         $with_jpeg_turbo
+  Freetype bitmap support (Emoji):  $freetype_bitmap_support
   Profile:                          $enable_profile
   Data Dir (Read/Write):            $dataReadWriteDir
   Data Dir (Read Only):             $dataReadOnlyDir