Regenerated.

This commit is contained in:
Lars Magne Ingebrigtsen 2010-10-24 22:47:22 +02:00
parent d52bb9b4f6
commit d77d0953b5

25
configure vendored
View file

@ -5506,19 +5506,17 @@ with the \`--without-makeinfo' option to build without the manuals. " "$LINENO"
fi
if test x$GCC = xyes && test "x$GCC_LINK_TEST_OPTIONS" != x
then
ac_link="$ac_link $GCC_LINK_TEST_OPTIONS"
fi
if test x$GCC = x && test "x$NON_GCC_LINK_TEST_OPTIONS" != x
then
ac_link="$ac_link $NON_GCC_LINK_TEST_OPTIONS"
if test x$GCC = xyes; then
test "x$GCC_LINK_TEST_OPTIONS" != x && \
ac_link="$ac_link $GCC_LINK_TEST_OPTIONS"
else
test "x$NON_GCC_LINK_TEST_OPTIONS" != x && \
ac_link="$ac_link $NON_GCC_LINK_TEST_OPTIONS"
fi
late_LDFLAGS=$LDFLAGS
if test "$GCC" = yes; then
if test x$GCC = xyes; then
LDFLAGS="$LDFLAGS -Wl,-znocombreloc"
else
LDFLAGS="$LDFLAGS -znocombreloc"
@ -8054,6 +8052,7 @@ int
main ()
{
char *data, *data2, *data3;
const char *cdata2;
int i, pagesize;
int fd, fd2;
@ -8078,10 +8077,10 @@ main ()
fd2 = open ("conftest.txt", O_RDWR | O_CREAT | O_TRUNC, 0600);
if (fd2 < 0)
return 4;
data2 = "";
if (write (fd2, data2, 1) != 1)
cdata2 = "";
if (write (fd2, cdata2, 1) != 1)
return 5;
data2 = mmap (0, pagesize, PROT_READ | PROT_WRITE, MAP_SHARED, fd2, 0L);
data2 = (char *) mmap (0, pagesize, PROT_READ | PROT_WRITE, MAP_SHARED, fd2, 0L);
if (data2 == MAP_FAILED)
return 6;
for (i = 0; i < pagesize; ++i)
@ -14968,7 +14967,7 @@ echo " Does Emacs use -lgpm? ${HAVE_GPM}"
echo " Does Emacs use -ldbus? ${HAVE_DBUS}"
echo " Does Emacs use -lgconf? ${HAVE_GCONF}"
echo " Does Emacs use -lselinux? ${HAVE_LIBSELINUX}"
echo " Does Emacs use -lgnutls (BROKEN)? ${HAVE_GNUTLS}"
echo " Does Emacs use -lgnutls? ${HAVE_GNUTLS}"
echo " Does Emacs use -lxml2? ${HAVE_LIBXML2}"
echo " Does Emacs use -lfreetype? ${HAVE_FREETYPE}"