--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-06-25  Simon Josefsson  <jas@extundo.com>
+
+	* modules/check-version: New file.
+
 2005-06-24  Derek Price  <derek@ximbiot.com>
 	and Bruno Haible  <bruno@clisp.org>
 

--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,7 @@
+2005-06-28  Simon Josefsson  <jas@extundo.com>
+
+	* check-version.h, check-version.c: New files.
+
 2005-06-28  Simon Josefsson  <jas@extundo.com>
 
 	* base64.c (base64_encode): Indent.  Rename 'b64' to avoid

new file mode 100644
--- /dev/null
+++ b/lib/check-version.c
@@ -0,0 +1,47 @@
+/* check-version.h --- Check version string compatibility.
+   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free
+   Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+
+/* Written by Simon Josefsson.  This interface is influenced by
+   gcry_check_version from Werner Koch's Libgcrypt.  Paul Eggert
+   suggested the use of strverscmp to simplify implementation. */
+
+#if HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <stddef.h>
+#include <strverscmp.h>
+
+/* Get specification. */
+#include "check_version.h"
+
+/* Check that the the version of the library (i.e., the CPP symbol
+ * VERSION) is at minimum the requested one in REQ_VERSION (typically
+ * found in a header file) and return the version string.  Return NULL
+ * if the condition is not satisfied.  If a NULL is passed to this
+ * function, no check is done, but the version string is simply
+ * returned.
+ */
+const char *
+check_version (const char *req_version)
+{
+  if (!req_version || strverscmp (req_version, VERSION) < 0)
+    return VERSION;
+
+  return NULL;
+}

new file mode 100644
--- /dev/null
+++ b/lib/check-version.h
@@ -0,0 +1,26 @@
+/* check-version.h --- Check version string compatibility.
+   Copyright (C) 2005 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+
+/* Written by Simon Josefsson. */
+
+#ifndef CHECK_VERSION_H
+# define CHECK_VERSION_H
+
+extern const char *
+check_version (const char *req_version);
+
+#endif /* CHECK_VERSION_H */

new file mode 100644
--- /dev/null
+++ b/modules/check-version
@@ -0,0 +1,23 @@
+Description:
+Check version string compatibility.
+
+Files:
+lib/check-version.h
+lib/check-version.c
+
+Depends-on:
+strverscmp
+
+configure.ac:
+gl_CHECK_VERSION
+
+Makefile.am:
+
+Include:
+"check-version.h"
+
+License:
+LGPL
+
+Maintainer:
+Simon Josefsson