summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMurray Cumming <murrayc.com>2005-11-29 16:13:24 +0000
committerMurray Cumming <murrayc@src.gnome.org>2005-11-29 16:13:24 +0000
commit6d0b61de13926fd741ae5a99f64fea31cd46f6a5 (patch)
tree1b6e87a825ece409942d7fb7b24513cbdacc38af
parent7decc2f30b5b1187d0969a13f453b8be6ee1111e (diff)
downloadglibmm-6d0b61de13926fd741ae5a99f64fea31cd46f6a5.tar.gz
Added --enable-use-deprecations, defaulting to no (do not check for them),
2005-11-29 Murray Cumming <murrayc.com> * build_shared/Makefile_build.am_fragment: * configure.in: Added --enable-use-deprecations, defaulting to no (do not check for them), so that the tarball will still build when newer versions of glib deprecate some API. * examples/Makefile.am_fragment: Use the deprecation, if wanted.
-rw-r--r--ChangeLog10
-rw-r--r--build_shared/Makefile_build.am_fragment2
-rw-r--r--configure.in11
-rw-r--r--examples/Makefile.am_fragment2
4 files changed, 23 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index d4990d5f..639365f5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2005-11-29 Murray Cumming <murrayc.com>
+
+ * build_shared/Makefile_build.am_fragment:
+ * configure.in: Added --enable-use-deprecations,
+ defaulting to no (do not check for them), so that
+ the tarball will still build when newer versions
+ of glib deprecate some API.
+ * examples/Makefile.am_fragment: Use the
+ deprecation, if wanted.
+
2005-11-29 Murray Cumming <murrayc@murrayc.com>
* build_shared/Makefile_build.am_fragment:
diff --git a/build_shared/Makefile_build.am_fragment b/build_shared/Makefile_build.am_fragment
index edfe7da8..2ce34b56 100644
--- a/build_shared/Makefile_build.am_fragment
+++ b/build_shared/Makefile_build.am_fragment
@@ -42,7 +42,7 @@ all_includes = -I$(top_builddir)/glib -I$(top_srcdir)/glib \
$(sublib_cflags) $(GTHREAD_CFLAGS)
extra_defines = -DG_LOG_DOMAIN=\"$(sublib_name)\" \
- -DG_DISABLE_DEPRECATED $(GLIBMM_DISABLE_DEPRECATED)
+ $(DISABLE_DEPRECATED_CFLAGS) $(DISABLE_DEPRECATED_API_CFLAGS)
dist_sources = $(files_built_all_cc) $(files_extra_all_cc) \
$(files_built_all_h) $(files_extra_all_h)
diff --git a/configure.in b/configure.in
index 71d899f4..a08a7529 100644
--- a/configure.in
+++ b/configure.in
@@ -213,6 +213,17 @@ GLIBMM_ARG_ENABLE_DEBUG_REFCOUNTING()
# Evaluate the --enable-warnings=level option.
GTKMM_ARG_ENABLE_WARNINGS()
+# Add an --enable-use-deprecations configure option:
+AC_ARG_ENABLE(deprecations,
+ [AC_HELP_STRING([--enable-use-deprecations],
+ [warn about deprecated usages [default=no]])],,
+ [enable_deprecations=no])
+
+if test "x$enable_use_deprecations" = "xyes"; then
+ DISABLE_DEPRECATED_CFLAGS="-DG_DISABLE_DEPRECATED"
+ AC_SUBST(DISABLE_DEPRECATED_CFLAGS)
+fi
+
# Add an --enable-deprecated-api option:
AC_ARG_ENABLE(deprecated-api, [AC_HELP_STRING([--enable-deprecated-api],
diff --git a/examples/Makefile.am_fragment b/examples/Makefile.am_fragment
index b9982e0b..83433390 100644
--- a/examples/Makefile.am_fragment
+++ b/examples/Makefile.am_fragment
@@ -4,7 +4,7 @@ local_glibmm_lib = $(top_builddir)/glib/glibmm/libglibmm-2.4.la
LIBS = $(local_glibmm_lib) $(GLIBMM_LIBS)
all_includes = -I$(top_builddir)/glib -I$(top_srcdir)/glib \
- $(GLIBMM_CFLAGS)
+ $(GLIBMM_CFLAGS) $(DISABLE_DEPRECATED_CFLAGS) $(DISABLE_DEPRECATED_API_CFLAGS)
DEFS = @DEFS@
DEFAULT_INCLUDES =