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

Get rid of the symlink farm in $builddir too, contrib is here

Browse Source 
to stay for a while.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29321 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Ron Lee 2004-09-24 16:00:21 +00:00
parent 2b2ba79b25
commit ecd16d74ce
3 changed files with 296 additions and 568 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

845
configure vendored
View File

File diff suppressed because it is too large Load Diff

14
configure.in
View File

@ -6139,18 +6139,8 @@ AC_CONFIG_COMMANDS([ wx-config
LN_S="${LN_S}" LN_S="${LN_S}"
]) ])
dnl When contrib is gone, this is all we will need: AC_CONFIG_LINKS([ include/wx-$WX_RELEASE$WX_FLAVOUR:include ])
dnl AC_CONFIG_LINKS([ include/wx-$WX_RELEASE$WX_FLAVOUR/wx:include/wx ]) AC_CONFIG_LINKS([ contrib/include ])
dnl Until then, we need to be a little more extravagent to create
dnl a 'real' working $prefix subtree in each build dir. Doing this
dnl really does make them otherwise identical to an installed set.
for c in `ls $srcdir/contrib/include/wx 2> /dev/null`; do
AC_CONFIG_LINKS([ include/wx-$WX_RELEASE$WX_FLAVOUR/wx/$c:contrib/include/wx/$c ])
done
for f in `ls $srcdir/include/wx 2> /dev/null`; do
AC_CONFIG_LINKS([ include/wx-$WX_RELEASE$WX_FLAVOUR/wx/$f:include/wx/$f ])
done
dnl Configure samples, contrib etc. directories, but only if they are present: dnl Configure samples, contrib etc. directories, but only if they are present:

3
wx-config.in
View File

@ -883,8 +883,9 @@ fi
[ -n "$this_linkage" ] || _static_cppflags="@TOOLCHAIN_DLL_DEFS@" [ -n "$this_linkage" ] || _static_cppflags="@TOOLCHAIN_DLL_DEFS@"
[ "$using_gui" = "yes" ] || _gui_cppflags="-DwxUSE_GUI=0" [ "$using_gui" = "yes" ] || _gui_cppflags="-DwxUSE_GUI=0"
[ -z "$this_prefix" ] || _intree_cppflags="-I${prefix}/contrib/include"
_cppflags=$(echo "-I${libdir}/wx/include/@TOOLCHAIN_FULLNAME@ -I${includedir}/wx-@WX_RELEASE@@WX_FLAVOUR@" "@WXDEBUG_DEFINE@" "@TOOLCHAIN_DEFS@" $_static_cppflags $_gui_cppflags "@WXCONFIG_INCLUDE@" "@WX_LARGEFILE_FLAGS@" "@GCC_PRAGMA_FLAGS@") _cppflags=$(echo "-I${libdir}/wx/include/@TOOLCHAIN_FULLNAME@ -I${includedir}/wx-@WX_RELEASE@@WX_FLAVOUR@" $_intree_cppflags "@WXDEBUG_DEFINE@" "@TOOLCHAIN_DEFS@" $_static_cppflags $_gui_cppflags "@WXCONFIG_INCLUDE@" "@WX_LARGEFILE_FLAGS@" "@GCC_PRAGMA_FLAGS@")
# now without further ado, we can answer these too. # now without further ado, we can answer these too.
[ -z "$output_option_cppflags" ] || echo $_cppflags [ -z "$output_option_cppflags" ] || echo $_cppflags