mirror of
https://git.savannah.gnu.org/git/make.git
synced 2024-12-27 23:06:53 +00:00
63b42fa235
Move content from glob/* and config/* into standard GNU directory locations lib/* and m4/*. Install the gnulib bootstrap script and its configuration file, and create a bootstrap.bat file for Windows. Update the README.git file with new requirements and instructions for building from Git. At this point we only install the alloca, getloadavg, and FDL modules from gnulib. We keep our old glob/fnmatch implementation since the gnulib versions require significant amounts of infrastructure which doesn't exist on Windows yet. Further work is required here. Due to a problem with gnulib's version of getloadavg, we need to bump the minimum required version of automake to 1.16.1 unfortunately. * README.git: Update instructions * NEWS: Move developer news to a separate section * configure.ac: Update for use with gnulib modules * bootstrap: Bootstrap from Git workspace (import from gnulib) * bootstrap.conf: Bootstrap configuration for GNU make * bootstrap.bat: Bootstrap from Git workspace for Windows * gl/modules/make-glob: Support our local fnmatch/glob implementation * config/acinclude.m4: Move to m4/ * config/dospaths.m4: Move to m4/ * glob/fnmatch.c: Move to lib/ * glob/fnmatch.h.in: Move to lib/ * glob/glob.c: Move to lib/ * glob/glob.h.in: Move to lib/ * Makefile.am: Update for new directories * build.template: Update for new directories * build_w32.bat: Update for new directories * builddos.bat: Update for new directories * maintMakefile: Update for new directories * makefile.com: Update for new directories * mk/Amiga.mk: Update for new directories * mk/Posix.mk.in: Update for new directories * mk/VMS.mk: Update for new directories * mk/Windows32.mk: Update for new directories * mk/msdosdjgpp.mk: Update for new directories * po/LINGUAS: One language per line (needed by gnulib) * INSTALL: Remove (obtained from gnulib) * src/alloca.c: Remove (obtained from gnulib) * src/getloadavg.c: Remove (obtained from gnulib) * po/Makevars: Remove (created by bootstrap) * config/*: Remove leftover files * glob/*: Remove leftover files
132 lines
4.9 KiB
Text
132 lines
4.9 KiB
Text
dnl acinclude.m4 -- Extra macros needed for GNU make.
|
|
dnl
|
|
dnl Automake will incorporate this into its generated aclocal.m4.
|
|
dnl Copyright (C) 1998-2018 Free Software Foundation, Inc.
|
|
dnl This file is part of GNU Make.
|
|
dnl
|
|
dnl GNU Make is free software; you can redistribute it and/or modify it under
|
|
dnl the terms of the GNU General Public License as published by the Free
|
|
dnl Software Foundation; either version 3 of the License, or (at your option)
|
|
dnl any later version.
|
|
dnl
|
|
dnl GNU Make is distributed in the hope that it will be useful, but WITHOUT
|
|
dnl ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
|
dnl FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for.
|
|
dnl more details.
|
|
dnl
|
|
dnl You should have received a copy of the GNU General Public License along
|
|
dnl with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
dnl ---------------------------------------------------------------------------
|
|
dnl Got this from the lynx 2.8 distribution.
|
|
dnl by T.E.Dickey <dickey@clark.net>
|
|
dnl and Jim Spath <jspath@mail.bcpl.lib.md.us>
|
|
dnl and Philippe De Muyter <phdm@macqel.be>
|
|
dnl
|
|
dnl Created: 1997/1/28
|
|
dnl Updated: 1997/12/23
|
|
dnl ---------------------------------------------------------------------------
|
|
dnl After checking for functions in the default $LIBS, make a further check
|
|
dnl for the functions that are netlib-related (these aren't always in the
|
|
dnl libc, etc., and have to be handled specially because there are conflicting
|
|
dnl and broken implementations.
|
|
dnl Common library requirements (in order):
|
|
dnl -lresolv -lsocket -lnsl
|
|
dnl -lnsl -lsocket
|
|
dnl -lsocket
|
|
dnl -lbsd
|
|
AC_DEFUN([CF_NETLIBS],[
|
|
cf_test_netlibs=no
|
|
AC_MSG_CHECKING(for network libraries)
|
|
AC_CACHE_VAL(cf_cv_netlibs,[
|
|
AC_MSG_RESULT(working...)
|
|
cf_cv_netlibs=""
|
|
cf_test_netlibs=yes
|
|
AC_CHECK_FUNCS(gethostname,,[
|
|
CF_RECHECK_FUNC(gethostname,nsl,cf_cv_netlibs,[
|
|
CF_RECHECK_FUNC(gethostname,socket,cf_cv_netlibs)])])
|
|
#
|
|
# FIXME: sequent needs this library (i.e., -lsocket -linet -lnsl), but
|
|
# I don't know the entrypoints - 97/7/22 TD
|
|
AC_CHECK_LIB(inet,main,cf_cv_netlibs="-linet $cf_cv_netlibs")
|
|
#
|
|
if test "$ac_cv_func_lsocket" != no ; then
|
|
AC_CHECK_FUNCS(socket,,[
|
|
CF_RECHECK_FUNC(socket,socket,cf_cv_netlibs,[
|
|
CF_RECHECK_FUNC(socket,bsd,cf_cv_netlibs)])])
|
|
fi
|
|
#
|
|
AC_CHECK_FUNCS(gethostbyname,,[
|
|
CF_RECHECK_FUNC(gethostbyname,nsl,cf_cv_netlibs)])
|
|
])
|
|
LIBS="$LIBS $cf_cv_netlibs"
|
|
test $cf_test_netlibs = no && echo "$cf_cv_netlibs" >&AC_FD_MSG
|
|
])dnl
|
|
dnl ---------------------------------------------------------------------------
|
|
dnl Re-check on a function to see if we can pick it up by adding a library.
|
|
dnl $1 = function to check
|
|
dnl $2 = library to check in
|
|
dnl $3 = environment to update (e.g., $LIBS)
|
|
dnl $4 = what to do if this fails
|
|
dnl
|
|
dnl This uses 'unset' if the shell happens to support it, but leaves the
|
|
dnl configuration variable set to 'unknown' if not. This is a little better
|
|
dnl than the normal autoconf test, which gives misleading results if a test
|
|
dnl for the function is made (e.g., with AC_CHECK_FUNC) after this macro is
|
|
dnl used (autoconf does not distinguish between a null token and one that is
|
|
dnl set to 'no').
|
|
AC_DEFUN([CF_RECHECK_FUNC],[
|
|
AC_CHECK_LIB($2,$1,[
|
|
CF_UPPER(cf_tr_func,$1)
|
|
AC_DEFINE_UNQUOTED(HAVE_$cf_tr_func,1,[Define if you have function $1])
|
|
ac_cv_func_$1=yes
|
|
$3="-l$2 [$]$3"],[
|
|
ac_cv_func_$1=unknown
|
|
unset ac_cv_func_$1 2>/dev/null
|
|
$4],
|
|
[[$]$3])
|
|
])dnl
|
|
dnl ---------------------------------------------------------------------------
|
|
dnl Make an uppercase version of a variable
|
|
dnl $1=uppercase($2)
|
|
AC_DEFUN([CF_UPPER],
|
|
[
|
|
changequote(,)dnl
|
|
$1=`echo $2 | tr '[a-z]' '[A-Z]'`
|
|
changequote([,])dnl
|
|
])dnl
|
|
|
|
|
|
dnl ---------------------------------------------------------------------------
|
|
dnl From Paul Eggert <eggert@twinsun.com>
|
|
dnl Update for Darwin by Troy Runkel <Troy.Runkel@mathworks.com>
|
|
dnl Update for AIX by Olexiy Buyanskyy (Savannah bug 32485)
|
|
|
|
AC_DEFUN([AC_STRUCT_ST_MTIM_NSEC],
|
|
[AC_CACHE_CHECK([for nanoseconds field of struct stat],
|
|
ac_cv_struct_st_mtim_nsec,
|
|
[ac_save_CPPFLAGS="$CPPFLAGS"
|
|
ac_cv_struct_st_mtim_nsec=no
|
|
# st_mtim.tv_nsec -- the usual case
|
|
# st_mtim._tv_nsec -- Solaris 2.6, if
|
|
# (defined _XOPEN_SOURCE && _XOPEN_SOURCE_EXTENDED == 1
|
|
# && !defined __EXTENSIONS__)
|
|
# st_mtim.st__tim.tv_nsec -- UnixWare 2.1.2
|
|
# st_mtime_n -- AIX 5.2 and above
|
|
# st_mtimespec.tv_nsec -- Darwin (Mac OSX)
|
|
for ac_val in st_mtim.tv_nsec st_mtim._tv_nsec st_mtim.st__tim.tv_nsec st_mtime_n st_mtimespec.tv_nsec; do
|
|
CPPFLAGS="$ac_save_CPPFLAGS -DST_MTIM_NSEC=$ac_val"
|
|
AC_TRY_COMPILE([#include <sys/types.h>
|
|
#include <sys/stat.h>
|
|
], [struct stat s; s.ST_MTIM_NSEC;],
|
|
[ac_cv_struct_st_mtim_nsec=$ac_val; break])
|
|
done
|
|
CPPFLAGS="$ac_save_CPPFLAGS"
|
|
])
|
|
|
|
if test $ac_cv_struct_st_mtim_nsec != no; then
|
|
AC_DEFINE_UNQUOTED([ST_MTIM_NSEC], [$ac_cv_struct_st_mtim_nsec],
|
|
[Define if struct stat contains a nanoseconds field])
|
|
fi
|
|
]
|
|
)
|