[ptx] [PATCH] wxWidgets gtk check for ax_check_wx_gtk.m4

[Edouard Gomez]

Hi,

here is a patch so CVS can be compiled correctly with a
wxwidgets 2.5.3 release. This is caused by the fact the shared
lib is named xxxxxx_gtk2_xxxx.so instead of -gtk2-, so the
patch extends the test with _.

Note that i had to remove the --static option from the
wx-config call as it seems this option isn't supported
when building shared wxwidgets libs only (though the tool
still reports the option)

Maybe adding a test for test --static option support should be
a good idea.

-- 
Edouard Gomez
-------------- next part --------------
Index: m4/ax_check_wx_gtk.m4
===================================================================
RCS file: /cvsroot/hugin/hugin/m4/ax_check_wx_gtk.m4,v
retrieving revision 1.1
diff -u -r1.1 ax_check_wx_gtk.m4
--- m4/ax_check_wx_gtk.m4	12 Oct 2004 17:05:40 -0000	1.1
+++ m4/ax_check_wx_gtk.m4	24 Oct 2004 19:14:41 -0000
@@ -8,13 +8,13 @@
 [
   GTK_USEDVERSION=''
   AC_MSG_CHECKING(if wxWindows was linked with GTK2)
-  if $WX_CONFIG_NAME --static --libs | grep '_gtk2-' > /dev/null ; then
+  if $WX_CONFIG_NAME --libs | grep 'gtk2[[-_]]' > /dev/null ; then
      GTK_USEDVERSION=2
      AC_MSG_RESULT(yes)
   else
      AC_MSG_RESULT(no)
      AC_MSG_CHECKING(if wxWindows was linked with GTK)
-     if $WX_CONFIG_NAME --static --libs | grep '_gtk-' > /dev/null ; then
+     if $WX_CONFIG_NAME --libs | grep 'gtk[[-_]]' > /dev/null ; then
        GTK_USEDVERSION=1
        AC_MSG_RESULT(yes)
      else