Build improvements #203

Merged
merged 2 commits into from Aug 14, 2012

Projects

None yet

2 participants

@lpinca
Contributor
lpinca commented Aug 14, 2012

Fix incompatible grep usage that was breaking building on OS X.
Check whether GIF_LIB_VERSION is defined, otherwise use the new macros.

lpinca added some commits Aug 14, 2012
@lpinca lpinca Fix auto-detection of optional libraries for OS X
The OS X version of grep doesn't support -P (--perl-regexp). It was breaking the building.
Solved by slightly changing the RegExp and using -E (--extended-regexp).
19bcf35
@lpinca lpinca Fix cases where GIF_LIB_VERSION is not defined
Versions up to 4.1.6 of GIFLIB defined a GIF_LIB_VERSION macro that was string-valued.
Versions after 4.1.6 define integer-valued GIFLIB_MAJOR, GIFLIB_MINOR, and GIFLIB_RELEASE macros for the three components of the version.

Check for GIF_LIB_VERSION, otherwise use the new macros.
25234db
@tj tj merged commit c546847 into Automattic:master Aug 14, 2012
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment