libs/newlib-cygwin
libs/newlib-cygwin
4
0
Fork 0
mirror of git://sourceware.org/git/newlib-cygwin.git synced 2025-01-19 04:49:25 +08:00
Code Issues Projects Releases Wiki Activity

Cygwin: Remove recursive configure

Browse Source 
There's doesn't seem to be much use in independently distributing these
subdirectories, so allowing them to be independently configured seems
pointless and overcomplicated.

The order in which the subdirectories are built is still a little odd,
as cygwin is linked with libcygserver, and cygserver is then linked with
cygwin. So, we build the cygwin directory first, which invokes a build
of libcygserver in the cygserver directory, and then build in the
cygserver directory to build the cygserver executable.

Drop AC_CONFIGURE_ARGS, since we don't need to recursively call
configure with the same arguments anymore.

Slightly refine when we build utils: Previously we didn't build any
utils if MinGW compiler use was avoided, now we just avoid building
those utils which require that compiler.

Greatly simplify how winsup_srcdir and target_builddir are set, since
we're only configuring from one directory.  (These are still kept
absolute, since we don't adjust them where used for being used in a
subdirectory).

Remove configure.cygwin and put it's (greatly reduced) contents inline
in the one place it's used now.

Remove generated configure and aclocal.m4 in subdirectories.
This commit is contained in:
Jon Turney 2020-10-06 16:22:02 +01:00
parent 11c5fd6abd
commit dc93f7ef2d
No known key found for this signature in database
GPG Key ID: C7C86F0370285C81
28 changed files with 1392 additions and 24230 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
winsup/Makefile.in
View File

@ -40,7 +40,7 @@ INSTALL:=@INSTALL@
INSTALL_PROGRAM:=@INSTALL_PROGRAM@
INSTALL_DATA:=@INSTALL_DATA@
SUBDIRS=@subdirs@
SUBDIRS=cygwin cygserver doc utils testsuite
INSTALL_SUBDIRS=${patsubst %,install_%,$(SUBDIRS)}
CLEAN_SUBDIRS=${patsubst %,clean_%,$(SUBDIRS)}
@ -88,7 +88,7 @@ $(CLEAN_SUBDIRS):
.PRECIOUS: Makefile
Makefile: Makefile.in $(srcdir)/configure config.status
Makefile: Makefile.in ${patsubst %,%/Makefile.in,$(SUBDIRS)} $(srcdir)/configure config.status
$(SHELL) config.status
config.status: configure
@ -103,6 +103,8 @@ cygwin:
cygserver: cygwin
testsuite: cygwin
install_utils: cygwin
install_cygwin:

14
winsup/acinclude.m4
View File

@ -16,7 +16,7 @@ if test -z "$newlib_headers"; then
fi
newlib_headers="$target_builddir/newlib/targ-include $newlib_headers"
INCLUDES="-I${srcdir}/../cygwin -I${target_builddir}/winsup/cygwin"
INCLUDES="-I${winsup_srcdir}/cygwin -I${target_builddir}/winsup/cygwin"
INCLUDES="${INCLUDES} -isystem ${cygwin_headers}"
for h in ${newlib_headers}; do
INCLUDES="${INCLUDES} -isystem $h"
@ -24,17 +24,5 @@ done
AC_SUBST(INCLUDES)
])
AC_DEFUN([AC_CONFIGURE_ARGS], [
configure_args=X
for f in $ac_configure_args; do
case "$f" in
*--srcdir*) ;;
*) configure_args="$configure_args $f" ;;
esac
done
configure_args=$(/usr/bin/expr "$configure_args" : 'X \(.*\)')
AC_SUBST(configure_args)
])
AC_SUBST(target_builddir)
AC_SUBST(winsup_srcdir)

5
winsup/autogen.sh
View File

@ -10,8 +10,3 @@ fi
/usr/bin/aclocal --force
/usr/bin/autoconf -f
/bin/rm -rf autom4te.cache
res=0
for d in cygwin utils cygserver testsuite; do
(cd $d && exec ./autogen.sh) || res=1
done
exit $res

1522
winsup/configure vendored
View File

File diff suppressed because it is too large Load Diff

84
winsup/configure.ac
View File

@ -9,11 +9,22 @@ dnl
dnl Process this file with autoconf to produce a configure script.
AC_PREREQ([2.59])
AC_INIT([Cygwin toplevel],[0],[cygwin@cygwin.com],[cygwin],[https://cygwin.com])
AC_INIT([Cygwin],[0],[cygwin@cygwin.com],[cygwin],[https://cygwin.com])
AC_CONFIG_SRCDIR(Makefile.in)
AC_CONFIG_AUX_DIR(..)
. ${srcdir}/configure.cygwin
realdirpath() {
test -z "$1" && return 1
(cd "$1" 2>/dev/null && pwd)
if test $? -ne 0; then
return 1
else
return 0
fi
}
winsup_srcdir="$(realdirpath $srcdir)"
target_builddir="$(realdirpath ..)"
AC_PROG_INSTALL
AC_NO_EXECUTABLES
@ -23,16 +34,71 @@ AC_PROG_CC
AC_PROG_CXX
AC_PROG_CPP
AC_LANG(C)
AC_ARG_WITH([cross-bootstrap],[AS_HELP_STRING([--with-cross-bootstrap],[do not build programs using the mingw toolchain or check for mingw libraries (useful for bootstrapping a cross-compiler)])],[],[with_cross_bootstrap=no])
AC_LANG(C++)
AC_ARG_WITH([cross-bootstrap],[AS_HELP_STRING([--with-cross-bootstrap],[do not build programs using the MinGW toolchain or check for MinGW libraries (useful for bootstrapping a cross-compiler)])],[],[with_cross_bootstrap=no])
AC_CYGWIN_INCLUDES
AC_CONFIG_SUBDIRS(cygwin cygserver doc testsuite)
if test "x$with_cross_bootstrap" != "xyes"; then
AC_CONFIG_SUBDIRS([utils])
fi
AC_CONFIG_HEADER(cygwin/config.h)
AC_CHECK_TOOL(AR, ar, ar)
AC_CHECK_TOOL(AS, as, as)
AC_CHECK_TOOL(DLLTOOL, dlltool, dlltool)
AC_CHECK_TOOL(LD, ld, ld)
AC_CHECK_TOOL(NM, nm, nm)
AC_CHECK_TOOL(OBJCOPY, objcopy, objcopy)
AC_CHECK_TOOL(OBJDUMP, objdump, objdump)
AC_CHECK_TOOL(RANLIB, ranlib, ranlib)
AC_CHECK_TOOL(STRIP, strip, strip)
AC_CHECK_TOOL(WINDRES, windres, windres)
AC_ARG_ENABLE(debugging,
[ --enable-debugging Build a cygwin DLL which has more consistency checking for debugging],
[case "${enableval}" in
yes) AC_DEFINE([DEBUGGING],[1],[Define if DEBUGGING support is requested.]) ;;
no) ;;
esac
])
case "$target_cpu" in
i?86)
DLL_ENTRY="_dll_entry@12"
DEF_DLL_ENTRY="dll_entry@12"
DIN_FILE="i686.din"
TLSOFFSETS_H="tlsoffsets.h"
;;
x86_64)
DLL_ENTRY="dll_entry"
DEF_DLL_ENTRY="dll_entry"
DIN_FILE="x86_64.din"
TLSOFFSETS_H="tlsoffsets64.h"
;;
*) AC_MSG_ERROR([Invalid target processor "$target_cpu"]) ;;
esac
AC_SUBST(DLL_ENTRY)
AC_SUBST(DEF_DLL_ENTRY)
AC_SUBST(DIN_FILE)
AC_SUBST(TLSOFFSETS_H)
AC_CHECK_PROGS([DOCBOOK2XTEXI], [docbook2x-texi db2x_docbook2texi], [true])
if test "x$with_cross_bootstrap" != "xyes"; then
AC_CHECK_PROGS(MINGW_CXX, ${target_cpu}-w64-mingw32-g++)
test -n "$MINGW_CXX" || AC_MSG_ERROR([no acceptable MinGW g++ found in \$PATH])
AC_CHECK_PROGS(MINGW_CC, ${target_cpu}-w64-mingw32-gcc)
test -n "$MINGW_CC" || AC_MSG_ERROR([no acceptable MinGW gcc found in \$PATH])
fi
AC_EXEEXT
AC_CONFIG_FILES([
Makefile
cygwin/Makefile
cygserver/Makefile
doc/Makefile
utils/Makefile
testsuite/Makefile
])
AC_CONFIG_FILES([Makefile])
AC_OUTPUT

38
winsup/configure.cygwin
View File

@ -1,38 +0,0 @@
realdirpath() {
[ -z "$1" ] && return 1
(cd "$1" 2>/dev/null && pwd)
if test $? -ne 0; then
return 1
else
return 0
fi
}
for d in . .. ../.. ../../..; do
if test -e "$srcdir/$d/configure.cygwin"; then
winsup_srcdir=$(realdirpath "$srcdir/$d")
break
fi
done
if test -z "$winsup_srcdir"; then
echo "cannot find directory containing configure.cygwin" 1>&2
exit 1
fi
case "$srcdir" in
*/newlib*) lookfor=newlib ;;
*/winsup*) lookfor=winsup ;;
*) lookfor=. ;;
esac
for d in . .. ../.. ../../..; do
if test -d "$d/$lookfor"; then
target_builddir=$(realdirpath "$d")
break
fi
done
if test -z "$target_builddir"; then
target_builddir=$(pwd)
fi

4
winsup/cygserver/Makefile.in
View File

@ -9,7 +9,6 @@
srcdir:=@srcdir@
target_builddir:=@target_builddir@
winsup_srcdir:=@winsup_srcdir@
configure_args=@configure_args@
CC:=@CC@
CXX:=@CXX@
@ -69,9 +68,6 @@ cygserver.exe: $(CYGWIN_LIB) $(OBJS)
$(cygwin_build)/%.o:
$(MAKE) -C $(@D) $(@F)
Makefile: Makefile.in configure
./config.status
lib%.o: %.cc
${filter-out -D__OUTSIDE_CYGWIN__, $(COMPILE.cc)} -c -o $(@D)/${basename $(@F)}.o $<

55
winsup/cygserver/aclocal.m4 vendored
View File

@ -1,55 +0,0 @@
# generated automatically by aclocal 1.11.6 -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
# Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
dnl This provides configure definitions used by all the cygwin
dnl configure.in files.
AC_DEFUN([AC_CYGWIN_INCLUDES], [
: ${ac_cv_prog_CXX:=$CXX}
: ${ac_cv_prog_CC:=$CC}
cygwin_headers=$(realdirpath "$winsup_srcdir/cygwin/include")
if test -z "$cygwin_headers"; then
AC_MSG_ERROR([cannot find $winsup_srcdir/cygwin/include directory])
fi
newlib_headers=$(realdirpath $winsup_srcdir/../newlib/libc/include)
if test -z "$newlib_headers"; then
AC_MSG_ERROR([cannot find newlib source directory: $winsup_srcdir/../newlib/libc/include])
fi
newlib_headers="$target_builddir/newlib/targ-include $newlib_headers"
INCLUDES="-I${srcdir}/../cygwin -I${target_builddir}/winsup/cygwin"
INCLUDES="${INCLUDES} -isystem ${cygwin_headers}"
for h in ${newlib_headers}; do
INCLUDES="${INCLUDES} -isystem $h"
done
AC_SUBST(INCLUDES)
])
AC_DEFUN([AC_CONFIGURE_ARGS], [
configure_args=X
for f in $ac_configure_args; do
case "$f" in
*--srcdir*) ;;
*) configure_args="$configure_args $f" ;;
esac
done
configure_args=$(/usr/bin/expr "$configure_args" : 'X \(.*\)')
AC_SUBST(configure_args)
])
AC_SUBST(target_builddir)
AC_SUBST(winsup_srcdir)

4
winsup/cygserver/autogen.sh
View File

@ -1,4 +0,0 @@
#!/bin/sh -e
/usr/bin/aclocal --system-acdir=..
/usr/bin/autoconf -f
exec /bin/rm -rf autom4te.cache

5219
winsup/cygserver/configure vendored
View File

File diff suppressed because it is too large Load Diff

48
winsup/cygserver/configure.ac
View File

@ -1,48 +0,0 @@
dnl Autoconf configure script for Cygserver.
dnl
dnl This file is part of Cygwin.
dnl
dnl This software is a copyrighted work licensed under the terms of the
dnl Cygwin license. Please consult the file "CYGWIN_LICENSE" for
dnl details.
dnl
dnl Process this file with autoconf to produce a configure script.
AC_PREREQ([2.59])
AC_INIT([Cygwin Cygserver],[0],[cygwin@cygwin.com],[cygwin],[https://cygwin.com])
AC_CONFIG_SRCDIR(cygserver.cc)
AC_CONFIG_AUX_DIR(..)
. ${srcdir}/../configure.cygwin
AC_PROG_INSTALL
AC_NO_EXECUTABLES
AC_CANONICAL_TARGET
AC_PROG_CC
AC_PROG_CXX
AC_PROG_CPP
AC_LANG(C)
AC_LANG(C++)
AC_CYGWIN_INCLUDES
AC_CHECK_TOOL(AR, ar, ar)
AC_CHECK_TOOL(AS, as, as)
AC_CHECK_TOOL(RANLIB, ranlib, ranlib)
AC_CHECK_TOOL(LD, ld, ld)
AC_CHECK_TOOL(NM, nm, nm)
AC_CHECK_TOOL(DLLTOOL, dlltool, dlltool)
AC_CHECK_TOOL(WINDRES, windres, windres)
AC_ARG_ENABLE(debugging,
[ --enable-debugging Build a cygwin DLL which has more consistency checking for debugging],
[case "${enableval}" in
yes) AC_DEFINE(DEBUGGING) ;;
no) ;;
esac
])
AC_CONFIGURE_ARGS
AC_CONFIG_FILES([Makefile])
AC_OUTPUT

8
winsup/cygwin/Makefile.in
View File

@ -12,7 +12,6 @@
srcdir:=@srcdir@
target_builddir:=@target_builddir@
winsup_srcdir:=@winsup_srcdir@
configure_args=@configure_args@
CC:=@CC@
CXX:=@CXX@
@ -673,10 +672,6 @@ $(TEST_LIB_NAME): $(LIB_NAME)
$(LIBSERVER): ${cygserver_blddir}/Makefile
$(MAKE) -C ${cygserver_blddir} libcygserver.a
${cygserver_blddir}/Makefile:
/bin/mkdir -p ${@D}
cd ${@D} && exec /bin/sh $(dir ${srcdir})/cygserver/configure ${configure_args}
dll_ofiles: $(DLL_OFILES)
$(LIBGMON_A): $(GMON_OFILES) $(GMON_START)
@ -754,9 +749,6 @@ version.cc: mkvers.sh include/cygwin/version.h winver.rc $(src_files)
/bin/sh ${word 1,$^} ${word 2,$^} ${word 3,$^} $(WINDRES) ${CFLAGS} -I${srcdir}/include
$(VERSION_OFILES): version.cc
Makefile: ${srcdir}/Makefile.in
/bin/sh ./config.status
$(DEF_FILE): gendef $(srcdir)/$(TLSOFFSETS_H) $(DIN_FILE)
$(word 1,$^) --cpu=${target_cpu} --output-def=$@ --tlsoffsets=$(word 2,$^) $(wordlist 3,99,$^)

54
winsup/cygwin/aclocal.m4 vendored
View File

@ -1,54 +0,0 @@
# generated automatically by aclocal 1.12.6 -*- Autoconf -*-
# Copyright (C) 1996-2012 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
dnl This provides configure definitions used by all the cygwin
dnl configure.in files.
AC_DEFUN([AC_CYGWIN_INCLUDES], [
: ${ac_cv_prog_CXX:=$CXX}
: ${ac_cv_prog_CC:=$CC}
cygwin_headers=$(realdirpath "$winsup_srcdir/cygwin/include")
if test -z "$cygwin_headers"; then
AC_MSG_ERROR([cannot find $winsup_srcdir/cygwin/include directory])
fi
newlib_headers=$(realdirpath $winsup_srcdir/../newlib/libc/include)
if test -z "$newlib_headers"; then
AC_MSG_ERROR([cannot find newlib source directory: $winsup_srcdir/../newlib/libc/include])
fi
newlib_headers="$target_builddir/newlib/targ-include $newlib_headers"
INCLUDES="-I${srcdir}/../cygwin -I${target_builddir}/winsup/cygwin"
INCLUDES="${INCLUDES} -isystem ${cygwin_headers}"
for h in ${newlib_headers}; do
INCLUDES="${INCLUDES} -isystem $h"
done
AC_SUBST(INCLUDES)
])
AC_DEFUN([AC_CONFIGURE_ARGS], [
configure_args=X
for f in $ac_configure_args; do
case "$f" in
*--srcdir*) ;;
*) configure_args="$configure_args $f" ;;
esac
done
configure_args=$(/usr/bin/expr "$configure_args" : 'X \(.*\)')
AC_SUBST(configure_args)
])
AC_SUBST(target_builddir)
AC_SUBST(winsup_srcdir)

4
winsup/cygwin/autogen.sh
View File

@ -1,4 +0,0 @@
#!/bin/sh -e
/usr/bin/aclocal --system-acdir=..
/usr/bin/autoconf -f
exec /bin/rm -rf autom4te.cache

5643
winsup/cygwin/configure vendored
View File

File diff suppressed because it is too large Load Diff

73
winsup/cygwin/configure.ac
View File

@ -1,73 +0,0 @@
dnl Autoconf configure script for Cygwin.
dnl
dnl This file is part of Cygwin.
dnl
dnl This software is a copyrighted work licensed under the terms of the
dnl Cygwin license. Please consult the file "CYGWIN_LICENSE" for
dnl details.
dnl
dnl Process this file with autoconf to produce a configure script.
AC_PREREQ([2.59])
AC_INIT([Cygwin DLL],[0],[cygwin@cygwin.com],[cygwin],[https://cygwin.com])
AC_CONFIG_SRCDIR(Makefile.in)
AC_CONFIG_HEADER(config.h)
AC_CONFIG_AUX_DIR(..)
. ${srcdir}/../configure.cygwin
AC_PROG_INSTALL
AC_NO_EXECUTABLES
AC_CANONICAL_TARGET
AC_PROG_CC
AC_PROG_CXX
AC_PROG_CPP
AC_LANG(C)
AC_LANG(C++)
AC_CYGWIN_INCLUDES
AC_CHECK_TOOL(AR, ar, ar)
AC_CHECK_TOOL(AS, as, as)
AC_CHECK_TOOL(DLLTOOL, dlltool, dlltool)
AC_CHECK_TOOL(LD, ld, ld)
AC_CHECK_TOOL(NM, nm, nm)
AC_CHECK_TOOL(OBJCOPY, objcopy, objcopy)
AC_CHECK_TOOL(OBJDUMP, objdump, objdump)
AC_CHECK_TOOL(RANLIB, ranlib, ranlib)
AC_CHECK_TOOL(STRIP, strip, strip)
AC_CHECK_TOOL(WINDRES, windres, windres)
AC_ARG_ENABLE(debugging,
[ --enable-debugging Build a cygwin DLL which has more consistency checking for debugging],
[case "${enableval}" in
yes) AC_DEFINE([DEBUGGING],[1],[Define if DEBUGGING support is requested.]) ;;
no) ;;
esac
])
case "$target_cpu" in
i?86)
DLL_ENTRY="_dll_entry@12"
DEF_DLL_ENTRY="dll_entry@12"
DIN_FILE="i686.din"
TLSOFFSETS_H="tlsoffsets.h"
;;
x86_64)
DLL_ENTRY="dll_entry"
DEF_DLL_ENTRY="dll_entry"
DIN_FILE="x86_64.din"
TLSOFFSETS_H="tlsoffsets64.h"
;;
*) AC_MSG_ERROR([Invalid target processor "$target_cpu"]) ;;
esac
AC_CONFIGURE_ARGS
AC_SUBST(DLL_ENTRY)
AC_SUBST(DEF_DLL_ENTRY)
AC_SUBST(DIN_FILE)
AC_SUBST(TLSOFFSETS_H)
AC_CONFIG_FILES([Makefile])
AC_OUTPUT

3
winsup/doc/Makefile.in
View File

@ -54,9 +54,6 @@ all: Makefile Makefile.dep \
intro2man.stamp \
cygwin-ug-net.info cygwin-api.info
Makefile: $(srcdir)/Makefile.in
/bin/sh ./config.status
clean:
rm -f Makefile.dep
rm -f *.html *.html.gz

4064
winsup/doc/configure vendored
View File

File diff suppressed because it is too large Load Diff

24
winsup/doc/configure.ac
View File

@ -1,24 +0,0 @@
dnl Autoconf configure script for winsup/doc
dnl
dnl This file is part of Cygwin.
dnl
dnl This software is a copyrighted work licensed under the terms of the
dnl Cygwin license. Please consult the file "CYGWIN_LICENSE" for
dnl details.
dnl Process this file with autoconf to produce a configure script.
AC_PREREQ([2.59])
AC_INIT([Cygwin Documentation],[0],[cygwin@cygwin.com],[cygwin],[https://cygwin.com])
AC_CONFIG_SRCDIR(cygwin-api.xml)
AC_CONFIG_AUX_DIR(../..)
AC_PROG_INSTALL
AC_CHECK_PROGS([DOCBOOK2XTEXI], [docbook2x-texi db2x_docbook2texi], [true])
AC_NO_EXECUTABLES
AC_CANONICAL_TARGET
AC_PROG_CC
AC_CONFIG_FILES([Makefile])
AC_OUTPUT

7
winsup/testsuite/Makefile.in
View File

@ -119,7 +119,7 @@ tmpdir = $(abspath $(objdir)/testsuite/tmp/)
# understood by the test DLL, which will have a different mount table)
testdll_tmpdir = $(shell cygpath -ma $(tmpdir) | sed -e 's#^\([A-Z]\):#/cygdrive/\L\1#')
site.exp: ./config.status Makefile
site.exp: ../config.status Makefile
@echo "Making a new config file..."
-@rm -f ./tmp?
@touch site.exp
@ -163,11 +163,10 @@ check: $(TESTSUP_LIB_NAME) $(RUNTIME) cygrun.exe testsuite/site.exp
PATH=$$rootme/../cygwin:$${PATH} ;\
cd testsuite; runtest --tool winsup $(RUNTESTFLAGS)
ifdef MINGW_CC
cygrun.o: cygrun.c
$(MINGW_CC) $(MINGW_CFLAGS) -o $@ -c $<
cygrun.exe : cygrun.o
$(MINGW_CC) $(MINGW_LDFLAGS) -o $@ $<
Makefile: Makefile.in $(srcdir)/configure config.status
$(SHELL) config.status
endif

4
winsup/testsuite/autogen.sh
View File

@ -1,4 +0,0 @@
#!/bin/sh -e
/usr/bin/aclocal --system-acdir=..
/usr/bin/autoconf -f
exec /bin/rm -rf autom4te.cache

4199
winsup/testsuite/configure vendored
View File

File diff suppressed because it is too large Load Diff

28
winsup/testsuite/configure.ac
View File

@ -1,28 +0,0 @@
dnl Autoconf configure script for Cygwin's testsuite.
dnl
dnl This file is part of Cygwin.
dnl
dnl This software is a copyrighted work licensed under the terms of the
dnl Cygwin license. Please consult the file "CYGWIN_LICENSE" for
dnl details.
dnl
dnl Process this file with autoconf to produce a configure script.
AC_PREREQ(2.59)
AC_INIT([Cygwin Testsuite],[0],[cygwin@cygwin.com],[cygwin],[https://cygwin.com])
AC_CONFIG_SRCDIR(Makefile.in)
. ${srcdir}/../configure.cygwin
AC_CANONICAL_TARGET
AC_PROG_CC
AC_PROG_CPP
AC_CHECK_TOOL(AR,ar)
AC_SUBST(target_builddir)
AC_CHECK_PROGS(MINGW_CXX, ${target_cpu}-w64-mingw32-g++)
AC_CHECK_PROGS(MINGW_CC, ${target_cpu}-w64-mingw32-gcc)
AC_OUTPUT(Makefile)

9
winsup/utils/Makefile.in
View File

@ -9,7 +9,6 @@
srcdir:=@srcdir@
target_builddir:=@target_builddir@
winsup_srcdir:=@winsup_srcdir@
configure_args=@configure_args@
CC:=@CC@
CXX:=@CXX@
@ -52,7 +51,9 @@ CYGWIN_BINS := ${addsuffix .exe,chattr cygpath gencat getconf getfacl ldd locale
# List all binaries to be linked in MinGW mode. Each binary on this list
# must have a corresponding .o of the same name.
ifdef MINGW_CXX
MINGW_BINS := ${addsuffix .exe,cygcheck cygwin-console-helper ldh strace}
endif
# List all objects to be compiled in MinGW mode. Any object not on this
# list will will be compiled in Cygwin mode implicitly, so there is no
@ -166,9 +167,6 @@ install: all
$(INSTALL_PROGRAM) $$i $(DESTDIR)$(bindir)/$$i; \
done
$(cygwin_build)/libcygwin.a: $(cygwin_build)/Makefile
@$(MAKE) -C $(@D) $(@F)
.PHONY: warn_dumper
warn_dumper:
@echo '*** Not building dumper.exe since some required libraries or'
@ -177,6 +175,3 @@ warn_dumper:
@echo '*** If you need this program, check out the naked-bfd and naked-intl'
@echo '*** sources from sourceware.org. Then, configure and build these'
@echo '*** libraries. Otherwise, you can safely ignore this warning.'
Makefile: Makefile.in config.status
/bin/sh ./config.status

54
winsup/utils/aclocal.m4 vendored
View File

@ -1,54 +0,0 @@
# generated automatically by aclocal 1.12.6 -*- Autoconf -*-
# Copyright (C) 1996-2012 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
dnl This provides configure definitions used by all the cygwin
dnl configure.in files.
AC_DEFUN([AC_CYGWIN_INCLUDES], [
: ${ac_cv_prog_CXX:=$CXX}
: ${ac_cv_prog_CC:=$CC}
cygwin_headers=$(realdirpath "$winsup_srcdir/cygwin/include")
if test -z "$cygwin_headers"; then
AC_MSG_ERROR([cannot find $winsup_srcdir/cygwin/include directory])
fi
newlib_headers=$(realdirpath $winsup_srcdir/../newlib/libc/include)
if test -z "$newlib_headers"; then
AC_MSG_ERROR([cannot find newlib source directory: $winsup_srcdir/../newlib/libc/include])
fi
newlib_headers="$target_builddir/newlib/targ-include $newlib_headers"
INCLUDES="-I${srcdir}/../cygwin -I${target_builddir}/winsup/cygwin"
INCLUDES="${INCLUDES} -isystem ${cygwin_headers}"
for h in ${newlib_headers}; do
INCLUDES="${INCLUDES} -isystem $h"
done
AC_SUBST(INCLUDES)
])
AC_DEFUN([AC_CONFIGURE_ARGS], [
configure_args=X
for f in $ac_configure_args; do
case "$f" in
*--srcdir*) ;;
*) configure_args="$configure_args $f" ;;
esac
done
configure_args=$(/usr/bin/expr "$configure_args" : 'X \(.*\)')
AC_SUBST(configure_args)
])
AC_SUBST(target_builddir)
AC_SUBST(winsup_srcdir)

4
winsup/utils/autogen.sh
View File

@ -1,4 +0,0 @@
#!/bin/sh -e
/usr/bin/aclocal --system-acdir=..
/usr/bin/autoconf -f
exec /bin/rm -rf autom4te.cache

4409
winsup/utils/configure vendored
View File

File diff suppressed because it is too large Load Diff

36
winsup/utils/configure.ac
View File

@ -1,36 +0,0 @@
dnl Autoconf configure script for Cygwin utilities.
dnl
dnl This file is part of Cygwin.
dnl
dnl This software is a copyrighted work licensed under the terms of the
dnl Cygwin license. Please consult the file "CYGWIN_LICENSE" for
dnl details.
dnl Process this file with autoconf to produce a configure script.
AC_PREREQ([2.59])
AC_INIT([Cygwin Utils],[0],[cygwin@cygwin.com],[cygwin],[https://cygwin.com])
AC_CONFIG_SRCDIR(mount.cc)
AC_CONFIG_AUX_DIR(../..)
AC_NO_EXECUTABLES
. ${srcdir}/../configure.cygwin
AC_CANONICAL_TARGET
AC_PROG_CC
AC_PROG_CXX
AC_CYGWIN_INCLUDES
AC_PROG_INSTALL
AC_CHECK_PROGS(MINGW_CXX, ${target_cpu}-w64-mingw32-g++)
test -n "$MINGW_CXX" || AC_MSG_ERROR([no acceptable mingw g++ found in \$PATH])
AC_EXEEXT
AC_CONFIGURE_ARGS
AC_CONFIG_FILES([Makefile])
AC_OUTPUT