Skip to content
Permalink
Browse files

Add --disable-self-check for configure

Fixed make distcheck, see #1129
  • Loading branch information...
yetist authored and raveit65 committed Feb 6, 2019
1 parent 2fde826 commit 91f1dc66b6f56e57734d3048501a6c4679331290
Showing with 16 additions and 5 deletions.
  1. +1 −0 Makefile.am
  2. +12 −0 configure.ac
  3. +1 −5 libcaja-private/caja-icon-container.c
  4. +2 −0 src/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}
@@ -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}
@@ -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 */
@@ -197,7 +197,9 @@ caja_connect_server_SOURCES = \
$(NULL)


if ENABLE_SELF_CHECK
TESTS=check-caja
endif

@INTLTOOL_SERVER_RULE@

0 comments on commit 91f1dc6

Please sign in to comment.
You can’t perform that action at this time.