libs/newlib-cygwin
libs
/
newlib-cygwin
mirror of git://sourceware.org/git/newlib-cygwin.git
4
0
Fork 0
Code Issues Projects Releases Wiki Activity

Cygwin: Remove --with-windows-{libs,headers}

This commit is contained in:
Jon Turney 2020-10-14 16:49:45 +01:00
parent b55e3f1916
commit 78bfd7dbb9
No known key found for this signature in database
GPG Key ID: C7C86F0370285C81
14 changed files with 2 additions and 400 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
winsup/acinclude.m4
View File

@ -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)
])

50
winsup/configure vendored
View File

@ -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}"

5
winsup/configure.ac
View File

@ -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

41
winsup/cygserver/aclocal.m4 vendored
View File

@ -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)
])

55
winsup/cygserver/configure vendored
View File

@ -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}"

6
winsup/cygserver/configure.ac
View File

@ -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

4
winsup/cygwin/Makefile.in
View File

@ -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) \

41
winsup/cygwin/aclocal.m4 vendored
View File

@ -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)
])

54
winsup/cygwin/configure vendored
View File

@ -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}"

5
winsup/cygwin/configure.ac
View File

@ -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

4
winsup/utils/Makefile.in
View File

@ -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@

41
winsup/utils/aclocal.m4 vendored
View File

@ -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)
])

52
winsup/utils/configure vendored
View File

@ -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}"

3
winsup/utils/configure.ac
View File

@ -21,9 +21,6 @@ AC_CANONICAL_TARGET
AC_PROG_CC
AC_WINDOWS_HEADERS
AC_WINDOWS_LIBS
AC_PROG_CXX
AC_CYGWIN_INCLUDES