* configure.in (CFLAGS): Remove -D__USE_CRTIMP=1 due to possibilites

of multiply defined symbols if the symbols is defined locally.  E.G.:
	A local definition of malloc causes this problem.
	* configure: Regenerate.
	* profile/Makefile.in (W32API_INCLUDE): New variable.
	(ALL_CFLAGS): Use W32API_INCLUDE value.
	(ALL_CXXFLAGS): Ditto.
	(gcrt0.o gcrt1.o gcrt2.o): Use ALL_CFLAGS instead of CFLAGS.
	Thanks to Jeff Bonggren <jbon@users.sf.net>.
	* profile/configure.in (W32API_INCLUDE): Set default value.
	* profile/configure: Regenerate.
	* mingwex/Makefile.in (W32API_INCLUDE): New variable.
	(ALL_CFLAGS): Use W32API-INCLUDE value.
	(ALL_CXXFLAGS): Ditto.
	* mingwex/configure.in (W32API_INCLUDE): Set default value.
	* mingwex/configure: Regenerate.
This commit is contained in:
Earnie Boyd
2003-05-06 13:26:44 +00:00
parent af70a0ea40
commit 42fbaad1e8
9 changed files with 49 additions and 17 deletions

View File

@@ -76,13 +76,12 @@ OPTFLAGS= -fomit-frame-pointer
# compiling with Cygwin?
MNO_CYGWIN = @MNO_CYGWIN@
W32API_INCLUDE = @W32API_INCLUDE@
INCLUDES = -I$(srcdir) -I$(srcdir)/../include \
-I$(srcdir)/../../w32api/include \
-nostdinc -nostdinc++ \
-iwithprefixbefore include
ALL_CFLAGS = $(CFLAGS) $(OPTFLAGS) $(INCLUDES) $(MNO_CYGWIN)
ALL_CXXFLAGS = $(CXXFLAGS) $(OPTFLAGS) $(INCLUDES) $(MNO_CYGWIN)
ALL_CFLAGS = $(CFLAGS) $(OPTFLAGS) $(W32API_INCLUDE) $(INCLUDES) $(MNO_CYGWIN)
ALL_CXXFLAGS = $(CXXFLAGS) $(OPTFLAGS) $(W32API_INCLUDE) $(INCLUDES) $(MNO_CYGWIN)
AS = @AS@
AR = @AR@

View File

@@ -657,6 +657,9 @@ esac
W32API_INCLUDE='$(subdir)/../w32api/include'
# 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:
@@ -669,7 +672,7 @@ esac
# 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:673: checking for a BSD compatible install" >&5
echo "configure:676: 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
@@ -889,6 +892,7 @@ s%@build_cpu@%$build_cpu%g
s%@build_vendor@%$build_vendor%g
s%@build_os@%$build_os%g
s%@MNO_CYGWIN@%$MNO_CYGWIN%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

View File

@@ -47,6 +47,9 @@ esac
AC_SUBST(MNO_CYGWIN)
W32API_INCLUDE='$(subdir)/../w32api/include'
AC_SUBST(W32API_INCLUDE)
AC_PROG_INSTALL
AC_OUTPUT(Makefile)