Skip to content

Commit 89a3be2

Browse files
yetistraveit65
authored and
raveit65
committed
Add --disable-self-check for configure
Fixed make distcheck, see #1129
1 parent e6bfa07 commit 89a3be2

File tree

4 files changed

+16
-5
lines changed

4 files changed

+16
-5
lines changed

Makefile.am

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ DISTCHECK_CONFIGURE_FLAGS = \
3333
--disable-update-mimedb \
3434
--disable-icon-update \
3535
--enable-gtk-doc \
36+
--disable-self-check \
3637
CFLAGS='-Wno-deprecated-declarations'
3738

3839
ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}

configure.ac

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -186,6 +186,17 @@ AC_ARG_ENABLE(empty_view,
186186
AC_SUBST(ENABLE_EMPTY_VIEW)
187187
AM_CONDITIONAL(ENABLE_EMPTY_VIEW, test "x$ENABLE_EMPTY_VIEW" = "x1")
188188

189+
dnl ========== EEL/CAJA OMIT SELF CHECK ====================================
190+
AC_ARG_ENABLE(self-check,
191+
AC_HELP_STRING([--disable-self-check], [build with self check]))
192+
msg_self_check=yes
193+
if test "x$enable_self_check" == "xno"; then
194+
msg_self_check=no
195+
AC_DEFINE(EEL_OMIT_SELF_CHECK, 1, [define to disable eel self check])
196+
AC_DEFINE(CAJA_OMIT_SELF_CHECK, 1, [define to disable caja self check])
197+
fi
198+
AM_CONDITIONAL(ENABLE_SELF_CHECK, test "x$msg_self_check" = "xyes")
199+
189200
dnl ==========================================================================
190201

191202
AC_ARG_ENABLE(packagekit,
@@ -355,6 +366,7 @@ caja-$VERSION:
355366
compiler: ${CC}
356367
xmp support: $msg_xmp
357368
PackageKit support: $msg_packagekit
369+
Self check: $msg_self_check
358370

359371
caja-extension documentation: ${enable_gtk_doc}
360372
caja-extension introspection: ${found_introspection}

libcaja-private/caja-icon-container.c

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10010,6 +10010,7 @@ caja_self_check_icon_container (void)
1001010010
EEL_CHECK_STRING_RESULT (check_compute_stretch (0, 0, 16, 16, 16, 17, 16), "0,0:16");
1001110011
EEL_CHECK_STRING_RESULT (check_compute_stretch (100, 100, 64, 105, 105, 40, 40), "35,35:129");
1001210012
}
10013+
#endif /* ! CAJA_OMIT_SELF_CHECK */
1001310014

1001410015
gboolean
1001510016
caja_icon_container_is_layout_rtl (CajaIconContainer *container)
@@ -10109,7 +10110,6 @@ store_layout_timestamps_now (CajaIconContainer *container)
1010910110
}
1011010111
}
1011110112

10112-
1011310113
void
1011410114
caja_icon_container_end_loading (CajaIconContainer *container,
1011510115
gboolean all_icons_added)
@@ -10134,13 +10134,9 @@ caja_icon_container_get_store_layout_timestamps (CajaIconContainer *container)
1013410134
return container->details->store_layout_timestamps;
1013510135
}
1013610136

10137-
1013810137
void
1013910138
caja_icon_container_set_store_layout_timestamps (CajaIconContainer *container,
1014010139
gboolean store_layout_timestamps)
1014110140
{
1014210141
container->details->store_layout_timestamps = store_layout_timestamps;
1014310142
}
10144-
10145-
10146-
#endif /* ! CAJA_OMIT_SELF_CHECK */

src/Makefile.am

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,9 @@ caja_connect_server_SOURCES = \
197197
$(NULL)
198198

199199

200+
if ENABLE_SELF_CHECK
200201
TESTS=check-caja
202+
endif
201203

202204
@INTLTOOL_SERVER_RULE@
203205

0 commit comments

Comments
 (0)