mirror of
https://salsa.debian.org/srivasta/make-dfsg.git
synced 2024-12-26 14:00:56 +00:00
* Some configure fixes.
This commit is contained in:
parent
4e7ee4fc01
commit
a9166bb7bc
3 changed files with 140 additions and 141 deletions
16
configure.in
16
configure.in
|
@ -3,7 +3,7 @@ AC_REVISION([$Id$])
|
||||||
AC_PREREQ(2.13)dnl dnl Minimum Autoconf version required.
|
AC_PREREQ(2.13)dnl dnl Minimum Autoconf version required.
|
||||||
AC_INIT(vpath.c)dnl dnl A distinctive file to look for in srcdir.
|
AC_INIT(vpath.c)dnl dnl A distinctive file to look for in srcdir.
|
||||||
|
|
||||||
AM_INIT_AUTOMAKE(make, 3.77.90)
|
AM_INIT_AUTOMAKE(make, 3.77.91)
|
||||||
AM_CONFIG_HEADER(config.h)
|
AM_CONFIG_HEADER(config.h)
|
||||||
|
|
||||||
dnl Regular configure stuff
|
dnl Regular configure stuff
|
||||||
|
@ -57,8 +57,8 @@ AC_CHECK_LIB(posix4, clock_gettime)
|
||||||
|
|
||||||
AC_CHECK_FUNCS(memmove strdup psignal mktemp pstat_getdynamic \
|
AC_CHECK_FUNCS(memmove strdup psignal mktemp pstat_getdynamic \
|
||||||
clock_gettime dup2 getcwd sigsetmask sigaction getgroups \
|
clock_gettime dup2 getcwd sigsetmask sigaction getgroups \
|
||||||
setlinebuf seteuid setegid setreuid setregid \
|
setlinebuf seteuid setegid setreuid setregid pipe \
|
||||||
strerror strsignal pipe)
|
strerror strsignal)
|
||||||
AC_CHECK_SYMBOL(sys_siglist)
|
AC_CHECK_SYMBOL(sys_siglist)
|
||||||
AC_FUNC_ALLOCA
|
AC_FUNC_ALLOCA
|
||||||
AC_FUNC_VFORK
|
AC_FUNC_VFORK
|
||||||
|
@ -212,12 +212,14 @@ if test -r $srcdir/maintMakefile; then
|
||||||
fi
|
fi
|
||||||
AC_SUBST_FILE(MAINT_MAKEFILE)
|
AC_SUBST_FILE(MAINT_MAKEFILE)
|
||||||
|
|
||||||
dnl build.sh is also an AC_OUTPUT, but we can't specify it here because
|
|
||||||
dnl it's built from build.template and autoconf will crap out. So, we
|
|
||||||
dnl build it in the makefiles themselves.
|
|
||||||
|
|
||||||
AC_OUTPUT(build.sh Makefile glob/Makefile)
|
AC_OUTPUT(build.sh Makefile glob/Makefile)
|
||||||
|
|
||||||
|
dnl If we don't yet have build.sh.in, build.sh is a bogus 0-length file
|
||||||
|
dnl so remove it.
|
||||||
|
|
||||||
|
test -f build.sh.in || rm -f build.sh
|
||||||
|
|
||||||
|
|
||||||
case "$make_badcust" in
|
case "$make_badcust" in
|
||||||
yes) echo
|
yes) echo
|
||||||
echo "WARNING: --with-customs specified but no customs.h could be found;"
|
echo "WARNING: --with-customs specified but no customs.h could be found;"
|
||||||
|
|
13
job.c
13
job.c
|
@ -542,13 +542,10 @@ reap_children (block, err)
|
||||||
break;
|
break;
|
||||||
|
|
||||||
if (c == 0)
|
if (c == 0)
|
||||||
{
|
|
||||||
/* An unknown child died.
|
/* An unknown child died.
|
||||||
Ignore it; it was inherited from our invoker. */
|
Ignore it; it was inherited from our invoker. */
|
||||||
continue;
|
continue;
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
if (debug_flag)
|
if (debug_flag)
|
||||||
printf ("Reaping %s child 0x%08lx PID %ld token %c%s\n",
|
printf ("Reaping %s child 0x%08lx PID %ld token %c%s\n",
|
||||||
child_failed ? "losing" : "winning",
|
child_failed ? "losing" : "winning",
|
||||||
|
@ -557,13 +554,13 @@ reap_children (block, err)
|
||||||
|
|
||||||
if (c->sh_batch_file) {
|
if (c->sh_batch_file) {
|
||||||
if (debug_flag)
|
if (debug_flag)
|
||||||
printf("Cleaning up temp batch file %s\n", c->sh_batch_file);
|
printf ("Cleaning up temp batch file %s\n", c->sh_batch_file);
|
||||||
|
|
||||||
/* just try and remove, don't care if this fails */
|
/* just try and remove, don't care if this fails */
|
||||||
remove(c->sh_batch_file);
|
remove (c->sh_batch_file);
|
||||||
|
|
||||||
/* all done with memory */
|
/* all done with memory */
|
||||||
free(c->sh_batch_file);
|
free (c->sh_batch_file);
|
||||||
c->sh_batch_file = NULL;
|
c->sh_batch_file = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -684,11 +681,11 @@ reap_children (block, err)
|
||||||
/* fatal_error_signal will die with the right signal. */
|
/* fatal_error_signal will die with the right signal. */
|
||||||
!handling_fatal_signal)
|
!handling_fatal_signal)
|
||||||
die (2);
|
die (2);
|
||||||
}
|
|
||||||
|
|
||||||
/* Only block for one child. */
|
/* Only block for one child. */
|
||||||
block = 0;
|
block = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -11,10 +11,10 @@ globhdr := $(wildcard glob/*.h)
|
||||||
TEMPLATES = README README.DOS config.ami configh.dos config.h.W32 config.h-vms
|
TEMPLATES = README README.DOS config.ami configh.dos config.h.W32 config.h-vms
|
||||||
MTEMPLATES = Makefile.DOS SMakefile
|
MTEMPLATES = Makefile.DOS SMakefile
|
||||||
|
|
||||||
# We need this to ensure that README is created on time to avoid errors
|
# We need this to ensure that README and build.sh.in are created on time to
|
||||||
# by automake.
|
# avoid errors by automake.
|
||||||
#
|
#
|
||||||
Makefile.in: README
|
#Makefile.in: README build.sh.in
|
||||||
|
|
||||||
# General rule for turning a .template into a regular file.
|
# General rule for turning a .template into a regular file.
|
||||||
#
|
#
|
||||||
|
|
Loading…
Reference in a new issue