[Sblim-commit] Git: sfcc- Small Footprint CIM Client branch, master, updated. 4d69257b56a92a251c42fb269711272acf595013

[Chris B. <buc...@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 "sfcc- Small Footprint CIM Client".

The branch, master has been updated
       via  4d69257b56a92a251c42fb269711272acf595013 (commit)
       via  f9ef997f2b39e4c138dc96f6d23bc81fafcd89b5 (commit)
       via  7a3e7f7f436f5e4e03824104330c79c4dbb157fb (commit)
      from  1f82c33791fe33739a57cfcd511845918ac415bc (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 4d69257b56a92a251c42fb269711272acf595013
Author: buccella <buc...@li...>
Date:   Tue Jul 2 21:47:12 2013 -0400

    adjustments to fix for [bugs:#2646]

commit f9ef997f2b39e4c138dc96f6d23bc81fafcd89b5
Merge: 1f82c33 7a3e7f7
Author: buccella <buc...@li...>
Date:   Tue Jul 2 21:39:54 2013 -0400

    Merge changes from jameskyle for [bugs:#2646] sblim-sfcc does not compile on apple systems

commit 7a3e7f7f436f5e4e03824104330c79c4dbb157fb
Author: James Kyle <ja...@ja...>
Date:   Wed Jun 26 13:46:26 2013 -0700

    Now compiles under OS X.
    
    * Removes --version-script switch if darwin system is detected
    * autoconfiscate not looks for glibtoolize
    * __SOCKADDR_ARG defined to struct sockaddr if __APPLE__

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

Summary of changes:
 Makefile.am                         |    6 +++---
 autoconfiscate.sh                   |   10 ++++++----
 backend/cimxml/indicationlistener.c |    4 ++++
 configure.ac                        |   15 +++++++++++++++
 contributions.txt                   |    4 ++++
 5 files changed, 32 insertions(+), 7 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index e6ab239..b4d211b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -109,7 +109,7 @@ libcimcClientXML_la_SOURCES = \
 
 libcimcclient_la_LDFLAGS = \
        -version-info $(Libcimcclient_CURRENT):$(Libcimcclient_REVISION):$(Libcimcclient_AGE) \
-       -Wl,--version-script,$(srcdir)/cimc/libcimcclient.Versions
+       @HOST_LDFLAGS@,$(srcdir)/cimc/libcimcclient.Versions
 libcimcclient_la_LIBADD = -ldl
 libcimcclient_la_CPPFLAGS = -DSFCB_LIBDIR=\"$(SFCB_LIBDIR)\"
 
@@ -118,13 +118,13 @@ libcmpisfcc_la_LIBADD = -lcimcclient
 libcmpisfcc_la_DEPENDENCIES = libcimcclient.la
 libcmpisfcc_la_LDFLAGS = \
        -version-info $(Libcmpisfcc_CURRENT):$(Libcmpisfcc_REVISION):$(Libcmpisfcc_AGE) \
-       -Wl,--version-script,$(srcdir)/frontend/sfcc/libcmpisfcc.Versions
+       @HOST_LDFLAGS@,$(srcdir)/frontend/sfcc/libcmpisfcc.Versions
 
 libcimcClientXML_la_CPPFLAGS = -I$(srcdir)/backend/cimxml/sfcUtil -I$(srcdir)/backend/cimxml  -I$(srcdir)/frontend/sfcc -I$(srcdir)/cimc
 libcimcClientXML_la_LIBADD = -lcurl
 libcimcClientXML_la_LDFLAGS = \
        -version-info $(LibcimcClientXML_CURRENT):$(LibcimcClientXML_REVISION):$(LibcimcClientXML_AGE) \
-       -Wl,--version-script,$(srcdir)/backend/cimxml/libcimcClientXML.Versions
+       @HOST_LDFLAGS@,$(srcdir)/backend/cimxml/libcimcClientXML.Versions
 
 SUBDIRS = . TEST
 
diff --git a/autoconfiscate.sh b/autoconfiscate.sh
index 23f0fc0..589f682 100755
--- a/autoconfiscate.sh
+++ b/autoconfiscate.sh
@@ -1,6 +1,8 @@
 #!/bin/sh
-aclocal &&
-autoheader &&
-libtoolize &&
-automake -af &&
+set -e
+
+aclocal
+autoheader
+test `which glibtoolize 2> /dev/null` && glibtoolize || libtoolize
+automake -af
 autoconf
diff --git a/backend/cimxml/indicationlistener.c b/backend/cimxml/indicationlistener.c
index 7e0606a..0d7d9fe 100755
--- a/backend/cimxml/indicationlistener.c
+++ b/backend/cimxml/indicationlistener.c
@@ -36,6 +36,10 @@ static int do_listen=1;
 #define hdrBufsize 5000
 #define hdrLimmit 5000
 
+#ifdef __APPLE__
+# define __SOCKADDR_ARG   struct sockaddr *__restrict
+#endif
+
 typedef struct _buffer {
    char *data, *content;
    int length, size, ptr, content_length,trailers;
diff --git a/configure.ac b/configure.ac
index 0b3950b..484dfb4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -77,4 +77,19 @@ then
 fi
 
 AC_CONFIG_FILES([Makefile sfcc.spec TEST/Makefile ])
+
+#### Platform Specific Configuration ####
+AC_CANONICAL_HOST
+case $host_os in
+  darwin* )
+    HOST_LDFLAGS="-Wl"
+ 
+    ;;
+  *)
+    HOST_LDFLAGS="-Wl,--version-script"
+    ;;
+esac
+
+AC_SUBST(HOST_LDFLAGS)
+
 AC_OUTPUT
diff --git a/contributions.txt b/contributions.txt
index c08b7e1..c4bc908 100644
--- a/contributions.txt
+++ b/contributions.txt
@@ -59,3 +59,7 @@ Michal Minar
 ------------
 07/31/2012 [ 3547832 ] memory leak in backend/cimxml/grammer.c
 09/10/2012 [ 3555103 ] wrong declaration of release attribute in _CIMCArgsFT
+
+James Kyle
+----------
+07/02/2013 [bugs:#2646] sblim-sfcc does not compile on apple systems 


hooks/post-receive
-- 
sfcc- Small Footprint CIM Client