diff --git a/Makefile.in b/Makefile.in
index 5013e787..f3f46c7d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -89,6 +89,7 @@ XGETTEXT = @XGETTEXT@
 XLFLAGS = @XLFLAGS@
 XLIBS = @XLIBS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
+X_LIBRARY_PATH = @X_LIBRARY_PATH@
 wprefsdir = @wprefsdir@
 
 SUBDIRS = wrlib WINGs src util po WindowMaker wmlib test WPrefs.app doc 	contrib
@@ -113,9 +114,9 @@ GZIP_ENV = --best
 all: all-redirect
 .SUFFIXES:
 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile
+	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps Makefile
 
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	cd $(top_builddir) \
 	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
@@ -282,11 +283,6 @@ distdir: $(DISTFILES)
 	-rm -rf $(distdir)
 	mkdir $(distdir)
 	-chmod 777 $(distdir)
-	here=`cd $(top_builddir) && pwd`; \
-	top_distdir=`cd $(distdir) && pwd`; \
-	distdir=`cd $(distdir) && pwd`; \
-	cd $(top_srcdir) \
-	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu Makefile
 	@for file in $(DISTFILES); do \
 	  d=$(srcdir); \
 	  if test -d $$d/$$file; then \
diff --git a/test/Makefile.in b/test/Makefile.in
index ba89504a..3935cf8b 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -89,6 +89,7 @@ XGETTEXT = @XGETTEXT@
 XLFLAGS = @XLFLAGS@
 XLIBS = @XLIBS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
+X_LIBRARY_PATH = @X_LIBRARY_PATH@
 wprefsdir = @wprefsdir@
 
 AUTOMAKE_OPTIONS = no-dependencies
diff --git a/util/Makefile.in b/util/Makefile.in
index c91d3140..063b9aca 100644
--- a/util/Makefile.in
+++ b/util/Makefile.in
@@ -87,6 +87,7 @@ XGETTEXT = @XGETTEXT@
 XLFLAGS = @XLFLAGS@
 XLIBS = @XLIBS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
+X_LIBRARY_PATH = @X_LIBRARY_PATH@
 wprefsdir = @wprefsdir@
 
 AUTOMAKE_OPTIONS = no-dependencies
diff --git a/util/wmsetbg.c b/util/wmsetbg.c
index 29dd4bf5..9442bdcd 100644
--- a/util/wmsetbg.c
+++ b/util/wmsetbg.c
@@ -358,6 +358,15 @@ parseTexture(RContext *rc, char *text)
 	    pixmap = LoadJPEG(rc, tmp, &iwidth, &iheight);
  */
 
+	if (!pixmap) {
+	    image = loadImage(rc, tmp);
+	    if (!image) {
+		goto error;
+	    }
+	    iwidth = image->width;
+	    iheight = image->height;
+	}
+
 	GETSTRORGOTO(val, tmp, 2, error);
 
 	if (!XParseColor(dpy, DefaultColormap(dpy, scr), tmp, &color)) {
@@ -374,15 +383,6 @@ parseTexture(RContext *rc, char *text)
 	    RGetClosestXColor(rc, &rcolor, &color);
 	}
 
-	if (!pixmap) {
-	    image = loadImage(rc, tmp);
-	    if (!image) {
-		goto error;
-	    }
-	    iwidth = image->width;
-	    iheight = image->height;
-	}
-
 	switch (toupper(type[0])) {
 	 case 'T':
 	    texture->width = iwidth;
diff --git a/wmlib/Makefile.in b/wmlib/Makefile.in
index 2a803724..5f719ec0 100644
--- a/wmlib/Makefile.in
+++ b/wmlib/Makefile.in
@@ -89,6 +89,7 @@ XGETTEXT = @XGETTEXT@
 XLFLAGS = @XLFLAGS@
 XLIBS = @XLIBS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
+X_LIBRARY_PATH = @X_LIBRARY_PATH@
 wprefsdir = @wprefsdir@
 
 AUTOMAKE_OPTIONS = no-dependencies