CWS-TOOLING: integrate CWS cmcfixes69

5 files changed, 10 insertions, 18 deletions

diff --git a/configure b/configure
index ca6818eaab0e..409ec509e222 100755
--- a/configure
+++ b/configure
@@ -12720,7 +12720,7 @@ echo "${ECHO_T}no" >&6
 fi
 
 
-if test -z "$with_system_stdlibs" -a -z "$with_system_libs"; then
+if test "$_os" = "Linux" -a -z "$with_system_stdlibs" -a -z "$with_system_libs"; then
   if test -n "$checkforstdlibproblems"; then
     if test -f /etc/rpm/macros.prelink; then
       with_system_stdlibs=yes
@@ -18636,16 +18636,6 @@ echo "$as_me: error: Library requirements (silgraphite ) not met; consider adjus
    { (exit 1); exit 1; }; }
   fi
 
-	echo "$as_me:$LINENO: checking STL compatibility" >&5
-echo $ECHO_N "checking STL compatibility... $ECHO_C" >&6
-	if test "$WITH_STLPORT" != "no"; then
-		{ { echo "$as_me:$LINENO: error: to use system graphite you need to use --without-stlport" >&5
-echo "$as_me: error: to use system graphite you need to use --without-stlport" >&2;}
-   { (exit 1); exit 1; }; }
-	else
-		echo "$as_me:$LINENO: result: OK" >&5
-echo "${ECHO_T}OK" >&6
-	fi
     else
         echo "$as_me:$LINENO: result: internal" >&5
 echo "${ECHO_T}internal" >&6
diff --git a/configure.in b/configure.in
index 0ce538aeed8e..d1c63add38b0 100644
--- a/configure.in
+++ b/configure.in
@@ -3495,7 +3495,7 @@ AC_SUBST(BUILD_QADEVOOO)
 dnl ===================================================================
 dnl Check for prelinked libgcc_s.so.1
 dnl ===================================================================
-if test -z "$with_system_stdlibs" -a -z "$with_system_libs"; then
+if test "$_os" = "Linux" -a -z "$with_system_stdlibs" -a -z "$with_system_libs"; then
   if test -n "$checkforstdlibproblems"; then
     if test -f /etc/rpm/macros.prelink; then
       with_system_stdlibs=yes
@@ -4472,12 +4472,6 @@ if test "$_os" = "WINNT" -o "$_os" = "Linux" && test "z$enable_graphite" == "z"
         AC_MSG_RESULT([external])
         SYSTEM_GRAPHITE=YES
         PKG_CHECK_MODULES( GRAPHITE, silgraphite )
-	AC_MSG_CHECKING([STL compatibility])
-	if test "$WITH_STLPORT" != "no"; then
-		AC_MSG_ERROR([to use system graphite you need to use --without-stlport])
-	else
-		AC_MSG_RESULT([OK])	
-	fi
     else
         AC_MSG_RESULT([internal])
         SYSTEM_GRAPHITE=NO
diff --git a/soltools/mkdepend/collectdircontent.cxx b/soltools/mkdepend/collectdircontent.cxx
index 691996d56cca..c9308faf0562 100755
--- a/soltools/mkdepend/collectdircontent.cxx
+++ b/soltools/mkdepend/collectdircontent.cxx
@@ -73,6 +73,10 @@ extern "C" {
             return new IncludesCollection;
     }
 
+    void delete_IncludesCollection(IncludesCollection *m) {
+            delete m;
+    }
+
     int call_IncludesCollection_exists(IncludesCollection* m, const char * filePath) {
         return m->exists(filePath);
     }
diff --git a/soltools/mkdepend/collectdircontent.hxx b/soltools/mkdepend/collectdircontent.hxx
index 1ffd9cf60f0c..1896df0c8bc7 100644
--- a/soltools/mkdepend/collectdircontent.hxx
+++ b/soltools/mkdepend/collectdircontent.hxx
@@ -47,6 +47,7 @@ extern "C" {
 #endif
 
 struct IncludesCollection * create_IncludesCollection(void);
+void delete_IncludesCollection(struct IncludesCollection *);
 
 int call_IncludesCollection_exists(struct IncludesCollection* m, const char* filePath);
 
diff --git a/soltools/mkdepend/main.c b/soltools/mkdepend/main.c
index a786f5a4d7f6..fd9bdc18e5d2 100644
--- a/soltools/mkdepend/main.c
+++ b/soltools/mkdepend/main.c
@@ -465,6 +465,9 @@ int main(argc, argv)
     }
     if (printed)
         printf("\n");
+
+    delete_IncludesCollection(incCollection);
+
     exit(0);
 }