Attachment #349642 for bug #469206

Lines 139-144 Link Here

(-)a/import-gnulib.config (+1 lines)
139	sys_wait	139	sys_wait
140	timespec	140	timespec
141	uname	141	uname
		142	unlinkat
142	verify	143	verify
143	version-etc	144	version-etc
144	version-etc-fsf	145	version-etc-fsf







  gl_LIBOBJS="$gl_LIBOBJS rmdir.$ac_objext"

  fi





          GNULIB_RMDIR=1
        if test "$GNULIB_RMDIR" = 0; then
      GNULIB_RMDIR=$gl_module_indicator_condition
    else
      GNULIB_RMDIR="($GNULIB_RMDIR || $gl_module_indicator_condition)"
    fi
  fi







  gl_LIBOBJS="$gl_LIBOBJS unlink.$ac_objext"

  fi





          GNULIB_UNLINK=1
        if test "$GNULIB_UNLINK" = 0; then
      GNULIB_UNLINK=$gl_module_indicator_condition
    else
      GNULIB_UNLINK="($GNULIB_UNLINK || $gl_module_indicator_condition)"
    fi
  fi







  gl_LIBOBJS="$gl_LIBOBJS unlinkat.$ac_objext"

  fi





          GNULIB_UNLINKAT=1
        if test "$GNULIB_UNLINKAT" = 0; then
      GNULIB_UNLINKAT=$gl_module_indicator_condition
    else
      GNULIB_UNLINKAT="($GNULIB_UNLINKAT || $gl_module_indicator_condition)"
    fi
  fi







	readdir.c readlink.c at-func.c readlinkat.c realloc.c \
	realloc.c regcomp.c regex.c regex.h regex_internal.c \
	regex_internal.h regexec.c dirent-private.h rewinddir.c \
	rmdir.c \
	root-uid.h rpmatch.c same.h same-inode.h save-cwd.h savedir.h \
	at-func.c selinux-at.c selinux-at.h getfilecon.c setenv.c \
	$(top_srcdir)/build-aux/snippet/_Noreturn.h \

	$(top_srcdir)/build-aux/config.rpath time.in.h time_r.c \
	timespec.h trunc.c uname.c unistd.in.h unistd--.h \
	unistd-safer.h unitypes.in.h localcharset.h uniwidth.in.h \
	uniwidth/cjk.h unlink.c at-func.c unlinkat.c unsetenv.c \
	$(top_srcdir)/build-aux/update-copyright \
	$(top_srcdir)/build-aux/useless-if-before-free asnprintf.c \
	float+.h printf-args.c printf-args.h printf-parse.c \

	mountlist.c msvc-inval.c msvc-nothrow.c nl_langinfo.c open.c \
	openat.c opendir.c perror.c readdir.c readlink.c at-func.c \
	readlinkat.c realloc.c realloc.c regcomp.c regex.c \
	regex_internal.c regexec.c rewinddir.c \
	rmdir.c rpmatch.c at-func.c \
	selinux-at.c getfilecon.c setenv.c snprintf.c stat.c stpcpy.c \
	strcasecmp.c strncasecmp.c strcasestr.c strdup.c strerror.c \
	strerror-override.c strerror_r.c strndup.c strnlen.c strstr.c \
	strtol.c strtol.c strtoul.c strtol.c strtoul.c strtoull.c \
	strtoimax.c strtoumax.c time_r.c trunc.c uname.c \
	unlink.c at-func.c unlinkat.c unsetenv.c \
	asnprintf.c printf-args.c printf-parse.c vasnprintf.c \
	wcrtomb.c wcwidth.c
charset_alias = $(DESTDIR)$(libdir)/charset.alias

@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/regex_internal.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/regexec.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rewinddir.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rmdir.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rpmatch.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/same.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/save-cwd.Po@am__quote@

@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/timespec.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/trunc.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/uname.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unlink.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unlinkat.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unsetenv.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vasnprintf.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/version-etc-fsf.Po@am__quote@

Return to bug 469206

Lines 42356-42362 Link Here

(-)a/configure (-24 / +6 lines)
42356		42356
42357		42357
42358		42358
42359	gltests_LIBOBJS="$gltests_LIBOBJS rmdir.$ac_objext"	42359	gl_LIBOBJS="$gl_LIBOBJS rmdir.$ac_objext"
42360		42360
42361	fi	42361	fi
42362		42362
Lines 42364-42376 Link Here
42364		42364
42365		42365
42366		42366
42367	if test "$GNULIB_RMDIR" != 1; then	42367	GNULIB_RMDIR=1
42368	if test "$GNULIB_RMDIR" = 0; then
42369	GNULIB_RMDIR=$gl_module_indicator_condition
42370	else
42371	GNULIB_RMDIR="($GNULIB_RMDIR \|\| $gl_module_indicator_condition)"
42372	fi
42373	fi
42374		42368
42375		42369
42376		42370
Lines 43683-43689 Link Here
43683		43677
43684		43678
43685		43679
43686	gltests_LIBOBJS="$gltests_LIBOBJS unlink.$ac_objext"	43680	gl_LIBOBJS="$gl_LIBOBJS unlink.$ac_objext"
43687		43681
43688	fi	43682	fi
43689		43683
Lines 43691-43703 Link Here
43691		43685
43692		43686
43693		43687
43694	if test "$GNULIB_UNLINK" != 1; then	43688	GNULIB_UNLINK=1
43695	if test "$GNULIB_UNLINK" = 0; then
43696	GNULIB_UNLINK=$gl_module_indicator_condition
43697	else
43698	GNULIB_UNLINK="($GNULIB_UNLINK \|\| $gl_module_indicator_condition)"
43699	fi
43700	fi
43701		43689
43702		43690
43703		43691
Lines 43746-43752 Link Here
43746		43734
43747		43735
43748		43736
43749	gltests_LIBOBJS="$gltests_LIBOBJS unlinkat.$ac_objext"	43737	gl_LIBOBJS="$gl_LIBOBJS unlinkat.$ac_objext"
43750		43738
43751	fi	43739	fi
43752		43740
Lines 43754-43766 Link Here
43754		43742
43755		43743
43756		43744
43757	if test "$GNULIB_UNLINKAT" != 1; then	43745	GNULIB_UNLINKAT=1
43758	if test "$GNULIB_UNLINKAT" = 0; then
43759	GNULIB_UNLINKAT=$gl_module_indicator_condition
43760	else
43761	GNULIB_UNLINKAT="($GNULIB_UNLINKAT \|\| $gl_module_indicator_condition)"
43762	fi
43763	fi
43764		43746
43765		43747
43766		43748

Lines 1570-1575 Link Here

(-)a/gl/lib/Makefile.in (-3 / +9 lines)
1570	readdir.c readlink.c at-func.c readlinkat.c realloc.c \	1570	readdir.c readlink.c at-func.c readlinkat.c realloc.c \
1571	realloc.c regcomp.c regex.c regex.h regex_internal.c \	1571	realloc.c regcomp.c regex.c regex.h regex_internal.c \
1572	regex_internal.h regexec.c dirent-private.h rewinddir.c \	1572	regex_internal.h regexec.c dirent-private.h rewinddir.c \
		1573	rmdir.c \
1573	root-uid.h rpmatch.c same.h same-inode.h save-cwd.h savedir.h \	1574	root-uid.h rpmatch.c same.h same-inode.h save-cwd.h savedir.h \
1574	at-func.c selinux-at.c selinux-at.h getfilecon.c setenv.c \	1575	at-func.c selinux-at.c selinux-at.h getfilecon.c setenv.c \
1575	$(top_srcdir)/build-aux/snippet/_Noreturn.h \	1576	$(top_srcdir)/build-aux/snippet/_Noreturn.h \
Lines 1590-1596 Link Here
1590	$(top_srcdir)/build-aux/config.rpath time.in.h time_r.c \	1591	$(top_srcdir)/build-aux/config.rpath time.in.h time_r.c \
1591	timespec.h trunc.c uname.c unistd.in.h unistd--.h \	1592	timespec.h trunc.c uname.c unistd.in.h unistd--.h \
1592	unistd-safer.h unitypes.in.h localcharset.h uniwidth.in.h \	1593	unistd-safer.h unitypes.in.h localcharset.h uniwidth.in.h \
1593	uniwidth/cjk.h unsetenv.c \	1594	uniwidth/cjk.h unlink.c at-func.c unlinkat.c unsetenv.c \
1594	$(top_srcdir)/build-aux/update-copyright \	1595	$(top_srcdir)/build-aux/update-copyright \
1595	$(top_srcdir)/build-aux/useless-if-before-free asnprintf.c \	1596	$(top_srcdir)/build-aux/useless-if-before-free asnprintf.c \
1596	float+.h printf-args.c printf-args.h printf-parse.c \	1597	float+.h printf-args.c printf-args.h printf-parse.c \
Lines 1697-1708 Link Here
1697	mountlist.c msvc-inval.c msvc-nothrow.c nl_langinfo.c open.c \	1698	mountlist.c msvc-inval.c msvc-nothrow.c nl_langinfo.c open.c \
1698	openat.c opendir.c perror.c readdir.c readlink.c at-func.c \	1699	openat.c opendir.c perror.c readdir.c readlink.c at-func.c \
1699	readlinkat.c realloc.c realloc.c regcomp.c regex.c \	1700	readlinkat.c realloc.c realloc.c regcomp.c regex.c \
1700	regex_internal.c regexec.c rewinddir.c rpmatch.c at-func.c \	1701	regex_internal.c regexec.c rewinddir.c \
		1702	rmdir.c rpmatch.c at-func.c \
1701	selinux-at.c getfilecon.c setenv.c snprintf.c stat.c stpcpy.c \	1703	selinux-at.c getfilecon.c setenv.c snprintf.c stat.c stpcpy.c \
1702	strcasecmp.c strncasecmp.c strcasestr.c strdup.c strerror.c \	1704	strcasecmp.c strncasecmp.c strcasestr.c strdup.c strerror.c \
1703	strerror-override.c strerror_r.c strndup.c strnlen.c strstr.c \	1705	strerror-override.c strerror_r.c strndup.c strnlen.c strstr.c \
1704	strtol.c strtol.c strtoul.c strtol.c strtoul.c strtoull.c \	1706	strtol.c strtol.c strtoul.c strtol.c strtoul.c strtoull.c \
1705	strtoimax.c strtoumax.c time_r.c trunc.c uname.c unsetenv.c \	1707	strtoimax.c strtoumax.c time_r.c trunc.c uname.c \
		1708	unlink.c at-func.c unlinkat.c unsetenv.c \
1706	asnprintf.c printf-args.c printf-parse.c vasnprintf.c \	1709	asnprintf.c printf-args.c printf-parse.c vasnprintf.c \
1707	wcrtomb.c wcwidth.c	1710	wcrtomb.c wcwidth.c
1708	charset_alias = $(DESTDIR)$(libdir)/charset.alias	1711	charset_alias = $(DESTDIR)$(libdir)/charset.alias
Lines 1938-1943 Link Here
1938	@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/regex_internal.Po@am__quote@	1941	@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/regex_internal.Po@am__quote@
1939	@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/regexec.Po@am__quote@	1942	@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/regexec.Po@am__quote@
1940	@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rewinddir.Po@am__quote@	1943	@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rewinddir.Po@am__quote@
		1944	@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rmdir.Po@am__quote@
1941	@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rpmatch.Po@am__quote@	1945	@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rpmatch.Po@am__quote@
1942	@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/same.Po@am__quote@	1946	@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/same.Po@am__quote@
1943	@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/save-cwd.Po@am__quote@	1947	@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/save-cwd.Po@am__quote@
Lines 1972-1977 Link Here
1972	@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/timespec.Po@am__quote@	1976	@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/timespec.Po@am__quote@
1973	@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/trunc.Po@am__quote@	1977	@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/trunc.Po@am__quote@
1974	@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/uname.Po@am__quote@	1978	@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/uname.Po@am__quote@
		1979	@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unlink.Po@am__quote@
		1980	@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unlinkat.Po@am__quote@
1975	@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unsetenv.Po@am__quote@	1981	@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unsetenv.Po@am__quote@
1976	@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vasnprintf.Po@am__quote@	1982	@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vasnprintf.Po@am__quote@
1977	@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/version-etc-fsf.Po@am__quote@	1983	@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/version-etc-fsf.Po@am__quote@