[PATCH 4/5] Don't build utils/lsaauth when cross compiling.

Peter Foley pefoley2@pefoley.com
Mon Mar 21 17:16:00 GMT 2016


Don't require a mingw compiler when bootstrapping a cross toolchain.
Also update some obsolete macros.

winsup/ChangeLog
configure.ac: Only build lsaauth and utils when compiling natively
configure: Regenerate.

Signed-off-by: Peter Foley <pefoley2@pefoley.com>
---
 winsup/configure    | 11 ++++++++---
 winsup/configure.ac | 16 ++++++++++------
 2 files changed, 18 insertions(+), 9 deletions(-)
 mode change 100755 => 100644 winsup/configure.ac

diff --git a/winsup/configure b/winsup/configure
index 0887d66..57c3378 100755
--- a/winsup/configure
+++ b/winsup/configure
@@ -680,7 +680,8 @@ CXX
 CXXFLAGS
 CCC
 CPP'
-ac_subdirs_all='cygwin utils cygserver lsaauth doc'
+ac_subdirs_all='utils lsaauth
+cygwin cygserver doc'
 
 # Initialize some variables set by options.
 ac_init_help=
@@ -2092,7 +2093,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'
@@ -3433,9 +3433,14 @@ export CXX
 
 
 
+if test "x$cross_compiling" != xyes; then
+
 
+subdirs="$subdirs utils lsaauth"
+
+fi
 
-subdirs="$subdirs cygwin utils cygserver lsaauth doc"
+subdirs="$subdirs cygwin cygserver doc"
 
 INSTALL_LICENSE="install-license"
 
diff --git a/winsup/configure.ac b/winsup/configure.ac
old mode 100755
new mode 100644
index 43b95c5..ce4f4bb
--- a/winsup/configure.ac
+++ b/winsup/configure.ac
@@ -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,7 +19,7 @@ AC_CONFIG_AUX_DIR(..)
 
 AC_PROG_INSTALL
 AC_NO_EXECUTABLES
-AC_CANONICAL_SYSTEM
+AC_CANONICAL_TARGET
 
 AC_PROG_CC
 AC_PROG_CXX
@@ -34,11 +33,16 @@ AC_LANG(C++)
 
 AC_CYGWIN_INCLUDES
 
-AC_CONFIG_SUBDIRS(cygwin utils cygserver lsaauth doc)
+if test "x$cross_compiling" != xyes; then
+    AC_CONFIG_SUBDIRS([utils lsaauth])
+fi
+
+AC_CONFIG_SUBDIRS(cygwin cygserver doc)
 INSTALL_LICENSE="install-license"
 
 AC_SUBST(INSTALL_LICENSE)
 
 AC_PROG_MAKE_SET
 
-AC_OUTPUT(Makefile)
+AC_CONFIG_FILES([Makefile])
+AC_OUTPUT
-- 
2.7.4



More information about the Cygwin-patches mailing list