From 5ee49693225a71413fb4ba21b46d3665eb412170 Mon Sep 17 00:00:00 2001
From: hagen <hagen@mail.i2p>
Date: Fri, 12 Dec 2014 08:05:27 +0000
Subject: [PATCH] * Makefile.linux : reorder checks

---
 Makefile.linux | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/Makefile.linux b/Makefile.linux
index 9f24f709..bcac24f5 100644
--- a/Makefile.linux
+++ b/Makefile.linux
@@ -1,9 +1,8 @@
 CXXFLAGS = -g -Wall -fPIC
-CXXVER := $(shell $(CXX) -dumpversion)
+INCFLAGS =
 
-FGREP = fgrep
-IS_64 := $(shell $(CXX) -dumpmachine 2>&1 | $(FGREP) -c "64")
-USE_AESNI := yes
+# detect proper flag for c++11 support by gcc
+CXXVER := $(shell $(CXX) -dumpversion)
 ifeq ($(shell expr match ${CXXVER} "4\.[0-9][0-9]"),4) # >= 4.10
 CXXFLAGS += -std=c++11
 else ifeq ($(shell expr match ${CXXVER} "4\.[7-9]"),3) # >= 4.7
@@ -18,7 +17,7 @@ endif
 
 LIBDIR := /usr/lib
 
-INCFLAGS =
+USE_AESNI := yes
 ifeq ($(STATIC),yes)
 LDLIBS += $(LIBDIR)/libcryptopp.a $(LIBDIR)/libboost_system.a
 LDLIBS += $(LIBDIR)/libboost_date_time.a $(LIBDIR)/libboost_filesystem.a
@@ -29,6 +28,8 @@ else
 LDLIBS = -lcryptopp -lboost_system -lboost_date_time -lboost_filesystem -lboost_regex -lboost_program_options -lpthread
 endif
 
+FGREP = fgrep
+IS_64 := $(shell $(CXX) -dumpmachine 2>&1 | $(FGREP) -c "64")
 ifeq ($(USE_AESNI),yes)
 ifeq ($(IS_64),1)
 #check if AES-NI is supported by CPU