diff options
| author | Bastien Roucariès <bastien.roucaries+debian@gmail.com> | 2018-03-09 11:42:21 +0100 |
|---|---|---|
| committer | Bastien Roucariès <bastien.roucaries+debian@gmail.com> | 2018-03-09 11:42:21 +0100 |
| commit | 7ce1b4a6fbd4eb283fbd0abf9ccca05f05d1fccb (patch) | |
| tree | 16b0309362d515464ce16b18f19a9c3fb70d38ac /m4/ax_compiler_version.m4 | |
| parent | ef68f5d7665249f7afc5a620f3dd9fe6ddb77a69 (diff) | |
| download | autoconf-archive-7ce1b4a6fbd4eb283fbd0abf9ccca05f05d1fccb.tar.gz | |
Fix version extraction with old sdcc
Diffstat (limited to 'm4/ax_compiler_version.m4')
| -rw-r--r-- | m4/ax_compiler_version.m4 | 27 |
1 files changed, 24 insertions, 3 deletions
diff --git a/m4/ax_compiler_version.m4 b/m4/ax_compiler_version.m4 index 9dd32d3..23c5533 100644 --- a/m4/ax_compiler_version.m4 +++ b/m4/ax_compiler_version.m4 @@ -464,13 +464,34 @@ AC_DEFUN([_AX_COMPILER_VERSION_TCC],[ # for GNU AC_DEFUN([_AX_COMPILER_VERSION_SDCC],[ AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_major, - __SDCC_VERSION_MAJOR,, + /* avoid parse error with comments */ + #if(defined(__SDCC_VERSION_MAJOR)) + __SDCC_VERSION_MAJOR + #else + SDCC/100 + #endif + ,, AC_MSG_FAILURE([[[$0]] unknown sdcc major])) AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor, - __SDCC_VERSION_MINOR,, + /* avoid parse error with comments */ + #if(defined(__SDCC_VERSION_MINOR)) + __SDCC_VERSION_MINOR + #else + (SDCC%100)/10 + #endif + ,, AC_MSG_FAILURE([[[$0]] unknown sdcc minor])) AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch, - [__SDCC_VERSION_PATCH],, + [ + /* avoid parse error with comments */ + #if(defined(__SDCC_VERSION_PATCH)) + __SDCC_VERSION_PATCH + #elsif(defined(_SDCC_VERSION_PATCHLEVEL)) + __SDCC_VERSION_PATCHLEVEL + #else + SDCC%10 + #endif + ],, AC_MSG_FAILURE([[[$0]] unknown sdcc patch level])) ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch" ]) |