Cygwin: Define target_builddir autoconf and Makefile variables

This is now required as cygwin_build is defined in terms of
target_builddir.

(Note that in other subdirectories, the autoconf variable
target_builddir is AC_SUBST-ed as a side-effect of using a macro from
winsup/acinclude.m4, which is perhaps less than ideal)

diff --git a/winsup/testsuite/Makefile.in b/winsup/testsuite/Makefile.in
index aaa5851b284a25e7e4694cc6a2b092e4cd73356a..2a44fec0714eb58011ef5f1c5773a9614b453f43 100644 (file)
--- a/winsup/testsuite/Makefile.in
+++ b/winsup/testsuite/Makefile.in
@@ -12,6 +12,7 @@ SHELL:=@SHELL@
 srcdir:=@srcdir@
 objdir:=.
 libltp_srcdir=$(srcdir)/libltp
+target_builddir:=@target_builddir@
 
 target_alias:=@target_alias@
 build_alias:=@build_alias@

diff --git a/winsup/testsuite/configure b/winsup/testsuite/configure
index da461658263c214a2d3adc86ca72de2effd736e5..eab9fbbc7612131c1db91b716665f59fd4d876ae 100755 (executable)
--- a/winsup/testsuite/configure
+++ b/winsup/testsuite/configure
@@ -587,6 +587,7 @@ PACKAGE_URL='https://cygwin.com'
 ac_unique_file="Makefile.in"
 ac_subst_vars='LTLIBOBJS
 LIBOBJS
+target_builddir
 AR
 CPP
 OBJEXT
@@ -1771,6 +1772,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
+. ${srcdir}/../configure.cygwin
+
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -2790,6 +2793,8 @@ else
 fi
 
 
+
+
 ac_config_files="$ac_config_files Makefile"
 
 cat >confcache <<\_ACEOF

diff --git a/winsup/testsuite/configure.ac b/winsup/testsuite/configure.ac
index 46f9fb0923a8373a44d2d6c68b98d3684d69165b..effea48c9349ecbadba085630c38aa9fe27e611d 100755 (executable)
--- a/winsup/testsuite/configure.ac
+++ b/winsup/testsuite/configure.ac
@@ -12,8 +12,12 @@ 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_PROG_CC
 AC_PROG_CPP
 AC_CHECK_TOOL(AR,ar)
 
+AC_SUBST(target_builddir)
+
 AC_OUTPUT(Makefile)