[cantarell-fonts] Make directories for fonts and fontconfig files configurable.

[Jakub Steiner <jimmac src gnome org>]

commit 047d1f3d185a72073d630ab5a37e8662ebe176a3
Author: Fabian Greffrath <fabian greffrath com>
Date:   Fri Sep 14 09:42:25 2012 +0200

    Make directories for fonts and fontconfig files configurable.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=644187

 configure.ac           |   34 ++++++++++++++++++++++++++++++++++
 fontconfig/Makefile.am |    2 +-
 otf/Makefile.am        |    2 +-
 3 files changed, 36 insertions(+), 2 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 823e93b..fe2e595 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12,6 +12,40 @@ AC_PROG_SED
 # Workaround to make aclocal get the right flags
 AC_SUBST(ACLOCAL_AMFLAGS, "\${ACLOCAL_FLAGS}")
 
+AC_ARG_WITH([configdir],
+            [AC_HELP_STRING([--with-configdir=DIR],
+            [Use DIR to store fontconfig configuration files [default=DATADIR/fontconfig/conf.avail]])],
+            [configdir="$withval"],
+            [configdir=yes])
+
+case "$configdir" in
+no|yes)
+    configdir='${datadir}'/fontconfig/conf.avail
+    ;;
+*)
+    ;;
+esac
+
+CONFIGDIR=${configdir}
+AC_SUBST(CONFIGDIR)
+
+AC_ARG_WITH([fontdir],
+            [AC_HELP_STRING([--with-fontdir=DIR],
+            [Use DIR to store font files [default=DATADIR/fonts/cantarell]])],
+            [fontdir="$withval"],
+            [fontdir=yes])
+
+case "$fontdir" in
+no|yes)
+    fontdir='${datadir}'/fonts/cantarell
+    ;;
+*)
+    ;;
+esac
+
+FONTDIR=${fontdir}
+AC_SUBST(FONTDIR)
+
 AC_CONFIG_FILES([
 Makefile
 fontconfig/Makefile
diff --git a/fontconfig/Makefile.am b/fontconfig/Makefile.am
index a6fb360..e6ad554 100644
--- a/fontconfig/Makefile.am
+++ b/fontconfig/Makefile.am
@@ -1,4 +1,4 @@
-configdir = $(datadir)/fontconfig/conf.avail/
+configdir = $(CONFIGDIR)
 config_DATA = \
 	31-cantarell.conf
 
diff --git a/otf/Makefile.am b/otf/Makefile.am
index 1e9b7f3..1d11665 100644
--- a/otf/Makefile.am
+++ b/otf/Makefile.am
@@ -1,5 +1,5 @@
 
-fontdir = $(datadir)/fonts/cantarell
+fontdir = $(FONTDIR)
 font_DATA = \
 	Cantarell-Regular.otf		\
 	Cantarell-Bold.otf