* profile/configure.in: Make msvcrt.dll version default.

	* profile/makefile.in: Build both gcrt1.o and gcrt2.o.
	* provile/configure: Regenerate.

4 files changed, 28 insertions, 22 deletions

diff --git a/winsup/mingw/ChangeLog b/winsup/mingw/ChangeLog
index bd136f2c3..1afa120b5 100644
--- a/winsup/mingw/ChangeLog
+++ b/winsup/mingw/ChangeLog
@@ -1,4 +1,10 @@
 
+2001-06-11  Danny Smith  <danny_r_smith_2001@yahoo.co.nz>
+
+	* profile/configure.in: Make msvcrt.dll version default.
+	* profile/makefile.in: Build both gcrt1.o and gcrt2.o.	
+	* provile/configure: Regenerate.
+
 2001-06-11  Mattia Barbon  <mbarbon@dsi.unive.it>
 
 	* include/stdio.h (swscanf): Make first arugument const. 
diff --git a/winsup/mingw/profile/Makefile.in b/winsup/mingw/profile/Makefile.in
index 396ff20fe..d8825269f 100644
--- a/winsup/mingw/profile/Makefile.in
+++ b/winsup/mingw/profile/Makefile.in
@@ -65,7 +65,7 @@ DLLTOOL_FLAGS = --as $(AS_FOR_TARGET)
 
 LIBGMON_A = @LIBGMON_A@
 LIBGMON_OBJS = gmon.o mcount.o profil.o
-CRT0S = gcrt$(CRT_ID).o
+CRT0S = gcrt1.o gcrt2.o
 
 LIBS = $(LIBGMON_A)
 DLLS = 
diff --git a/winsup/mingw/profile/configure b/winsup/mingw/profile/configure
index 7d5b92b22..cc3dcfeac 100755
--- a/winsup/mingw/profile/configure
+++ b/winsup/mingw/profile/configure
@@ -646,18 +646,18 @@ test "$host_alias" != "$target_alias" &&
 
 
 case "$target_os" in
-*mingw32msvc*)
-  CRT_ID=2
+*mingw32crt*)
+  CRT_ID=1
   MNO_CYGWIN=
-  RUNTIME=msvcrt
-  THREAD_DLL=mingwm
+  RUNTIME=crtdll
+  THREAD_DLL=mingwc
   LIBM_A=libm.a
   LIBGMON_A=libgmon.a
   ;;
 *cygwin*)
-  CRT_ID=1
+  CRT_ID=2
   MNO_CYGWIN=-mno-cygwin
-  RUNTIME=crtdll
+  RUNTIME=msvcrt
   THREAD_DLL=mingwc
   # Do not build libm.a when building under Cygwin winsup. Otherwise, it'll
   # overwrite Cygwin's one. Likewise for libgmon.a.
@@ -665,11 +665,11 @@ case "$target_os" in
   LIBGMON_A=
   ;;
 *)
-  # Build it for CRTDLL by default.
-  CRT_ID=1
+  # Build it for MSVCRT by default.
+  CRT_ID=2
   MNO_CYGWIN=
-  RUNTIME=crtdll
-  THREAD_DLL=mingwc
+  RUNTIME=msvcrt
+  THREAD_DLL=mingwm
   LIBM_A=libm.a
   LIBGMON_A=libgmon.a
   ;;
diff --git a/winsup/mingw/profile/configure.in b/winsup/mingw/profile/configure.in
index 8f2846e70..4f41536b9 100644
--- a/winsup/mingw/profile/configure.in
+++ b/winsup/mingw/profile/configure.in
@@ -16,7 +16,7 @@ dnl You should have received a copy of the GNU General Public License
 dnl along with this program; if not, write to the Free Software
 dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-AC_PREREQ(2.12)
+AC_PREREQ(2.13)
 AC_INIT(gcrt0.c)
 
 CC=${CC-cc}
@@ -36,18 +36,18 @@ AC_SUBST(DLLWRAP)
 AC_CANONICAL_SYSTEM
 
 case "$target_os" in
-*mingw32msvc*)
-  CRT_ID=2
+*mingw32crt*)
+  CRT_ID=1
   MNO_CYGWIN=
-  RUNTIME=msvcrt
-  THREAD_DLL=mingwm
+  RUNTIME=crtdll
+  THREAD_DLL=mingwc
   LIBM_A=libm.a
   LIBGMON_A=libgmon.a
   ;;
 *cygwin*)
-  CRT_ID=1
+  CRT_ID=2
   MNO_CYGWIN=-mno-cygwin
-  RUNTIME=crtdll
+  RUNTIME=msvcrt
   THREAD_DLL=mingwc
   # Do not build libm.a when building under Cygwin winsup. Otherwise, it'll
   # overwrite Cygwin's one. Likewise for libgmon.a.
@@ -55,11 +55,11 @@ case "$target_os" in
   LIBGMON_A=
   ;;
 *)
-  # Build it for CRTDLL by default.
-  CRT_ID=1
+  # Build it for MSVCRT by default.
+  CRT_ID=2
   MNO_CYGWIN=
-  RUNTIME=crtdll
-  THREAD_DLL=mingwc
+  RUNTIME=msvcrt
+  THREAD_DLL=mingwm
   LIBM_A=libm.a
   LIBGMON_A=libgmon.a
   ;;