json-glib r47 - in branches/json-glib-0-6: . json-glib

[ebassi svn gnome org]

Author: ebassi
Date: Fri Jun 13 10:35:06 2008
New Revision: 47
URL: http://svn.gnome.org/viewvc/json-glib?rev=47&view=rev

Log:
2008-06-13  Emmanuele Bassi  <ebassi openedhand com>

	Bug #965 - --disable-glibtest configure flag is not properly
	           handled

	* Makefile.am:
	* configure.ac:
	* json-glib/Makefile.am: Do not recurse into the test suite if
	the --disable-glibtest command line switch is passed to the
	configure script.

Modified:
   branches/json-glib-0-6/ChangeLog
   branches/json-glib-0-6/Makefile.am
   branches/json-glib-0-6/configure.ac
   branches/json-glib-0-6/json-glib/Makefile.am

Modified: branches/json-glib-0-6/Makefile.am
==============================================================================
--- branches/json-glib-0-6/Makefile.am	(original)
+++ branches/json-glib-0-6/Makefile.am	Fri Jun 13 10:35:06 2008
@@ -1,6 +1,10 @@
 include $(top_srcdir)/Makefile.decl
 
-SUBDIRS = json-glib doc tests
+SUBDIRS = json-glib doc
+
+if ENABLE_GLIB_TEST
+SUBDIRS += tests
+endif
 
 pcfiles = json-glib-1.0.pc
 

Modified: branches/json-glib-0-6/configure.ac
==============================================================================
--- branches/json-glib-0-6/configure.ac	(original)
+++ branches/json-glib-0-6/configure.ac	Fri Jun 13 10:35:06 2008
@@ -63,6 +63,8 @@
 AC_SUBST(JSON_CFLAGS)
 AC_SUBST(JSON_LIBS)
 
+AM_CONDITIONAL(ENABLE_GLIB_TEST, test "x$enable_glibtest" = "xyes")
+
 dnl = Enable debug level ===================================================
 
 m4_define([debug_default],
@@ -127,4 +129,5 @@
 echo "           Debug level: ${enable_debug}"
 echo "        Compiler flags: ${CPPFLAGS}"
 echo "         API reference: ${enable_gtk_doc}"
+echo "     Enable test suite: ${enable_glibtest}"
 echo ""

Modified: branches/json-glib-0-6/json-glib/Makefile.am
==============================================================================
--- branches/json-glib-0-6/json-glib/Makefile.am	(original)
+++ branches/json-glib-0-6/json-glib/Makefile.am	Fri Jun 13 10:35:06 2008
@@ -1,6 +1,8 @@
 include $(top_srcdir)/Makefile.decl
 
+if ENABLE_GLIB_TEST
 SUBDIRS = . tests
+endif
 
 DIST_SUBDIRS = tests