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

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

diff --git a/configure b/configure
index 220cf42313d37861ea870572429e80d69c274830..a48880cce76eef008a324b8de6e3c11a3413862d 100755 (executable)
--- a/configure
+++ b/configure
@@ -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
-                        *-*-solaris2* )
-                            if test "$wxUSE_SHARED" != "yes"; then
-                                GTK_LIBS="$GTK_LIBS -lX11"
-                            fi
-                    esac
+                                        GTK_LIBS="$GTK_LIBS -lX11"

                 fi
 
                                 if test -z "$wx_cv_lib_gtk"; then
                 fi
 
                                 if test -z "$wx_cv_lib_gtk"; then

diff --git a/configure.in b/configure.in
index cecced57402d0c2f987b8644bdbab96578a9e9de..e30e70d6395fc91849ba4bc0ca0129abb9c2b2e1 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -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
-                    case "${host}" in
-                        *-*-solaris2* )
-                            if test "$wxUSE_SHARED" != "yes"; then
-                                GTK_LIBS="$GTK_LIBS -lX11"
-                            fi
-                    esac
+                    dnl we use symbols from X11 directly so we should link with it
+                    GTK_LIBS="$GTK_LIBS -lX11"

                 fi
 
                 dnl detect GTK1.x
                 fi
 
                 dnl detect GTK1.x