diff options
author | Wolfgang Ulbrich <[email protected]> | 2016-01-15 13:00:54 +0100 |
---|---|---|
committer | Wolfgang Ulbrich <[email protected]> | 2016-01-15 13:00:54 +0100 |
commit | 8187e18cc3044d8a9e9da1bb959b543a2afcb980 (patch) | |
tree | 59157a4c0b31b5b065b59a0a95f3ad77da34c460 | |
parent | 7b5604b7e1af03445e7209b8a067ef359c2b4846 (diff) | |
download | caja-8187e18cc3044d8a9e9da1bb959b543a2afcb980.tar.bz2 caja-8187e18cc3044d8a9e9da1bb959b543a2afcb980.tar.xz |
Revert "define max/min version of GLib"
To avoid a glib redefine of a version defined by glib itself,
which spams only the build log and nobody takes care of it.
This reverts commit 3e9b28b2ebc9579bc868e2a8d1dc2d6f6b568c68.
-rw-r--r-- | configure.ac | 6 | ||||
-rw-r--r-- | libcaja-extension/caja-extension-i18n.h | 4 |
2 files changed, 2 insertions, 8 deletions
diff --git a/configure.ac b/configure.ac index ddbdb362..b0733d50 100644 --- a/configure.ac +++ b/configure.ac @@ -21,12 +21,6 @@ m4_define(caja_extension_revision, 0) AC_INIT([caja], [1.13.0], [http://www.mate-desktop.org]) -# GLib min/max required versions -AC_DEFINE([GLIB_VERSION_MAX_ALLOWED], [GLIB_VERSION_2_36], - [Warn on use of APIs added after GLib 2.36]) -AC_DEFINE([GLIB_VERSION_MIN_REQUIRED], [GLIB_VERSION_2_36], - [Warn on use of APIs deprecated before GLib 2.36]) - dnl --------------------------------------------------------------------------- dnl GTK library version dnl --------------------------------------------------------------------------- diff --git a/libcaja-extension/caja-extension-i18n.h b/libcaja-extension/caja-extension-i18n.h index c4e802f1..34e1b3e6 100644 --- a/libcaja-extension/caja-extension-i18n.h +++ b/libcaja-extension/caja-extension-i18n.h @@ -1,8 +1,8 @@ -#include "config.h" - #ifndef CAJA_EXTENSION_I18N_H #define CAJA_EXTENSION_I18N_H +#include "config.h" + #ifdef ENABLE_NLS #include<libintl.h> #define _(String) dgettext(GETTEXT_PACKAGE,String) |