[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 12/21] Minor re-ordering of configure.ac
From: |
John Darrington |
Subject: |
[PATCH 12/21] Minor re-ordering of configure.ac |
Date: |
Sun, 12 Jan 2014 12:00:25 +0100 |
* configure.ac: Move the test for enable_freetype closer to where
it is used.
---
configure.ac | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/configure.ac b/configure.ac
index 1a98f07..e22b86a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -518,14 +518,6 @@ AC_SUBST(HAVE_DBUS)
AC_CHECK_LIB(dl, dlopen)
-AC_ARG_ENABLE([freetype], AC_HELP_STRING([--disable-freetype],
- [Disable freetype for font rasterization]))
-FT_BRIDGE=0
-SHARE_FT=0
-FTSRCDIR=
-FT_CFLAGS=
-FT_LIBS=
-
dnl UFST detection
AC_ARG_WITH([ufst], AC_HELP_STRING([--with-ufst=UFST_ROOT_DIR],
[Use UFST]),
@@ -545,6 +537,15 @@ AC_SUBST(UFST_ROOT)
AC_SUBST(UFST_CFLAGS)
AC_SUBST(UFST_LIB_EXT)
+
+AC_ARG_ENABLE([freetype], AC_HELP_STRING([--disable-freetype],
+ [Disable freetype for font rasterization]))
+FT_BRIDGE=0
+SHARE_FT=0
+FTSRCDIR=
+FT_CFLAGS=
+FT_LIBS=
+
if test x"$enable_freetype" != xno; then
AC_MSG_CHECKING([for local freetype library source])
dnl We prefer freetype2 over freetype, so it is easy to override
--
1.7.10.4
- [PATCH 04/21] Fix crash on startup if the configuration file is missing., (continued)
- [PATCH 04/21] Fix crash on startup if the configuration file is missing., John Darrington, 2014/01/12
- [PATCH 13/21] Improve reliability of freetype library (esp. wrt cross-building), John Darrington, 2014/01/12
- [PATCH 05/21] base/lib.mak: Fix broken build dependency, John Darrington, 2014/01/12
- [PATCH 10/21] Fix test for dbus when cross building, John Darrington, 2014/01/12
- [PATCH 11/21] Fix incorrect determination of host/build OS, John Darrington, 2014/01/12
- [PATCH 17/21] Avoid redundancy in package version number/string, John Darrington, 2014/01/12
- [PATCH 16/21] Remove the code running ./configure from autogen.sh - I am of the opinion, that the bootstrap process and the configuration should be kept seperate. It should be possible to bootstrap without configuring., John Darrington, 2014/01/12
- [PATCH 20/21] Remove 'exe' suffix from GS variable., John Darrington, 2014/01/12
- [PATCH 21/21] Do install contrib drivers if the --disable-contrib option was chosen., John Darrington, 2014/01/12
- [PATCH 14/21] Remove broken test for OpenJpeg library., John Darrington, 2014/01/12
- [PATCH 12/21] Minor re-ordering of configure.ac,
John Darrington <=
- [PATCH 03/21] doc/gs-vms.htp: Gnu policy is not to acknowledge trademarks., John Darrington, 2014/01/12
- [PATCH 15/21] Correct bad directories for ROMFS_OBJS, John Darrington, 2014/01/12
- [PATCH 18/21] Remove hard coded variables for tools (eg: SHELL)., John Darrington, 2014/01/12
- [PATCH 19/21] Remove duplicate assignment to EXTRALIBS, John Darrington, 2014/01/12