diff options
| author | Vincent Untz <vuntz@gnome.org> | 2010-09-27 12:43:37 +0200 |
|---|---|---|
| committer | Vincent Untz <vuntz@gnome.org> | 2010-09-27 12:44:12 +0200 |
| commit | 7fcbb6d90d2c6251434dfac19364b39af21dceed (patch) | |
| tree | 152d82e7d57605e634ecef9c9a2d095769098152 | |
| parent | 2ce2378514c60c3008ab1a9b39083f1aad87be3e (diff) | |
| download | gnome-desktop-7fcbb6d90d2c6251434dfac19364b39af21dceed.tar.gz | |
misc: Rename --enable-deprecations to --enable-deprecation-flags
This is a better name for this configure option, since it's really about
enabling the use of the deprecation flags, not allowing the use of
deprecated API.
| -rw-r--r-- | configure.ac | 18 | ||||
| -rw-r--r-- | libgnome-desktop/Makefile.am | 2 |
2 files changed, 10 insertions, 10 deletions
diff --git a/configure.ac b/configure.ac index 043f10cb..b4e78a1a 100644 --- a/configure.ac +++ b/configure.ac @@ -81,14 +81,14 @@ GNOME_DEBUG_CHECK GNOME_COMPILE_WARNINGS([maximum]) GNOME_MAINTAINER_MODE_DEFINES -# As a special favour for vuntz, support --disable-deprecations - -AC_ARG_ENABLE([deprecations], - [AS_HELP_STRING([--disable-deprecations],[don't warn about deprecated usages])], - [],[enable_deprecations=yes]) -if test "$enable_deprecations" = "no"; then - DISABLE_DEPRECATED="" - AC_SUBST([DISABLE_DEPRECATED]) +AC_ARG_ENABLE(deprecation_flags, + [AC_HELP_STRING([--enable-deprecation-flags], + [use *_DISABLE_DEPRECATED flags @<:@default=no@:>@])],, + [enable_deprecation_flags=no]) + +if test "x$enable_deprecation_flags" = "xyes"; then + DISABLE_DEPRECATED_CFLAGS=$DISABLE_DEPRECATED + AC_SUBST(DISABLE_DEPRECATED_CFLAGS) fi # Should we build gnome-about or the shared desktop docs? Useful for people who @@ -268,7 +268,7 @@ echo " compiler: ${CC} cflags: ${CFLAGS} Maintainer mode: ${USE_MAINTAINER_MODE} - Warn about deprecations: ${enable_deprecations} + Use *_DISABLE_DEPRECATED: ${enable_deprecation_flags} GNOME Distributor: ${GNOME_DISTRIBUTOR} Build gnome-about: ${enable_gnome_about} diff --git a/libgnome-desktop/Makefile.am b/libgnome-desktop/Makefile.am index 9c775c6e..a98bc74e 100644 --- a/libgnome-desktop/Makefile.am +++ b/libgnome-desktop/Makefile.am @@ -8,7 +8,7 @@ AM_CPPFLAGS = \ -DG_LOG_DOMAIN=\"GnomeDesktop\" \ -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale\"" \ -DPNP_IDS=\""$(PNP_IDS)"\" \ - $(DISABLE_DEPRECATED) + $(DISABLE_DEPRECATED_CFLAGS) AM_CFLAGS = $(WARN_CFLAGS) |