From d3d9acf829af1b0bd867367138d3a7ba2b2675a9 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Sebastian=20Dr=C3=B6ge?= <sebastian.droege@collabora.co.uk>
Date: Sun, 5 Sep 2010 12:07:28 +0200
Subject: [PATCH] orc: Add --compat $ORC_REQ to the orcc commandlines

This allows orcc to always use the latest features of the required
orc version instead of always generating code that would still work
with 0.4.5 or even earlier.
---
 m4/orc.m4 | 4 +++-
 orc.mak   | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/m4/orc.m4 b/m4/orc.m4
index f6355ff..d7abd81 100644
--- a/m4/orc.m4
+++ b/m4/orc.m4
@@ -5,7 +5,7 @@ dnl ORC_CHECK([REQUIRED_VERSION])
 
 AC_DEFUN([ORC_CHECK],
 [
-  ORC_REQ=ifelse([$1], , "0.4.5", [$1])
+  ORC_REQ=ifelse([$1], , "0.4.6", [$1])
 
   AC_ARG_ENABLE(orc,
   AC_HELP_STRING([--enable-orc],[use Orc if installed]),
@@ -23,6 +23,8 @@ AC_DEFUN([ORC_CHECK],
       AC_DEFINE(HAVE_ORC, 1, [Use Orc])
       ORCC=`$PKG_CONFIG --variable=orcc orc-0.4`
       AC_SUBST(ORCC)
+      ORCC_FLAGS="--compat $ORC_REQ"
+      AC_SUBST(ORCC_FLAGS)
       HAVE_ORC=yes
     ], [
       if test "x$enable_orc" = "xyes" ; then
diff --git a/orc.mak b/orc.mak
index fb22efc..bea776e 100644
--- a/orc.mak
+++ b/orc.mak
@@ -42,10 +42,10 @@ cp_v_gen_0 = @echo "  CP     $@";
 
 if HAVE_ORC
 tmp-orc.c: $(srcdir)/$(ORC_SOURCE).orc
-	$(orcc_v_gen)$(ORCC) --implementation --include glib.h -o tmp-orc.c $(srcdir)/$(ORC_SOURCE).orc
+	$(orcc_v_gen)$(ORCC) $(ORCC_FLAGS) --implementation --include glib.h -o tmp-orc.c $(srcdir)/$(ORC_SOURCE).orc
 
 $(ORC_SOURCE).h: $(srcdir)/$(ORC_SOURCE).orc
-	$(orcc_v_gen)$(ORCC) --header --include glib.h -o $(ORC_SOURCE).h $(srcdir)/$(ORC_SOURCE).orc
+	$(orcc_v_gen)$(ORCC) $(ORCC_FLAGS) --header --include glib.h -o $(ORC_SOURCE).h $(srcdir)/$(ORC_SOURCE).orc
 else
 tmp-orc.c: $(srcdir)/$(ORC_SOURCE).orc
 	$(cp_v_gen)cp $(srcdir)/$(ORC_SOURCE)-dist.c tmp-orc.c
-- 
2.7.4