Mercurial > dwindows
comparison configure.in @ 775:5ec50e403a8a
Added initial support for GTK 3.0. Split it off into its own directory.
Lots of stuff is broken but it builds and sort of works.
author | bsmith@81767d24-ef19-dc11-ae90-00e081727c95 |
---|---|
date | Sun, 20 Mar 2011 05:12:40 +0000 |
parents | 39d848c20c05 |
children | baf23fa69b99 |
comparison
equal
deleted
inserted
replaced
774:bf3e9892146f | 775:5ec50e403a8a |
---|---|
194 esac | 194 esac |
195 | 195 |
196 if test $build_gtk = "yes"; then | 196 if test $build_gtk = "yes"; then |
197 AC_CHECK_PROG(PKG_CFG, pkg-config, pkg-config) | 197 AC_CHECK_PROG(PKG_CFG, pkg-config, pkg-config) |
198 if test x"$PKG_CFG" != x; then | 198 if test x"$PKG_CFG" != x; then |
199 GTK_LIBS=`$PKG_CFG --silence-errors --libs gtk+-2.0 gthread-2.0` | 199 GTK_PACKAGES="gtk+-3.0" |
200 GTK_LIBS=`$PKG_CFG --silence-errors --libs $GTK_PACKAGES` | |
201 if test x"$GTK_LIBS" = x; then | |
202 GTK_PACKAGES="gtk+-2.0 gthread-2.0" | |
203 GTK_LIBS=`$PKG_CFG --silence-errors --libs $GTK_PACKAGES` | |
204 else | |
205 DW_DIR=gtk3 | |
206 fi | |
200 if test $with_gtkmozembed = yes; then | 207 if test $with_gtkmozembed = yes; then |
201 MOZEMBED_LIBS=`$PKG_CFG --silence-errors --libs firefox-gtkmozembed` | 208 MOZEMBED_LIBS=`$PKG_CFG --silence-errors --libs firefox-gtkmozembed` |
202 MOZEMBED_CFLAGS=`$PKG_CFG --silence-errors --cflags firefox-gtkmozembed` | 209 MOZEMBED_CFLAGS=`$PKG_CFG --silence-errors --cflags firefox-gtkmozembed` |
203 RPATH=`$PKG_CFG --silence-errors --libs-only-L firefox-gtkmozembed | cut -b 3-` | 210 RPATH=`$PKG_CFG --silence-errors --libs-only-L firefox-gtkmozembed | cut -b 3-` |
204 if test x"$MOZEMBED_LIBS" = x; then | 211 if test x"$MOZEMBED_LIBS" = x; then |
239 if test x"$GTK_LIBS" = x; then | 246 if test x"$GTK_LIBS" = x; then |
240 AM_PATH_GLIB(1.2.0,,AC_MSG_ERROR(AC_MSG_ERROR(Cannot find GLIB: Is glib-config in path?))) | 247 AM_PATH_GLIB(1.2.0,,AC_MSG_ERROR(AC_MSG_ERROR(Cannot find GLIB: Is glib-config in path?))) |
241 AM_PATH_GTK(1.2.0,,AC_MSG_ERROR(AC_MSG_ERROR(Cannot find GTK: Is gtk-config in path?)), gthread) | 248 AM_PATH_GTK(1.2.0,,AC_MSG_ERROR(AC_MSG_ERROR(Cannot find GTK: Is gtk-config in path?)), gthread) |
242 AM_PATH_GDK_IMLIB(1.9.4, AC_DEFINE(USE_IMLIB), AC_MSG_ERROR(IMLIB not found or too old. Dynamic Windows cannot build without it.)) | 249 AM_PATH_GDK_IMLIB(1.9.4, AC_DEFINE(USE_IMLIB), AC_MSG_ERROR(IMLIB not found or too old. Dynamic Windows cannot build without it.)) |
243 else | 250 else |
244 GTK_CFLAGS=`$PKG_CFG --cflags gtk+-2.0 gthread-2.0` | 251 GTK_CFLAGS=`$PKG_CFG --cflags $GTK_PACKAGES` |
245 GTK_LIBS=`$PKG_CFG --libs gtk+-2.0 gthread-2.0` | 252 GTK_LIBS=`$PKG_CFG --libs $GTK_PACKAGES` |
246 fi | 253 fi |
247 fi | 254 fi |
248 | 255 |
249 if test $check_pthreads = "yes"; then | 256 if test $check_pthreads = "yes"; then |
250 AC_CHECK_HEADER(pthread.h,,AC_MSG_ERROR([pthread header not found. Dynamic Windows cannot build without it.])) | 257 AC_CHECK_HEADER(pthread.h,,AC_MSG_ERROR([pthread header not found. Dynamic Windows cannot build without it.])) |