From fe2f86961ea40d57ab654302d7c2ecff64c85c2b Mon Sep 17 00:00:00 2001
From: Earnie Boyd <earnie@users.sf.net>
Date: Mon, 5 May 2003 16:04:11 +0000
Subject: [PATCH] * Makefile.in (W32API_INCLUDE): New variable.
(ALL_CFLAGS): Include W32API_INCLUDE value. (ALL_CXXFLAGS): Ditto. *
configure.in (CFLAGS): Add -D__USE_CRTIMP=1 to default values.
(W32API_INCLUDE): Set default value. * configure: Regenerate.
---
winsup/mingw/ChangeLog | 9 +++++++++
winsup/mingw/Makefile.in | 7 ++++---
winsup/mingw/configure | 10 +++++++---
winsup/mingw/configure.in | 7 +++++--
4 files changed, 25 insertions(+), 8 deletions(-)
diff --git a/winsup/mingw/ChangeLog b/winsup/mingw/ChangeLog
index b2f8c1b05..78777aebd 100644
--- a/winsup/mingw/ChangeLog
+++ b/winsup/mingw/ChangeLog
@@ -1,3 +1,12 @@
+2003-05-05 Earnie Boyd <earnie@users.sf.net>
+
+ * Makefile.in (W32API_INCLUDE): New variable.
+ (ALL_CFLAGS): Include W32API_INCLUDE value.
+ (ALL_CXXFLAGS): Ditto.
+ * configure.in (CFLAGS): Add -D__USE_CRTIMP=1 to default values.
+ (W32API_INCLUDE): Set default value.
+ * configure: Regenerate.
+
2003-04-11 Earnie Boyd <earnie@users.sf.net>
* configure.in (LIBM_A): Define for cygwin target.
diff --git a/winsup/mingw/Makefile.in b/winsup/mingw/Makefile.in
index 3b2712368..f2de9b8bb 100644
--- a/winsup/mingw/Makefile.in
+++ b/winsup/mingw/Makefile.in
@@ -95,12 +95,13 @@ THREAD_DLL_NAME = $(THREAD_DLL)$(THREAD_DLL_VERSION).dll
# Various libraries.
LIBM_A=@LIBM_A@
-INCLUDES = -I$(srcdir)/include -I$(srcdir)/../w32api/include \
+W32API_INCLUDES = @W32API_INCLUDE@
+INCLUDES+= -I$(srcdir)/include \
-I$(srcdir)/../include \
-nostdinc -nostdinc++ \
-iwithprefixbefore include
-ALL_CFLAGS = $(CFLAGS) $(INCLUDES) $(MNO_CYGWIN)
-ALL_CXXFLAGS = $(CXXFLAGS) $(INCLUDES) $(MNO_CYGWIN)
+ALL_CFLAGS = $(CFLAGS) $(W32API_INCLUDE) $(INCLUDES) $(MNO_CYGWIN)
+ALL_CXXFLAGS = $(CXXFLAGS) $(W32API_INCLUDE) $(INCLUDES) $(MNO_CYGWIN)
AS = @AS@
AR = @AR@
diff --git a/winsup/mingw/configure b/winsup/mingw/configure
index 50a345753..3a2f7e373 100755
--- a/winsup/mingw/configure
+++ b/winsup/mingw/configure
@@ -757,9 +757,9 @@ echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
if test "$ac_test_CFLAGS" = set; then
CFLAGS="$ac_save_CFLAGS"
elif test $ac_cv_prog_cc_g = yes; then
- CFLAGS="-g -O2"
+ CFLAGS="-g -O2 -D__USE_CRTIMP"
else
- CFLAGS="-O2"
+ CFLAGS="-O2 -D__USE_CRTIMP"
fi
if test "$ac_test_CXXFLAGS" != set; then
CXXFLAGS='$(CFLAGS)'
@@ -1665,6 +1665,8 @@ HEADER_SUBDIR=""
LIBGMON_A=libgmon.a
+W32API_INCLUDE='$(srcdir)/../w32api/include'
+
case "$target_os" in
*cygwin*)
MNO_CYGWIN=-mno-cygwin
@@ -1700,6 +1702,7 @@ MKINSTALLDIRS=$ac_aux_dir/mkinstalldirs
+
# Find a good install program. We prefer a C program (faster),
# so one script is as good as another. But avoid the broken or
# incompatible versions:
@@ -1712,7 +1715,7 @@ MKINSTALLDIRS=$ac_aux_dir/mkinstalldirs
# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
# ./install, which can be erroneously created by make from ./install.sh.
echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:1716: checking for a BSD compatible install" >&5
+echo "configure:1719: checking for a BSD compatible install" >&5
if test -z "$INSTALL"; then
if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -1944,6 +1947,7 @@ s%@LIBM_A@%$LIBM_A%g
s%@LIBGMON_A@%$LIBGMON_A%g
s%@SUBDIRS@%$SUBDIRS%g
s%@HEADER_SUBDIR@%$HEADER_SUBDIR%g
+s%@W32API_INCLUDE@%$W32API_INCLUDE%g
s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
s%@INSTALL_DATA@%$INSTALL_DATA%g
diff --git a/winsup/mingw/configure.in b/winsup/mingw/configure.in
index ed7458eba..aba480771 100644
--- a/winsup/mingw/configure.in
+++ b/winsup/mingw/configure.in
@@ -47,9 +47,9 @@ dnl normal versions of a library), tasteless as that idea is.
if test "$ac_test_CFLAGS" = set; then
CFLAGS="$ac_save_CFLAGS"
elif test $ac_cv_prog_cc_g = yes; then
- CFLAGS="-g -O2"
+ CFLAGS="-g -O2 -D__USE_CRTIMP=1"
else
- CFLAGS="-O2"
+ CFLAGS="-O2 -D__USE_CRTIMP=1"
fi
if test "$ac_test_CXXFLAGS" != set; then
CXXFLAGS='$(CFLAGS)'
@@ -94,6 +94,8 @@ HEADER_SUBDIR=""
LIBGMON_A=libgmon.a
+W32API_INCLUDE='$(srcdir)/../w32api/include'
+
case "$target_os" in
*cygwin*)
MNO_CYGWIN=-mno-cygwin
@@ -127,6 +129,7 @@ AC_SUBST(LIBM_A)
AC_SUBST(LIBGMON_A)
AC_SUBST(SUBDIRS)
AC_SUBST(HEADER_SUBDIR)
+AC_SUBST(W32API_INCLUDE)
AC_PROG_INSTALL
AC_OUTPUT(Makefile)