[libegg/spread-table-dnd: 37/45] Update configure.ac and Makefile.am files

[Murray Cumming <murrayc src gnome org>]

commit e975d9004dc2417df457d2ce4a4120734fa8486c
Author: David King <davidk openismus com>
Date:   Wed Mar 23 15:45:48 2011 +0100

    Update configure.ac and Makefile.am files

 configure.ac                |   13 +------------
 libegg/Makefile.am          |    7 +------
 libegg/datetime/Makefile.am |    2 +-
 3 files changed, 3 insertions(+), 19 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index bd8dd8e..b6bb012 100644
--- a/configure.ac
+++ b/configure.ac
@@ -90,12 +90,6 @@ AC_SUBST(EGG_SMCLIENT_DBUS_LIBS)
 AC_SUBST(EGG_SMCLIENT_DBUS_CFLAGS)
 AM_CONDITIONAL(HAVE_DBUS, test "$have_dbus" = "yes")
 
-## check if we have gtk+ 2.1.x
-AM_CONDITIONAL(HAVE_GTK21, $PKG_CONFIG --atleast-version=2.1.0 gtk+-2.0)
-
-## check if we have gtk+ 2.4.x
-AM_CONDITIONAL(HAVE_GTK24, $PKG_CONFIG --atleast-version=2.4.0 gtk+-2.0)
-
 ## check if we have gtk+ 2.5.x
 AM_CONDITIONAL(HAVE_GTK25, $PKG_CONFIG --atleast-version=2.5.0 gtk+-2.0)
 
@@ -105,15 +99,10 @@ AM_CONDITIONAL(HAVE_GTK27, $PKG_CONFIG --atleast-version=2.7.0 gtk+-2.0)
 ## check if we have gtk+ 2.10.x
 AM_CONDITIONAL(HAVE_GTK210, $PKG_CONFIG --atleast-version=2.10.0 gtk+-2.0)
 
-## check if we have gtk+ 2.15.x
-AM_CONDITIONAL(HAVE_GTK215, $PKG_CONFIG --atleast-version=2.15.0 gtk+-2.0)
-
 ## check if we have gtk+ 3
 AM_CONDITIONAL(HAVE_GTK30, $PKG_CONFIG --atleast-version=2.91.1 gtk+-3.0)
 
-AM_COND_IF(HAVE_GTK30,
-  [PKG_CHECK_MODULES(EGG_30, gtk+-3.0)
-  AC_CONFIG_FILES()])
+AM_COND_IF(HAVE_GTK30, [PKG_CHECK_MODULES(EGG_30, gtk+-3.0)])
 
 ## check if we have the X11 gtk+ backend
 AM_CONDITIONAL(HAVE_GTK_TARGET_X11, test `$PKG_CONFIG --variable=target gtk+-2.0` = x11)
diff --git a/libegg/Makefile.am b/libegg/Makefile.am
index 7efbc1c..97932e9 100644
--- a/libegg/Makefile.am
+++ b/libegg/Makefile.am
@@ -19,10 +19,6 @@ gtk210_SUBDIRS = \
   fileformatchooser
 endif
 
-if HAVE_GTK215
-gtk215_SUBDIRS =
-endif
-
 if HAVE_GTK_TARGET_X11
 background_monitor_SUBDIRS = \
   background-monitor
@@ -33,8 +29,7 @@ SUBDIRS = util column-chooser treeviewutils \
   dock datetime $(thumbnail_SUBDIRS) \
   smclient $(spreadtable_SUBDIRS) \
   $(gtk210_SUBDIRS) \
-  $(gtk215_SUBDIRS) \
-  $(gtk30_SUBDIRS)
+  $(gtk215_SUBDIRS)
 
 # Don't compile broken code
 #$(iconchooser_SUBDIRS)
diff --git a/libegg/datetime/Makefile.am b/libegg/datetime/Makefile.am
index 5652e75..5eed4d7 100644
--- a/libegg/datetime/Makefile.am
+++ b/libegg/datetime/Makefile.am
@@ -12,4 +12,4 @@ noinst_HEADERS = egg-datetime.h
 
 noinst_PROGRAMS = test-datetime
 test_datetime_SOURCES = test-datetime.c
-test_datetime_LDADD = $(EGG_LIBS) $(top_builddir)/libegg/datetime/libeggdatetime.la
+test_datetime_LDADD = $(EGG_LIBS) libeggdatetime.la