json-glib r33 - in trunk: . contrib

[ebassi svn gnome org]

Author: ebassi
Date: Wed May  7 09:17:38 2008
New Revision: 33
URL: http://svn.gnome.org/viewvc/json-glib?rev=33&view=rev

Log:
2008-05-07  Emmanuele Bassi  <ebassi openedhand com>

	* contrib/: Remove Vala bindings; Vala already has them
	so there's no point in us keeping a copy here.

	* Makefile.am:
	* configure.ac: Do not check for Vala and don't recurse
	into the contrib directory.

Removed:
   trunk/contrib/
Modified:
   trunk/ChangeLog
   trunk/Makefile.am
   trunk/configure.ac

Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am	(original)
+++ trunk/Makefile.am	Wed May  7 09:17:38 2008
@@ -2,12 +2,6 @@
 
 SUBDIRS = json-glib doc tests
 
-if HAVE_VALA
-SUBDIRS += contrib
-endif
-
-DIST_SUBDIRS = json-glib doc tests contrib
-
 pcfiles = json-glib-1.0.pc
 
 json-glib-1.0.pc: json-glib.pc

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Wed May  7 09:17:38 2008
@@ -63,19 +63,6 @@
 AC_SUBST(JSON_CFLAGS)
 AC_SUBST(JSON_LIBS)
 
-has_vala=no
-PKG_CHECK_MODULES(JSON_VALA, vala-1.0, has_vala=yes, has_vala=no)
-
-if test "x$has_vala" = "xyes"; then
-  VAPI_DIR=`pkg-config --variable=vapidir vala-1.0`
-else
-  VAPI_DIR=
-fi
-
-AM_CONDITIONAL(HAVE_VALA, [test "x$has_vala" = "xyes"])
-AC_SUBST(VAPI_DIR)
-
-
 dnl = Enable debug level ===================================================
 
 m4_define([debug_default],
@@ -128,7 +115,6 @@
         doc/Makefile
         doc/reference/Makefile
         doc/reference/version.xml
-        contrib/Makefile
         json-glib.pc
 ])
 
@@ -141,5 +127,4 @@
 echo "           Debug level: ${enable_debug}"
 echo "        Compiler flags: ${CPPFLAGS}"
 echo "         API reference: ${enable_gtk_doc}"
-echo " Install vala bindings: ${has_vala} (${VAPI_DIR})"
 echo ""