modified burnt_name to use only soname instead of full version name

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6188 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/configure b/configure
index 17f89ba47ed5cfa75f032699478d2c6044a23b3f..717d9e4ae56f6ac200c7395c2d47386f58edd532 100755 (executable)
--- a/configure
+++ b/configure
@@ -8441,7 +8441,7 @@ if test "$wxUSE_SHARED" = "yes"; then
         WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS"
         WX_ALL="CREATE_LINKS"
         if test "$wxUSE_BURNT_NAME" = "yes" ; then
         WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS"
         WX_ALL="CREATE_LINKS"
         if test "$wxUSE_BURNT_NAME" = "yes" ; then

-            BURNT_LIBRARY_NAME="-Wl,-soname -Wl,${WX_LIBRARY_NAME_SHARED}"
+            BURNT_LIBRARY_NAME="-Wl,-soname,${WX_LIBRARY_LINK1}"

         fi
       ;;
       *-*-irix5* | *-*-irix6* )
         fi
       ;;
       *-*-irix5* | *-*-irix6* )


@@ -9103,7 +9103,7 @@ else
 int main() {
 
 /* Ultrix mips cc rejects this.  */
 int main() {
 
 /* Ultrix mips cc rejects this.  */

-typedef int charset[2]; const charset x;
+typedef int charset[2]; const charset x = {0,0};

 /* SunOS 4.1.1 cc rejects this.  */
 char const *const *ccp;
 char **p;
 /* SunOS 4.1.1 cc rejects this.  */
 char const *const *ccp;
 char **p;


@@ -9178,7 +9178,7 @@ for ac_kw in inline __inline__ __inline; do
 #include "confdefs.h"
 
 int main() {
 #include "confdefs.h"
 
 int main() {

-} $ac_kw foo() {
+} int $ac_kw foo() {

 ; return 0; }
 EOF
 if { (eval echo configure:9185: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
 ; return 0; }
 EOF
 if { (eval echo configure:9185: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

diff --git a/configure.in b/configure.in
index e0bb5bba35aad2bc94077241b71520af6a479fd1..8826792b02a86b18aaad4abcff6a29859f1ff78a 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1932,7 +1932,7 @@ if test "$wxUSE_SHARED" = "yes"; then
         WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS"
         WX_ALL="CREATE_LINKS"
         if test "$wxUSE_BURNT_NAME" = "yes" ; then
         WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS"
         WX_ALL="CREATE_LINKS"
         if test "$wxUSE_BURNT_NAME" = "yes" ; then

-            BURNT_LIBRARY_NAME="-Wl,-soname -Wl,${WX_LIBRARY_NAME_SHARED}"
+            BURNT_LIBRARY_NAME="-Wl,-soname,${WX_LIBRARY_LINK1}"

         fi
       ;;
       *-*-irix5* | *-*-irix6* )
         fi
       ;;
       *-*-irix5* | *-*-irix6* )