From 9970249880237f06d2f718f5168532b93f8d1064 Mon Sep 17 00:00:00 2001
From: monsta <monsta@inbox.ru>
Date: Fri, 10 Feb 2017 14:05:05 +0300
Subject: build: remove option that disables deprecated stuff

it's also named incorrectly - it doesn't enable anything
but makes the build break on the first deprecated item
---
 caja/Makefile.am         | 1 -
 configure.ac             | 8 --------
 copy-n-paste/Makefile.am | 1 -
 src/Makefile.am          | 1 -
 src/commands/Makefile.am | 2 +-
 5 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/caja/Makefile.am b/caja/Makefile.am
index b516f83..3d95d68 100644
--- a/caja/Makefile.am
+++ b/caja/Makefile.am
@@ -3,7 +3,6 @@ AM_CPPFLAGS =						\
 	-DMATELOCALEDIR=\""$(datadir)/locale"\" 	\
 	-I$(top_srcdir)					\
 	-I$(top_builddir)				\
-	$(DISABLE_DEPRECATED)				\
 	$(CAJA_CFLAGS)
 
 caja_extensiondir=$(CAJA_EXTENSION_DIR)
diff --git a/configure.ac b/configure.ac
index aa03c84..c557b71 100644
--- a/configure.ac
+++ b/configure.ac
@@ -204,14 +204,6 @@ YELP_HELP_INIT
 
 dnl ******************************
 
-AC_ARG_ENABLE(deprecations,AS_HELP_STRING([--enable-deprecations],[warn about deprecated usages]),)
-if test "x$enable_deprecations" = "xyes"; then
-        DISABLE_DEPRECATED="-DGSEAL_ENABLE -DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED"
-fi
-AC_SUBST(DISABLE_DEPRECATED)
-
-dnl ******************************
-
 AC_CONFIG_FILES([Makefile
 		 data/Makefile
 		 data/engrampa.desktop.in
diff --git a/copy-n-paste/Makefile.am b/copy-n-paste/Makefile.am
index 2b7d18e..776885a 100644
--- a/copy-n-paste/Makefile.am
+++ b/copy-n-paste/Makefile.am
@@ -1,5 +1,4 @@
 AM_CPPFLAGS = \
-	$(DISABLE_DEPRECATED) \
 	-UGETTEXT_PACKAGE
 
 noinst_LTLIBRARIES = libeggsmclient.la
diff --git a/src/Makefile.am b/src/Makefile.am
index c4da5ed..49adf26 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -37,7 +37,6 @@ AM_CPPFLAGS =						\
 	-DGLADEDIR=\""$(gladedir)"\" 			\
 	-DPRIVEXECDIR=\"$(privexecdir)\"		\
 	-DSHDIR=\"$(shdir)\"				\
-	$(DISABLE_DEPRECATED)				\
 	$(FR_CFLAGS)					\
 	$(JSON_GLIB_CFLAGS)
 
diff --git a/src/commands/Makefile.am b/src/commands/Makefile.am
index 9228238..63d3d73 100644
--- a/src/commands/Makefile.am
+++ b/src/commands/Makefile.am
@@ -1,7 +1,7 @@
 privexecdir = $(libexecdir)/$(PACKAGE)
 privexec_PROGRAMS = rpm2cpio
 
-AM_CPPFLAGS = $(DISABLE_DEPRECATED) $(FR_CFLAGS)
+AM_CPPFLAGS = $(FR_CFLAGS)
 
 rpm2cpio_SOURCES = rpm2cpio.c
 rpm2cpio_LDADD = $(FR_LIBS)
-- 
cgit v1.2.1