sblim-commit

[Michael Chase-S. <mc...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "SFCB - Small Footprint CIM Broker".

The branch, master has been updated
       via  db253645551ff731abfef80bcc3d701d2c67e5d0 (commit)
      from  701ee0f37771e6d40532b206dbee1e880e163952 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit db253645551ff731abfef80bcc3d701d2c67e5d0
Author: Michael Chase-Salerno <br...@li...>
Date:   Thu Mar 3 16:49:03 2011 -0500

    create sfcCommon - ID: 3177587
    Rollback changes to put in devel branch

-----------------------------------------------------------------------

Summary of changes:
diff --git a/ChangeLog b/ChangeLog
index a53b018..6a5a0cc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-03-03 Michael Chase-Salerno <br...@li...>
+
+	* Makefile.am, configure.ac, README:
+	[ 3177587 ] create sfcCommon library
+	Rollback changes for a devel branch.
+
 2011-02-28 Michael Chase-Salerno <br...@li...>
 
 	* Makefile.am, configure.ac, README, most .c files:
diff --git a/Makefile.am b/Makefile.am
index 2d1111b..c6f322d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -27,6 +27,7 @@ sfcbconfdir=$(sysconfdir)/sfcb
 sfcbstatedir=$(localstatedir)/lib/sfcb
 initdir=$(sysconfdir)/init.d
 pamdir=$(sysconfdir)/pam.d
+sfcblibdir=$(libdir)/sfcb
 cmpilibdir=$(libdir)/cmpi
 
 MANFILES=man/genSslCert.1 man/getSchema.1 man/sfcbd.1 man/sfcbmof.1 \
@@ -35,28 +36,6 @@ MANFILES=man/genSslCert.1 man/getSchema.1 man/sfcbd.1 man/sfcbmof.1 \
 
 BUILT_SOURCES=queryParser.c queryLexer.c sqlParser.c sqlLexer.c cimXmlOps.c cimXmlParserProcessed.c $(MANFILES)
 
-if SFCCOMMON
-# Use the local sfcCommon libs
-    sfcblibdir=$(libdir)/sfcb
-    SFCCOMMON_LIBS = libsfcUtil.la 
-    SFCCOMMON_CPPFLAGS="-I$(srcdir)/sfcUtil"
-    SFCCOMMON_HEADER = sfcUtil/hashtable.h sfcUtil/utilft.h
-libsfcUtil_la_SOURCES = \
-        sfcUtil/hashtable.c \
-        sfcUtil/utilFactory.c \
-	    sfcUtil/utilHashtable.c \
-	    sfcUtil/utilStringBuffer.c \
-	    sfcUtil/libsfcUtil.Versions
-libsfcUtil_la_LDFLAGS = -Wl,--version-script,$(srcdir)/sfcUtil/libsfcUtil.Versions
-libsfcBrokerCore_la_LIBADD=-lsfcUtil
-libsfcBrokerCore_la_DEPENDENCIES=libsfcUtil.la
-else
-# Use shared library
-    sfccommondir=$(includedir)/sfcCommon
-    sfcblibdir=$(libdir)
-libsfcBrokerCore_la_LIBADD=
-endif
-
 AM_YFLAGS=-d
 AM_CPPFLAGS=-DSFCB_CONFDIR=\"$(sfcbconfdir)\" \
 	-DSFCB_STATEDIR=\"$(sfcbstatedir)\" \
@@ -64,7 +43,7 @@ AM_CPPFLAGS=-DSFCB_CONFDIR=\"$(sfcbconfdir)\" \
 	-DCMPI_LIBDIR=\"$(cmpilibdir)\" \
 	-DLIBDIR=\"$(libdir)\" \
 	-DSFCB_BINARY=\"$(sbindir)/sfcbd\" \
-    $(SFCCOMMON_CPPFLAGS) \
+	-I$(srcdir)/sfcUtil \
 	@SFCB_CPPFLAGS@ \
         @SFCB_CMPI_PLATFORM@ 
 AM_LDFLAGS=@SFCB_LDFLAGS@
@@ -137,8 +116,8 @@ endif
 sfcb_sharedobjects = \
    $(sfcblibdir)/*.so
 
-
 sfcblib_LTLIBRARIES = \
+   libsfcUtil.la \
    libsfcBrokerCore.la \
    libsfcFileRepository.la \
    libsfcInternalProvider.la \
@@ -159,7 +138,6 @@ sfcblib_LTLIBRARIES = \
    $(QUALREP_LIBS) \
    $(INDICATION_LIBS) \
    $(PAM_LIBS) \
-   $(SFCCOMMON_LIBS) \
    $(SLP_HOSTNAME_LIBS)
 
 if TEST_ENABLED 
@@ -183,6 +161,13 @@ bin_PROGRAMS = \
 noinst_PROGRAMS = \
    sfcbdumpP32onI32 classSchema2c
 
+libsfcUtil_la_SOURCES = \
+	sfcUtil/hashtable.c \
+	sfcUtil/utilFactory.c \
+	sfcUtil/utilHashtable.c \
+	sfcUtil/utilStringBuffer.c \
+	sfcUtil/libsfcUtil.Versions
+libsfcUtil_la_LDFLAGS = -Wl,--version-script,$(srcdir)/sfcUtil/libsfcUtil.Versions
 
 libsfcBrokerCore_la_SOURCES = \
     args.c \
@@ -222,6 +207,8 @@ libsfcBrokerCore_la_SOURCES = \
     $(QUALREP_FILES)
 
 libsfcBrokerCore_la_CFLAGS = $(AM_CFLAGS) @SFCB_CMPI_OS@ 
+libsfcBrokerCore_la_LIBADD=-lsfcUtil
+libsfcBrokerCore_la_DEPENDENCIES=libsfcUtil.la
 
 queryLexer.c: $(srcdir)/queryLexer.l
 	$(LEX) -t $< | sed -e "s/yy/sfcQuery/g" > $@
@@ -329,7 +316,7 @@ libsfcClassProvider_la_DEPENDENCIES=libsfcBrokerCore.la
 
 libsfcClassProviderMem_la_SOURCES = \
    classProviderMem.c classSchemaMem.c interop_classSchema.c
-libsfcClassProviderMem_la_LIBADD=-lsfcBrokerCore -lsfcUtil
+libsfcClassProviderMem_la_LIBADD=-lsfcBrokerCore
 libsfcClassProviderMem_la_DEPENDENCIES=libsfcBrokerCore.la
 
 # Building providers in the test/TestProviders directory
@@ -418,14 +405,14 @@ sfcbinst2mof_SOURCES=sfcbinst2mof.c
 sfcbinst2mof_LDADD = -lsfcFileRepository
 
 classSchema2c_SOURCES=classSchema2c.c
-classSchema2c_LDADD=-lsfcBrokerCore -lsfcUtil
-classSchema2c_DEPENDENCIES=libsfcBrokerCore.la 
+classSchema2c_LDADD=-lsfcBrokerCore
+classSchema2c_DEPENDENCIES=libsfcBrokerCore.la
 
 noinst_HEADERS=array.h $(SLP_INC) httpComm.h control.h    providerMgr.h \
 	constClass.h   msgqueue.h     providerRegister.h \
 	cimXmlParser.h    native.h       support.h cimXmlGen.h \
-	cimRequest.h cimRsRequest.h objectImpl.h   trace.h \
-	mlog.h $(SFCCOMMON_HEADER) \
+	cimRequest.h cimRsRequest.h genericlist.h  objectImpl.h   trace.h \
+	sfcUtil/hashtable.h      sfcUtil/utilft.h mlog.h \
 	cmpiftx.h cmpimacsx.h \
 	fileRepository.h internalProvider.h \
 	selectexp.h queryOperation.h \
diff --git a/NEWS b/NEWS
index f4a8412..b1f15d6 100644
--- a/NEWS
+++ b/NEWS
@@ -4,7 +4,6 @@ Changes in 1.4.1
 New features:
 - 3152523 Changes for footprinting in ABT 
 - 1596336 Add config option for network interface binding
-- 3177587 create sfcCommon library
 
 Bugs fixed: 
 
diff --git a/configure.ac b/configure.ac
index a4ab862..890a71a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -31,6 +31,10 @@ AC_CONFIG_SRCDIR([providerDrv.c])
 AM_INIT_AUTOMAKE
 AM_CONFIG_HEADER([config.h])
 
+#Source files will use the local sfcCommon files if this is set.
+#Reverse this to use the shared sfcCommon library.
+AC_DEFINE(SFCCOMMON,1,[Local sfcCommon files used.])
+
 AC_ARG_ENABLE(debug,
 	[AC_HELP_STRING([--disable-debug],
 		[disable debug mode for SFCB.])],
@@ -107,13 +111,6 @@ AC_ARG_ENABLE(request-types,
 	[AC_HELP_STRING([--enable-request-types(=TYPES)],
 		[Enable support of listed request types. If none are listed, all are enabled.])])
 
-AC_ARG_ENABLE(sfcCommon,
-	[AC_HELP_STRING([--disable-sfcCommon],
-		[Disable local sfcCommon libraries and use shared version.])],
-	[enable_sfcCommon=$enableval],
-	[enable_sfcCommon="yes"]
-    )
-
 # Size checks
 AC_CHECK_SIZEOF(void*)
 AC_CHECK_SIZEOF(int)
@@ -233,7 +230,6 @@ AM_CONDITIONAL(CMDTEST,[test "$test_cmd" == "yes"])
 AM_CONDITIONAL(SLPTEST,[test "$test_slp" == "yes"])
 AM_CONDITIONAL(PROVTEST,[test "$test_providers" == "yes"])
 AM_CONDITIONAL(PROVTEST,[test "$test_local" == "yes"])
-
 if [test "$enable_tests"]; then
     # The order of TEST_SUBDIRS determines test
     # execution order.
@@ -336,12 +332,6 @@ if test "$handler_CIMRS" == "yes"; then
 fi
 # End of parser config
 
-if test "$enable_sfcCommon" == "yes"; then
-   AC_DEFINE(SFCCOMMON,,[Local sfcCommon enabled])
-else
-   AC_CHECK_LIB(sfcUtil,main,,[AC_MSG_ERROR([Could not find required sfcUtil])])
-fi
-
 if test "$enable_uds" == "yes"; then
    AC_DEFINE(HAVE_UDS,,[UDS authentication enabled])
 fi
@@ -434,7 +424,6 @@ fi
 # Checks for libraries.
 AC_CHECK_LIB(pthread,main)
 AC_CHECK_LIB(dl,main)
-
 AC_CHECK_LIB(z,main,[SFCB_LIBZ=-lz],[AC_MSG_ERROR([Could not find required libz])])
 if test "$enable_indications" = "yes" ; then
    LOAD_INDICATION_PROVIDER=
@@ -546,7 +535,6 @@ AM_CONDITIONAL(DOCS,[test "$enable_docs" == "yes"])
 AM_CONDITIONAL(IPV6,[test "$enable_ipv6" == "yes"])
 AM_CONDITIONAL(LOCAL_CONNECT_NO_INDICATION,[test "$enable_local_connect_only" == "yes" -a "$enable_indications" == "no"])
 AM_CONDITIONAL(LOCAL_CONNECT_ONLY,[test "$enable_local_connect_only" == "yes"])
-AM_CONDITIONAL(SFCCOMMON,[test "$enable_sfcCommon" == "yes"])
 
 AC_CONFIG_FILES([Makefile sfcb.spec sfcbrepos.sh sfcbstage.sh sfcbunstage.sh 
 	         sfcbuuid.sh sfcb.cfg.pre getSchema.sh.pre 
@@ -574,7 +562,6 @@ echo -e "uds"\\t\\t\\t\\t"${enable_uds:-no}"
 echo -e "tests"\\t\\t\\t\\t"${enable_tests:-no}"
 echo -e "debug"\\t\\t\\t\\t"${enable_debug:-no}"
 echo -e "Request types"\\t\\t\\t"${enable_request_types}"
-echo -e "Local sfcCommon"\\t\\t\\t"${enable_sfcCommon}"
 echo =================================================================
 echo
 echo "sfcb configuration complete.  you may now run 'make'"


hooks/post-receive
-- 
SFCB - Small Footprint CIM Broker