diff options
| author | Ronald S. Bultje <rbultje@ronald.bitfreak.net> | 2005-07-16 10:03:19 +0000 |
|---|---|---|
| committer | Ronald S. Bultje <rbultje@ronald.bitfreak.net> | 2005-07-16 10:03:19 +0000 |
| commit | 571c48831f2f5990c3f684aa73405a3d1da7c6ee (patch) | |
| tree | 6c6092126e9a9629b636dc2fd26a7e0bea384d12 | |
| parent | ac7272b7af934c2294a44ac1c0f3fac3f8d17ec6 (diff) | |
gst-autogen.sh: Do not parse unrecognized options, but pass blindly to ./configure.RELEASE-0_8_12BRANCH-GSTREAMER-0_8
Original commit message from CVS:
* gst-autogen.sh:
Do not parse unrecognized options, but pass blindly to ./configure.
Should fix x86-64 build error in jhbuild, including #307352.
| -rw-r--r-- | ChangeLog | 29 | ||||
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | gst-autogen.sh | 28 |
3 files changed, 8 insertions, 51 deletions
@@ -1,31 +1,8 @@ -2005-07-08 Thomas Vander Stichele <thomas at apestaart dot org> - - * m4/gst-error.m4: - add macro to set ERROR_CFLAGS - -2005-06-30 Jan Schmidt <thaytan@mad.scientist.com> +2005-07-16 Ronald S. Bultje <rbultje@ronald.bitfreak.net> * gst-autogen.sh: - Remove the old autoregen.sh if it exists before recreating it, - to prevent confusing any shell process that might be reading it - currently. - -2005-06-29 Thomas Vander Stichele <thomas at apestaart dot org> - - * m4/gtk-doc.m4: - added - -2005-06-03 Stefan Kost <ensonic@users.sf.net> - - * gst-autogen.sh: create autoregen.sh *before* shifting the options - -2005-05-17 Thomas Vander Stichele <thomas at apestaart dot org> - - * gst-autogen.sh: only update autoregen.sh on actual runs - -2005-03-11 Thomas Vander Stichele <thomas at apestaart dot org> - - * m4/check.m4: m4 from the check unit test suite + Do not parse unrecognized options, but pass blindly to ./configure. + Should fix x86-64 build error in jhbuild, including #307352. 2004-12-14 David Schleef <ds@schleef.org> diff --git a/Makefile.am b/Makefile.am index 9b78636..6dd775e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,3 +1,3 @@ SUBDIRS = m4 -EXTRA_DIST = ChangeLog gettext.patch glib-gen.mak gtk-doc.mak release.mak gst-autogen.sh +EXTRA_DIST = ChangeLog gettext.patch glib-gen.mak release.mak gst-autogen.sh diff --git a/gst-autogen.sh b/gst-autogen.sh index f13abf4..7a42be2 100644 --- a/gst-autogen.sh +++ b/gst-autogen.sh @@ -1,10 +1,4 @@ # a silly hack that generates autoregen.sh but it's handy -# Remove the old autoregen.sh first to create a new file, -# as the current one may be being read by the shell executing -# this script. -if [ -f "autoregen.sh" ]; then - rm autoregen.sh -fi echo "#!/bin/sh" > autoregen.sh echo "./autogen.sh $@ \$@" >> autoregen.sh chmod +x autoregen.sh @@ -227,19 +221,6 @@ autogen_options () echo "+ debug output enabled" shift ;; - --prefix=*) - CONFIGURE_EXT_OPT="$CONFIGURE_EXT_OPT --prefix=$optarg" - echo "+ passing --prefix=$optarg to configure" - shift - ;; - --prefix) - shift - echo "DEBUG: $1" - CONFIGURE_EXT_OPT="$CONFIGURE_EXT_OPT --prefix=$1" - echo "+ passing --prefix=$1 to configure" - shift - ;; - -h|--help) echo "autogen.sh (autogen options) -- (configure options)" echo "autogen.sh help options: " @@ -266,13 +247,12 @@ autogen_options () CONFIGURE_DEF_OPT="$CONFIGURE_DEF_OPT --with-autoconf=$AUTOCONF" shift ;; - --disable*|--enable*|--with*) - echo "+ passing option $1 to configure" - CONFIGURE_EXT_OPT="$CONFIGURE_EXT_OPT $1" + --) shift ; break ;; + *) + CONFIGURE_EXT_OPT="$CONFIGURE_EXT_OPT $1" + echo "+ passing unknown option $1 to configure" shift ;; - --) shift ; break ;; - *) echo "- ignoring unknown autogen.sh argument $1"; shift ;; esac done |