diff options
| author | Jon Turney <jon.turney@dronecode.org.uk> | 2020-10-14 18:49:45 +0300 |
|---|---|---|
| committer | Jon Turney <jon.turney@dronecode.org.uk> | 2020-10-18 16:55:14 +0300 |
| commit | 78bfd7dbb96eae1d9541711578ff08e56ddbca5b (patch) | |
| tree | 39937fb6018f97a4e46da438bef7ce40f5fe7a9a /winsup/acinclude.m4 | |
| parent | b55e3f1916edcb457bc4cc91d74e2c8dfa85e57e (diff) | |
Cygwin: Remove --with-windows-{libs,headers}
Diffstat (limited to 'winsup/acinclude.m4')
| -rw-r--r-- | winsup/acinclude.m4 | 41 |
1 files changed, 0 insertions, 41 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) ]) |