[Sblim-commit] mofc Makefile.am,1.1.1.1,1.2 README,1.1.1.1,1.2 configure.ac,1.2,1.3

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

Update of /cvsroot/sblim/mofc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28168

Modified Files:
	Makefile.am README configure.ac 
Log Message:
Bug 1174684: Change MOF Compiler Name to sfcbmof for the sfcb backend.
Further, enhance configuration step to automatically assume --with-sfcb if
SFCB_DIR is set.


Index: README
===================================================================
RCS file: /cvsroot/sblim/mofc/README,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- README	3 Mar 2005 09:08:47 -0000	1.1.1.1
+++ README	1 Apr 2005 10:48:14 -0000	1.2
@@ -62,6 +62,8 @@
 mofc.out is now a binary file that can be used as classSchemas file
 of the SFCB.
 
+NOTE: Upon installation the executable will be renamed from mofc to sfcbmof.
+
 Building Embedded in SFCB
 -------------------------
 There's also another possibility to build an SFCB version of MOFC. In case
@@ -79,7 +81,7 @@
 must be fed with information about parent classes, qualifiers and so on.
 This basically means that the only meaningful invocation will look like this:
 
-  mofc -I <CIM Schema Directory> -i CIM_Schemaxx.mof your.mof [other.mof ...]
+  sfcbmof -I <CIM Schema Directory> -i CIM_Schemaxx.mof your.mof [other.mof ...]
 
 You can download the CIM Schema files from http://www.dmtf.org.
 
@@ -93,4 +95,8 @@
 
 Documentation:
 --------------
-None yet, except for mofc -h (Exercise left to the reader).
+None yet, except for sfcbmof/mofc -h (Exercise left to the reader).
+
+CVS Instructions:
+-----------------
+If you checkout from CVS run autoconfiscate.sh to prepare for building.

Index: configure.ac
===================================================================
RCS file: /cvsroot/sblim/mofc/configure.ac,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- configure.ac	3 Mar 2005 09:26:37 -0000	1.2
+++ configure.ac	1 Apr 2005 10:48:14 -0000	1.3
@@ -1,6 +1,6 @@
 # $Id$
 
-AC_INIT(MOF Compiler, 0.6.5b, mih...@de...,mofc)
+AC_INIT(MOF Compiler, 0.7.0, mih...@de...,mofc)
 AC_CONFIG_SRCDIR([hash.c])
 AC_CONFIG_HEADER([config.h])
 
@@ -33,15 +33,26 @@
 		              [use sfcb backend. In that case this package must
 			       be in a sub-directory of the sfcb package.])])
 
+
+if test x"$SFCB_DIR" != x && test "$with_sfcb" != yes ; then
+   AC_WARN([SFCB_DIR has been specified ... assuming --with_sfcb])
+   with_sfcb=yes
+fi
+
+unset MOFCNAME
+
 if test "$with_sfcb" == yes; then
    if test x"$SFCB_DIR" = x; then
       SFCB_DIR=..
    fi
+   MOFCNAME=sfcbmof
+   BACKEND_STRING=sfcb
    BACKEND_OBJ='backend_sfcb.$(OBJEXT)'
    BACKEND_LIBS="-L $SFCB_DIR/.libs -lsfcBrokerCore"
    BACKEND_INCLUDES="-I $SFCB_DIR"
    AC_DEFINE(BACKEND_INFO,"SFCB Backend",[Backend Identification String])
 else
+   BACKEND_STRING=default
    BACKEND_OBJ='backend_print.$(OBJEXT)'
    BACKEND_LIBS=
    BACKEND_INCLUDES=
@@ -94,12 +105,24 @@
   AC_DEFINE(RELAXED_MOF,,[Relaxed MOF Parsing])
 fi
 
-AM_CONDITIONAL(TESTSCANNER,[test "$enable_testscanner" = yes]) 
+AM_CONDITIONAL(TESTSCANNER,[test "$enable_testscanner" == yes]) 
+AM_CONDITIONAL(ALTERNATE_MOFCNAME,[test x"$MOFCNAME" != x]) 
 
+AC_SUBST(MOFCNAME)
 AC_SUBST(BACKEND_OBJ)
 AC_SUBST(BACKEND_LIBS)
 AC_SUBST(BACKEND_INCLUDES)
 
 # Output control
+echo =================================================================
+echo mofc configuration complete
+echo configured for $BACKEND_STRING backend
+if test "$with_sfcb" == yes
+then
+echo SFCB_DIR=$SFCB_DIR
+fi
+echo =================================================================
+
+
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT

Index: Makefile.am
===================================================================
RCS file: /cvsroot/sblim/mofc/Makefile.am,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- Makefile.am	3 Mar 2005 09:08:47 -0000	1.1.1.1
+++ Makefile.am	1 Apr 2005 10:48:13 -0000	1.2
@@ -22,3 +22,12 @@
 
 EXTRA_DIST=runtest.sh tests/test1.mof tests/include/test2.mof \
 	tests/include/test3.mof 
+
+
+if ALTERNATE_MOFCNAME
+install-exec-hook:
+	mv $(DESTDIR)$(bindir)/mofc $(DESTDIR)$(bindir)/$(MOFCNAME)
+
+uninstall-hook:
+	rm $(DESTDIR)$(bindir)/$(MOFCNAME)
+endif