During configuration process, ensure that GMP and GC install _anything_ under the build directory. Use the files src/gmp/config.{guess,sub} to guess the hosts. Use src/gc/mkinstalldirs to create directories.
This commit is contained in:
jjgarcia
parent
a656edfe85
commit
bbb36b39df
7 changed files with 1069 additions and 665 deletions
8
configure
vendored
8
configure
vendored
|
|
@ -55,10 +55,10 @@ else
|
|||
# GMP knows more chiptset names than usual FSF configuration tools. We
|
||||
# therefore need to use its config* files when configuring either ECL
|
||||
# or the Boehm-Weiser garbage collector.
|
||||
for i in config.sub configfsf.sub config.guess configfsf.guess; do
|
||||
cp ${srcdir}/gmp/$i ${srcdir}/
|
||||
cp ${srcdir}/gmp/$i ${srcdir}/gc/
|
||||
done;
|
||||
#for i in config.sub configfsf.sub config.guess configfsf.guess; do
|
||||
# cp ${srcdir}/gmp/$i ${srcdir}/
|
||||
# cp ${srcdir}/gmp/$i ${srcdir}/gc/
|
||||
#done;
|
||||
LDFLAGS="${LDFLAGS}" CFLAGS="${CFLAGS}" \
|
||||
${srcdir}/configure --srcdir=${srcdir} $* --host=${host}
|
||||
fi
|
||||
|
|
|
|||
|
|
@ -30,6 +30,7 @@ infodir=@infodir@
|
|||
INSTALL = @INSTALL@
|
||||
INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
||||
INSTALL_DATA = @INSTALL_DATA@
|
||||
mkinstalldirs = $(SHELL) $(top_srcdir)/gc/mkinstalldirs
|
||||
|
||||
# Files
|
||||
|
||||
|
|
@ -78,9 +79,7 @@ BUILD-STAMP: config.status
|
|||
(echo "#"; uname -a) > $@
|
||||
head -8 config.status | tail -6 >> $@
|
||||
install: BUILD-STAMP
|
||||
-for i in $(PREFIX)$(bindir) $(PREFIX)$(libdir)/h; do\
|
||||
$(INSTALL) -d $$i; \
|
||||
done
|
||||
$(mkinstalldirs) $(PREFIX)$(bindir) $(PREFIX)$(libdir)/h
|
||||
for i in $(TARGETS); do \
|
||||
$(INSTALL) -s $$i $(PREFIX)$(bindir); \
|
||||
done
|
||||
|
|
@ -97,7 +96,7 @@ install: BUILD-STAMP
|
|||
cd c; $(MAKE) PREFIX="$(PREFIX)" install
|
||||
cd doc; $(MAKE) PREFIX="$(PREFIX)" install
|
||||
installgc:
|
||||
-$(INSTALL) -d $(PREFIX)$(libdir)/h/private
|
||||
$(mkinstalldirs) $(PREFIX)$(libdir)
|
||||
for i in $(srcdir)/gc/include/*.h; do \
|
||||
$(INSTALL_DATA) $$i $(PREFIX)$(libdir)/h/; \
|
||||
done
|
||||
|
|
|
|||
46
src/configure
vendored
46
src/configure
vendored
|
|
@ -1299,18 +1299,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
|
|||
### Make sure we do not configure within source directory
|
||||
###
|
||||
|
||||
if test -f configure; then
|
||||
echo "***"
|
||||
echo "*** This program cannot be built within the source directory ***"
|
||||
echo "***"
|
||||
exit 2;
|
||||
fi
|
||||
|
||||
ECL_VERSION=0.9d
|
||||
|
||||
|
||||
ac_aux_dir=
|
||||
for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
|
||||
for ac_dir in ${srcdir}/gmp $srcdir/${srcdir}/gmp; do
|
||||
if test -f $ac_dir/install-sh; then
|
||||
ac_aux_dir=$ac_dir
|
||||
ac_install_sh="$ac_aux_dir/install-sh -c"
|
||||
|
|
@ -1326,14 +1316,24 @@ for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
|
|||
fi
|
||||
done
|
||||
if test -z "$ac_aux_dir"; then
|
||||
{ { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
|
||||
echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;}
|
||||
{ { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in ${srcdir}/gmp $srcdir/${srcdir}/gmp" >&5
|
||||
echo "$as_me: error: cannot find install-sh or install.sh in ${srcdir}/gmp $srcdir/${srcdir}/gmp" >&2;}
|
||||
{ (exit 1); exit 1; }; }
|
||||
fi
|
||||
ac_config_guess="$SHELL $ac_aux_dir/config.guess"
|
||||
ac_config_sub="$SHELL $ac_aux_dir/config.sub"
|
||||
ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
|
||||
|
||||
if test -f configure; then
|
||||
echo "***"
|
||||
echo "*** This program cannot be built within the source directory ***"
|
||||
echo "***"
|
||||
exit 2;
|
||||
fi
|
||||
|
||||
ECL_VERSION=0.9d
|
||||
|
||||
|
||||
# Make sure we can run config.sub.
|
||||
$ac_config_sub sun4 >/dev/null 2>&1 ||
|
||||
{ { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5
|
||||
|
|
@ -4484,16 +4484,28 @@ int main() {
|
|||
int_type="int";
|
||||
for (bits=1; ((t << 1) >> 1) == t; bits++, t <<= 1);
|
||||
l = (~l) << (bits - 3);
|
||||
#if 1
|
||||
fprintf(f,"CL_FIXNUM_MIN='%d';",l);
|
||||
fprintf(f,"CL_FIXNUM_MAX='%d';",-(l+1));
|
||||
#else
|
||||
l++;
|
||||
fprintf(f,"CL_FIXNUM_MIN='%d';",l);
|
||||
fprintf(f,"CL_FIXNUM_MAX='%d';",-l);
|
||||
#endif
|
||||
} else if (sizeof(long) >= sizeof(void*)) {
|
||||
unsigned long int t = 1;
|
||||
signed long int l = 0;
|
||||
int_type="long int";
|
||||
for (bits=1; ((t << 1) >> 1) == t; bits++, t <<= 1);
|
||||
l = (~l) << (bits - 3);
|
||||
fprintf(f,"CL_FIXNUM_MIN='%ld';",l);
|
||||
fprintf(f,"CL_FIXNUM_MAX='%ld';",-(l+1));
|
||||
#if 1
|
||||
fprintf(f,"CL_FIXNUM_MIN='%d';",l);
|
||||
fprintf(f,"CL_FIXNUM_MAX='%d';",-(l+1));
|
||||
#else
|
||||
l++;
|
||||
fprintf(f,"CL_FIXNUM_MIN='%d';",l);
|
||||
fprintf(f,"CL_FIXNUM_MAX='%d';",-l);
|
||||
#endif
|
||||
} else
|
||||
exit(1);
|
||||
fprintf(f,"CL_FIXNUM_TYPE='%s';",int_type);
|
||||
|
|
@ -5976,12 +5988,12 @@ echo "${ECHO_T}configuring local copy" >&6
|
|||
if mkdir gc; then
|
||||
if test "${threads}" ; then
|
||||
(destdir=`${PWDCMD}`; cd gc; CC="${CC} ${PICFLAG}" \
|
||||
$srcdir/gc/configure --disable-shared --prefix=$bindir \
|
||||
$srcdir/gc/configure --disable-shared --prefix=${destdir} \
|
||||
--includedir=${destdir}/h --libdir=${destdir} --build=${build} \
|
||||
--host=${host})
|
||||
else
|
||||
(destdir=`${PWDCMD}`; cd gc; CC="${CC} ${PICFLAG}" \
|
||||
$srcdir/gc/configure --disable-threads --disable-shared --prefix=$bindir \
|
||||
$srcdir/gc/configure --disable-threads --disable-shared --prefix=${destdir} \
|
||||
--includedir=${destdir}/h --libdir=${destdir} --build=${build} \
|
||||
--host=${host})
|
||||
fi
|
||||
|
|
|
|||
|
|
@ -24,6 +24,7 @@ AC_PREREQ(2.1) # You must have autoconf version 2.1 or later.
|
|||
### Make sure we do not configure within source directory
|
||||
###
|
||||
AC_CONFIG_SRCDIR(CHANGELOG)
|
||||
AC_CONFIG_AUX_DIR(${srcdir}/gmp)
|
||||
if test -f configure; then
|
||||
echo "***"
|
||||
echo "*** This program cannot be built within the source directory ***"
|
||||
|
|
@ -331,7 +332,7 @@ else
|
|||
test -d gmp && rm -rf gmp
|
||||
if mkdir gmp; then
|
||||
(destdir=`${PWDCMD}`; cd gmp; CC="${CC} ${PICFLAG}" \
|
||||
$srcdir/gmp/configure --disable-shared --prefix=$bindir \
|
||||
$srcdir/gmp/configure --disable-shared --prefix=${destdir} \
|
||||
--infodir=${destdir}/doc --includedir=${destdir}/h \
|
||||
--libdir=${destdir} --build=${build} --host=${host} $gmp_flags)
|
||||
fi
|
||||
|
|
@ -348,12 +349,12 @@ elif test "${local_boehm}" = "no" ; then
|
|||
if mkdir gc; then
|
||||
if test "${threads}" ; then
|
||||
(destdir=`${PWDCMD}`; cd gc; CC="${CC} ${PICFLAG}" \
|
||||
$srcdir/gc/configure --disable-shared --prefix=$bindir \
|
||||
$srcdir/gc/configure --disable-shared --prefix=${destdir} \
|
||||
--includedir=${destdir}/h --libdir=${destdir} --build=${build} \
|
||||
--host=${host})
|
||||
else
|
||||
(destdir=`${PWDCMD}`; cd gc; CC="${CC} ${PICFLAG}" \
|
||||
$srcdir/gc/configure --disable-threads --disable-shared --prefix=$bindir \
|
||||
$srcdir/gc/configure --disable-threads --disable-shared --prefix=${destdir} \
|
||||
--includedir=${destdir}/h --libdir=${destdir} --build=${build} \
|
||||
--host=${host})
|
||||
fi
|
||||
|
|
|
|||
|
|
@ -16,6 +16,7 @@ manext=1
|
|||
INSTALL = @INSTALL@
|
||||
INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
||||
INSTALL_DATA = @INSTALL_DATA@
|
||||
mkinstalldirs = $(SHELL) $(top_srcdir)/gc/mkinstalldirs
|
||||
|
||||
VERSION=@ECL_VERSION@
|
||||
|
||||
|
|
@ -39,10 +40,10 @@ ecldev.ps: ecldev.dvi $(srcdir)/macros.txi
|
|||
dvips -o $@ ecldev.dvi
|
||||
|
||||
install: all
|
||||
$(INSTALL) -d $(PREFIX)$(infodir)
|
||||
$(mkinstalldirs) $(PREFIX)$(infodir)
|
||||
$(INSTALL_DATA) ecl.info $(PREFIX)$(infodir)
|
||||
$(INSTALL_DATA) ecldev.info $(PREFIX)$(infodir)
|
||||
$(INSTALL) -d $(PREFIX)$(mandir)/man$(manext)
|
||||
$(mkinstalldirs) $(PREFIX)$(mandir)/man$(manext)
|
||||
$(INSTALL_DATA) ecl.man $(PREFIX)$(mandir)/man$(manext)/ecl.$(manext)
|
||||
|
||||
uninstall:
|
||||
|
|
|
|||
1660
src/gc/configure
vendored
1660
src/gc/configure
vendored
File diff suppressed because it is too large
Load diff
|
|
@ -20,6 +20,7 @@ dnl Process this file with autoconf to produce configure.
|
|||
AC_INIT(gc,6.2,Hans.Boehm@hp.com)
|
||||
## version must conform to [0-9]+[.][0-9]+(alpha[0-9]+)?
|
||||
AC_CONFIG_SRCDIR(gcj_mlc.c)
|
||||
AC_CONFIG_AUX_DIR(${srcdir}/../gmp)
|
||||
AC_CANONICAL_TARGET
|
||||
AC_PREREQ(2.53)
|
||||
AC_REVISION($Revision$)
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue