--- ./configure	Sat Nov 10 11:16:17 2001
+++ ../bbmail-0.8.2/./configure	Thu Jun  6 11:39:32 2002
@@ -903,13 +903,13 @@
   
 if test $enableval = "no";
  then 
- test "$CFLAGS" = "" && CFLAGS="-O2 -Wall"
- test "$CXXFLAGS" = "" && CXXFLAGS="-O2 -Wall"
+ test "$CFLAGS" = "" && CFLAGS="-O2 "
+ test "$CXXFLAGS" = "" && CXXFLAGS="-O2 "
  test "$LDFLAGS" = "" && LDFLAGS="-s"
 
  else 
- test "$CFLAGS" = "" && CFLAGS="-g -Wall -DDEBUG"
- test "$CXXFLAGS" = "" && CXXFLAGS="-g -Wall -DDEBUG"
+ test "$CFLAGS" = "" && CFLAGS="-g -DDEBUG"
+ test "$CXXFLAGS" = "" && CXXFLAGS="-g -DDEBUG"
  test "$LDFLAGS" = "" && LDFLAGS=""
 
 fi
@@ -916,8 +916,8 @@
 
 else
   
- test "$CFLAGS" = "" && CFLAGS="-O2 -Wall"
- test "$CXXFLAGS" = "" && CXXFLAGS="-O2 -Wall"
+ test "$CFLAGS" = "" && CFLAGS="-O2 "
+ test "$CXXFLAGS" = "" && CXXFLAGS="-O2 "
  test "$LDFLAGS" = "" && LDFLAGS="-s"
 
 fi
@@ -2704,7 +2704,8 @@
 
 CFLAGS="$CFLAGS $X_CFLAGS"
 CXXFLAGS="$CXXFLAGS $X_CFLAGS"
-LDFLAGS="$LDFLAGS $X_LIBS $X_PRE_LIBS"
+LDFLAGS="$LDFLAGS"
+X_LIBS="$X_LIBS $X_PRE_LIBS"
 echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6
 echo "configure:2710: checking for XOpenDisplay in -lX11" >&5
 ac_lib_var=`echo X11'_'XOpenDisplay | sed 'y%./+-%__p_%'`
@@ -2740,7 +2741,7 @@
 fi
 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
   echo "$ac_t""yes" 1>&6
-  LDFLAGS="$LDFLAGS -lX11"
+  X_LIBS="$X_LIBS -lX11 -lm"
 else
   echo "$ac_t""no" 1>&6
 { echo "configure: error: XOpenDisplay not found in -lX11" 1>&2; exit 1; }