[glom/glom-1-14] Minor build system cleanup

[David King <davidk src gnome org>]

commit 2f4e571deed7b2f80707ddf5fb264ae6fa1cf2a8
Author: David King <davidk openismus com>
Date:   Fri Aug 6 12:32:28 2010 +0200

    Minor build system cleanup
    
    * configure.ac: Drop unnecessary AC_DISABLE_STATIC. Use AS_IF rather
    than shell if...fi. Add a TODO.
    * Makefile.am:
    * Makefile_tests.am: Take advantage of dependencies to reduce
    duplication of linker flags.

 ChangeLog         |   10 ++++++++++
 Makefile.am       |    4 ++--
 Makefile_tests.am |   16 ++++++++--------
 configure.ac      |   21 +++++++++++----------
 4 files changed, 31 insertions(+), 20 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 6ad457f..5ee95a7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2010-08-06  David King  <davidk openismus com>
+
+	Minor build system cleanup
+
+	* configure.ac: Drop unnecessary AC_DISABLE_STATIC. Use AS_IF rather
+	than shell if...fi. Add a TODO.
+	* Makefile.am:
+	* Makefile_tests.am: Take advantage of dependencies to reduce
+	duplication of linker flags.
+
 1.14.5:
 
 2010-07-25  Murray Cumming  <murrayc murrayc com>
diff --git a/Makefile.am b/Makefile.am
index db915a4..e093022 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-## Copyright (c) 2009  Openismus GmbH  <http://www.openismus.com/>
+## Copyright (c) 2009, 2010  Openismus GmbH  <http://www.openismus.com/>
 ##
 ## This file is part of Glom.
 ##
@@ -63,7 +63,7 @@ glom_python_embed_python_module_glom_1_14_la_SOURCES =		\
 
 glom_python_embed_python_module_glom_1_14_la_LIBADD = \
 	glom/libglom/libglom-$(GLOM_ABI_VERSION).la \
-	$(LIBGLOM_LIBS) $(PYTHON_LIBS) $(BOOST_PYTHON_LIBS)
+	$(PYTHON_LIBS) $(BOOST_PYTHON_LIBS)
 
 if HOST_WIN32
 pymod_ldflags = -module -avoid-version -no-undefined -shrext .pyd
diff --git a/Makefile_tests.am b/Makefile_tests.am
index fe33902..e822ecc 100644
--- a/Makefile_tests.am
+++ b/Makefile_tests.am
@@ -1,4 +1,4 @@
-## Copyright (c) 2009  Openismus GmbH  <http://www.openismus.com/>
+## Copyright (c) 2009, 2010  Openismus GmbH  <http://www.openismus.com/>
 ##
 ## This file is part of Glom.
 ##
@@ -67,8 +67,8 @@ dist_noinst_SCRIPTS = tests/test_dtd_file_validation.sh \
 
 #TESTS_ENVIRONMENT=which valgrind && valgrind --tool=memcheck --leak-check=full --leak-resolution=high --trace-children=yes --num-callers=30
 
-LIBGLOM_LA = glom/libglom/libglom-$(GLOM_ABI_VERSION).la $(LIBGLOM_LIBS)
-tests_ldadd = $(LIBGLOM_LA)
+# This also links to the libraries in LIBGLOM_LIBS
+tests_ldadd = glom/libglom/libglom-$(GLOM_ABI_VERSION).la
 
 glom_libglom_test_connectionpool_SOURCES = glom/libglom/test_connectionpool.cc
 glom_libglom_example_document_load_SOURCES = glom/libglom/example_document_load.cc
@@ -133,14 +133,14 @@ glom_utility_widgets_test_flowtable_LDADD = $(GLOM_LIBS)
 #	glom/utility_widgets/test_flowtable_dnd.cc
 
 tests_glade_toplevels_instantiation_SOURCES = tests/glade_toplevels_instantiation.cc
-tests_glade_toplevels_instantiation_LDADD = $(tests_ldadd) $(LIBGLOM_LIBS) $(GLOM_LIBS)
+tests_glade_toplevels_instantiation_LDADD = $(tests_ldadd) $(GLOM_LIBS)
 
 
 glom_test_pyembed_LDADD = $(LIBGLOM_LIBS) $(PYTHON_LIBS)
 
 tests_test_parsing_time_LDADD = $(tests_ldadd)
-tests_test_document_load_LDADD = $(tests_ldadd) $(LIBGLOM_LIBS)
-tests_test_document_autosave_LDADD = $(tests_ldadd) $(LIBGLOM_LIBS)
+tests_test_document_load_LDADD = $(tests_ldadd)
+tests_test_document_autosave_LDADD = $(tests_ldadd)
 tests_test_signal_reemit_LDADD = $(LIBGLOM_LIBS)
 tests_test_load_python_library_LDADD = $(LIBGLOM_LIBS) -ldl
 tests_test_python_module_LDADD = $(tests_ldadd) $(PYTHON_LIBS)
@@ -149,7 +149,7 @@ tests_test_python_execute_func_bad_syntax_LDADD = $(tests_ldadd) $(GLOM_LIBS) $(
 tests_test_python_execute_func_date_LDADD = $(tests_ldadd) $(GLOM_LIBS) $(PYTHON_LIBS)
 tests_test_python_execute_func_change_result_type_LDADD = $(tests_ldadd) $(GLOM_LIBS) $(PYTHON_LIBS)
 tests_test_python_execute_script_LDADD = $(tests_ldadd) $(GLOM_LIBS) $(PYTHON_LIBS)
-tests_import_test_parsing_LDADD = $(LIBGLOM_LIBS) $(GLOM_LIBS)
-tests_import_test_signals_LDADD = $(LIBGLOM_LIBS) $(GLOM_LIBS)
+tests_import_test_parsing_LDADD = $(GLOM_LIBS)
+tests_import_test_signals_LDADD = $(GLOM_LIBS)
 tests_test_glade_derived_instantiation_LDADD = $(glom_all_libs)
 tests_test_selfhosting_new_empty_LDADD = $(glom_all_libs)
diff --git a/configure.ac b/configure.ac
index c5d5279..e488652 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-## Copyright (c) 2009  Openismus GmbH  <http://www.openismus.com/>
+## Copyright (c) 2009, 2010  Openismus GmbH  <http://www.openismus.com/>
 ##
 ## This file is part of Glom.
 ##
@@ -33,7 +33,6 @@ AC_PROG_CXX
 
 LT_PREREQ([2.2.0])
 LT_INIT([disable-static win32-dll])
-AC_DISABLE_STATIC
 
 # Used for the install directories for headers.  The same number is used in
 # the library name, which must be kept in sync, but variables can't be used
@@ -260,17 +259,19 @@ AS_IF([test "x$ENABLE_DOCUMENTATION" != xno],
      [],
      [AC_MSG_ERROR([The documentation build is enabled, but the sphinx-build tool could not be found.])])])
 
-# Check for tar and gzip (used by tar via -z) because we use these when creating backups.
-# TODO: This lets us provide a path via a configure option, but we just use Glib::find_program_in_path(), ignoring that.
+# Check for tar and gzip (used by tar via -z) because we use these when
+# creating backups.
+# TODO: This lets us provide a path via a configure option, but we just use
+# Glib::find_program_in_path(), ignoring that.
+# TODO: This should check for GNU tar, as GNU tar features are used during the
+# backup process.
 AC_CHECK_PROG([GLOM_TAR], [tar], [yes], [no])
-if test "$GLOM_TAR" = no ; then
-	AC_MSG_ERROR([tar not found. Glom needs this to create backup files.])
-fi
+AS_IF([test "$GLOM_TAR" = no],
+  [AC_MSG_ERROR([tar not found. Glom needs this to create backup files.])])
 
 AC_CHECK_PROG([GLOM_GZIP], [gzip], [yes], [no])
-if test "$GLOM_GZIP" = no ; then
-	AC_MSG_ERROR([gzip not found. Glom needs this to create backup files.])
-fi
+AS_IF([test "$GLOM_GZIP" = no],
+  [AC_MSG_ERROR([gzip not found. Glom needs this to create backup files.])])
 
 AC_CONFIG_FILES([Makefile
                  docs/user-guide/Makefile