[jhbuild/wip/path-env: 4/6] autotools: remove '--' GStreamer hack

[Ryan Lortie <desrt src gnome org>]

commit a0c50d7c50004203eebc83db593153177982a95b
Author: Ryan Lortie <desrt desrt ca>
Date:   Mon Mar 10 00:27:25 2014 -0400

    autotools: remove '--' GStreamer hack
    
    This strange hack looks like it might have gotten introduced by accident
    as part of e9084288cdf1e520c409ca8fb377480676e46782 which is otherwise a
    completely unrelated commit.  I have no idea why this might have been
    needed, but it seems very likely that if it was, it is no longer.

 jhbuild/modtypes/autotools.py |   19 +++----------------
 1 files changed, 3 insertions(+), 16 deletions(-)
---
diff --git a/jhbuild/modtypes/autotools.py b/jhbuild/modtypes/autotools.py
index 69e11c8..41e4b12 100644
--- a/jhbuild/modtypes/autotools.py
+++ b/jhbuild/modtypes/autotools.py
@@ -21,7 +21,6 @@
 __metaclass__ = type
 
 import os
-import re
 import stat
 try:
     import hashlib
@@ -134,24 +133,12 @@ class AutogenModule(MakeModule, DownloadableModule):
             cmd = cmd.replace('autoreconf', 'configure')
             cmd = cmd.replace('--enable-maintainer-mode', '')
 
-        # Fix up the arguments for special cases:
-        #   tarballs: remove --enable-maintainer-mode to avoid breaking build
-        #   tarballs: remove '-- ' to avoid breaking build (GStreamer weirdness)
-        #   non-tarballs: place --prefix and --libdir after '-- ', if present
+        # if we are using configure as the autogen command, make sure
+        # we don't pass --enable-maintainer-mode, since it breaks many
+        # tarball builds.
         if self.autogen_sh == 'configure':
             cmd = cmd.replace('--enable-maintainer-mode', '')
 
-            # Also, don't pass '--', which gstreamer attempts to do, since
-            # it is royally broken.
-            cmd = cmd.replace('-- ', '')
-        else:
-            # place --prefix and --libdir arguments after '-- '
-            # (GStreamer weirdness)
-            if autogenargs.find('-- ') != -1:
-                p = re.compile('(.*)(--prefix %s )((?:--libdir %s )?)(.*)-- ' %
-                       (vars['prefix'], "'\${exec_prefix}/lib64'"))
-                cmd = p.sub(r'\1\4-- \2\3', cmd)
-
         # If there is no --exec-prefix in the constructed autogen command, we
         # can safely assume it will be the same as {prefix} and substitute it
         # right now, so the printed command can be copy/pasted afterwards.