diff options
| author | Wu Xiaotian <[email protected]> | 2019-02-06 13:09:16 +0800 |
|---|---|---|
| committer | raveit65 <[email protected]> | 2019-02-06 10:07:09 +0100 |
| commit | 91f1dc66b6f56e57734d3048501a6c4679331290 (patch) | |
| tree | a282106ac4891b9c1705b04ee544ca56f2629f90 | |
| parent | 2fde826ae189a535bfe00c15ca3ba7c51daaa08b (diff) | |
| download | caja-91f1dc66b6f56e57734d3048501a6c4679331290.tar.bz2 caja-91f1dc66b6f56e57734d3048501a6c4679331290.tar.xz | |
Add --disable-self-check for configure
Fixed make distcheck, see #1129
| -rw-r--r-- | Makefile.am | 1 | ||||
| -rw-r--r-- | configure.ac | 12 | ||||
| -rw-r--r-- | libcaja-private/caja-icon-container.c | 6 | ||||
| -rw-r--r-- | 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 94f46a65..027b6cde 100644 --- a/configure.ac +++ b/configure.ac @@ -190,6 +190,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, @@ -366,6 +377,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 182bdc69..6b753b31 100644 --- a/libcaja-private/caja-icon-container.c +++ b/libcaja-private/caja-icon-container.c @@ -10033,6 +10033,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) @@ -10132,7 +10133,6 @@ store_layout_timestamps_now (CajaIconContainer *container) } } - void caja_icon_container_end_loading (CajaIconContainer *container, gboolean all_icons_added) @@ -10157,13 +10157,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@ |