Mercurial > hg > forks > geeqie
changeset 2045:acbfadc01ad2
more compilation fixes
| author | Vladimir Nadvornik <nadvornik@suse.cz> |
|---|---|
| date | Tue, 14 Aug 2012 21:58:57 +0200 |
| parents | a1bd12a58ac0 |
| children | fd514dc9e132 |
| files | configure.in src/compat.h |
| diffstat | 2 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/configure.in Tue Aug 14 20:22:37 2012 +0200 +++ b/configure.in Tue Aug 14 21:58:57 2012 +0200 @@ -189,7 +189,7 @@ prefix=$prefix fi -AM_PATH_GLIB_2_0(2.4.0,,AC_MSG_ERROR(GLIB >= 2.4.0 not installed.)) +AM_PATH_GLIB_2_0(2.24.0,,AC_MSG_ERROR(GLIB >= 2.24.0 not installed.)) AC_ARG_ENABLE([gtk3], AC_HELP_STRING([--disable-gtk3], [use gtk2 instead of gtk3]),[gtk3="${enableval}"], [gtk3=m4_ifdef([AM_PATH_GTK_3_0], [auto], [no])]) if test x$gtk3 == xyes; then @@ -203,7 +203,7 @@ fi if test x$gtk3 == xno; then - m4_ifdef([AM_PATH_GTK_2_0], [AM_PATH_GTK_2_0(2.20.0,,AC_MSG_ERROR(GTK+ >= 2.12.0 not installed.))]) + m4_ifdef([AM_PATH_GTK_2_0], [AM_PATH_GTK_2_0(2.20.0,,AC_MSG_ERROR(GTK+ >= 2.20.0 not installed.))]) true fi
--- a/src/compat.h Tue Aug 14 20:22:37 2012 +0200 +++ b/src/compat.h Tue Aug 14 21:58:57 2012 +0200 @@ -28,7 +28,7 @@ #define MAP_ANON MAP_ANONYMOUS #endif -#ifndef GDK_KEY_Up +#if !GTK_CHECK_VERSION(2,22,0) #define GDK_KEY_BackSpace GDK_BackSpace #define GDK_KEY_Delete GDK_Delete #define GDK_KEY_Down GDK_Down @@ -78,7 +78,7 @@ #endif -#if !GTK_CHECK_VERSION(2,24,0) +#if !GTK_CHECK_VERSION(2,22,0) #define gdk_window_create_similar_surface(window, content, width, height) compat_gdk_window_create_similar_surface(window, content, width, height) cairo_surface_t *compat_gdk_window_create_similar_surface (GdkWindow *window, cairo_content_t content, gint width, gint height);