From 78249d5ff4e87d2751c7f51e960d360124ed073a Mon Sep 17 00:00:00 2001
From: weidai <weidai@57ff6487-cd31-0410-9ec3-f628ee90f5f0>
Date: Sun, 5 Apr 2009 19:58:48 +0000
Subject: fix compile on MacOS X and MinGW

git-svn-id: svn://svn.code.sf.net/p/cryptopp/code/trunk/c5@463 57ff6487-cd31-0410-9ec3-f628ee90f5f0
---
 GNUmakefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'GNUmakefile')

diff --git a/GNUmakefile b/GNUmakefile
index 4f73103..291eb60 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -12,7 +12,6 @@ MKDIR = mkdir
 EGREP = egrep
 UNAME = $(shell uname)
 ISX86 = $(shell uname -m | $(EGREP) -c "i.86|x86|i86|amd64")
-ISMINGW = $(shell uname | $(EGREP) -c "MINGW32")
 
 # Default prefix for make install
 ifeq ($(PREFIX),)
@@ -29,6 +28,7 @@ GCC42_OR_LATER = $(shell $(CXX) --version 2>&1 | $(EGREP) -c "\(GCC\) (4.[2-9]|[
 INTEL_COMPILER = $(shell $(CXX) --version 2>&1 | $(EGREP) -c "\(ICC\)")
 GAS210_OR_LATER = $(shell echo "" | $(AS) -v 2>&1 | $(EGREP) -c "GNU assembler version (2\.[1-9][0-9]|[3-9])")
 GAS217_OR_LATER = $(shell echo "" | $(AS) -v 2>&1 | $(EGREP) -c "GNU assembler version (2\.1[7-9]|2\.[2-9]|[3-9])")
+ISMINGW = $(shell $(CXX) --version 2>&1 | $(EGREP) -c "mingw")
 
 ifneq ($(GCC42_OR_LATER),0)
 ifneq ($(UNAME),Darwin)
@@ -53,12 +53,12 @@ CXXFLAGS += -Wa,--divide	# allow use of "/" operator
 endif
 endif
 
-endif	# ISX86
-
 ifeq ($(ISMINGW),1)
 LDLIBS += -lws2_32
 endif
 
+endif	# ISX86
+
 ifeq ($(UNAME),)	# for DJGPP, where uname doesn't exist
 CXXFLAGS += -mbnu210
 else
-- 
cgit v1.2.1