summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Schleef <ds@schleef.org>2010-10-14 12:25:27 -0700
committerDavid Schleef <ds@schleef.org>2010-10-14 12:25:27 -0700
commit7bbd708e42adb484cb036b913403c9b8f64e55b6 (patch)
tree1748fbc94eff810742287ca0ebc55c7445576227
parent5a668bff68498be5b9dded7e838e1aca70910793 (diff)
orc.m4: Don't set HAVE_ORCC if orc is disabled
-rw-r--r--m4/orc.m48
1 files changed, 7 insertions, 1 deletions
diff --git a/m4/orc.m4 b/m4/orc.m4
index 4c7324c..3b2c6b5 100644
--- a/m4/orc.m4
+++ b/m4/orc.m4
@@ -28,19 +28,25 @@ AC_DEFUN([ORC_CHECK],
ORCC_FLAGS="--compat $ORC_REQ"
AC_SUBST(ORCC_FLAGS)
HAVE_ORC=yes
+ HAVE_ORCC=yes
+ if test "x$cross_compiling" = "xyes" ; then
+ HAVE_ORCC=no
+ fi
], [
if test "x$enable_orc" = "xyes" ; then
AC_MSG_ERROR([--enable-orc specified, but Orc >= $ORC_REQ not found])
fi
AC_DEFINE(DISABLE_ORC, 1, [Disable Orc])
HAVE_ORC=no
+ HAVE_ORCC=no
])
else
AC_DEFINE(DISABLE_ORC, 1, [Disable Orc])
HAVE_ORC=no
+ HAVE_ORCC=no
fi
AM_CONDITIONAL(HAVE_ORC, [test "x$HAVE_ORC" = "xyes"])
- AM_CONDITIONAL(HAVE_ORCC, [test "x$cross_compiling" != xyes -a "x$HAVE_ORC" = "xyes"])
+ AM_CONDITIONAL(HAVE_ORCC, [test "x$HAVE_ORCC" = "xyes"])
]))