diff options
| author | Sam Varshavchik | 2020-10-26 13:59:01 -0400 |
|---|---|---|
| committer | Sam Varshavchik | 2020-10-26 13:59:01 -0400 |
| commit | 9db205e80a937095c2993022a81dd73c622ea2a4 (patch) | |
| tree | 71e28459bfa7eeff9f433f8528a4998b6a89ad42 | |
| parent | 2d11cfdf0232dd8154c00a8e9a987d27d2269b75 (diff) | |
| download | courier-libs-9db205e80a937095c2993022a81dd73c622ea2a4.tar.bz2 | |
Make it possible to bind to a specific courier-unicode version.
| -rw-r--r-- | unicode/configure.ac | 1 | ||||
| -rw-r--r-- | unicode/m4/courier-unicode.m4 | 23 |
2 files changed, 21 insertions, 3 deletions
diff --git a/unicode/configure.ac b/unicode/configure.ac index b074657..5c366de 100644 --- a/unicode/configure.ac +++ b/unicode/configure.ac @@ -22,6 +22,7 @@ AC_PROG_CC AC_PROG_CC_C99 AC_PROG_CXX AX_COURIER_UNICODE_CXXFLAGS + AC_SUBST(COURIER_UNICODE_CXXFLAGS) AC_PATH_PROGS(PERL, perl5 perl, perl, $LPATH) diff --git a/unicode/m4/courier-unicode.m4 b/unicode/m4/courier-unicode.m4 index 349206c..dadf321 100644 --- a/unicode/m4/courier-unicode.m4 +++ b/unicode/m4/courier-unicode.m4 @@ -55,19 +55,36 @@ AC_DEFUN([AX_COURIER_UNICODE_VERSION],[ AC_MSG_CHECKING(courier-unicode library and version) +v="$1" + +if test "$v" = "" +then + v=2.2 +fi + +set -- `echo "$v" | tr '.' ' '` + +v=$[]1 +r=$[]2 +p=$[]3 + +if test "$p" = "" + then p="0" +fi + AC_TRY_COMPILE([ #include <courier-unicode.h> #ifndef COURIER_UNICODE_VERSION #define COURIER_UNICODE_VERSION 0 #endif -#if COURIER_UNICODE_VERSION < 220 -#error "courier-unicode 2.2 library is required" +#if COURIER_UNICODE_VERSION < ]$v$r$p[ +#error "courier-unicode ]$1[ library is required" #endif ],[],[], AC_MSG_ERROR([ -ERROR: The Courier Unicode Library 2.2 header files appear not to be installed. +ERROR: The Courier Unicode Library ]$1[ header files appear not to be installed. You may need to upgrade the library or install a separate development subpackage in addition to the main package.]) ) |