diff options
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 27 |
1 files changed, 12 insertions, 15 deletions
diff --git a/configure.in b/configure.in index b3a5b37e28..7e9b0601a1 100644 --- a/configure.in +++ b/configure.in @@ -12,11 +12,6 @@ AC_INIT(gdk/gdktypes.h) # foo_DEP_CFLAGS: All cflags this module requires -## We could have pkg-config uniquify the ldflags and cflags by calling -## it once with both the GLib and Pango package names, but we don't, -## someone should fix that. - - # Save this value here, since automake will set cflags later cflags_set=${CFLAGS+set} @@ -32,13 +27,14 @@ GLIB_AC_DIVERT_BEFORE_HELP([ # if backwards compatibility has been broken, # set GTK_BINARY_AGE and GTK_INTERFACE_AGE to 0. # -GTK_MAJOR_VERSION=1 -GTK_MINOR_VERSION=3 -GTK_MICRO_VERSION=15 +GTK_MAJOR_VERSION=2 +GTK_MINOR_VERSION=0 +GTK_MICRO_VERSION=0 GTK_INTERFACE_AGE=0 GTK_BINARY_AGE=0 GTK_VERSION=$GTK_MAJOR_VERSION.$GTK_MINOR_VERSION.$GTK_MICRO_VERSION -dnl +dnl This is the X.Y used in -lgtk-FOO-X.Y +GTK_API_VERSION=2.0 ])dnl AC_SUBST(GTK_MAJOR_VERSION) @@ -46,6 +42,7 @@ AC_SUBST(GTK_MINOR_VERSION) AC_SUBST(GTK_MICRO_VERSION) AC_SUBST(GTK_INTERFACE_AGE) AC_SUBST(GTK_BINARY_AGE) +AC_SUBST(GTK_API_VERSION) AC_SUBST(GTK_VERSION) # libtool versioning @@ -80,9 +77,9 @@ AC_SUBST(GDK_PIXBUF_MICRO) AC_SUBST(GDK_PIXBUF_VERSION) ## Versions of dependencies -GLIB_REQUIRED_VERSION=1.3.15 -PANGO_REQUIRED_VERSION=0.26 -ATK_REQUIRED_VERSION=0.13 +GLIB_REQUIRED_VERSION=2.0.0 +PANGO_REQUIRED_VERSION=1.0.0 +ATK_REQUIRED_VERSION=1.0.0 # For automake. VERSION=$GTK_VERSION @@ -193,8 +190,8 @@ case $gdktarget in *) AC_MSG_ERROR([Invalid target for GDK: use x11, linux-fb or win32.]);; esac -gdktargetlib=libgdk-$gdktarget-1.3.la -gtktargetlib=libgtk-$gdktarget-1.3.la +gdktargetlib=libgdk-$gdktarget-$GTK_API_VERSION.la +gtktargetlib=libgtk-$gdktarget-$GTK_API_VERSION.la AC_SUBST(gdktargetlib) AC_SUBST(gtktargetlib) @@ -1270,7 +1267,7 @@ fi if $PKG_CONFIG --uninstalled $ATK_PACKAGES; then : else - AC_CHECK_LIB(atk, atk_object_get_type, : , AC_MSG_ERROR([ + AC_CHECK_LIB(atk-1.0, atk_object_get_type, : , AC_MSG_ERROR([ *** Cannot link to Accessibility Toolkit. Accessibility Toolkit is required *** to build GTK+]), $ATK_LIBS $GLIB_LIBS) fi |