diff options
| author | Keith Packard <keithp@keithp.com> | 2014-01-27 14:11:09 -0800 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2014-01-27 14:11:09 -0800 |
| commit | 0fbb3d711efec5222a57b45a70d28fc98380f3a1 (patch) | |
| tree | 86dbf8bc68bd9471cd40e52589811e56ec595b80 /include | |
| parent | 7ddef4f7033c10b6e92866182d4475a4d49c5083 (diff) | |
| parent | b98e49379c8d7cecce991207048489f51b10028c (diff) | |
Merge remote-tracking branch 'anholt/glamor-reformat'
Conflicts:
Makefile.am
Conflict caused by adding PSEUDORAMIX and GLAMOR directory defines in
separate branches
Diffstat (limited to 'include')
| -rw-r--r-- | include/dix-config.h.in | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/dix-config.h.in b/include/dix-config.h.in index 30456cbae..ced3ba14a 100644 --- a/include/dix-config.h.in +++ b/include/dix-config.h.in @@ -478,4 +478,7 @@ /* Ask fontsproto to make font path element names const */ #define FONT_PATH_ELEMENT_NAME_CONST 1 +/* Build GLAMOR */ +#undef GLAMOR + #endif /* _DIX_CONFIG_H_ */ |