AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

make --static default if configured with --disable-shared

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16972 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2002-09-04 14:56:55 +00:00
parent 2076893b53
commit 2bffed64c5
3 changed files with 244 additions and 229 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

463
configure vendored
View File

File diff suppressed because it is too large Load Diff

8
configure.in
View File

@ -2829,6 +2829,12 @@ if test "$wxUSE_SHARED" = "no"; then
WX_TARGET_LIBRARY_TYPE="a" WX_TARGET_LIBRARY_TYPE="a"
INSTALL_LIBRARY='$(INSTALL_DATA)' INSTALL_LIBRARY='$(INSTALL_DATA)'
dnl wx-config should assume the --static flag by default if we don't have
dnl any shared libs anyhow
STATIC_FLAG="yes"
else
STATIC_FLAG="no"
fi fi
if test "$wxUSE_MAC" = 1; then if test "$wxUSE_MAC" = 1; then
@ -5037,6 +5043,8 @@ AC_SUBST(SONAME_FLAGS_GL)
AC_SUBST(WX_TARGET_LIBRARY_SONAME) AC_SUBST(WX_TARGET_LIBRARY_SONAME)
AC_SUBST(WX_TARGET_LIBRARY_TYPE) AC_SUBST(WX_TARGET_LIBRARY_TYPE)
AC_SUBST(STATIC_FLAG)
dnl debugging options dnl debugging options
AC_SUBST(WXDEBUG_DEFINE) AC_SUBST(WXDEBUG_DEFINE)

2
wx-config.in
View File

@ -8,7 +8,7 @@ CXX="@CXX@"
LD="@SHARED_LD@" LD="@SHARED_LD@"
cross_compiling=@cross_compiling@ cross_compiling=@cross_compiling@
target=@host_alias@ target=@host_alias@
static_flag=no static_flag=@STATIC_FLAG@
usage() usage()
{ {