summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNorbert Thiebaud <nthiebaud@gmail.com>2012-04-02 00:10:17 -0500
committerNorbert Thiebaud <nthiebaud@gmail.com>2012-04-02 00:10:17 -0500
commit1f4a9f88d9031b520a034f19c20605a7a647dab7 (patch)
tree83019f76a7d32f6142d91d673e7239dbae2b87b5
parent2dd69264eafe50592602a24d8391a0fb15f77db7 (diff)
add a configure flag to enable CoreText Support
-rw-r--r--config_host.mk.in3
-rw-r--r--configure.in20
2 files changed, 22 insertions, 1 deletions
diff --git a/config_host.mk.in b/config_host.mk.in
index 2839b5c83eed..822ec983e0ec 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -101,6 +101,7 @@ export ENABLE_EVOAB2=@ENABLE_EVOAB2@
export ENABLE_GCONF=@ENABLE_GCONF@
export ENABLE_GIO=@ENABLE_GIO@
export ENABLE_GNOMEVFS=@ENABLE_GNOMEVFS@
+export ENABLE_CORETEXT?=@ENABLE_CORETEXT@
export ENABLE_GRAPHITE=@ENABLE_GRAPHITE@
export ENABLE_GSTREAMER=@ENABLE_GSTREAMER@
export ENABLE_GTK3=@ENABLE_GTK3@
@@ -152,7 +153,7 @@ export GIO_LIBS=@GIO_LIBS@
export GIT_LINK_SRC=@GIT_LINK_SRC@
export GIT_REPO_NAMES=@GIT_REPO_NAMES@
export GMAKE_MODULE_PARALLELISM=@GMAKE_MODULE_PARALLELISM@
-export GMAKE_PARALLELISM=@GMAKE_PARALLELISM@
+export GMAKE_PARALLELISM?=@GMAKE_PARALLELISM@
export GNOMEVFS_CFLAGS=@GNOMEVFS_CFLAGS@
export GNOMEVFS_LIBS=@GNOMEVFS_LIBS@
@x_GNUCP@ export GNUCOPY=@GNUCP@
diff --git a/configure.in b/configure.in
index 33109cac11ff..b66521c60bc5 100644
--- a/configure.in
+++ b/configure.in
@@ -905,6 +905,11 @@ AC_ARG_ENABLE(postgresql-sdbc,
[Disable the build of the PostgreSQL-SDBC driver.])
)
+AC_ARG_ENABLE(coretext,
+ AS_HELP_STRING([--enable-coretext],
+ [Whether to use CoreText framwork on Mac (instead of ATSU).]),
+)
+
dnl ===================================================================
dnl Optional Packages (--with/without-)
dnl ===================================================================
@@ -9237,6 +9242,21 @@ else
fi
AC_SUBST(WITH_HELPPACK_INTEGRATION)
+dnl ===================================================================
+dnl Test whether to use CoreText framework
+dnl ===================================================================
+ENABLE_CORETEXT=NO
+if test "$_os" = "Darwin"; then
+ AC_MSG_CHECKING([whether to build the MySQL Connector extension])
+ if test "$enable_coretext" = "yes"; then
+ AC_MSG_RESULT([yes])
+ ENABLE_CORETEXT=YES
+ else
+ AC_MSG_RESULT([no])
+ fi
+fi
+AC_SUBST(ENABLE_CORETEXT)
+
###############################################################################
# Extensions checking
###############################################################################