From 78bfd7dbb96eae1d9541711578ff08e56ddbca5b Mon Sep 17 00:00:00 2001 From: Jon Turney Date: Wed, 14 Oct 2020 16:49:45 +0100 Subject: [PATCH] Cygwin: Remove --with-windows-{libs,headers} --- winsup/acinclude.m4 | 41 -------------------------- winsup/configure | 50 ------------------------------- winsup/configure.ac | 5 ---- winsup/cygserver/aclocal.m4 | 41 -------------------------- winsup/cygserver/configure | 55 ----------------------------------- winsup/cygserver/configure.ac | 6 ---- winsup/cygwin/Makefile.in | 4 +-- winsup/cygwin/aclocal.m4 | 41 -------------------------- winsup/cygwin/configure | 54 ---------------------------------- winsup/cygwin/configure.ac | 5 ---- winsup/utils/Makefile.in | 4 +-- winsup/utils/aclocal.m4 | 41 -------------------------- winsup/utils/configure | 52 --------------------------------- winsup/utils/configure.ac | 3 -- 14 files changed, 2 insertions(+), 400 deletions(-) diff --git a/winsup/acinclude.m4 b/winsup/acinclude.m4 index 5f71871ec..5248e2a2a 100644 --- a/winsup/acinclude.m4 +++ b/winsup/acinclude.m4 @@ -1,33 +1,6 @@ dnl This provides configure definitions used by all the cygwin dnl configure.in files. -AC_DEFUN([AC_WINDOWS_HEADERS],[ -AC_ARG_WITH( - [windows-headers], - [AS_HELP_STRING([--with-windows-headers=DIR], - [specify where the windows includes are located])], - [test -z "$withval" && AC_MSG_ERROR([must specify value for --with-windows-headers])] -) -]) - -AC_DEFUN([AC_WINDOWS_LIBS],[ -AC_ARG_WITH( - [windows-libs], - [AS_HELP_STRING([--with-windows-libs=DIR], - [specify where the windows libraries are located])], - [test -z "$withval" && AC_MSG_ERROR([must specify value for --with-windows-libs])] -) -windows_libdir=$(realdirpath "$with_windows_libs") -if test -z "$windows_libdir"; then - windows_libdir=$(realdirpath $(${ac_cv_prog_CC:-$CC} -xc /dev/null -Wl,--verbose=1 -lntdll 2>&1 | sed -rn 's%^.*\s(\S+)/libntdll\..*succeeded%\1%p')) - if test -z "$windows_libdir"; then - AC_MSG_ERROR([cannot find windows library files]) - fi -fi -AC_SUBST(windows_libdir) -] -) - AC_DEFUN([AC_CYGWIN_INCLUDES], [ : ${ac_cv_prog_CXX:=$CXX} : ${ac_cv_prog_CC:=$CC} @@ -43,25 +16,11 @@ if test -z "$newlib_headers"; then fi newlib_headers="$target_builddir/newlib/targ-include $newlib_headers" -if test -n "$with_windows_headers"; then - if test -e "$with_windows_headers/windef.h"; then - windows_headers="$with_windows_headers" - else - AC_MSG_ERROR([cannot find windef.h in specified --with-windows-headers path: $saw_windows_headers]); - fi -else - windows_headers=$(cd $($ac_cv_prog_CC -xc /dev/null -E -include windef.h 2>/dev/null | sed -n 's%^# 1 "\([^"]*\)/windef\.h".*$%\1%p' | head -n1) 2>/dev/null && pwd) - if test -z "$windows_headers" -o ! -d "$windows_headers"; then - AC_MSG_ERROR([cannot find windows header files]) - fi -fi - 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 -INCLUDES="${INCLUDES} -isystem ${windows_headers}" AC_SUBST(INCLUDES) ]) diff --git a/winsup/configure b/winsup/configure index 6bfd2781f..e028e2889 100755 --- a/winsup/configure +++ b/winsup/configure @@ -591,7 +591,6 @@ ac_subst_vars='LTLIBOBJS LIBOBJS subdirs INCLUDES -windows_libdir CPP ac_ct_CXX CXXFLAGS @@ -662,8 +661,6 @@ ac_subst_files='' ac_user_opts=' enable_option_checking with_cross_bootstrap -with_windows_headers -with_windows_libs ' ac_precious_vars='build_alias host_alias @@ -1294,9 +1291,6 @@ Optional Packages: --with-cross-bootstrap do not build programs using the mingw toolchain or check for mingw libraries (useful for bootstrapping a cross-compiler) - --with-windows-headers=DIR - specify where the windows includes are located - --with-windows-libs=DIR specify where the windows libraries are located Some influential environment variables: CC C compiler command @@ -3367,36 +3361,6 @@ else fi - - -# Check whether --with-windows-headers was given. -if test "${with_windows_headers+set}" = set; then : - withval=$with_windows_headers; test -z "$withval" && as_fn_error $? "must specify value for --with-windows-headers" "$LINENO" 5 - -fi - - -if test "x$with_cross_bootstrap" != "xyes"; then - - -# Check whether --with-windows-libs was given. -if test "${with_windows_libs+set}" = set; then : - withval=$with_windows_libs; test -z "$withval" && as_fn_error $? "must specify value for --with-windows-libs" "$LINENO" 5 - -fi - -windows_libdir=$(realdirpath "$with_windows_libs") -if test -z "$windows_libdir"; then - windows_libdir=$(realdirpath $(${ac_cv_prog_CC:-$CC} -xc /dev/null -Wl,--verbose=1 -lntdll 2>&1 | sed -rn 's%^.*\s(\S+)/libntdll\..*succeeded%\1%p')) - if test -z "$windows_libdir"; then - as_fn_error $? "cannot find windows library files" "$LINENO" 5 - fi -fi - - - -fi - ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -3419,25 +3383,11 @@ if test -z "$newlib_headers"; then fi newlib_headers="$target_builddir/newlib/targ-include $newlib_headers" -if test -n "$with_windows_headers"; then - if test -e "$with_windows_headers/windef.h"; then - windows_headers="$with_windows_headers" - else - as_fn_error $? "cannot find windef.h in specified --with-windows-headers path: $saw_windows_headers" "$LINENO" 5; - fi -else - windows_headers=$(cd $($ac_cv_prog_CC -xc /dev/null -E -include windef.h 2>/dev/null | sed -n 's%^# 1 "\([^"]*\)/windef\.h".*$%\1%p' | head -n1) 2>/dev/null && pwd) - if test -z "$windows_headers" -o ! -d "$windows_headers"; then - as_fn_error $? "cannot find windows header files" "$LINENO" 5 - fi -fi - 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 -INCLUDES="${INCLUDES} -isystem ${windows_headers}" diff --git a/winsup/configure.ac b/winsup/configure.ac index 13f8883eb..65369ae7f 100644 --- a/winsup/configure.ac +++ b/winsup/configure.ac @@ -25,11 +25,6 @@ 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_WINDOWS_HEADERS -if test "x$with_cross_bootstrap" != "xyes"; then - AC_WINDOWS_LIBS -fi - AC_LANG(C++) AC_CYGWIN_INCLUDES diff --git a/winsup/cygserver/aclocal.m4 b/winsup/cygserver/aclocal.m4 index 2a9d9c6db..26f51e234 100644 --- a/winsup/cygserver/aclocal.m4 +++ b/winsup/cygserver/aclocal.m4 @@ -15,33 +15,6 @@ dnl This provides configure definitions used by all the cygwin dnl configure.in files. -AC_DEFUN([AC_WINDOWS_HEADERS],[ -AC_ARG_WITH( - [windows-headers], - [AS_HELP_STRING([--with-windows-headers=DIR], - [specify where the windows includes are located])], - [test -z "$withval" && AC_MSG_ERROR([must specify value for --with-windows-headers])] -) -]) - -AC_DEFUN([AC_WINDOWS_LIBS],[ -AC_ARG_WITH( - [windows-libs], - [AS_HELP_STRING([--with-windows-libs=DIR], - [specify where the windows libraries are located])], - [test -z "$withval" && AC_MSG_ERROR([must specify value for --with-windows-libs])] -) -windows_libdir=$(realdirpath "$with_windows_libs") -if test -z "$windows_libdir"; then - windows_libdir=$(realdirpath $(${ac_cv_prog_CC:-$CC} -xc /dev/null -Wl,--verbose=1 -lntdll 2>&1 | sed -rn 's%^.*\s(\S+)/libntdll\..*succeeded%\1%p')) - if test -z "$windows_libdir"; then - AC_MSG_ERROR([cannot find windows library files]) - fi -fi -AC_SUBST(windows_libdir) -] -) - AC_DEFUN([AC_CYGWIN_INCLUDES], [ : ${ac_cv_prog_CXX:=$CXX} : ${ac_cv_prog_CC:=$CC} @@ -57,25 +30,11 @@ if test -z "$newlib_headers"; then fi newlib_headers="$target_builddir/newlib/targ-include $newlib_headers" -if test -n "$with_windows_headers"; then - if test -e "$with_windows_headers/windef.h"; then - windows_headers="$with_windows_headers" - else - AC_MSG_ERROR([cannot find windef.h in specified --with-windows-headers path: $saw_windows_headers]); - fi -else - windows_headers=$(cd $($ac_cv_prog_CC -xc /dev/null -E -include windef.h 2>/dev/null | sed -n 's%^# 1 "\([^"]*\)/windef\.h".*$%\1%p' | head -n1) 2>/dev/null && pwd) - if test -z "$windows_headers" -o ! -d "$windows_headers"; then - AC_MSG_ERROR([cannot find windows header files]) - fi -fi - 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 -INCLUDES="${INCLUDES} -isystem ${windows_headers}" AC_SUBST(INCLUDES) ]) diff --git a/winsup/cygserver/configure b/winsup/cygserver/configure index 14d8deab8..4d1bb97d0 100755 --- a/winsup/cygserver/configure +++ b/winsup/cygserver/configure @@ -599,7 +599,6 @@ AR install_host all_host INCLUDES -windows_libdir CPP ac_ct_CXX CXXFLAGS @@ -669,8 +668,6 @@ target_builddir' ac_subst_files='' ac_user_opts=' enable_option_checking -with_windows_headers -with_windows_libs enable_debugging ' ac_precious_vars='build_alias @@ -1301,13 +1298,6 @@ Optional Features: --enable-FEATURE[=ARG] include FEATURE [ARG=yes] --enable-debugging Build a cygwin DLL which has more consistency checking for debugging -Optional Packages: - --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] - --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) - --with-windows-headers=DIR - specify where the windows includes are located - --with-windows-libs=DIR specify where the windows libraries are located - Some influential environment variables: CC C compiler command CFLAGS C compiler flags @@ -3368,37 +3358,6 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu - - - -# Check whether --with-windows-headers was given. -if test "${with_windows_headers+set}" = set; then : - withval=$with_windows_headers; test -z "$withval" && as_fn_error $? "must specify value for --with-windows-headers" "$LINENO" 5 - -fi - - -if test "x$with_cross_bootstrap" != "xyes"; then - - -# Check whether --with-windows-libs was given. -if test "${with_windows_libs+set}" = set; then : - withval=$with_windows_libs; test -z "$withval" && as_fn_error $? "must specify value for --with-windows-libs" "$LINENO" 5 - -fi - -windows_libdir=$(realdirpath "$with_windows_libs") -if test -z "$windows_libdir"; then - windows_libdir=$(realdirpath $(${ac_cv_prog_CC:-$CC} -xc /dev/null -Wl,--verbose=1 -lntdll 2>&1 | sed -rn 's%^.*\s(\S+)/libntdll\..*succeeded%\1%p')) - if test -z "$windows_libdir"; then - as_fn_error $? "cannot find windows library files" "$LINENO" 5 - fi -fi - - - -fi - ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -3421,25 +3380,11 @@ if test -z "$newlib_headers"; then fi newlib_headers="$target_builddir/newlib/targ-include $newlib_headers" -if test -n "$with_windows_headers"; then - if test -e "$with_windows_headers/windef.h"; then - windows_headers="$with_windows_headers" - else - as_fn_error $? "cannot find windef.h in specified --with-windows-headers path: $saw_windows_headers" "$LINENO" 5; - fi -else - windows_headers=$(cd $($ac_cv_prog_CC -xc /dev/null -E -include windef.h 2>/dev/null | sed -n 's%^# 1 "\([^"]*\)/windef\.h".*$%\1%p' | head -n1) 2>/dev/null && pwd) - if test -z "$windows_headers" -o ! -d "$windows_headers"; then - as_fn_error $? "cannot find windows header files" "$LINENO" 5 - fi -fi - 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 -INCLUDES="${INCLUDES} -isystem ${windows_headers}" diff --git a/winsup/cygserver/configure.ac b/winsup/cygserver/configure.ac index d8b2a61fa..9a6baceb7 100644 --- a/winsup/cygserver/configure.ac +++ b/winsup/cygserver/configure.ac @@ -23,12 +23,6 @@ AC_PROG_CC AC_PROG_CXX AC_PROG_CPP AC_LANG(C) - -AC_WINDOWS_HEADERS -if test "x$with_cross_bootstrap" != "xyes"; then - AC_WINDOWS_LIBS -fi - AC_LANG(C++) AC_CYGWIN_INCLUDES diff --git a/winsup/cygwin/Makefile.in b/winsup/cygwin/Makefile.in index 01c2f72a3..a56a311b8 100644 --- a/winsup/cygwin/Makefile.in +++ b/winsup/cygwin/Makefile.in @@ -52,8 +52,6 @@ override INSTALL:=@INSTALL@ override INSTALL_PROGRAM:=@INSTALL_PROGRAM@ override INSTALL_DATA:=@INSTALL_DATA@ -WINDOWS_LIBDIR:=@windows_libdir@ - cygserver_blddir:=${target_builddir}/winsup/cygserver LIBSERVER:=${cygserver_blddir}/libcygserver.a @@ -680,7 +678,7 @@ $(LDSCRIPT): $(LDSCRIPT).in # Rule to build cygwin.dll $(TEST_DLL_NAME): $(LDSCRIPT) dllfixdbg $(DLL_OFILES) $(LIBSERVER) $(LIBC) $(LIBM) $(API_VER) Makefile $(VERSION_OFILES) $(CXX) $(CXXFLAGS) \ - -mno-use-libstdc-wrappers -L${WINDOWS_LIBDIR} \ + -mno-use-libstdc-wrappers \ -Wl,--gc-sections $(nostdlib) -Wl,-T$(firstword $^) -static \ -Wl,--heap=0 -Wl,--out-implib,cygdll.a -shared -o $@ \ -e $(DLL_ENTRY) $(DEF_FILE) $(DLL_OFILES) $(VERSION_OFILES) \ diff --git a/winsup/cygwin/aclocal.m4 b/winsup/cygwin/aclocal.m4 index 88de6cbf8..77959ef37 100644 --- a/winsup/cygwin/aclocal.m4 +++ b/winsup/cygwin/aclocal.m4 @@ -14,33 +14,6 @@ dnl This provides configure definitions used by all the cygwin dnl configure.in files. -AC_DEFUN([AC_WINDOWS_HEADERS],[ -AC_ARG_WITH( - [windows-headers], - [AS_HELP_STRING([--with-windows-headers=DIR], - [specify where the windows includes are located])], - [test -z "$withval" && AC_MSG_ERROR([must specify value for --with-windows-headers])] -) -]) - -AC_DEFUN([AC_WINDOWS_LIBS],[ -AC_ARG_WITH( - [windows-libs], - [AS_HELP_STRING([--with-windows-libs=DIR], - [specify where the windows libraries are located])], - [test -z "$withval" && AC_MSG_ERROR([must specify value for --with-windows-libs])] -) -windows_libdir=$(realdirpath "$with_windows_libs") -if test -z "$windows_libdir"; then - windows_libdir=$(realdirpath $(${ac_cv_prog_CC:-$CC} -xc /dev/null -Wl,--verbose=1 -lntdll 2>&1 | sed -rn 's%^.*\s(\S+)/libntdll\..*succeeded%\1%p')) - if test -z "$windows_libdir"; then - AC_MSG_ERROR([cannot find windows library files]) - fi -fi -AC_SUBST(windows_libdir) -] -) - AC_DEFUN([AC_CYGWIN_INCLUDES], [ : ${ac_cv_prog_CXX:=$CXX} : ${ac_cv_prog_CC:=$CC} @@ -56,25 +29,11 @@ if test -z "$newlib_headers"; then fi newlib_headers="$target_builddir/newlib/targ-include $newlib_headers" -if test -n "$with_windows_headers"; then - if test -e "$with_windows_headers/windef.h"; then - windows_headers="$with_windows_headers" - else - AC_MSG_ERROR([cannot find windef.h in specified --with-windows-headers path: $saw_windows_headers]); - fi -else - windows_headers=$(cd $($ac_cv_prog_CC -xc /dev/null -E -include windef.h 2>/dev/null | sed -n 's%^# 1 "\([^"]*\)/windef\.h".*$%\1%p' | head -n1) 2>/dev/null && pwd) - if test -z "$windows_headers" -o ! -d "$windows_headers"; then - AC_MSG_ERROR([cannot find windows header files]) - fi -fi - 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 -INCLUDES="${INCLUDES} -isystem ${windows_headers}" AC_SUBST(INCLUDES) ]) diff --git a/winsup/cygwin/configure b/winsup/cygwin/configure index 0aa134218..eddd8996f 100755 --- a/winsup/cygwin/configure +++ b/winsup/cygwin/configure @@ -607,7 +607,6 @@ AR install_host all_host INCLUDES -windows_libdir CPP ac_ct_CXX CXXFLAGS @@ -677,8 +676,6 @@ target_builddir' ac_subst_files='' ac_user_opts=' enable_option_checking -with_windows_headers -with_windows_libs enable_debugging ' ac_precious_vars='build_alias @@ -1309,13 +1306,6 @@ Optional Features: --enable-FEATURE[=ARG] include FEATURE [ARG=yes] --enable-debugging Build a cygwin DLL which has more consistency checking for debugging -Optional Packages: - --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] - --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) - --with-windows-headers=DIR - specify where the windows includes are located - --with-windows-libs=DIR specify where the windows libraries are located - Some influential environment variables: CC C compiler command CFLAGS C compiler flags @@ -3379,36 +3369,6 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu - - -# Check whether --with-windows-headers was given. -if test "${with_windows_headers+set}" = set; then : - withval=$with_windows_headers; test -z "$withval" && as_fn_error $? "must specify value for --with-windows-headers" "$LINENO" 5 - -fi - - -if test "x$with_cross_bootstrap" != "xyes"; then - - -# Check whether --with-windows-libs was given. -if test "${with_windows_libs+set}" = set; then : - withval=$with_windows_libs; test -z "$withval" && as_fn_error $? "must specify value for --with-windows-libs" "$LINENO" 5 - -fi - -windows_libdir=$(realdirpath "$with_windows_libs") -if test -z "$windows_libdir"; then - windows_libdir=$(realdirpath $(${ac_cv_prog_CC:-$CC} -xc /dev/null -Wl,--verbose=1 -lntdll 2>&1 | sed -rn 's%^.*\s(\S+)/libntdll\..*succeeded%\1%p')) - if test -z "$windows_libdir"; then - as_fn_error $? "cannot find windows library files" "$LINENO" 5 - fi -fi - - - -fi - ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -3431,25 +3391,11 @@ if test -z "$newlib_headers"; then fi newlib_headers="$target_builddir/newlib/targ-include $newlib_headers" -if test -n "$with_windows_headers"; then - if test -e "$with_windows_headers/windef.h"; then - windows_headers="$with_windows_headers" - else - as_fn_error $? "cannot find windef.h in specified --with-windows-headers path: $saw_windows_headers" "$LINENO" 5; - fi -else - windows_headers=$(cd $($ac_cv_prog_CC -xc /dev/null -E -include windef.h 2>/dev/null | sed -n 's%^# 1 "\([^"]*\)/windef\.h".*$%\1%p' | head -n1) 2>/dev/null && pwd) - if test -z "$windows_headers" -o ! -d "$windows_headers"; then - as_fn_error $? "cannot find windows header files" "$LINENO" 5 - fi -fi - 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 -INCLUDES="${INCLUDES} -isystem ${windows_headers}" diff --git a/winsup/cygwin/configure.ac b/winsup/cygwin/configure.ac index 32862d7e5..0e9df29bb 100644 --- a/winsup/cygwin/configure.ac +++ b/winsup/cygwin/configure.ac @@ -25,11 +25,6 @@ AC_PROG_CXX AC_PROG_CPP AC_LANG(C) -AC_WINDOWS_HEADERS -if test "x$with_cross_bootstrap" != "xyes"; then - AC_WINDOWS_LIBS -fi - AC_LANG(C++) AC_CYGWIN_INCLUDES diff --git a/winsup/utils/Makefile.in b/winsup/utils/Makefile.in index bd17d6862..add29d10f 100644 --- a/winsup/utils/Makefile.in +++ b/winsup/utils/Makefile.in @@ -22,8 +22,6 @@ include ${srcdir}/../Makefile.common cygwin_build:=${target_builddir}/winsup/cygwin -WINDOWS_LIBDIR:=@windows_libdir@ - prefix:=@prefix@ exec_prefix:=@exec_prefix@ @@ -39,7 +37,7 @@ EXEEXT_FOR_BUILD:=@EXEEXT_FOR_BUILD@ .PHONY: all install clean realclean warn_dumper warn_cygcheck_zlib LDLIBS := -lnetapi32 -ladvapi32 -lkernel32 -luser32 -CYGWIN_LDFLAGS := -static -Wl,--enable-auto-import -L${WINDOWS_LIBDIR} $(LDLIBS) +CYGWIN_LDFLAGS := -static -Wl,--enable-auto-import $(LDLIBS) DEP_LDLIBS := $(cygwin_build)/libcygwin.a MINGW_CXX := @MINGW_CXX@ diff --git a/winsup/utils/aclocal.m4 b/winsup/utils/aclocal.m4 index 88de6cbf8..77959ef37 100644 --- a/winsup/utils/aclocal.m4 +++ b/winsup/utils/aclocal.m4 @@ -14,33 +14,6 @@ dnl This provides configure definitions used by all the cygwin dnl configure.in files. -AC_DEFUN([AC_WINDOWS_HEADERS],[ -AC_ARG_WITH( - [windows-headers], - [AS_HELP_STRING([--with-windows-headers=DIR], - [specify where the windows includes are located])], - [test -z "$withval" && AC_MSG_ERROR([must specify value for --with-windows-headers])] -) -]) - -AC_DEFUN([AC_WINDOWS_LIBS],[ -AC_ARG_WITH( - [windows-libs], - [AS_HELP_STRING([--with-windows-libs=DIR], - [specify where the windows libraries are located])], - [test -z "$withval" && AC_MSG_ERROR([must specify value for --with-windows-libs])] -) -windows_libdir=$(realdirpath "$with_windows_libs") -if test -z "$windows_libdir"; then - windows_libdir=$(realdirpath $(${ac_cv_prog_CC:-$CC} -xc /dev/null -Wl,--verbose=1 -lntdll 2>&1 | sed -rn 's%^.*\s(\S+)/libntdll\..*succeeded%\1%p')) - if test -z "$windows_libdir"; then - AC_MSG_ERROR([cannot find windows library files]) - fi -fi -AC_SUBST(windows_libdir) -] -) - AC_DEFUN([AC_CYGWIN_INCLUDES], [ : ${ac_cv_prog_CXX:=$CXX} : ${ac_cv_prog_CC:=$CC} @@ -56,25 +29,11 @@ if test -z "$newlib_headers"; then fi newlib_headers="$target_builddir/newlib/targ-include $newlib_headers" -if test -n "$with_windows_headers"; then - if test -e "$with_windows_headers/windef.h"; then - windows_headers="$with_windows_headers" - else - AC_MSG_ERROR([cannot find windef.h in specified --with-windows-headers path: $saw_windows_headers]); - fi -else - windows_headers=$(cd $($ac_cv_prog_CC -xc /dev/null -E -include windef.h 2>/dev/null | sed -n 's%^# 1 "\([^"]*\)/windef\.h".*$%\1%p' | head -n1) 2>/dev/null && pwd) - if test -z "$windows_headers" -o ! -d "$windows_headers"; then - AC_MSG_ERROR([cannot find windows header files]) - fi -fi - 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 -INCLUDES="${INCLUDES} -isystem ${windows_headers}" AC_SUBST(INCLUDES) ]) diff --git a/winsup/utils/configure b/winsup/utils/configure index ec9bea17f..04ba6ec2b 100755 --- a/winsup/utils/configure +++ b/winsup/utils/configure @@ -597,7 +597,6 @@ INCLUDES ac_ct_CXX CXXFLAGS CXX -windows_libdir OBJEXT EXEEXT ac_ct_CC @@ -660,8 +659,6 @@ target_builddir' ac_subst_files='' ac_user_opts=' enable_option_checking -with_windows_headers -with_windows_libs ' ac_precious_vars='build_alias host_alias @@ -1284,13 +1281,6 @@ if test -n "$ac_init_help"; then esac cat <<\_ACEOF -Optional Packages: - --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] - --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) - --with-windows-headers=DIR - specify where the windows includes are located - --with-windows-libs=DIR specify where the windows libraries are located - Some influential environment variables: CC C compiler command CFLAGS C compiler flags @@ -2822,34 +2812,6 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu - - -# Check whether --with-windows-headers was given. -if test "${with_windows_headers+set}" = set; then : - withval=$with_windows_headers; test -z "$withval" && as_fn_error $? "must specify value for --with-windows-headers" "$LINENO" 5 - -fi - - - - -# Check whether --with-windows-libs was given. -if test "${with_windows_libs+set}" = set; then : - withval=$with_windows_libs; test -z "$withval" && as_fn_error $? "must specify value for --with-windows-libs" "$LINENO" 5 - -fi - -windows_libdir=$(realdirpath "$with_windows_libs") -if test -z "$windows_libdir"; then - windows_libdir=$(realdirpath $(${ac_cv_prog_CC:-$CC} -xc /dev/null -Wl,--verbose=1 -lntdll 2>&1 | sed -rn 's%^.*\s(\S+)/libntdll\..*succeeded%\1%p')) - if test -z "$windows_libdir"; then - as_fn_error $? "cannot find windows library files" "$LINENO" 5 - fi -fi - - - - ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -3123,25 +3085,11 @@ if test -z "$newlib_headers"; then fi newlib_headers="$target_builddir/newlib/targ-include $newlib_headers" -if test -n "$with_windows_headers"; then - if test -e "$with_windows_headers/windef.h"; then - windows_headers="$with_windows_headers" - else - as_fn_error $? "cannot find windef.h in specified --with-windows-headers path: $saw_windows_headers" "$LINENO" 5; - fi -else - windows_headers=$(cd $($ac_cv_prog_CC -xc /dev/null -E -include windef.h 2>/dev/null | sed -n 's%^# 1 "\([^"]*\)/windef\.h".*$%\1%p' | head -n1) 2>/dev/null && pwd) - if test -z "$windows_headers" -o ! -d "$windows_headers"; then - as_fn_error $? "cannot find windows header files" "$LINENO" 5 - fi -fi - 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 -INCLUDES="${INCLUDES} -isystem ${windows_headers}" diff --git a/winsup/utils/configure.ac b/winsup/utils/configure.ac index ce35f9c7b..5fff31414 100644 --- a/winsup/utils/configure.ac +++ b/winsup/utils/configure.ac @@ -21,9 +21,6 @@ AC_CANONICAL_TARGET AC_PROG_CC -AC_WINDOWS_HEADERS -AC_WINDOWS_LIBS - AC_PROG_CXX AC_CYGWIN_INCLUDES