merge of '1ec1784c6eed4da97d0f3236f9fb46dea17d158b'

and '602d5ca1a488f10859327e19709700a7e1837c7c'

core/c/jbigi/build_jbigi.sh

@@ -4,6 +4,21 @@
 # When executed in OSX: Produces a libjbigi.jnilib
 [ -z "$CC" ] && CC="gcc"
 
+if [ -z $BITS ]; then
+  if [[ $(uname -a) =~ "x86_64" ]]; then
+    BITS=64
+  elif [[ $(uname -a) =~ "i386" ]]; then
+    BITS=32
+  elif [[ $(uname -a) =~ "i686" ]]; then
+    BITS=32
+  else
+    echo "Unable to detect default setting for BITS variable"
+    exit
+  fi
+
+  printf "\aBITS variable not set, defaulting to $BITS\n\a" >&2
+fi
+
 # If JAVA_HOME isn't set we'll try to figure it out
 [ -z $JAVA_HOME ] && . `dirname $0`/../find-java-home
 if [ ! -f "$JAVA_HOME/include/jni.h" ]; then

core/c/jbigi/mbuild-all.sh

@@ -86,10 +86,22 @@ fi
 
 
 if [ -z $BITS ]; then
+  UNAME="$(uname -a)"
+  if test "${UNAME#*x86_64}" != "x86_&4"; then
+    BITS=64
+  elif test "${UNAME#*i386}" != "i386"; then
     BITS=32
+  elif test "${UNAME#*i686}" != "i686"; then
+    BITS=32
+  else
+    echo "Unable to detect default setting for BITS variable"
+    exit
+  fi
+
   printf "\aBITS variable not set, defaulting to $BITS\n\a" >&2
 fi
 
+
 if [ -z $CC ]; then
   export CC="gcc"
   printf "\aCC variable not set, defaulting to $CC\n\a" >&2

core/c/jcpuid/build.sh

@@ -24,10 +24,22 @@ esac
 
 
 if [ -z $BITS ]; then
+  UNAME="$(uname -a)"
+  if test "${UNAME#*x86_64}" != "x86_&4"; then
     BITS=64
+  elif test "${UNAME#*i386}" != "i386"; then
+    BITS=32
+  elif test "${UNAME#*i686}" != "i686"; then
+    BITS=32
+  else
+    echo "Unable to detect default setting for BITS variable"
+    exit
+  fi
+
   printf "\aBITS variable not set, defaulting to $BITS\n\a" >&2
 fi
 
+
 if [ -z $CC ]; then
   export CC="gcc"
   printf "\aCC variable not set, defaulting to $CC\n\a" >&2