Merged trunk changes r9797:9829 into 217update branch.
--- eog-2.16.1/shell/Makefile.am.orig 2006-10-02 11:20:36.231651000 +0100
+++ eog-2.16.1/shell/Makefile.am 2006-10-02 11:21:24.113681000 +0100
@@ -52,6 +52,7 @@
$(jpeg_LIB) \
$(X_LIBS) \
$(EOG_LIBS) \
+ -lX11 \
$(LIBJPEG)
uidir = $(datadir)/eog