Use gedcom_check_version when available.

diff --git a/m4/gedcom.m4 b/m4/gedcom.m4
index d2335731b674b0ba4bdd9202bf251459b516eac6..9c88ecf6101e67b047c2eabcb0e31333f83ad38e 100644 (file)
--- a/m4/gedcom.m4
+++ b/m4/gedcom.m4
@@ -4,24 +4,34 @@ dnl
 dnl $Id$
 dnl $Name$
 
-dnl AM_LIB_GEDCOM_PARSER([MINIMUM-MAJOR-VERSION, [MINIMUM-MINOR-VERSION]])
+dnl AM_LIB_GEDCOM_PARSER([MINIMUM-MAJOR-VERSION, [MINIMUM-MINOR-VERSION,
+dnl                      [MINIMUM-PATCH]]])
 dnl Test for the availability of the Gedcom parser library, and check whether
 dnl the required minimum version is available (parameters default to 0 if
-dnl not given
+dnl not given)
 AC_DEFUN(AM_LIB_GEDCOM_PARSER, [
   AC_CHECK_LIB(gedcom, gedcom_parse_file,,
      AC_MSG_ERROR([Cannot find libgedcom: Please install gedcom-parse]))
   major_version=ifelse([$1], ,0,$1)
   minor_version=ifelse([$2], ,0,$2)
-  AC_MSG_CHECKING(for libgedcom version >= $major_version.$minor_version)
+  patch_version=ifelse([$3], ,0,$3)
+  if test "$patch_version" = '0'; then
+    AC_MSG_CHECKING(for libgedcom version >= $major_version.$minor_version)
+  else
+    AC_MSG_CHECKING(for libgedcom version >= $major_version.$minor_version.$patch_version)
+  fi
   AC_TRY_RUN([
-#include <stdio.h>
 #include <stdlib.h>
 #include <gedcom.h>
 int
 main()
 {
+#ifdef GEDCOM_PARSE_VERSION_PATCH
+if (gedcom_check_version($major_version, $minor_version, $patch_version))
+  exit(0);
+#else
 if (GEDCOM_PARSE_VERSION >= $major_version * 1000 + $minor_version) exit(0);
+#endif
 exit(1);
 }],
 ac_gedcom_version_ok='yes',
@@ -31,6 +41,10 @@ if test "$ac_gedcom_version_ok" = 'yes' ; then
   AC_MSG_RESULT(ok)
 else
   AC_MSG_RESULT(not ok)
-  AC_MSG_ERROR(You need at least version $major_version.$minor_version of gedcom-parse)
+  if test "$patch_version" = '0'; then
+    AC_MSG_ERROR(You need at least version $major_version.$minor_version of gedcom-parse)
+  else
+    AC_MSG_ERROR(You need at least version $major_version.$minor_version.$patch_version of gedcom-parse)
+  fi
 fi
 ])