[Sblim-commit] cmpi-base acinclude.m4,1.3,1.4

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

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

Modified Files:
	acinclude.m4 
Log Message:
Bug 1179453: CPPFLAGS was overwritten, if indication helper in standard place.


Index: acinclude.m4
===================================================================
RCS file: /cvsroot/sblim/cmpi-base/acinclude.m4,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- acinclude.m4	11 Apr 2005 14:24:02 -0000	1.3
+++ acinclude.m4	11 Apr 2005 15:45:29 -0000	1.4
@@ -118,12 +118,12 @@
 	[
 	AC_MSG_CHECKING(for CMPI headers)
 	dnl Check just with the standard include paths
+	CMPI_CPP_FLAGS="$CPPFLAGS"
 	_CHECK_CMPI(standard)
 	if test "$have_CMPI" == "yes"; then
 		dnl The standard include paths worked.
 		AC_MSG_RESULT(yes)
 	else
-          CMPI_CPP_FLAGS="$CPPFLAGS"
 	  _DIRS_="/usr/include/cmpi \
                   /usr/local/include/cmpi \
 		  $PEGASUS_ROOT/src/Pegasus/Provider/CMPI \
@@ -162,6 +162,7 @@
 
 AC_DEFUN([CHECK_INDHELP_HEADER],
 	[
+        INDHELP_CPP_FLAGS="$CPPFLAGS"
 	AC_MSG_CHECKING(for indication helper header)
 	dnl Check just with the standard include paths
 	_CHECK_INDHELP_HEADER(standard)
@@ -169,7 +170,6 @@
 		dnl The standard include paths worked.
 		AC_MSG_RESULT(yes)
 	else
-          INDHELP_CPP_FLAGS="$CPPFLAGS"
 	  _DIRS_="/usr/include/sblim \
                   /usr/local/include/sblim"
 	  for _DIR_ in $_DIRS_