Add option to not build mingw programs when cross compiling.

Add an option to not require a mingw compiler when bootstrapping a cross toolchain.
Defaults to existing behavior.
Also update some obsolete macros.

winsup/ChangeLog
configure.ac: Add option to skip building programs that require mingw.
configure: Regenerate.

Signed-off-by: Peter Foley <pefoley2@pefoley.com>
This commit is contained in:
Peter Foley 2016-03-23 09:34:10 -04:00 committed by Corinna Vinschen
parent 279aaeb5c7
commit cf41355aba
2 changed files with 30 additions and 9 deletions

22
winsup/configure vendored
View File

@ -665,6 +665,7 @@ target_builddir'
ac_subst_files=''
ac_user_opts='
enable_option_checking
with_mingw_progs
with_windows_headers
with_windows_libs
'
@ -680,7 +681,8 @@ CXX
CXXFLAGS
CCC
CPP'
ac_subdirs_all='cygwin utils cygserver lsaauth doc'
ac_subdirs_all='cygwin cygserver doc
utils lsaauth'
# Initialize some variables set by options.
ac_init_help=
@ -1293,6 +1295,8 @@ if test -n "$ac_init_help"; then
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
--without-mingw-progs do not build programs using the mingw toolchain
(useful for cross-compiling)
--with-windows-headers=DIR
specify where the windows includes are located
--with-windows-libs=DIR specify where the windows libraries are located
@ -2092,7 +2096,6 @@ test -n "$target_alias" &&
NONENONEs,x,x, &&
program_prefix=${target_alias}-
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@ -3359,6 +3362,14 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
ac_compiler_gnu=$ac_cv_c_compiler_gnu
# Check whether --with-mingw-progs was given.
if test "${with_mingw_progs+set}" = set; then :
withval=$with_mingw_progs;
else
with_mingw_progs=yes
fi
# Check whether --with-windows-headers was given.
@ -3435,7 +3446,12 @@ export CXX
subdirs="$subdirs cygwin utils cygserver lsaauth doc"
subdirs="$subdirs cygwin cygserver doc"
if test "x$with_mingw_progs" != xno; then
subdirs="$subdirs utils lsaauth"
fi
INSTALL_LICENSE="install-license"

17
winsup/configure.ac Executable file → Normal file
View File

@ -10,9 +10,8 @@ dnl details.
dnl
dnl Process this file with autoconf to produce a configure script.
AC_PREREQ(2.59)dnl
AC_INIT([Cygwin toplevel], 0,
cygwin@cygwin.com, cygwin, https://cygwin.com)
AC_PREREQ([2.59])
AC_INIT([Cygwin toplevel],[0],[cygwin@cygwin.com],[cygwin],[https://cygwin.com])
AC_CONFIG_SRCDIR(Makefile.in)
AC_CONFIG_AUX_DIR(..)
@ -20,12 +19,13 @@ AC_CONFIG_AUX_DIR(..)
AC_PROG_INSTALL
AC_NO_EXECUTABLES
AC_CANONICAL_SYSTEM
AC_CANONICAL_TARGET
AC_PROG_CC
AC_PROG_CXX
AC_PROG_CPP
AC_LANG(C)
AC_ARG_WITH([mingw-progs],[AS_HELP_STRING([--without-mingw-progs],[do not build programs using the mingw toolchain (useful for cross-compiling)])],[],[with_mingw_progs=yes])
AC_WINDOWS_HEADERS
AC_WINDOWS_LIBS
@ -34,11 +34,16 @@ AC_LANG(C++)
AC_CYGWIN_INCLUDES
AC_CONFIG_SUBDIRS(cygwin utils cygserver lsaauth doc)
AC_CONFIG_SUBDIRS(cygwin cygserver doc)
if test "x$with_mingw_progs" != xno; then
AC_CONFIG_SUBDIRS([utils lsaauth])
fi
INSTALL_LICENSE="install-license"
AC_SUBST(INSTALL_LICENSE)
AC_PROG_MAKE_SET
AC_OUTPUT(Makefile)
AC_CONFIG_FILES([Makefile])
AC_OUTPUT