mirror of
git://sourceware.org/git/newlib-cygwin.git
synced 2025-01-20 05:19:21 +08:00
dc93f7ef2d
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.
29 lines
887 B
Plaintext
29 lines
887 B
Plaintext
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${winsup_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_SUBST(target_builddir)
|
|
AC_SUBST(winsup_srcdir)
|