diff options
| author | marha <marha@users.sourceforge.net> | 2012-08-28 14:07:02 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-09-04 14:23:04 +0200 |
| commit | 9dec848b23cf905ded387820f2893425cc00d545 (patch) | |
| tree | 4933836d801d8569a31cd5689e5f8eceeb4f78ff /fontconfig | |
| parent | 9891a8cd45663a5431bbae63ccc41c6570a60d5b (diff) | |
| download | vcxsrv-9dec848b23cf905ded387820f2893425cc00d545.tar.gz vcxsrv-9dec848b23cf905ded387820f2893425cc00d545.tar.bz2 vcxsrv-9dec848b23cf905ded387820f2893425cc00d545.zip | |
fontconfig mesa xserver git update 28 Aug 2012
Diffstat (limited to 'fontconfig')
| -rw-r--r-- | fontconfig/Makefile.am | 1 | ||||
| -rw-r--r-- | fontconfig/config-fixups.h | 4 | ||||
| -rw-r--r-- | fontconfig/configure.ac | 1 |
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 |