fixed test for GTK+ 2.4: was always false on a second or subsequent configure run...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33111 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/configure b/configure
index c7d4f82cf95a386acd090e5ec9637ef8d1503b5c..0c0b3792cacee67a645bcafdcca216772ea7bc00 100755 (executable)
--- a/configure
+++ b/configure
@@ -25090,8 +25090,8 @@ equivalent variable and GTK+ is version 1.2.3 or above.
         if test "$WXGTK20" = 1; then
             save_CFLAGS="$CFLAGS"
             save_LIBS="$LIBS"
         if test "$WXGTK20" = 1; then
             save_CFLAGS="$CFLAGS"
             save_LIBS="$LIBS"

-            CFLAGS="$CFLAGS $GTK_CFLAGS"
-            LIBS="$LIBS $GTK_LIBS"
+            CFLAGS="$CFLAGS $wx_cv_cflags_gtk"
+            LIBS="$LIBS $wx_cv_lib_gtk"

 
 
 for ac_func in pango_font_family_is_monospace
 
 
 for ac_func in pango_font_family_is_monospace

diff --git a/configure.in b/configure.in
index f14a7327594c366db40a51cd8bd815ab92c9b122..e536f89454a570a0f4dbb6cad5cacdc217a6e5b1 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -2597,8 +2597,8 @@ equivalent variable and GTK+ is version 1.2.3 or above.
         if test "$WXGTK20" = 1; then
             save_CFLAGS="$CFLAGS"
             save_LIBS="$LIBS"
         if test "$WXGTK20" = 1; then
             save_CFLAGS="$CFLAGS"
             save_LIBS="$LIBS"

-            CFLAGS="$CFLAGS $GTK_CFLAGS"
-            LIBS="$LIBS $GTK_LIBS"
+            CFLAGS="$CFLAGS $wx_cv_cflags_gtk"
+            LIBS="$LIBS $wx_cv_lib_gtk"

             
             AC_CHECK_FUNCS([pango_font_family_is_monospace])
             
             
             AC_CHECK_FUNCS([pango_font_family_is_monospace])