Merge remote-tracking branch 'origin/released'

* origin/released:
  git update fontconfig mesa libXau pixman xkeyboard-config 30 Sep 2013

8 files changed, 5 insertions, 24 deletions

diff --git a/fontconfig/Makefile.am b/fontconfig/Makefile.am
index d310b4b62..2b949e439 100644
--- a/fontconfig/Makefile.am
+++ b/fontconfig/Makefile.am
@@ -90,12 +90,14 @@ $(srcdir)/ChangeLog:
 
 .PHONY: ChangeLog
 
+FC_CONFIGDIR = $(subst $(BASECONFIGDIR)/,,$(CONFIGDIR))
+
 fonts.conf: fonts.conf.in Makefile
 	sed \
 		-e 's,@FC_CACHEDIR\@,$(FC_CACHEDIR),g' \
 		-e 's,@FC_DEFAULT_FONTS\@,$(FC_DEFAULT_FONTS),g' \
 		-e 's,@FC_FONTPATH\@,$(FC_FONTPATH),g' \
-		-e 's,@CONFIGDIR\@,$(CONFIGDIR),g' \
+		-e 's,@CONFIGDIR\@,$(FC_CONFIGDIR),g' \
 		-e 's,@PACKAGE\@,$(PACKAGE),g' \
 		-e 's,@VERSION\@,$(VERSION),g' \
 		$(srcdir)/$@.in > $@.tmp && \
diff --git a/fontconfig/conf.d/Makefile.am b/fontconfig/conf.d/Makefile.am
index e1fab5061..d61756b81 100644
--- a/fontconfig/conf.d/Makefile.am
+++ b/fontconfig/conf.d/Makefile.am
@@ -45,7 +45,7 @@ CONF_LINKS = \
 EXTRA_DIST = $(template_DATA) $(DOC_SOURCES)
 CLEANFILES = $(DOC_FILES)
 
-configdir=$(CONFIGDIR)
+configdir = $(CONFIGDIR)
 config_DATA = $(DOC_FILES)
 
 templatedir = $(TEMPLATEDIR)
diff --git a/fontconfig/configure.ac b/fontconfig/configure.ac
index 952e73766..4b631bd53 100644
--- a/fontconfig/configure.ac
+++ b/fontconfig/configure.ac
@@ -588,7 +588,7 @@ no|yes)
 esac
 case "$configdir" in
 no|yes)
-	configdir='${baseconfigdir}'/conf.d
+	configdir='${BASECONFIGDIR}'/conf.d
 	;;
 *)
 	;;
@@ -605,13 +605,9 @@ TEMPLATEDIR=${templatedir}
 BASECONFIGDIR=${baseconfigdir}
 CONFIGDIR=${configdir}
 XMLDIR=${xmldir}
-AC_SUBST(templatedir)
 AC_SUBST(TEMPLATEDIR)
-AC_SUBST(baseconfigdir)
 AC_SUBST(BASECONFIGDIR)
-AC_SUBST(configdir)
 AC_SUBST(CONFIGDIR)
-AC_SUBST(xmldir)
 AC_SUBST(XMLDIR)
 
 
diff --git a/fontconfig/src/fcarch.c b/fontconfig/src/fcarch.c
index 21516ff05..398f4bbfc 100644
--- a/fontconfig/src/fcarch.c
+++ b/fontconfig/src/fcarch.c
@@ -23,10 +23,6 @@
 
 #include <stdio.h>
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include "fcint.h"
 #include "fcarch.h"
 
diff --git a/fontconfig/src/fccache.c b/fontconfig/src/fccache.c
index e02d49e8f..3568595ed 100644
--- a/fontconfig/src/fccache.c
+++ b/fontconfig/src/fccache.c
@@ -20,9 +20,6 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
 #include "fcint.h"
 #include "fcarch.h"
 #include <stdio.h>
diff --git a/fontconfig/src/fccompat.c b/fontconfig/src/fccompat.c
index ce4af5d0d..b685fade3 100644
--- a/fontconfig/src/fccompat.c
+++ b/fontconfig/src/fccompat.c
@@ -25,10 +25,6 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #include "fcint.h"
 
 #include <errno.h>
diff --git a/fontconfig/src/fchash.c b/fontconfig/src/fchash.c
index 7216beead..38300028c 100644
--- a/fontconfig/src/fchash.c
+++ b/fontconfig/src/fchash.c
@@ -23,9 +23,6 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
 #include "fcint.h"
 #include <stdio.h>
 #include <string.h>
diff --git a/fontconfig/src/fcstat.c b/fontconfig/src/fcstat.c
index 0263a0082..1f37cacf8 100644
--- a/fontconfig/src/fcstat.c
+++ b/fontconfig/src/fcstat.c
@@ -20,9 +20,6 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
 #include "fcint.h"
 #include "fcarch.h"
 #include <dirent.h>