--- Amaya/configure.in	2009/12/08 14:19:46	1.265
+++ Amaya/configure.in	2009/12/09 13:18:25	1.266
@@ -166,7 +166,6 @@ AC_CHECK_FUNCS(getcwd gethostname gettim
 #
 # Check for operating system (UNIX / WINDOWS / MACOSX )
 # ---------->
-
 # canonicalize the target OS
 AMAYAOS="LINUX"
 case $target_os in
@@ -194,20 +193,12 @@ 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)
-            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" ;;
+  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" ;;
 esac
 
 dnl
@@ -283,15 +274,11 @@ AC_SUBST(AMAYAGUI)
 
 if test "$with_mesa" = "yes" ; then
   # --------- compile Mesa library (opengl) --------------- #
-  # check that the right configure is used
-  if test "$SYSLIB_PATH"="/usr/lib64" ; then
-    cp ../../Mesa/configs/linux-x86-64-static ../../Mesa/configs/current
-  fi
   # check that sources of Mesa exists
   if test ! -f ../../Mesa/Makefile ; then
     GL_BUILDDIR=""
     GL_INCLUDES="-I/usr/include"
-    GL_LIBRARIES="-Wl,-rpath,$SYSLIB_PATH -L$SYSLIB_PATH -lGL -lGLU"
+    GL_LIBRARIES="-Wl,-rpath,usr/lib -L/usr/lib -lGL -lGLU"
     echo "---> Use system Mesa library"
   else
     OLDDIR=`pwd`
@@ -558,7 +545,7 @@ if test "$with_gl" = "yes" -o "$with_mes
 	# for AC_CHECK_LIB library existance checks
 	LIBS_OLD=$LIBS
 	LDFLAGS_OLD=$LDFLAGS
-	LDFLAGS="-L/usr/X11R6/lib -L$SYSLIB_PATH -L/usr/local/lib"
+	LDFLAGS="-L/usr/X11R6/lib -L/usr/lib -L/usr/local/lib"
   	AC_MSG_CHECKING([OpenGL])
 	for ac_dir in               		\
 		/usr/include			\
@@ -628,7 +615,7 @@ if test "$with_gl" = "yes" -o "$with_mes
       GL_LIBRARIES=""
       GL_BUILDDIR=""
     else
-      GL_LIBRARIES="-L$SYSLIB_PATH -L/usr/X11R6/lib -lGL -lGLU"
+      GL_LIBRARIES="-L/usr/lib -L/usr/X11R6/lib -lGL -lGLU"
       GL_OPTIONS="-D_GL"
     fi
 
@@ -696,7 +683,7 @@ if test "$with_gl" = "yes" -o "$with_mes
 
   AC_MSG_CHECKING([gcc3])	
   for ac_dir in               		\
-		$SYSLIB_PATH 			\
+		/usr/lib 			\
 		/usr/X11R6/lib 		\
 		/usr/local/lib		\
 		; \
@@ -791,7 +778,7 @@ if test "$with_system_libwww" != "yes" ;
   -L$CURRENT_PATH/libwww/Library/src/SSL/.libs -lwwwssl\
   -L$CURRENT_PATH/libwww/modules/md5/.libs -lmd5 \
   -L$CURRENT_PATH/libwww/modules/expat/.libs -lexpat \
-  -L$SYSLIB_PATH -lssl -lcrypto"
+  -L/usr/lib -lssl -lcrypto"
   LIBWWW_CFLAGS="-I$CURRENT_PATH/../../libwww/Library/src -I$CURRENT_PATH/libwww -I$CURRENT_PATH/../../libwww/modules/expat/lib -I$CURRENT_PATH/../../libwww/Library/src/SSL"
 else
   LIBWWW_CFLAGS="`$LIBWWW_CONFIG --cflags`"
@@ -1234,7 +1221,7 @@ fi
 dnl
 if test "$build_amaya" = "yes" ; then
     echo Amaya $AMAYA_VER configured
-    echo Amaya configured with libWWW \(local source\) and $SYSLIB_PATH
+    echo Amaya configured with libWWW \(local source\)
     if test "$with_math" = "yes" ; then
 	echo Amaya configured with Math support
     fi