Attachment #240385 for bug #330139

Lines 125-131 Link Here

(-)gnulib/m4/include_next.m4.orig (-1 / +1 lines)
125	[	125	[
126	AC_REQUIRE([gl_INCLUDE_NEXT])	126	AC_REQUIRE([gl_INCLUDE_NEXT])
127	AC_REQUIRE([AC_CANONICAL_HOST])	127	AC_REQUIRE([AC_CANONICAL_HOST])
128	AC_CHECK_HEADERS_ONCE([$1])	128	AC_CHECK_HEADERS([$1])
129		129
130	m4_foreach_w([gl_HEADER_NAME], [$1],	130	m4_foreach_w([gl_HEADER_NAME], [$1],
131	[AS_VAR_PUSHDEF([gl_next_header],	131	[AS_VAR_PUSHDEF([gl_next_header],

Lines 11-16 Link Here

(-)gnulib/m4/selinux-selinux-h.m4.orig (+7 lines)
11		11
12	AC_DEFUN([gl_HEADERS_SELINUX_SELINUX_H],	12	AC_DEFUN([gl_HEADERS_SELINUX_SELINUX_H],
13	[	13	[
		14	AC_ARG_ENABLE(selinux,
		15	AS_HELP_STRING(--disable-selinux,Disable SELinux support),
		16	[ac_cv_selinux=$enableval],[ac_cv_selinux=yes])
		17
		18	if test "x$ac_cv_selinux" = "xyes"; then
14	AC_REQUIRE([gl_LIBSELINUX])	19	AC_REQUIRE([gl_LIBSELINUX])
15	AC_CHECK_HEADERS([selinux/selinux.h])	20	AC_CHECK_HEADERS([selinux/selinux.h])
16		21
Lines 34-39 Link Here
34	AC_MSG_WARN([libselinux was found but selinux/selinux.h is missing.])	39	AC_MSG_WARN([libselinux was found but selinux/selinux.h is missing.])
35	AC_MSG_WARN([AC_PACKAGE_NAME will be compiled without SELinux support.])	40	AC_MSG_WARN([AC_PACKAGE_NAME will be compiled without SELinux support.])
36	esac	41	esac
		42	fi
37	])	43	])
38		44
39	AC_DEFUN([gl_LIBSELINUX],	45	AC_DEFUN([gl_LIBSELINUX],
Lines 44-49 Link Here
44	gl_save_LIBS=$LIBS	50	gl_save_LIBS=$LIBS
45	AC_SEARCH_LIBS([setfilecon], [selinux],	51	AC_SEARCH_LIBS([setfilecon], [selinux],
46	[test "$ac_cv_search_setfilecon" = "none required" \|\|	52	[test "$ac_cv_search_setfilecon" = "none required" \|\|
		53	test "$ac_cv_selinux" != "yes" \|\|
47	LIB_SELINUX=$ac_cv_search_setfilecon])	54	LIB_SELINUX=$ac_cv_search_setfilecon])
48	AC_SUBST([LIB_SELINUX])	55	AC_SUBST([LIB_SELINUX])
49	LIBS=$gl_save_LIBS	56	LIBS=$gl_save_LIBS

Return to bug 330139