summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEdward Hervey <edward.hervey@collabora.co.uk>2012-06-08 12:57:14 +0200
committerEdward Hervey <edward.hervey@collabora.co.uk>2012-06-08 12:59:16 +0200
commit3baf58a140fb1219c917cbae1070c4734e30f028 (patch)
tree49fe843eab480601c95a63d62bb069237de012bc
parentb811047a49ae74adc08357af335f57f727948a3b (diff)
m4: Move AC_CANONICAL_HOST/_TARGET into AG_GST_INIT
They need to be called before AC_ARG_PROGRAM
-rw-r--r--m4/gst-arch.m43
-rw-r--r--m4/gst.m45
2 files changed, 5 insertions, 3 deletions
diff --git a/m4/gst-arch.m4 b/m4/gst-arch.m4
index ff0954a..077a20b 100644
--- a/m4/gst-arch.m4
+++ b/m4/gst-arch.m4
@@ -5,9 +5,6 @@ dnl defines HOST_CPU
AC_DEFUN([AG_GST_ARCH],
[
- AC_REQUIRE([AC_CANONICAL_HOST]) dnl we use host_ variables
- AC_REQUIRE([AC_CANONICAL_TARGET]) dnl we use target_ variables
-
dnl Determine CPU
case "x${target_cpu}" in
xi?86 | xk? | xi?86_64)
diff --git a/m4/gst.m4 b/m4/gst.m4
index ddfde51..d4c53cb 100644
--- a/m4/gst.m4
+++ b/m4/gst.m4
@@ -3,10 +3,15 @@ dnl sets up use of GStreamer configure.ac macros
dnl all GStreamer autoconf macros are prefixed
dnl with AG_GST_ for public macros
dnl with _AG_GST_ for private macros
+dnl
+dnl We call AC_CANONICAL_TARGET and AC_CANONICAL_HOST so that
+dnl it is valid before AC_ARG_PROGRAM is called
AC_DEFUN([AG_GST_INIT],
[
m4_pattern_forbid(^_?AG_GST_)
+ AC_REQUIRE([AC_CANONICAL_HOST]) dnl we use host_ variables
+ AC_REQUIRE([AC_CANONICAL_TARGET]) dnl we use target_ variables
])
dnl AG_GST_PKG_CONFIG_PATH