r3468 - in trunk: build.d libmcrypto libmikey libminisip libminisip-swig libmnetutil libmsip libmstun libmutil libzrtpcpp milbc minisip ministun
mikma at minisip.org
mikma at minisip.org
Fri Nov 16 20:40:46 CET 2007
Author: mikma
Date: 2007-11-16 20:40:46 +0100 (Fri, 16 Nov 2007)
New Revision: 3468
Modified:
trunk/build.d/build.local.example
trunk/libmcrypto/bootstrap
trunk/libmikey/bootstrap
trunk/libminisip-swig/bootstrap
trunk/libminisip/bootstrap
trunk/libmnetutil/bootstrap
trunk/libmsip/bootstrap
trunk/libmstun/bootstrap
trunk/libmutil/bootstrap
trunk/libzrtpcpp/bootstrap
trunk/milbc/bootstrap
trunk/minisip/bootstrap
trunk/ministun/bootstrap
Log:
AMVERS environment variable overrides the auto-detected automake version.
Modified: trunk/build.d/build.local.example
===================================================================
--- trunk/build.d/build.local.example 2007-11-16 19:17:08 UTC (rev 3467)
+++ trunk/build.d/build.local.example 2007-11-16 19:40:46 UTC (rev 3468)
@@ -14,6 +14,9 @@
# These options override the equivalent command line option defaults
# XXX: They also cause the command line options to be ignored.
+## Override environment
+# $ENV{AMVERS}="1.9";
+
## Override default path locations
## Note: these are not normally require and use sensible defaults.
##
Modified: trunk/libmcrypto/bootstrap
===================================================================
--- trunk/libmcrypto/bootstrap 2007-11-16 19:17:08 UTC (rev 3467)
+++ trunk/libmcrypto/bootstrap 2007-11-16 19:40:46 UTC (rev 3468)
@@ -14,7 +14,9 @@
# Check for automake
amvers="no"
-if automake-1.10 --version >/dev/null 2>&1; then
+if [ -n "$AMVERS" ]; then
+ amvers="-$AMVERS"
+elif automake-1.10 --version >/dev/null 2>&1; then
amvers="-1.10"
elif automake-1.9 --version >/dev/null 2>&1; then
amvers="-1.9"
Modified: trunk/libmikey/bootstrap
===================================================================
--- trunk/libmikey/bootstrap 2007-11-16 19:17:08 UTC (rev 3467)
+++ trunk/libmikey/bootstrap 2007-11-16 19:40:46 UTC (rev 3468)
@@ -14,7 +14,9 @@
# Check for automake
amvers="no"
-if automake-1.10 --version >/dev/null 2>&1; then
+if [ -n "$AMVERS" ]; then
+ amvers="-$AMVERS"
+elif automake-1.10 --version >/dev/null 2>&1; then
amvers="-1.10"
elif automake-1.9 --version >/dev/null 2>&1; then
amvers="-1.9"
Modified: trunk/libminisip/bootstrap
===================================================================
--- trunk/libminisip/bootstrap 2007-11-16 19:17:08 UTC (rev 3467)
+++ trunk/libminisip/bootstrap 2007-11-16 19:40:46 UTC (rev 3468)
@@ -14,7 +14,9 @@
# Check for automake
amvers="no"
-if automake-1.10 --version >/dev/null 2>&1; then
+if [ -n "$AMVERS" ]; then
+ amvers="-$AMVERS"
+elif automake-1.10 --version >/dev/null 2>&1; then
amvers="-1.10"
elif automake-1.9 --version >/dev/null 2>&1; then
amvers="-1.9"
Modified: trunk/libminisip-swig/bootstrap
===================================================================
--- trunk/libminisip-swig/bootstrap 2007-11-16 19:17:08 UTC (rev 3467)
+++ trunk/libminisip-swig/bootstrap 2007-11-16 19:40:46 UTC (rev 3468)
@@ -14,7 +14,9 @@
# Check for automake
amvers="no"
-if automake-1.10 --version >/dev/null 2>&1; then
+if [ -n "$AMVERS" ]; then
+ amvers="-$AMVERS"
+elif automake-1.10 --version >/dev/null 2>&1; then
amvers="-1.10"
elif automake-1.9 --version >/dev/null 2>&1; then
amvers="-1.9"
Modified: trunk/libmnetutil/bootstrap
===================================================================
--- trunk/libmnetutil/bootstrap 2007-11-16 19:17:08 UTC (rev 3467)
+++ trunk/libmnetutil/bootstrap 2007-11-16 19:40:46 UTC (rev 3468)
@@ -14,7 +14,9 @@
# Check for automake
amvers="no"
-if automake-1.10 --version >/dev/null 2>&1; then
+if [ -n "$AMVERS" ]; then
+ amvers="-$AMVERS"
+elif automake-1.10 --version >/dev/null 2>&1; then
amvers="-1.10"
elif automake-1.9 --version >/dev/null 2>&1; then
amvers="-1.9"
Modified: trunk/libmsip/bootstrap
===================================================================
--- trunk/libmsip/bootstrap 2007-11-16 19:17:08 UTC (rev 3467)
+++ trunk/libmsip/bootstrap 2007-11-16 19:40:46 UTC (rev 3468)
@@ -14,7 +14,9 @@
# Check for automake
amvers="no"
-if automake-1.10 --version >/dev/null 2>&1; then
+if [ -n "$AMVERS" ]; then
+ amvers="-$AMVERS"
+elif automake-1.10 --version >/dev/null 2>&1; then
amvers="-1.10"
elif automake-1.9 --version >/dev/null 2>&1; then
amvers="-1.9"
Modified: trunk/libmstun/bootstrap
===================================================================
--- trunk/libmstun/bootstrap 2007-11-16 19:17:08 UTC (rev 3467)
+++ trunk/libmstun/bootstrap 2007-11-16 19:40:46 UTC (rev 3468)
@@ -14,7 +14,9 @@
# Check for automake
amvers="no"
-if automake-1.10 --version >/dev/null 2>&1; then
+if [ -n "$AMVERS" ]; then
+ amvers="-$AMVERS"
+elif automake-1.10 --version >/dev/null 2>&1; then
amvers="-1.10"
elif automake-1.9 --version >/dev/null 2>&1; then
amvers="-1.9"
Modified: trunk/libmutil/bootstrap
===================================================================
--- trunk/libmutil/bootstrap 2007-11-16 19:17:08 UTC (rev 3467)
+++ trunk/libmutil/bootstrap 2007-11-16 19:40:46 UTC (rev 3468)
@@ -14,7 +14,9 @@
# Check for automake
amvers="no"
-if automake-1.10 --version >/dev/null 2>&1; then
+if [ -n "$AMVERS" ]; then
+ amvers="-$AMVERS"
+elif automake-1.10 --version >/dev/null 2>&1; then
amvers="-1.10"
elif automake-1.9 --version >/dev/null 2>&1; then
amvers="-1.9"
Modified: trunk/libzrtpcpp/bootstrap
===================================================================
--- trunk/libzrtpcpp/bootstrap 2007-11-16 19:17:08 UTC (rev 3467)
+++ trunk/libzrtpcpp/bootstrap 2007-11-16 19:40:46 UTC (rev 3468)
@@ -14,7 +14,9 @@
# Check for automake
amvers="no"
-if automake-1.10 --version >/dev/null 2>&1; then
+if [ -n "$AMVERS" ]; then
+ amvers="-$AMVERS"
+elif automake-1.10 --version >/dev/null 2>&1; then
amvers="-1.10"
elif automake-1.9 --version >/dev/null 2>&1; then
amvers="-1.9"
Modified: trunk/milbc/bootstrap
===================================================================
--- trunk/milbc/bootstrap 2007-11-16 19:17:08 UTC (rev 3467)
+++ trunk/milbc/bootstrap 2007-11-16 19:40:46 UTC (rev 3468)
@@ -14,7 +14,9 @@
# Check for automake
amvers="no"
-if automake-1.10 --version >/dev/null 2>&1; then
+if [ -n "$AMVERS" ]; then
+ amvers="-$AMVERS"
+elif automake-1.10 --version >/dev/null 2>&1; then
amvers="-1.10"
elif automake-1.9 --version >/dev/null 2>&1; then
amvers="-1.9"
Modified: trunk/minisip/bootstrap
===================================================================
--- trunk/minisip/bootstrap 2007-11-16 19:17:08 UTC (rev 3467)
+++ trunk/minisip/bootstrap 2007-11-16 19:40:46 UTC (rev 3468)
@@ -14,7 +14,9 @@
# Check for automake
amvers="no"
-if automake-1.10 --version >/dev/null 2>&1; then
+if [ -n "$AMVERS" ]; then
+ amvers="-$AMVERS"
+elif automake-1.10 --version >/dev/null 2>&1; then
amvers="-1.10"
elif automake-1.9 --version >/dev/null 2>&1; then
amvers="-1.9"
Modified: trunk/ministun/bootstrap
===================================================================
--- trunk/ministun/bootstrap 2007-11-16 19:17:08 UTC (rev 3467)
+++ trunk/ministun/bootstrap 2007-11-16 19:40:46 UTC (rev 3468)
@@ -14,7 +14,9 @@
# Check for automake
amvers="no"
-if automake-1.10 --version >/dev/null 2>&1; then
+if [ -n "$AMVERS" ]; then
+ amvers="-$AMVERS"
+elif automake-1.10 --version >/dev/null 2>&1; then
amvers="-1.10"
elif automake-1.9 --version >/dev/null 2>&1; then
amvers="-1.9"
More information about the Minisip-devel
mailing list