--- configure	2002-06-23 07:13:01.000000000 +0200
+++ configure-mod	2008-02-20 23:38:56.000000000 +0100
@@ -5,10 +5,10 @@
 echo -n "checking for X11 path... "
 if test "`uname`" = "SunOS"; then
 	X11_PATH="/usr/X11"
-	LDFLAGS="$LDFLAGS -L/usr/X/lib"
+	LDFLAGS="-L/usr/X/lib $LDFLAGS"
 	CFLAGS="$CFLAGS I/usr/include/X11"
 else
-	X11_PATH="/usr/X11R6"
+	X11_PATH="/usr"
 fi
 if test -e "$X11_PATH"; then
 	echo $X11_PATH
@@ -20,7 +20,7 @@
 fi
 
 CFLAGS="$CFLAGS -I$X11_PATH/include"
-LDFLAGS="$LDFLAGS -L$X11_PATH/lib -lX11"
+LDFLAGS="-L$X11_PATH/lib -lX11 $LDFLAGS" 
 
 if test "_$CC" = "_"; then
 	CC="cc"
@@ -41,7 +41,7 @@
 xpm=no
 if test -e "$X11_PATH/include/X11/xpm.h"; then
 	echo yes
-	LDFLAGS="$LDFLAGS -lXpm"
+	LDFLAGS="-lXpm $LDFLAGS"
 	CFLAGS="$CFLAGS -DHAVE_XPM"
 	xpm=yes
 else
@@ -52,7 +52,7 @@
 xft=no
 if test -e "$X11_PATH/include/X11/Xft/Xft.h"; then
 	echo yes
-	LDFLAGS="$LDFLAGS -lXft"
+	LDFLAGS="-lXft $LDFLAGS"
 	CFLAGS="$CFLAGS -DXFT"
 	xft=yes
 else