X-Git-Url: http://sjero.net/git/?p=linphone;a=blobdiff_plain;f=autogen.sh;h=3bb716755f6bc81d75f16e9aba19f49935f6757c;hp=a8bd1ca1ea1e87aa6d8618271f2d70fd99f318cf;hb=6fcf76e405a695f86a446f430903682f42155f43;hpb=1be210a99531b0b343d8cce750e8e5b542216c01

diff --git a/autogen.sh b/autogen.sh
index a8bd1ca1..3bb71675 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-AM_VERSION="1.10"
+#AM_VERSION="1.10"
 if ! type aclocal-$AM_VERSION 1>/dev/null 2>&1; then
 	# automake-1.10 (recommended) is not available on Fedora 8
 	AUTOMAKE=automake
@@ -20,6 +20,10 @@ if test -d /opt/local/share/aclocal ; then
         ACLOCAL_ARGS="-I /opt/local/share/aclocal"
 fi
 
+if test -d /share/aclocal ; then
+        ACLOCAL_ARGS="$ACLOCAL_ARGS -I /share/aclocal"
+fi
+
 if test -f /opt/local/bin/intltoolize ; then
 	#darwin
 	INTLTOOLIZE=/opt/local/bin/intltoolize
@@ -38,8 +42,12 @@ autoheader
 $AUTOMAKE --force-missing --add-missing --copy
 autoconf
 
-echo "Generating build scripts in oRTP..."
-cd oRTP && ./autogen.sh && cd -
+if [ -x oRTP/autogen.sh ]; then
+	echo "Generating build scripts in oRTP..."
+	( cd oRTP && ./autogen.sh )
+fi
 
-echo "Generating build scripts in mediastreamer2..."
-cd mediastreamer2 && ./autogen.sh && cd -
+if [ -x mediastreamer2/autogen.sh ]; then
+	echo "Generating build scripts in mediastreamer2..."
+	( cd mediastreamer2 && ./autogen.sh )
+fi