filename | configure.in |
changeset | 1115:90292b2f2243 |
prev | 1113:174fa8e137b6 |
next | 1147:e04e4af64626 |
author | nkeynes |
date | Wed Sep 08 08:42:09 2010 +1000 (13 years ago) |
permissions | -rw-r--r-- |
last change | Abort configure when we can't find a gdk display method Add -lX11 to the GTK-X11 lib list explicitly - on OSX at least pkg-config doesn't do the right thing automatically |
file | annotate | diff | log | raw |
1.1 --- a/configure.in Sat Jul 31 11:16:44 2010 +10001.2 +++ b/configure.in Wed Sep 08 08:42:09 2010 +10001.3 @@ -210,9 +210,15 @@1.4 AC_CHECK_FUNC(gdk_x11_display_get_xdisplay, [1.5 HAVE_GTK_X11='yes'1.6 AC_DEFINE([HAVE_GTK_X11],1,[Building with GTK+X11]) ], [])1.7 + dnl Add -lX11 explicitly as some pkg-configs get it wrong1.8 + GTK_LIBS="$GTK_LIBS -lX11"1.9 + LIBS="$LIBS -lX11"1.10 AC_CHECK_FUNC(gdk_quartz_window_get_nsview, [1.11 HAVE_GTK_OSX='yes'1.12 AC_DEFINE([HAVE_GTK_OSX],1,[Building with GTK+Cocoa]) ], [])1.13 + if test "x$HAVE_GTK_X11$HAVE_GTK_OSX" = "x"; then1.14 + AC_MSG_FAILURE( [Unable to identify GTK platform] )1.15 + fi1.16 fi1.18 AM_CONDITIONAL(GUI_GTK, [test "$HAVE_GTK" = 'yes'])
.