Applied in the master.
----- Original Message -----
From: "Marat Radchenko" <[email protected]>
To: [email protected]
Sent: Friday, December 3, 2010 11:21:47 AM
Subject: [SFLphone] [PATCH] Improved autogen.sh scripts
1. They do not require bash anymore
2. Added workaround for Debian bug #565663
3. Replaced manual autotools invocations with single autoreconf call
4. Non-zero return status on failure
---
sflphone-client-gnome/autogen.sh | 20 ++++----------------
sflphone-common/autogen.sh | 19 ++++---------------
2 files changed, 8 insertions(+), 31 deletions(-)
diff --git a/sflphone-client-gnome/autogen.sh b/sflphone-client-gnome/autogen.sh
index 9001af6..b161dd6 100755
--- a/sflphone-client-gnome/autogen.sh
+++ b/sflphone-client-gnome/autogen.sh
@@ -1,19 +1,7 @@
-#!/bin/bash
+#!/bin/sh -e
-function autocmd()
-{
- echo "Running ${1}..."
- $* || {
- echo "Error running ${1}"
- exit 1
- }
-}
+# Workaround for http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=565663
+[ ! -e m4 ] && mkdir m4
gnome-doc-prepare --force
-
-autocmd libtoolize --force --copy
-autocmd aclocal
-autocmd autoheader
-autocmd autoconf -f
-autocmd automake --add-missing --force-missing --copy -Wall
-
+autoreconf --force --install --verbose -Wall -I m4
diff --git a/sflphone-common/autogen.sh b/sflphone-common/autogen.sh
index 5c51459..839ab4a 100755
--- a/sflphone-common/autogen.sh
+++ b/sflphone-common/autogen.sh
@@ -1,17 +1,6 @@
-#!/bin/bash
+#!/bin/sh -e
-function autocmd()
-{
- echo "Running ${1}..."
- $* || {
- echo "Error running ${1}"
- exit 1
- }
-}
-
-autocmd libtoolize --force --copy
-autocmd aclocal
-autocmd autoheader
-autocmd autoconf -f
-autocmd automake --add-missing --force-missing --copy -Wall
+# Workaround for http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=565663
+[ ! -e m4 ] && mkdir m4
+autoreconf --force --install --verbose -Wall -I m4
--
1.6.6
_______________________________________________
SFLphone mailing list
[email protected]
http://lists.savoirfairelinux.net/mailman/listinfo/sflphone
_______________________________________________
SFLphone mailing list
[email protected]
http://lists.savoirfairelinux.net/mailman/listinfo/sflphone
