diff options
Diffstat (limited to '02-configure.ac.patch')
-rw-r--r-- | 02-configure.ac.patch | 53 |
1 files changed, 0 insertions, 53 deletions
diff --git a/02-configure.ac.patch b/02-configure.ac.patch deleted file mode 100644 index d7f78c9cda2c..000000000000 --- a/02-configure.ac.patch +++ /dev/null @@ -1,53 +0,0 @@ ---- a/configure.ac 2015-03-18 21:12:24.000000000 +0100 -+++ b/configure.ac 2015-03-18 21:35:29.224165540 +0100 -@@ -520,9 +520,14 @@ AC_SUBST(FC_FONTDATE) - - AC_ARG_WITH(templatedir, - [AC_HELP_STRING([--with-templatedir=DIR], -- [Use DIR to store the configuration template files [default=DATADIR/fontconfig/conf.avail]])], -+ [Use DIR to store the generic configuration template files [default=DATADIR/fontconfig/conf.avail]])], - [templatedir="$withval"], - [templatedir=yes]) -+AC_ARG_WITH(templateinfdir, -+ [AC_HELP_STRING([--with-templateinfdir=DIR], -+ [Use DIR to store the Infinality compliant configuration template files [default=DATADIR/fontconfig/conf.avail.infinality]])], -+ [templateinfdir="$withval"], -+ [templateinfdir=yes]) - AC_ARG_WITH(baseconfigdir, - [AC_HELP_STRING([--with-baseconfigdir=DIR], - [Use DIR to store the base configuration files [default=SYSCONFDIR/fonts]])], -@@ -546,6 +551,13 @@ no|yes) - *) - ;; - esac -+case "$templateinfdir" in -+no|yes) -+ templateinfdir='${datadir}'/fontconfig/conf.avail.infinality -+ ;; -+*) -+ ;; -+esac - case "$baseconfigdir" in - no|yes) - baseconfigdir='${sysconfdir}'/fonts -@@ -569,10 +581,12 @@ no|yes) - esac - - TEMPLATEDIR=${templatedir} -+TEMPLATEINFDIR=${templateinfdir} - BASECONFIGDIR=${baseconfigdir} - CONFIGDIR=${configdir} - XMLDIR=${xmldir} - AC_SUBST(TEMPLATEDIR) -+AC_SUBST(TEMPLATEINFDIR) - AC_SUBST(BASECONFIGDIR) - AC_SUBST(CONFIGDIR) - AC_SUBST(XMLDIR) -@@ -702,6 +716,7 @@ fc-blanks/Makefile - fc-case/Makefile - src/Makefile - conf.d/Makefile -+conf.d.infinality/Makefile - fc-cache/Makefile - fc-cat/Makefile - fc-list/Makefile |