--- Amaya/configure.in	2009/12/08 11:20:53	1.263
+++ Amaya/configure.in	2009/12/08 13:59:38	1.264
@@ -167,13 +167,6 @@ AC_CHECK_FUNCS(getcwd gethostname gettim
 # Check for operating system (UNIX / WINDOWS / MACOSX )
 # ---------->
 
-#default library path
-UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
-SYSLIB_PATH="/usr/lib"
-if test "${UNAME_MACHINE}"="x86_64" ; then
- SYSLIB_PATH="/usr/lib64"
-fi
-
 # canonicalize the target OS
 AMAYAOS="LINUX"
 case $target_os in
@@ -201,12 +194,20 @@ if test "$AMAYAOS" = "WINDOWS" ; then
   AC_MSG_ERROR(Windows port do not use configure - not yet tested.)
 fi
 
+#default library path
+UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
+SYSLIB_PATH="/usr/lib"
+
 OS_OPTIONS="-D_UNIX" # default is UNIX
 case $AMAYAOS in
-  LINUX)       OS_OPTIONS="-D_UNIX" ;;
-  WINDOWS)     OS_OPTIONS="-D_WINDOWS" ;; # not tested (cygwin or mingw)
-  MACOSX)      OS_OPTIONS="-D_UNIX -D_MACOS" ;;
-  FREEBSD)     OS_OPTIONS="-D_UNIX -D_FREEBSD" ;;
+  LINUX)
+            if test "$UNAME_MACHINE"="x86_64" ; then
+              SYSLIB_PATH="/usr/lib64"
+            fi
+            OS_OPTIONS="-D_UNIX" ;;
+  WINDOWS)  OS_OPTIONS="-D_WINDOWS" ;; # not tested (cygwin or mingw)
+  MACOSX)   OS_OPTIONS="-D_UNIX -D_MACOS" ;;
+  FREEBSD)  OS_OPTIONS="-D_UNIX -D_FREEBSD" ;;
 esac
 
 dnl
@@ -283,7 +284,7 @@ AC_SUBST(AMAYAGUI)
 if test "$with_mesa" = "yes" ; then
   # --------- compile Mesa library (opengl) --------------- #
   # check that the right configure is used
-  if test "${UNAME_MACHINE}"="x86_64" ; then
+  if test "$SYSLIB_PATH"="/usr/lib64" ; then
     cp ../../Mesa/configs/linux-x86-64-static ../../Mesa/configs/current
   fi
   # check that sources of Mesa exists