[Sblim-commit] cmpi-base ChangeLog,1.5,1.6 NEWS,1.1,1.2 configure.ac,1.5,1.6

[Viktor M. <mih...@us...>]

Update of /cvsroot/sblim/cmpi-base
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24430

Modified Files:
	ChangeLog NEWS configure.ac 
Log Message:
Bugs fixed: 1199129.
Now compiles with cmpi-devel 1.0.0.


Index: NEWS
===================================================================
RCS file: /cvsroot/sblim/cmpi-base/NEWS,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- NEWS	6 Apr 2005 16:29:47 -0000	1.1
+++ NEWS	11 May 2005 11:40:08 -0000	1.2
@@ -0,0 +1,5 @@
+Changes in 1.5.1
+================
+
+Bugs:
+- 1199129 Added toleration for newer (spec-conforming) CMPI headers.

Index: configure.ac
===================================================================
RCS file: /cvsroot/sblim/cmpi-base/configure.ac,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- configure.ac	20 Apr 2005 11:34:56 -0000	1.5
+++ configure.ac	11 May 2005 11:40:08 -0000	1.6
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.59)
-AC_INIT(SBLIM BaseOS Providers Base, 1.5.0, sbl...@li...,sblim-cmpi-base)
+AC_INIT(SBLIM BaseOS Providers Base, 1.5.0a, sbl...@li...,sblim-cmpi-base)
 AC_CONFIG_SRCDIR([OSBase_Common.c])
 AC_CONFIG_HEADER([config.h])
 AM_INIT_AUTOMAKE
@@ -86,7 +86,13 @@
 AM_CONDITIONAL(NOEVENTS,[test x"$EVENTFLAGS" != x])
 
 # Extend CPPFLAGS
-CPPFLAGS="$CPPFLAGS -D$HW $EVENTFLAGS"
+if echo $CPPFLAGS | grep -v CMPI_VERSION
+then
+   CPPFLAGS="$CPPFLAGS -D$HW $EVENTFLAGS -DCMPI_VERSION=90"
+else
+   CPPFLAGS="$CPPFLAGS -D$HW $EVENTFLAGS"
+fi
+
 if test x"$EVENTFLAGS" == x; then
    INDICATION_SUPPORT=Enabled
 else	

Index: ChangeLog
===================================================================
RCS file: /cvsroot/sblim/cmpi-base/ChangeLog,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- ChangeLog	20 Apr 2005 11:34:55 -0000	1.5
+++ ChangeLog	11 May 2005 11:40:08 -0000	1.6
@@ -1,4 +1,7 @@
+2005-05-10    <mih...@dy...>
 
+	* configure.ac: Bug 1199129 added -DCMPI_VERSION=90 to CPPFLAGS 
+	in order to support newer CMPI header versions.
 
 // ===================================================================
 // new in version 1.2.3 :