From 05cdfc6fadbaa2e3d701fbb8d6abc7d7775e6b25 Mon Sep 17 00:00:00 2001 From: Ron Lee Date: Mon, 21 Feb 2000 20:11:03 +0000 Subject: [PATCH] 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 --- configure | 6 +++--- configure.in | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configure b/configure index 17f89ba47e..717d9e4ae5 100755 --- 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 - BURNT_LIBRARY_NAME="-Wl,-soname -Wl,${WX_LIBRARY_NAME_SHARED}" + BURNT_LIBRARY_NAME="-Wl,-soname,${WX_LIBRARY_LINK1}" fi ;; *-*-irix5* | *-*-irix6* ) @@ -9103,7 +9103,7 @@ else 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; @@ -9178,7 +9178,7 @@ for ac_kw in inline __inline__ __inline; do #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 diff --git a/configure.in b/configure.in index e0bb5bba35..8826792b02 100644 --- 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 - BURNT_LIBRARY_NAME="-Wl,-soname -Wl,${WX_LIBRARY_NAME_SHARED}" + BURNT_LIBRARY_NAME="-Wl,-soname,${WX_LIBRARY_LINK1}" fi ;; *-*-irix5* | *-*-irix6* ) -- 2.45.2