[glom] Correct my previous commit.



commit 4cb912c178d4e49addbed5b79e4ad042e0c52bd0
Author: Murray Cumming <murrayc murrayc com>
Date:   Mon Dec 13 13:44:23 2010 +0100

    Correct my previous commit.
    
    * configure.ac: Correct the no/yes test for --enable-glom-ui and add a comma
    so it actually works.
    * Makefile_tests.am: Restore the source file lists for the python tests.

 ChangeLog         |    8 ++++++++
 Makefile_tests.am |   11 +++++++++++
 configure.ac      |    2 +-
 3 files changed, 20 insertions(+), 1 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index da4045f..cdf1549 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2010-12-13  Murray Cumming  <murrayc murrayc com>
 
+	Correct my previous commit.
+
+	* configure.ac: Correct the no/yes test for --enable-glom-ui and add a comma 
+	so it actually works.
+	* Makefile_tests.am: Restore the source file lists for the python tests.
+
+2010-12-13  Murray Cumming  <murrayc murrayc com>
+
 	Allow libglom to be built without building the Glom UI code too.
 	
 	* configure.ac: Added an --enable-glom-ui option, defaulting to yes.
diff --git a/Makefile_tests.am b/Makefile_tests.am
index ebf2b43..a446228 100644
--- a/Makefile_tests.am
+++ b/Makefile_tests.am
@@ -153,6 +153,17 @@ glom_mode_data_test_flowtablewithfields_SOURCES =	\
 	glom/mode_data/test_flowtablewithfields.cc
 glom_mode_data_test_flowtablewithfields_LDADD = $(glom_all_libs)
 
+tests_test_python_execute_func_SOURCES = tests/test_python_execute_func.cc \
+  glom/python_embed/glom_python.cc
+tests_test_python_execute_func_bad_syntax_SOURCES = tests/test_python_execute_func_bad_syntax.cc \
+  glom/python_embed/glom_python.cc
+tests_test_python_execute_func_date_SOURCES = tests/test_python_execute_func_date.cc \
+  glom/python_embed/glom_python.cc
+tests_test_python_execute_func_change_result_type_SOURCES = tests/test_python_execute_func_change_result_type.cc \
+  glom/python_embed/glom_python.cc
+tests_test_python_execute_script_SOURCES = tests/test_python_execute_script.cc \
+  glom/python_embed/glom_python.cc
+
 tests_test_python_execute_func_LDADD = $(tests_ldadd) $(GLOM_LIBS) $(PYTHON_LIBS)
 tests_test_python_execute_func_bad_syntax_LDADD = $(tests_ldadd) $(GLOM_LIBS) $(PYTHON_LIBS)
 tests_test_python_execute_func_date_LDADD = $(tests_ldadd) $(GLOM_LIBS) $(PYTHON_LIBS)
diff --git a/configure.ac b/configure.ac
index f972c02..065ce48 100644
--- a/configure.ac
+++ b/configure.ac
@@ -187,7 +187,7 @@ AS_IF([test "x$glom_maemo_launcher" = xyes],
 PKG_CHECK_MODULES([LIBGLOM], [$REQUIRED_LIBGLOM_LIBS])
 
 #Disable the checks for UI dependencies if not building the UI:
-AS_IF([test "x$glom_enable_ui" != xno]
+AS_IF([test "x$glom_enable_ui" = xno],
       [REQUIRED_GLOM_LIBS="$REQUIRED_LIBGLOM_LIBS"])
 
 PKG_CHECK_MODULES([GLOM], [$REQUIRED_GLOM_LIBS])



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]