aboutsummaryrefslogtreecommitdiff
path: root/fontconfig
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2012-08-28 14:07:02 +0200
committermarha <marha@users.sourceforge.net>2012-08-28 14:07:02 +0200
commit05d67ae9117e5157fd1a5175dde6d7e48caf4653 (patch)
tree601c92c99a901b165664df7482c7baf538d4d7c5 /fontconfig
parentb3462c12542a69eeaa3fe90fddfbb15d30c18158 (diff)
downloadvcxsrv-05d67ae9117e5157fd1a5175dde6d7e48caf4653.tar.gz
vcxsrv-05d67ae9117e5157fd1a5175dde6d7e48caf4653.tar.bz2
vcxsrv-05d67ae9117e5157fd1a5175dde6d7e48caf4653.zip
fontconfig mesa xserver git update 28 Aug 2012
Diffstat (limited to 'fontconfig')
-rw-r--r--fontconfig/Makefile.am1
-rw-r--r--fontconfig/config-fixups.h4
-rw-r--r--fontconfig/configure.ac1
3 files changed, 2 insertions, 4 deletions
diff --git a/fontconfig/Makefile.am b/fontconfig/Makefile.am
index 4e664ffea..f4203d6a2 100644
--- a/fontconfig/Makefile.am
+++ b/fontconfig/Makefile.am
@@ -27,6 +27,7 @@ SUBDIRS=fontconfig fc-case fc-lang fc-glyphname src \
conf.d $(DOCSRC) test
AUTOMAKE_OPTIONS = dist-bzip2
+ACLOCAL_AMFLAGS = -I m4
EXTRA_DIST = \
fontconfig.pc.in \
diff --git a/fontconfig/config-fixups.h b/fontconfig/config-fixups.h
index 0e708462e..93ebf5bb3 100644
--- a/fontconfig/config-fixups.h
+++ b/fontconfig/config-fixups.h
@@ -20,8 +20,6 @@
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
-#ifndef _CONFIG_FIXUPS_H_
-#define _CONFIG_FIXUPS_H_
/* This header file is supposed to be included in config.h */
@@ -40,5 +38,3 @@
# define ALIGNOF_DOUBLE 4
# endif
#endif
-
-#endif /* _CONFIG_FIXUPS_H_ */
diff --git a/fontconfig/configure.ac b/fontconfig/configure.ac
index 4de2d089c..1270ba5bf 100644
--- a/fontconfig/configure.ac
+++ b/fontconfig/configure.ac
@@ -57,6 +57,7 @@ AC_SUBST(LIBT_CURRENT_MINUS_AGE)
dnl ==========================================================================
AC_CONFIG_HEADERS(config.h)
+AC_CONFIG_MACRO_DIR([m4])
AC_PROG_CC
AC_PROG_INSTALL