[Fontconfig] fontconfig: Branch 'master' - 2 commits

[Behdad Esfahbod]

 autogen.sh       |    4 ++--
 test/Makefile.am |    2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 0831c1770e4bac7269a190936bbb0529d747e233
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Thu Jan 10 09:01:52 2013 -0600

    Ensure we find the uninstalled fontconfig header
    
    Patch from Colin Walters.

diff --git a/test/Makefile.am b/test/Makefile.am
index 3ba8e93..664138a 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -4,6 +4,8 @@ TESTS=run-test.sh
 
 TESTDATA=4x6.pcf 8x16.pcf out.expected fonts.conf.in
 
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir)
+
 if HAVE_PTHREAD
 check_PROGRAMS = test-pthread
 noinst_PROGRAMS = $(check_PROGRAMS)
commit 1527c395cbe0bbab9e66a42213ef3ac5ce1c0383
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Thu Jan 10 09:00:18 2013 -0600

    Resepct $NOCONFIGURE
    
    Patch from Colin Walters.

diff --git a/autogen.sh b/autogen.sh
index 93855cb..1482e40 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -86,7 +86,7 @@ test $TEST_TYPE $FILE || {
 	exit 1
 }
 
-if test -z "$AUTOGEN_SUBDIR_MODE"; then
+if test -z "$AUTOGEN_SUBDIR_MODE" -a -z "$NOCONFIGURE"; then
         if test -z "$*"; then
                 echo "I am going to run ./configure with no arguments - if you wish "
                 echo "to pass any to it, please specify them on the $0 command line."
@@ -115,7 +115,7 @@ echo Running $AUTOCONF
 $AUTOCONF
 cd $ORIGDIR
 
-if test -z "$AUTOGEN_SUBDIR_MODE"; then
+if test -z "$AUTOGEN_SUBDIR_MODE" -a -z "$NOCONFIGURE"; then
 	echo Running $srcdir/configure "$@"
         $srcdir/configure "$@"