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

diff --git a/configure b/configure
index 5094be821f28b43f92b4c09906c85f614851358e..0762d7de2de8845d5cdc47c651fad382e9fc6837 100755 (executable)
--- a/configure
+++ b/configure
@@ -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
 
 

diff --git a/configure.in b/configure.in
index da733e0626ff695fb222b229988ad7aa80d518cd..0a188f26f5d4c3a9bf2263445daed13cb445d40e 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -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
             ]
         )