Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

For wxGTK2, link with X11 explicitly, since we use many X11 functions directly.

Browse Source 
Some linkers, notably newer Linux ones, don't implicitly link against dependent libs
Fixes #13100


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67383 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2011-04-03 05:19:59 +00:00
parent 640a1b8474
commit a17305ea87
2 changed files with 3 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
configure vendored
View File

@@ -29949,12 +29949,7 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
rm -f conf.gtktest rm -f conf.gtktest
case "${host}" in GTK_LIBS="$GTK_LIBS -lX11"
*-*-solaris2* )
if test "$wxUSE_SHARED" != "yes"; then
GTK_LIBS="$GTK_LIBS -lX11"
fi
esac
fi fi
if test -z "$wx_cv_lib_gtk"; then if test -z "$wx_cv_lib_gtk"; then

9
configure.in
View File

@@ -2949,13 +2949,8 @@ if test "$wxUSE_GUI" = "yes"; then
AM_PATH_GTK_2_0(2.4.0, wx_cv_lib_gtk=2.0, , $GTK_MODULES) AM_PATH_GTK_2_0(2.4.0, wx_cv_lib_gtk=2.0, , $GTK_MODULES)
dnl Solaris also requires -lX11 for static lib dnl we use symbols from X11 directly so we should link with it
case "${host}" in GTK_LIBS="$GTK_LIBS -lX11"
*-*-solaris2* )
if test "$wxUSE_SHARED" != "yes"; then
GTK_LIBS="$GTK_LIBS -lX11"
fi
esac
fi fi
dnl detect GTK1.x dnl detect GTK1.x