Don't filter out Cairo libraries from GTK libraries list in configure.

This undoes the hack of r35357 which surreptitiously removed all Cairo
libraries from the GTK libraries list. This shouldn't be necessary any more as
we use Cairo calls in our own code and so can't run without it anyhow and in
fact is even actively harmful as it results in linking errors under Fedora 13
(which seems to use a slightly different linker?).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65489 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2010-09-09 20:59:10 +00:00
parent 83a7613b71
commit 38fd5bad72
2 changed files with 2 additions and 2 deletions

2
configure vendored
View File

@@ -30356,7 +30356,7 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
wx_cv_lib_gtk=none
else
wx_cv_cflags_gtk=$GTK_CFLAGS
wx_cv_libs_gtk=`echo $GTK_LIBS | sed -e 's/ -l[^ ]*cairo[^ ]*//g'`
wx_cv_libs_gtk=$GTK_LIBS
fi

View File

@@ -2962,7 +2962,7 @@ if test "$wxUSE_GUI" = "yes"; then
dnl we need to cache GTK_CFLAGS and GTK_LIBS for the
dnl subsequent runs
wx_cv_cflags_gtk=$GTK_CFLAGS
wx_cv_libs_gtk=`echo $GTK_LIBS | sed -e 's/ -l[[^ ]]*cairo[[^ ]]*//g'`
wx_cv_libs_gtk=$GTK_LIBS
fi
]
)