--- a/Makefile.am
+++ b/Makefile.am
@@ -17,4 +17,4 @@
 		  NETInterface.cc NETInterface.hh \
 		  blackboxstyle.hh
 EXTRA_DIST = BUGS TODO
-fluxter_LDADD = @X_LIBS@
+fluxter_LDADD = @LIBS@
--- a/configure.in
+++ b/configure.in
@@ -18,14 +18,12 @@
 [
  test "$CFLAGS" = "" && CFLAGS="-g -Wall -DDEBUG"
  test "$CXXFLAGS" = "" && CXXFLAGS="-g -Wall -DDEBUG"
- test "$LDFLAGS" = "" && LDFLAGS=""
 ])
 
 AC_DEFUN(AC_SET_NODEBUG,
 [
- test "$CFLAGS" = "" && CFLAGS="-O2 -Wall"
- test "$CXXFLAGS" = "" && CXXFLAGS="-O2 -Wall"
- test "$LDFLAGS" = "" && LDFLAGS="-s"
+ test "$CFLAGS" = "" && CFLAGS="-Wall"
+ test "$CXXFLAGS" = "" && CXXFLAGS="-Wall"
 ])
       
 
@@ -71,12 +69,12 @@
 
 CFLAGS="$CFLAGS $X_CFLAGS"
 CXXFLAGS="$CXXFLAGS $X_CFLAGS"
-LDFLAGS="$LDFLAGS $X_LIBS $X_PRE_LIBS"
+LIBS="$LIBS $X_LIBS $X_PRE_LIBS"
 dnl Checks for X libraries.
-AC_CHECK_LIB(X11, XOpenDisplay, LDFLAGS="$LDFLAGS -lX11",
+AC_CHECK_LIB(X11, XOpenDisplay, LIBS="$LIBS -lX11",
              AC_MSG_ERROR(XOpenDisplay not found in -lX11))
 
-LDFLAGS="$LDFLAGS $X_EXTRA_LIBS"
+LIBS="$LIBS $X_EXTRA_LIBS"
 
 dnl Checks for header files.
 AC_HEADER_STDC