diff options
| author | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2010-09-05 12:07:28 +0200 |
|---|---|---|
| committer | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2010-09-05 12:07:28 +0200 |
| commit | d3d9acf829af1b0bd867367138d3a7ba2b2675a9 (patch) | |
| tree | 5a1f2a33b3c0be15e03c57ef30535af5b0104525 | |
| parent | ca1c867ac96a3bdb83f2bc4cb2081e2a0deb1a16 (diff) | |
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.
| -rw-r--r-- | m4/orc.m4 | 4 | ||||
| -rw-r--r-- | orc.mak | 4 |
2 files changed, 5 insertions, 3 deletions
@@ -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 @@ -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 |