diff -Nurd -x'*~' rrdtool-1.4.4.orig/bindings/lua/Makefile.in rrdtool-1.4.4/bindings/lua/Makefile.in
--- rrdtool-1.4.4.orig/bindings/lua/Makefile.in	2010-07-05 15:31:54.000000000 -0400
+++ rrdtool-1.4.4/bindings/lua/Makefile.in	2012-02-09 17:36:11.000000000 -0500
@@ -329,8 +329,8 @@
 @LUA_NEED_OUR_COMPAT51_TRUE@rrd_la_SOURCES = rrdlua.c compat-5.1r5/compat-5.1.c compat-5.1r5/compat-5.1.h
 @LUA_NEED_OUR_COMPAT51_TRUE@compatdir = $(LUA_INSTALL_LMOD)
 @LUA_NEED_OUR_COMPAT51_TRUE@compat_DATA = compat-5.1r5/compat-5.1.lua
-rrd_la_LIBADD = -lrrd -lm
-rrd_la_LDFLAGS = -module -version-info $(LIB_VERSION_INFO) $(LUA_LFLAGS) -L$(top_builddir)/src/.libs
+rrd_la_LIBADD = $(top_builddir)/src/librrd.la -lm
+rrd_la_LDFLAGS = -module -version-info $(LIB_VERSION_INFO) $(LUA_LFLAGS)
 rrd_la_CFLAGS = -I$(top_srcdir)/src -I$(top_srcdir) $(LUA_CFLAGS) $(LUA_DEFINES) -DLIB_VERSION=\"$(LIB_VERSION)\"
 all: all-am
 
diff -Nurd -x'*~' rrdtool-1.4.4.orig/bindings/tcl/Makefile.in rrdtool-1.4.4/bindings/tcl/Makefile.in
--- rrdtool-1.4.4.orig/bindings/tcl/Makefile.in	2010-07-05 15:31:54.000000000 -0400
+++ rrdtool-1.4.4/bindings/tcl/Makefile.in	2012-02-09 17:35:50.000000000 -0500
@@ -292,7 +292,7 @@
 CLEANFILES = tclrrd.o tclrrd.so
 SRC_DIR = $(top_srcdir)/src
 AM_CPPFLAGS = $(TCL_INCLUDE_SPEC) -I$(SRC_DIR) -DUSE_TCL_STUBS
-LIBDIRS = -L$(top_builddir)/src/.libs -L$(top_builddir)/src -L$(libdir)
+LIBDIRS = -L$(libdir)
 LIB_RUNTIME_DIR = $(libdir)
 @BUILD_TCL_SITE_TRUE@tclpkgdir = @TCL_PACKAGE_DIR@
 @BUILD_TCL_SITE_TRUE@tclpkg_DATA = pkgIndex.tcl
@@ -651,7 +651,7 @@
 all-local: $(TCL_RRD_LIB)
 
 $(TCL_RRD_LIB): tclrrd.o
-	$(TCL_SHLIB_LD) $(TCL_LD_SEARCH_FLAGS) $(LIBDIRS) $< -o $@ -lrrd_th -lm $(TCL_STUB_LIB_SPEC) $(LDFLAGS) $(LIBS)
+	$(TCL_SHLIB_LD) $(TCL_LD_SEARCH_FLAGS) $(LIBDIRS) $< -o $@ $(top_builddir)/src/.libs/librrd_th.dylib -lm $(TCL_STUB_LIB_SPEC) $(LDFLAGS) $(LIBS)
 
 tclrrd.o: tclrrd.c
 	$(CC) $(AM_CFLAGS) $(CFLAGS) $(TCL_SHLIB_CFLAGS) $(AM_CPPFLAGS) -c tclrrd.c -DVERSION=\"$(VERSION)\"
diff -Nurd -x'*~' rrdtool-1.4.4.orig/src/Makefile.in rrdtool-1.4.4/src/Makefile.in
--- rrdtool-1.4.4.orig/src/Makefile.in	2010-07-05 15:31:55.000000000 -0400
+++ rrdtool-1.4.4/src/Makefile.in	2012-02-09 17:37:21.000000000 -0500
@@ -436,14 +436,14 @@
 librrdupd_la_LIBADD = $(CORE_LIBS)
 librrd_la_SOURCES = $(RRD_C_FILES)
 librrd_la_DEPENDENCIES = librrdupd.la librrd.sym
-librrd_la_LIBADD = librrdupd.la $(ALL_LIBS)
+librrd_la_LIBADD = librrdupd.la $(ALL_LIBS) -lpng
 librrd_la_LDFLAGS = -version-info @LIBVERS@ -export-symbols librrd.sym
 librrd_th_la_SOURCES = $(UPD_C_FILES) $(RRD_C_FILES) rrd_thread_safe.c
 librrd_th_la_DEPENDENCIES = librrd.sym
 librrd_th_la_CFLAGS = $(AM_CFLAGS) $(MULTITHREAD_CFLAGS)
 librrd_th_la_LDFLAGS = $(MULTITHREAD_LDFLAGS) -version-info @LIBVERS@ \
 	-export-symbols librrd.sym
-librrd_th_la_LIBADD = $(ALL_LIBS)
+librrd_th_la_LIBADD = $(ALL_LIBS) -lpng
 include_HEADERS = rrd.h rrd_format.h rrd_client.h
 rrdcgi_SOURCES = rrd_cgi.c
 rrdcgi_LDADD = librrd.la