Pass $CC as AS, unless $AS is provided. Add gas-preprocessor

Add gas-preprocessor.pl as a git submodule, and put it in the
path so that it is available if libav wants it.

Switch back to providing $CC as $AS by default, but
respect an external $AS setting so that it can be
overridden in cerbero

https://bugzilla.gnome.org/show_bug.cgi?id=694416

diff --git a/.gitmodules b/.gitmodules
index a645481..1a60633 100644 (file)
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,3 +4,6 @@
 [submodule "gst-libs/ext/libav"]
         path = gst-libs/ext/libav
         url = https://git.ffmpeg.org/ffmpeg.git
+[submodule "gst-libs/ext/gas-preprocessor"]
+       path = gst-libs/ext/gas-preprocessor
+       url = git://git.libav.org/gas-preprocessor.git

diff --git a/configure.ac b/configure.ac
index 3a73678..6039592 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -39,6 +39,8 @@ dnl we override it here if we need to for the release candidate of new series
 GST_API_VERSION=1.0
 AC_SUBST(GST_API_VERSION)
 
+dnl *** Check for external $AS vs detected by AS_LIBTOOL
+user_AS="$AS"
 AG_GST_LIBTOOL_PREPARE
 AS_LIBTOOL(GST, 1300, 0, 1300)
 
@@ -385,8 +387,11 @@ else
     emblibav_configure_args="$emblibav_configure_args --ar=\\\"\\\$AR\\\""
   fi
 
-  if test x"$AS" != x; then
-    emblibav_configure_args="$emblibav_configure_args --as=\\\"\\\$AS\\\""
+  if test x"$orig_AS" != x; then
+    emblibav_configure_args="$emblibav_configure_args --as=\\\"\\\$orig_AS\\\""
+  elif test x"$CC" != x; then
+    dnl No external $AS - try $CC for the libav assembler
+    emblibav_configure_args="$emblibav_configure_args --as=\\\"\\\$CC\\\""
   fi
 
   if test x"$CC" != x; then
@@ -430,14 +435,19 @@ else
      dnl to detect out-of-tree builds
      if test -z "$srcdir" -o "$srcdir" = .; then
        confcmd=./configure
+       gasppdir=../gas-preprocessor
      else
        confcmd="$ac_abs_top_srcdir"/gst-libs/ext/libav/configure
+       gasppdir="$ac_abs_top_srcdir"/gst-libs/ext/gas-preprocessor
      fi
 
      AS_MKDIR_P(["$ac_top_build_prefix"gst-libs/ext/libav])
+     oldPATH="$PATH"
+     PATH="$gasppdir:$PATH"
      cd "$ac_top_build_prefix"gst-libs/ext/libav &&
          eval "$confcmd $emblibav_configure_args" ||
          AC_MSG_ERROR([Failed to configure embedded Libav tree])
+     PATH="$oldPATH"
      cd "$origdir"
     ],
     [emblibav_configure_args="$emblibav_configure_args"])

diff --git a/gst-libs/ext/gas-preprocessor b/gst-libs/ext/gas-preprocessor
new file mode 160000 (submodule)
index 0000000..fad9080
--- /dev/null
+++ b/gst-libs/ext/gas-preprocessor
@@ -0,0 +1 @@
+Subproject commit fad9080da871bb7924431a5e22fdaccae56b5950