robustify bootstrap process, ensure distribution of updated boostrap.sh
2006-07-13 Paolo Bonzini <bonzini@gnu.org> * bootstrap.sh.in: Add a few autoconfy tests. * Makefile.am: Update distributed bootstrap.sh. git-archimport-id: bonzini@gnu.org--2004b/sed--stable--4.1--patch-68
This commit is contained in:
1 parent
760bf669e6
commit
ec9561cfa4
5 files changed
+117
-21
No files matched your search
@@ -1,4 +1,9 @@
|
||||
2006-05-15 Hans-Bernhard Bröker <broeker@physik.rwth-aachen.de>
|
||||
2006-07-13 Paolo Bonzini <bonzini@gnu.org>
|
||||
|
||||
* bootstrap.sh.in: Add a few autoconfy tests.
|
||||
* Makefile.am: Update distributed bootstrap.sh.
|
||||
|
||||
2006-05-15 Hans-Bernhard Broeker <broeker@physik.rwth-aachen.de>
|
||||
|
||||
* sed/basicdefs.h (OB_MALLOC): Turn VCAST into void * cast.
|
||||
|
||||
|
||||
+6
-2
@@ -11,8 +11,7 @@ SUBDIRS = intl lib po sed doc testsuite
|
||||
noinst_DATA = bootstrap.sh
|
||||
noinst_HEADERS = basicdefs.h
|
||||
|
||||
EXTRA_DIST = BUGS THANKS COPYING.DOC README.boot bootstrap.sh \
|
||||
config/texi2dvi config/help2man
|
||||
EXTRA_DIST = BUGS THANKS COPYING.DOC README.boot config/texi2dvi config/help2man
|
||||
|
||||
html:
|
||||
cd doc && make html
|
||||
@@ -20,6 +19,11 @@ html:
|
||||
DISTCHECK_CONFIGURE_FLAGS = XGETTEXT='$(SHELL) -c : dummy' $(EXTRA_DC_FLAGS)
|
||||
EXTRA_DC_FLAGS =
|
||||
|
||||
dist-hook:
|
||||
cmp bootstrap.sh $(srcdir)/bootstrap.sh > /dev/null 2>&1 || \
|
||||
cp -p bootstrap.sh $(srcdir)/bootstrap.sh
|
||||
cp -p $(srcdir)/bootstrap.sh $(distdir)/bootstrap.sh
|
||||
|
||||
full-distcheck:
|
||||
make distcheck EXTRA_DC_FLAGS='--enable-html'
|
||||
make distcheck EXTRA_DC_FLAGS='--disable-i18n'
|
||||
|
||||
+42
-9
@@ -19,7 +19,7 @@ if test -f config.h; then :; else
|
||||
*/
|
||||
|
||||
#define PACKAGE "sed"
|
||||
#define VERSION "4.1.2-boot"
|
||||
#define VERSION "4.1.5-boot"
|
||||
#define SED_FEATURE_VERSION "4.1"
|
||||
#define BOOTSTRAP 1
|
||||
|
||||
@@ -35,17 +35,50 @@ if test -f config.h; then :; else
|
||||
#undef HAVE_SYS_FILE_H
|
||||
#undef HAVE_IO_H
|
||||
|
||||
/* Undefine if <stdio.h> or <sys/types.h> has conflicting definition. */
|
||||
#define size_t unsigned
|
||||
#define ssize_t int
|
||||
|
||||
/* If your antique compiler doesn't grok ``void *'', then #define VOID char */
|
||||
#undef VOID
|
||||
|
||||
|
||||
/* All other config.h.in options intentionally omitted. Report as a
|
||||
bug if you need extra "#define"s in here. */
|
||||
END_OF_CONFIG_H
|
||||
|
||||
cat > conftest.c << \EOF
|
||||
#define size_t unsigned
|
||||
#include <sys/types.h>
|
||||
#include <stdio.h>
|
||||
|
||||
size_t s;
|
||||
EOF
|
||||
if $CC -c conftest.c -o conftest.o > /dev/null 2>&1 ; then
|
||||
echo '#define size_t unsigned' >> config.h
|
||||
echo checking for size_t... no
|
||||
else
|
||||
echo checking for size_t... yes
|
||||
fi
|
||||
|
||||
cat > conftest.c << \EOF
|
||||
#define ssize_t int
|
||||
#include <sys/types.h>
|
||||
#include <stdio.h>
|
||||
|
||||
ssize_t s;
|
||||
EOF
|
||||
if $CC -c conftest.c -o conftest.o > /dev/null 2>&1 ; then
|
||||
echo '#define ssize_t int' >> config.h
|
||||
echo checking for ssize_t... no
|
||||
else
|
||||
echo checking for ssize_t... yes
|
||||
fi
|
||||
|
||||
cat > conftest.c << \EOF
|
||||
void *foo;
|
||||
|
||||
EOF
|
||||
if $CC -c conftest.c -o conftest.o > /dev/null 2>&1 ; then
|
||||
echo checking for void *... yes
|
||||
else
|
||||
echo '#define VOID char' >> config.h
|
||||
echo checking for void *... no
|
||||
fi
|
||||
|
||||
rm -f conftest.*
|
||||
fi
|
||||
|
||||
# tell the user what we're doing from here on...
|
||||
|
||||
+41
-8
@@ -35,17 +35,50 @@ if test -f config.h; then :; else
|
||||
#undef HAVE_SYS_FILE_H
|
||||
#undef HAVE_IO_H
|
||||
|
||||
/* Undefine if <stdio.h> or <sys/types.h> has conflicting definition. */
|
||||
#define size_t unsigned
|
||||
#define ssize_t int
|
||||
|
||||
/* If your antique compiler doesn't grok ``void *'', then #define VOID char */
|
||||
#undef VOID
|
||||
|
||||
|
||||
/* All other config.h.in options intentionally omitted. Report as a
|
||||
bug if you need extra "#define"s in here. */
|
||||
END_OF_CONFIG_H
|
||||
|
||||
cat > conftest.c << \EOF
|
||||
#define size_t unsigned
|
||||
#include <sys/types.h>
|
||||
#include <stdio.h>
|
||||
|
||||
size_t s;
|
||||
EOF
|
||||
if $CC -c conftest.c -o conftest.o > /dev/null 2>&1 ; then
|
||||
echo '#define size_t unsigned' >> config.h
|
||||
echo checking for size_t... no
|
||||
else
|
||||
echo checking for size_t... yes
|
||||
fi
|
||||
|
||||
cat > conftest.c << \EOF
|
||||
#define ssize_t int
|
||||
#include <sys/types.h>
|
||||
#include <stdio.h>
|
||||
|
||||
ssize_t s;
|
||||
EOF
|
||||
if $CC -c conftest.c -o conftest.o > /dev/null 2>&1 ; then
|
||||
echo '#define ssize_t int' >> config.h
|
||||
echo checking for ssize_t... no
|
||||
else
|
||||
echo checking for ssize_t... yes
|
||||
fi
|
||||
|
||||
cat > conftest.c << \EOF
|
||||
void *foo;
|
||||
|
||||
EOF
|
||||
if $CC -c conftest.c -o conftest.o > /dev/null 2>&1 ; then
|
||||
echo checking for void *... yes
|
||||
else
|
||||
echo '#define VOID char' >> config.h
|
||||
echo checking for void *... no
|
||||
fi
|
||||
|
||||
rm -f conftest.*
|
||||
fi
|
||||
|
||||
# tell the user what we're doing from here on...
|
||||
|
||||
+22
-1
@@ -41,6 +41,8 @@
|
||||
#endif /* HAVE_WCTYPE_H || _LIBC */
|
||||
#if defined HAVE_STDBOOL_H || defined _LIBC
|
||||
# include <stdbool.h>
|
||||
#else
|
||||
# define bool char
|
||||
#endif /* HAVE_STDBOOL_H || _LIBC */
|
||||
#if defined _LIBC
|
||||
# include <bits/libc-lock.h>
|
||||
@@ -410,7 +412,26 @@ static unsigned int re_string_context_at (const re_string_t *input, int idx,
|
||||
#define re_string_skip_bytes(pstr,idx) ((pstr)->cur_idx += (idx))
|
||||
#define re_string_set_index(pstr,idx) ((pstr)->cur_idx = (idx))
|
||||
|
||||
#include <alloca.h>
|
||||
#ifndef alloca /* predefined by HP cc +Olibcalls */
|
||||
# ifdef __GNUC__
|
||||
# define alloca(size) __builtin_alloca(size)
|
||||
# else
|
||||
# if HAVE_ALLOCA_H
|
||||
# include <alloca.h>
|
||||
# else
|
||||
# if defined(__hpux)
|
||||
void *alloca ();
|
||||
# else
|
||||
# if !defined(__OS2__) && !defined(WIN32)
|
||||
char *alloca ();
|
||||
# else
|
||||
# include <malloc.h> /* OS/2 defines alloca in here */
|
||||
# endif
|
||||
# endif
|
||||
# endif
|
||||
# endif
|
||||
#endif
|
||||
|
||||
|
||||
#ifndef _LIBC
|
||||
# if HAVE_ALLOCA
|
||||
|
||||
Reference in new issue
Block a user