diff -Naupr fillets-ng-0.7.3.orig/configure.in fillets-ng-0.7.3/configure.in
--- fillets-ng-0.7.3.orig/configure.in	2005-10-04 20:11:00.000000000 +0200
+++ fillets-ng-0.7.3/configure.in	2006-08-30 13:50:45.000000000 +0200
@@ -13,9 +13,6 @@ AC_PROG_CC
 AC_PROG_INSTALL
 AC_PROG_RANLIB
 
-CPPFLAGS="-I/usr/local/include $CPPFLAGS"
-LIBS="-L/usr/local/lib $LIBS"
-
 ###################################################
 # Check for libm
 AC_CHECK_LIB(m, sin, LIBS="$LIBS -lm")
@@ -89,18 +86,15 @@ AC_CHECK_LIB([SDL_ttf], [TTF_OpenFont],
 
 ###################################################
 # Test X11
-OLD_CPPFLAGS="$CPPFLAGS"
-CPPFLAGS="$CPPFLAGS $SDL_CFLAGS"
-AC_TRY_COMPILE([
-    #include "SDL.h"
-    #include "SDL_syswm.h"
-    #include <X11/Xutil.h>
-    ], [
-    SDL_SysWMinfo info;
-    info.subsystem = SDL_SYSWM_X11;
-    ], [have_x11="yes"], [have_x11="no"])
-CPPFLAGS="$OLD_CPPFLAGS"
-if test "x$have_x11" = xyes; then
+AC_PATH_X
+AC_CHECK_LIB(X11, XFree,
+    have_x11='yes',
+    have_x11='no',
+    [-lX11 -L${x_libraries}])
+AC_CHECK_HEADERS(X11/Xutil.h)
+if test "$have_x11" != 'no'; then
+    CPPFLAGS="$X_CFLAGS $CPPFLAGS"
+    LIBS="$X_LIBS $LIBS -lX11"
     AC_DEFINE(HAVE_X11)
 fi