[next] telepathy-rakia: Use idle's autogen.sh

Simon McVittie smcv at kemper.freedesktop.org
Wed May 7 03:36:32 PDT 2014


Module: telepathy-rakia
Branch: next
Commit: 95fc58ca4f04df9f216ec6bb1e1e5e02dec7100a
URL:    http://cgit.freedesktop.org/telepathy/telepathy-rakia/commit/?id=95fc58ca4f04df9f216ec6bb1e1e5e02dec7100a

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Wed May  7 11:26:21 2014 +0100

Use idle's autogen.sh

---

 autogen.sh |   40 ++++++++++++++++------------------------
 1 file changed, 16 insertions(+), 24 deletions(-)

diff --git a/autogen.sh b/autogen.sh
index 5b32d48..381e32f 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,31 +1,23 @@
 #!/bin/sh
 set -e
 
-if test -n "$AUTOMAKE"; then
-    : # don't override an explicit user request
-elif automake-1.11 --version >/dev/null 2>/dev/null && \
-     aclocal-1.11 --version >/dev/null 2>/dev/null; then
-    # If we have automake-1.11, use it. This is the oldest version (=> least
-    # likely to introduce undeclared dependencies) that will give us
-    # --enable-silent-rules support.
-    AUTOMAKE=automake-1.11
-    export AUTOMAKE
-    ACLOCAL=aclocal-1.11
-    export ACLOCAL
-fi
-
-autoreconf -i -f
+autoreconf -i -Wno-portability
 
-run_configure=true
-for arg in $*; do
-    case $arg in
-        --no-configure)
-            run_configure=false
-            ;;
-        *)
-            ;;
-    esac
-done
+# Honor NOCONFIGURE for compatibility with gnome-autogen.sh
+if test x"$NOCONFIGURE" = x; then
+    run_configure=true
+    for arg in $*; do
+        case $arg in
+            --no-configure)
+                run_configure=false
+                ;;
+            *)
+                ;;
+        esac
+    done
+else
+    run_configure=false
+fi
 
 if test $run_configure = true; then
     ./configure "$@"



More information about the telepathy-commits mailing list