Search
lxdream.org :: lxdream :: r1115:90292b2f2243
lxdream 0.9.1
released Jun 29
Download Now
changeset1115:90292b2f2243
parent1114:2fbf712e53f0
child1116:09a69dfc7931
authornkeynes
dateWed Sep 08 08:42:09 2010 +1000 (9 years ago)
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
configure
configure.in
1.1 --- a/configure Tue Aug 31 21:38:38 2010 +1000
1.2 +++ b/configure Wed Sep 08 08:42:09 2010 +1000
1.3 @@ -8997,6 +8997,8 @@
1.4
1.5 fi
1.6
1.7 + GTK_LIBS="$GTK_LIBS -lX11"
1.8 + LIBS="$LIBS -lX11"
1.9 { echo "$as_me:$LINENO: checking for gdk_quartz_window_get_nsview" >&5
1.10 echo $ECHO_N "checking for gdk_quartz_window_get_nsview... $ECHO_C" >&6; }
1.11 if test "${ac_cv_func_gdk_quartz_window_get_nsview+set}" = set; then
1.12 @@ -9088,6 +9090,13 @@
1.13
1.14 fi
1.15
1.16 + if test "x$HAVE_GTK_X11$HAVE_GTK_OSX" = "x"; then
1.17 + { { echo "$as_me:$LINENO: error: Unable to identify GTK platform
1.18 +See \`config.log' for more details." >&5
1.19 +echo "$as_me: error: Unable to identify GTK platform
1.20 +See \`config.log' for more details." >&2;}
1.21 + { (exit 1); exit 1; }; }
1.22 + fi
1.23 fi
1.24
1.25
2.1 --- a/configure.in Tue Aug 31 21:38:38 2010 +1000
2.2 +++ b/configure.in Wed Sep 08 08:42:09 2010 +1000
2.3 @@ -210,9 +210,15 @@
2.4 AC_CHECK_FUNC(gdk_x11_display_get_xdisplay, [
2.5 HAVE_GTK_X11='yes'
2.6 AC_DEFINE([HAVE_GTK_X11],1,[Building with GTK+X11]) ], [])
2.7 + dnl Add -lX11 explicitly as some pkg-configs get it wrong
2.8 + GTK_LIBS="$GTK_LIBS -lX11"
2.9 + LIBS="$LIBS -lX11"
2.10 AC_CHECK_FUNC(gdk_quartz_window_get_nsview, [
2.11 HAVE_GTK_OSX='yes'
2.12 AC_DEFINE([HAVE_GTK_OSX],1,[Building with GTK+Cocoa]) ], [])
2.13 + if test "x$HAVE_GTK_X11$HAVE_GTK_OSX" = "x"; then
2.14 + AC_MSG_FAILURE( [Unable to identify GTK platform] )
2.15 + fi
2.16 fi
2.17
2.18 AM_CONDITIONAL(GUI_GTK, [test "$HAVE_GTK" = 'yes'])
.