gtk-config now checks for gthread

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

diff --git a/configure.in b/configure.in
index 83014388dc69c245fdc286af481ba396ffb644d8..17f158dfd95fbfbfe70b24f7a8ae40bb631c50b1 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -38,7 +38,7 @@ AC_DEFUN(AM_PATH_GTK,
   no_gtk=""
   if test "$GTK_CONFIG" != "no" ; then
     GTK_CFLAGS=`$GTK_CONFIG --cflags`
-    GTK_LIBS=`$GTK_CONFIG --libs`
+    GTK_LIBS=`$GTK_CONFIG --libs gthread`
     ac_save_CFLAGS="$CFLAGS"
     ac_save_LIBS="$LIBS"
     CFLAGS="$CFLAGS $GTK_CFLAGS"
@@ -1525,13 +1525,20 @@ dnl        )
 dnl    )
 
     TOOLKIT_INCLUDE="$GTK_CFLAGS"
-dnl On FreeBSD, the libs are called gtk12 etc, so we must append gthread12
-    echo $GTK_LIBS | fgrep -q "glib12"
-    if test $? = 0  ; then
-       GUI_TK_LIBRARY="$GTK_LIBS -gthread12"
-    else
-       GUI_TK_LIBRARY="$GTK_LIBS -lgthread"
-    fi
+
+dnl Appending gthreads as it was done here is not portable, instead
+dnl we now call "gtk-config --libs gthread" which sets the right library
+dnl name for us. The following hacks are no longer required.
+
+    GUI_TK_LIBRARY="$GTK_LIBS"
+
+dnl dnl On FreeBSD, the libs are called gtk12 etc, so we must append gthread12
+dnl    echo $GTK_LIBS | fgrep -q "glib12"
+dnl    if test $? = 0  ; then
+dnl       GUI_TK_LIBRARY="$GTK_LIBS -gthread12"
+dnl    else
+dnl       GUI_TK_LIBRARY="$GTK_LIBS -lgthread"
+dnl    fi
     TOOLKIT=GTK
 
     AFMINSTALL=afminstall