Merge pull request #246 from varunbpatil/detect_arch

Attempt to detect OS arch(32/64 bit) on most platforms

.travis.yml

@@ -8,5 +8,4 @@ before_install:
 #link libcrypto for 32bit
   - sudo ln -s /lib/i386-linux-gnu/libcrypto.so.1.0.0 /lib/i386-linux-gnu/libcrypto.so
 install: make gtest-bootstrap
-script: make -B ENABLE64BIT=Yes && make test && make -B ENABLE64BIT=Yes BUILDTYPE=Debug && make test && make -B && make test && make -B BUILDTYPE=Debug && make test
-
+script: make -B ENABLE64BIT=Yes && make test && make -B ENABLE64BIT=Yes BUILDTYPE=Debug && make test && make -B ENABLE64BIT=No && make test && make -B ENABLE64BIT=No BUILDTYPE=Debug && make test

Makefile

@@ -1,4 +1,5 @@
 UNAME=$(shell uname | tr A-Z a-z | tr -d \\-[:digit:].)
+ARCH=$(shell uname -m)
 LIBPREFIX=lib
 LIBSUFFIX=a
 CXX_O=-o $@
@@ -11,7 +12,11 @@ CFLAGS_M32=-m32
 CFLAGS_M64=-m64
 BUILDTYPE=Release
 
-
+ifeq (, $(ENABLE64BIT))
+ifeq ($(ARCH), x86_64)
+ENABLE64BIT=Yes
+endif
+endif
 
 ifeq (,$(wildcard ./gtest))
 HAVE_GTEST=No