Avoid unnecessary library dependencies in eesh and edox. Cleanups.

SVN revision: 25668

configure.in

@@ -134,7 +134,7 @@ IMLIB_LIBS=`imlib2-config --libs`
 IMLIB_CFLAGS=`imlib2-config --cflags`
 AC_SUBST(IMLIB_LIBS)
 AC_SUBST(IMLIB_CFLAGS)
-AC_CHECK_LIB(Imlib2, imlib_create_image,,
+AC_CHECK_LIB(Imlib2, imlib_create_image, dummy=1,
   AC_MSG_ERROR([Cannot find Imlib2: Is imlib2-config in path?]),
   $IMLIB_LIBS)
 
@@ -165,11 +165,12 @@ AC_ARG_ENABLE(xinerama,
 if test "x$enable_xinerama" = "xyes"; then
   AC_CHECK_LIB(Xinerama, XineramaQueryExtension,
     AC_DEFINE(HAS_XINERAMA, 1, [Xinerama support])
-    E_X_LIBS="-lXinerama $E_X_LIBS",
+    XINERAMA_LIBS="-lXinerama",
     enable_xinerama=no
     AC_MSG_WARN([Xinerama support was requested but not found]),
     $X_LIBS -lXext -lX11)
 fi
+AC_SUBST(XINERAMA_LIBS)
 
 AC_ARG_ENABLE(zoom,
   [  --enable-zoom           compile with zoom support @<:@default=yes@:>@],,

dox/Makefile.am

@@ -6,9 +6,9 @@ bin_PROGRAMS = edox
 
 edox_SOURCES = dox.c dox.h file.c format.c text.c ttfont.c
 
-LDADD = $(IMLIB_LIBS) $(X_LIBS) $(E_X_LIBS) -lX11 -lm
+LDADD = $(IMLIB_LIBS) $(X_LIBS) $(XINERAMA_LIBS) -lX11 -lm
 
-INCLUDES = -I$(top_builddir) -I$(top_srcdir)/intl $(IMLIB_CFLAGS) $(X_CFLAGS)
+INCLUDES = -I$(top_builddir) -I$(top_srcdir) $(IMLIB_CFLAGS) $(X_CFLAGS)
 
 uninstall-local:
 	for i in $(bin_PROGRAMS); do \

eesh/Makefile.am

@@ -5,7 +5,7 @@ eesh_SOURCES = E.h comms.c main.c
 
 LDADD = $(X_LIBS) -lX11
 
-INCLUDES = -I$(top_builddir) -I$(top_srcdir)/intl $(X_CFLAGS)
+INCLUDES = -I$(top_builddir) -I$(top_srcdir) $(X_CFLAGS)
 
 uninstall-local:
 	for i in $(bin_PROGRAMS); do \

epp/Makefile.am

@@ -30,7 +30,7 @@ epp_SOURCES = \
 	cpplib.c \
 	cppmain.c 
 
-INCLUDES=-I$(top_srcdir) -I$(top_builddir) -I$(includedir)
+INCLUDES = -I$(top_builddir) -I$(top_srcdir)
 
 DEFS= \
 -DHAVE_STRERROR \
@@ -51,8 +51,6 @@ DEFS= \
 -DTARGET_TAB=9 \
 -DTARGET_VT=11
 
-LIBS =
-
 uninstall-local:
 	for i in $(bin_PROGRAMS); do \
 	  rm -f $(exec_prefix)/bin/$$i; \

src/Makefile.am

@@ -145,6 +145,7 @@ LDADD = \
 	$(IMLIB_LIBS) 		\
 	$(X_PRE_LIBS) 		\
 	$(X_LIBS) 		\
+	$(XINERAMA_LIBS) 	\
 	$(X_EXTRA_LIBS) 	\
 	$(E_X_LIBS) 		\
 	-lX11 -lm