[pangomm] Make use of new MM_ARG_DISABLE_DEPRECATED macro

[Daniel Elstner <daniel src gnome org>]

commit 2e01dbb8c933dafd36ed4ffb705c6dc178577bdf
Author: Daniel Elstner <danielk openismus com>
Date:   Mon Aug 17 13:31:57 2009 +0200

    Make use of new MM_ARG_DISABLE_DEPRECATED macro
    
    * configure.ac (PANGOMM_DISABLE_DEPRECATED): Call the new
    MM_ARG_DISABLE_DEPRECATED_API macro from mm-common in order
    to provide the option to omit deprecated API from the library
    build, and to define the corresponding configuration macro.
    * pango/pangommconfig.h.in (PANGOMM_DISABLE_DEPRECATED): Copy
    the #undef statement from the generated config.h.in template.

 ChangeLog                |   11 +++++++++++
 configure.ac             |   17 +----------------
 pango/pangommconfig.h.in |    3 +++
 3 files changed, 15 insertions(+), 16 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 19885fc..8777615 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2009-08-17  Daniel Elstner  <danielk openismus com>
+
+	Make use of new MM_ARG_DISABLE_DEPRECATED macro
+
+	* configure.ac (PANGOMM_DISABLE_DEPRECATED): Call the new
+	MM_ARG_DISABLE_DEPRECATED_API macro from mm-common in order
+	to provide the option to omit deprecated API from the library
+	build, and to define the corresponding configuration macro.
+	* pango/pangommconfig.h.in (PANGOMM_DISABLE_DEPRECATED): Copy
+	the #undef statement from the generated config.h.in template.
+
 2009-08-17  Daniel Elstner  <daniel kitta gmail com>
 
 	Append slash to overridden $(htmlrefpub)
diff --git a/configure.ac b/configure.ac
index eb0883a..65c4833 100644
--- a/configure.ac
+++ b/configure.ac
@@ -45,27 +45,12 @@ PKG_CHECK_MODULES([PANGOMM], [$PANGOMM_MODULES])
 MM_PKG_CONFIG_SUBST([GTHREAD_CFLAGS], [--cflags-only-other gthread-2.0])
 MM_PKG_CONFIG_SUBST([GMMPROC_DIR], [--variable=gmmprocdir glibmm-2.4])
 
+MM_ARG_DISABLE_DEPRECATED_API
 MM_ARG_ENABLE_DOCUMENTATION
 MM_ARG_WITH_TAGFILE_DOC([libstdc++.tag], [mm-common-libstdc++])
 MM_ARG_WITH_TAGFILE_DOC([libsigc++-2.0.tag], [sigc++-2.0])
 MM_ARG_WITH_TAGFILE_DOC([glibmm-2.4.tag], [glibmm-2.4])
 
-AC_ARG_ENABLE([deprecated-api],
-              [AS_HELP_STRING([--disable-deprecated-api],
-                              [omit deprecated API from the library])],
-              [pangomm_deprecated_api=$enableval],
-              [pangomm_deprecated_api=yes])
-AS_IF([test "x$pangomm_deprecated_api" = xyes],
-[
-  AC_MSG_NOTICE([[Deprecated API will be built, for backwards-compatibility.]])
-  DISABLE_DEPRECATED_API_CFLAGS=dnl
-], [
-  AC_MSG_WARN([[Deprecated API will not be built, breaking compatibility.
-Do not use this option for distribution packages.]])
-  DISABLE_DEPRECATED_API_CFLAGS='-DPANGOMM_DISABLE_DEPRECATED'dnl
-])
-AC_SUBST([DISABLE_DEPRECATED_API_CFLAGS])
-
 AC_LANG([C++])
 MM_ARG_ENABLE_WARNINGS([PANGOMM_WXXFLAGS],
                        [-Wall],
diff --git a/pango/pangommconfig.h.in b/pango/pangommconfig.h.in
index f2122b0..8ab0305 100644
--- a/pango/pangommconfig.h.in
+++ b/pango/pangommconfig.h.in
@@ -4,6 +4,9 @@
 
 #include <glibmmconfig.h>
 
+/* Define to omit deprecated API from the library. */
+#undef PANGOMM_DISABLE_DEPRECATED
+
 /* Major version number of pangomm. */
 #undef PANGOMM_MAJOR_VERSION