summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Schleef <ds@schleef.org>2010-10-08 12:40:04 -0700
committerDavid Schleef <ds@schleef.org>2010-10-08 12:42:20 -0700
commit5a668bff68498be5b9dded7e838e1aca70910793 (patch)
tree55ccc7a32609c7611bc41ae7a5d8aa8f3d3a01c7
parentc4a8adc1fb9dac00a2278d9241aa06b97ce77d74 (diff)
orc: Allow cross-building without orcc
-rw-r--r--m4/orc.m43
-rw-r--r--orc.mak2
2 files changed, 3 insertions, 2 deletions
diff --git a/m4/orc.m4 b/m4/orc.m4
index ad0916a..4c7324c 100644
--- a/m4/orc.m4
+++ b/m4/orc.m4
@@ -39,7 +39,8 @@ AC_DEFUN([ORC_CHECK],
AC_DEFINE(DISABLE_ORC, 1, [Disable Orc])
HAVE_ORC=no
fi
- AM_CONDITIONAL(HAVE_ORC, test "x$HAVE_ORC" = "xyes")
+ AM_CONDITIONAL(HAVE_ORC, [test "x$HAVE_ORC" = "xyes"])
+ AM_CONDITIONAL(HAVE_ORCC, [test "x$cross_compiling" != xyes -a "x$HAVE_ORC" = "xyes"])
]))
diff --git a/orc.mak b/orc.mak
index 663cfc7..ce4be89 100644
--- a/orc.mak
+++ b/orc.mak
@@ -40,7 +40,7 @@ cp_v_gen = $(cp_v_gen_$(V))
cp_v_gen_ = $(cp_v_gen_$(AM_DEFAULT_VERBOSITY))
cp_v_gen_0 = @echo " CP $@";
-if HAVE_ORC
+if HAVE_ORCC
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