--- bbtime-0.1.5.orig/configure.in	2002-11-08 10:59:11.000000000 +0100
+++ bbtime-0.1.5/configure.in	2010-01-08 16:20:43.388323191 +0100
@@ -47,14 +47,9 @@
 AC_PATH_X
 AC_PATH_XTRA
 
-CFLAGS="$CFLAGS $X_CFLAGS"
-CXXFLAGS="$CXXFLAGS $X_CFLAGS"
-LDFLAGS="$LDFLAGS $X_LIBS $X_PRE_LIBS"
 dnl Checks for X libraries.
-AC_CHECK_LIB(X11, XOpenDisplay, LDFLAGS="$LDFLAGS -lX11",
-             AC_MSG_ERROR(XOpenDisplay not found in -lX11))
-
-LDFLAGS="$LDFLAGS $X_EXTRA_LIBS"
+AC_CHECK_LIB([X11], [XOpenDisplay], ,
+             AC_MSG_ERROR(XOpenDisplay not found in -lX11),)
 
 dnl Checks for header files.
 AC_HEADER_STDC
--- bbtime-0.1.5.orig/Makefile.am	1999-08-14 16:42:56.000000000 +0200
+++ bbtime-0.1.5/Makefile.am	2010-01-08 16:21:19.795321698 +0100
@@ -1,5 +1,4 @@
-CPPFLAGS =	@CPPFLAGS@ \
-		-DDEFAULT_CONF=\"$(datadir)/bbtools/bbtime.conf\" \
+AM_CPPFLAGS =	-DDEFAULT_CONF=\"$(datadir)/bbtools/bbtime.conf\" \
 		-DDEFAULT_NOBB=\"$(datadir)/bbtools/bbtime.nobb\"
 
 
@@ -14,4 +13,5 @@
 		 timemenu.cc timemenu.hh \
 		 blackboxstyle.hh
 EXTRA_DIST = BUGS TODO
-bbtime_LDADD = @X_LIBS@
+bbtime_LDADD = @X_PRE_LIBS@ @X_LIBS@ @X_EXTRA_LIBS@
+bbtime_CFLAGS = @X_PRE_CFLAGS@ @X_CGLAGS@ @X_EXTRA_CFLAGS@