Adding the HILDON_CHECK_VERSION macro. Fixes: NB#62061.

diff --git a/ChangeLog b/ChangeLog
index cc8588f..782506f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2007-07-25  Michael Dominic Kostrzewa  <michael.kostrzewa@nokia.com> 
 
+       * configure.ac:
+       * src/Makefile.am:
+       * src/hildon-version.h.in:
+       * src/hildon.h: Adding the HILDON_CHECK_VERSION macro. Fixes: NB#62061.
+
+2007-07-25  Michael Dominic Kostrzewa  <michael.kostrzewa@nokia.com> 
+
        * src/hildon-volumebar.c: Updating the docs.
 
 2007-07-25  Michael Dominic Kostrzewa  <michael.kostrzewa@nokia.com> 

diff --git a/configure.ac b/configure.ac
index 24b47cd..c55a665 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -173,7 +173,9 @@ HILDON_OBJ_LIBS="\$(top_builddir)/src/libhildon-\$(PACKAGE_VERSION_MAJOR).la \$(
 AC_SUBST(HILDON_OBJ_CFLAGS)
 AC_SUBST(HILDON_OBJ_LIBS)
 
-AC_CONFIG_FILES([Makefile src/Makefile  \
+AC_CONFIG_FILES([Makefile               \
+                 src/Makefile           \
+                 src/hildon-version.h   \
                  pkgconfig/Makefile     \
                  examples/Makefile      \
                  pkgconfig/hildon.pc    \

diff --git a/src/Makefile.am b/src/Makefile.am
index c026ae8..aa0c2fd 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -104,7 +104,8 @@ libhildon_@PACKAGE_VERSION_MAJOR@_public_headers    = hildon-banner.h                               \
                                                          hildon-wizard-dialog.h                        \
                                                          hildon-calendar.h                             \
                                                          hildon-bread-crumb-trail.h                    \
-                                                         hildon-bread-crumb.h
+                                                         hildon-bread-crumb.h                          \
+                                                         hildon-version.h
 
 libhildon_@PACKAGE_VERSION_MAJOR@_include_HEADERS      = $(libhildon_@PACKAGE_VERSION_MAJOR@_public_headers)                   \
                                                          $(libhildon_@PACKAGE_VERSION_MAJOR@_built_public_headers)

diff --git a/src/hildon-version.h.in b/src/hildon-version.h.in
new file mode 100644 (file)
index 0000000..6fec0ff
--- /dev/null
+++ b/src/hildon-version.h.in
@@ -0,0 +1,39 @@
+/*
+ * This file is a part of hildon
+ *
+ * Copyright (C) 2005, 2006, 2007 Nokia Corporation, all rights reserved.
+ *
+ * Contact: Michael Dominic Kostrzewa <michael.kostrzewa@nokia.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ *
+ */
+
+#ifndef                                         __HILDON_VERSION_H__
+#define                                         __HILDON_VERSION_H__
+
+#define HILDON_MAJOR_VERSION                               (@PACKAGE_VERSION_MAJOR@)
+#define HILDON_MINOR_VERSION                               (@PACKAGE_VERSION_MINOR@)
+#define HILDON_MICRO_VERSION                               (@PACKAGE_VERSION_MICRO@)
+
+#define        HILDON_CHECK_VERSION(major,minor,micro) \
+    (HILDON_MAJOR_VERSION > (major) || \
+     (HILDON_MAJOR_VERSION == (major) && HILDON_MINOR_VERSION > (minor)) || \
+     (HILDON_MAJOR_VERSION == (major) && HILDON_MINOR_VERSION == (minor) && \
+      HILDON_MICRO_VERSION >= (micro)))
+
+#endif                                          /* __HILDON_VERSION_H__ */
+

diff --git a/src/hildon.h b/src/hildon.h
index 5f38f73..dd57457 100644 (file)
--- a/src/hildon.h
+++ b/src/hildon.h
@@ -25,6 +25,7 @@
 #ifndef                                         __HILDON_H__
 #define                                         __HILDON_H__
 
+#include                                        "hildon-version.h"
 #include                                        "hildon-banner.h"
 #include                                        "hildon-calendar-popup.h"
 #include                                        "hildon-caption.h"