From 89a3be236969d9dfb8823ded695ccb7260dba454 Mon Sep 17 00:00:00 2001
From: Wu Xiaotian <yetist@gmail.com>
Date: Wed, 6 Feb 2019 13:09:16 +0800
Subject: Add --disable-self-check for configure

Fixed make distcheck, see #1129
---
 Makefile.am                           |  1 +
 configure.ac                          | 12 ++++++++++++
 libcaja-private/caja-icon-container.c |  6 +-----
 src/Makefile.am                       |  2 ++
 4 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index fcf52698..21d98a08 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -33,6 +33,7 @@ DISTCHECK_CONFIGURE_FLAGS = \
 	--disable-update-mimedb \
 	--disable-icon-update \
 	--enable-gtk-doc \
+	--disable-self-check \
 	CFLAGS='-Wno-deprecated-declarations'
 
 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
diff --git a/configure.ac b/configure.ac
index 9c429c83..cab5b568 100644
--- a/configure.ac
+++ b/configure.ac
@@ -186,6 +186,17 @@ AC_ARG_ENABLE(empty_view,
 AC_SUBST(ENABLE_EMPTY_VIEW)
 AM_CONDITIONAL(ENABLE_EMPTY_VIEW, test "x$ENABLE_EMPTY_VIEW" = "x1")
 
+dnl ==========  EEL/CAJA OMIT SELF CHECK  ====================================
+AC_ARG_ENABLE(self-check,
+    AC_HELP_STRING([--disable-self-check], [build with self check]))
+msg_self_check=yes
+if test "x$enable_self_check" == "xno"; then
+    msg_self_check=no
+    AC_DEFINE(EEL_OMIT_SELF_CHECK, 1, [define to disable eel self check])
+    AC_DEFINE(CAJA_OMIT_SELF_CHECK, 1, [define to disable caja self check])
+fi
+AM_CONDITIONAL(ENABLE_SELF_CHECK, test "x$msg_self_check" = "xyes")
+
 dnl ==========================================================================
 
 AC_ARG_ENABLE(packagekit,
@@ -355,6 +366,7 @@ caja-$VERSION:
     compiler:                     ${CC}
     xmp support:                  $msg_xmp
     PackageKit support:           $msg_packagekit
+    Self check:                   $msg_self_check
 
     caja-extension documentation: ${enable_gtk_doc}
     caja-extension introspection: ${found_introspection}
diff --git a/libcaja-private/caja-icon-container.c b/libcaja-private/caja-icon-container.c
index 5f941eab..33145a7f 100644
--- a/libcaja-private/caja-icon-container.c
+++ b/libcaja-private/caja-icon-container.c
@@ -10010,6 +10010,7 @@ caja_self_check_icon_container (void)
     EEL_CHECK_STRING_RESULT (check_compute_stretch (0, 0, 16, 16, 16, 17, 16), "0,0:16");
     EEL_CHECK_STRING_RESULT (check_compute_stretch (100, 100, 64, 105, 105, 40, 40), "35,35:129");
 }
+#endif /* ! CAJA_OMIT_SELF_CHECK */
 
 gboolean
 caja_icon_container_is_layout_rtl (CajaIconContainer *container)
@@ -10109,7 +10110,6 @@ store_layout_timestamps_now (CajaIconContainer *container)
     }
 }
 
-
 void
 caja_icon_container_end_loading (CajaIconContainer *container,
                                  gboolean               all_icons_added)
@@ -10134,13 +10134,9 @@ caja_icon_container_get_store_layout_timestamps (CajaIconContainer *container)
     return container->details->store_layout_timestamps;
 }
 
-
 void
 caja_icon_container_set_store_layout_timestamps (CajaIconContainer *container,
         gboolean               store_layout_timestamps)
 {
     container->details->store_layout_timestamps = store_layout_timestamps;
 }
-
-
-#endif /* ! CAJA_OMIT_SELF_CHECK */
diff --git a/src/Makefile.am b/src/Makefile.am
index f4e50024..eed28d9c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -197,7 +197,9 @@ caja_connect_server_SOURCES = \
 	$(NULL)
 
 
+if ENABLE_SELF_CHECK
 TESTS=check-caja
+endif
 
 @INTLTOOL_SERVER_RULE@
 
-- 
cgit v1.2.1