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

Fixups for solaris; remove '-mt' from pkg-config output and add '-lX11' for a static build

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35670 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Michael Wetherell
2005-09-25 07:12:02 +00:00
parent 42d0df0030
commit 5001df0dd5
2 changed files with 45 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
configure vendored
View File

@@ -25037,7 +25037,15 @@ echo "${ECHO_T}" >&6
fi fi
wx_cv_lib_gtk= wx_cv_lib_gtk=
if test "x$wxGTK_VERSION" != "x1"; then if test "x$wxGTK_VERSION" != "x1"
then
case "${host}" in
*-*-solaris2* )
if test "$wxUSE_THREADS" = "yes" -a "$GCC" = yes; then
enable_gtktest=no
fi
esac
# Check whether --enable-gtktest or --disable-gtktest was given. # Check whether --enable-gtktest or --disable-gtktest was given.
if test "${enable_gtktest+set}" = set; then if test "${enable_gtktest+set}" = set; then
enableval="$enable_gtktest" enableval="$enable_gtktest"
@@ -25340,6 +25348,17 @@ rm -f conftest.err conftest.$ac_objext \
rm -f conf.gtktest rm -f conf.gtktest
case "${host}" in
*-*-solaris2* )
if test "$wxUSE_THREADS" = "yes" -a "$GCC" = yes; then
GTK_CFLAGS=`echo $GTK_CFLAGS | sed 's/-mt//'`
GTK_LIBS=`echo $GTK_LIBS | sed 's/-mt//'`
fi
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

26
configure.in
View File

@@ -2743,8 +2743,32 @@ if test "$wxUSE_GUI" = "yes"; then
dnl detect GTK2 dnl detect GTK2
wx_cv_lib_gtk= wx_cv_lib_gtk=
if test "x$wxGTK_VERSION" != "x1"; then if test "x$wxGTK_VERSION" != "x1"
then
dnl The gthread.pc that ships with solaris returns '-mt',
dnl it's correct for Sun CC, but gcc requires '-pthreads'.
dnl So disable the compile check and remove the -mt below.
case "${host}" in
*-*-solaris2* )
if test "$wxUSE_THREADS" = "yes" -a "$GCC" = yes; then
enable_gtktest=no
fi
esac
AM_PATH_GTK_2_0(2.0.0, wx_cv_lib_gtk=2.0, , $GTK_MODULES) AM_PATH_GTK_2_0(2.0.0, wx_cv_lib_gtk=2.0, , $GTK_MODULES)
dnl Remove the '-mt' for gcc on solaris
case "${host}" in
*-*-solaris2* )
if test "$wxUSE_THREADS" = "yes" -a "$GCC" = yes; then
GTK_CFLAGS=`echo $GTK_CFLAGS | sed 's/-mt//'`
GTK_LIBS=`echo $GTK_LIBS | sed 's/-mt//'`
fi
dnl solaris also requires -lX11 for static lib
if test "$wxUSE_SHARED" != "yes"; then
GTK_LIBS="$GTK_LIBS -lX11"
fi
esac
fi fi
dnl detect GTK1.x dnl detect GTK1.x