declare smobs in alloc.c

[bpt/emacs.git] / autogen.sh

diff --git a/autogen.sh b/autogen.sh
index 880f21f..48e6d19 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -50,7 +50,7 @@ automake_min=`sed -n 's/^ *AM_INIT_AUTOMAKE(\([0-9\.]*\)).*/\1/p' configure.ac`
 get_version ()
 {
     ## Remove eg "./autogen.sh: line 50: autoconf: command not found".
 get_version ()
 {
     ## Remove eg "./autogen.sh: line 50: autoconf: command not found".

-    $1 --version 2>&1 | sed -e '/not found/d' -n -e '1 s/.* \([1-9][0-9\.]*\).*/\1/p'
+    $1 --version 2>&1 | sed -e '/not found/d' -e 's/.* //' -n -e '1 s/\([0-9][0-9\.]*\).*/\1/p'

 }
 
 ## $1 = version string, eg "2.59"
 }
 
 ## $1 = version string, eg "2.59"


@@ -76,7 +76,7 @@ minor_version ()
 check_version ()
 {
     ## Respect eg $AUTOMAKE if it is set, like autoreconf does.
 check_version ()
 {
     ## Respect eg $AUTOMAKE if it is set, like autoreconf does.

-    uprog=`echo $1 | sed 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
+    uprog=`echo $1 | sed -e 's/-/_/g' -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`

 
     eval uprog=\$${uprog}
 
 
     eval uprog=\$${uprog}
 


@@ -114,7 +114,9 @@ missing=
 
 for prog in $progs; do
 
 
 for prog in $progs; do
 

-    eval min=\$${prog}_min
+    sprog=`echo "$prog" | sed 's/-/_/g'`
+
+    eval min=\$${sprog}_min

 
     echo "Checking for $prog (need at least version $min)..."
 
 
     echo "Checking for $prog (need at least version $min)..."
 


@@ -133,7 +135,7 @@ for prog in $progs; do
 
     if [ $retval -ne 0 ]; then
         missing="$missing $prog"
 
     if [ $retval -ne 0 ]; then
         missing="$missing $prog"

-        eval ${prog}_why=\""$stat"\"
+        eval ${sprog}_why=\""$stat"\"

     fi
 
 done
     fi
 
 done


@@ -147,7 +149,9 @@ Building Emacs from Bzr requires the following specialized programs:
 EOF
 
     for prog in $progs; do
 EOF
 
     for prog in $progs; do

-        eval min=\$${prog}_min
+        sprog=`echo "$prog" | sed 's/-/_/g'`
+
+        eval min=\$${sprog}_min

 
         echo "$prog (minimum version $min)"
     done
 
         echo "$prog (minimum version $min)"
     done


@@ -159,7 +163,9 @@ Your system seems to be missing the following tool(s):
 EOF
 
     for prog in $missing; do
 EOF
 
     for prog in $missing; do

-        eval why=\$${prog}_why
+        sprog=`echo "$prog" | sed 's/-/_/g'`
+
+        eval why=\$${sprog}_why

 
         echo "$prog ($why)"
     done
 
         echo "$prog ($why)"
     done


@@ -188,7 +194,7 @@ this script.
 If you know that the required versions are in your PATH, but this
 script has made an error, then you can simply run
 
 If you know that the required versions are in your PATH, but this
 script has made an error, then you can simply run
 

-autoreconf -i -I m4
+autoreconf -fi -I m4

 
 instead of this script.
 
 
 instead of this script.
 


@@ -198,18 +204,19 @@ EOF
     exit 1
 fi
 
     exit 1
 fi
 

-echo "Your system has the required tools, running autoreconf..."
+echo 'Your system has the required tools.'
+echo "Running 'autoreconf -fi -I m4' ..."

 
 
 ## Let autoreconf figure out what, if anything, needs doing.
 ## Use autoreconf's -f option in case autoreconf itself has changed.
 
 
 ## Let autoreconf figure out what, if anything, needs doing.
 ## Use autoreconf's -f option in case autoreconf itself has changed.

-autoreconf -f -i -I m4 || exit $?
+autoreconf -fi -I m4 || exit $?

 
 ## Create a timestamp, so that './autogen.sh; make' doesn't
 ## cause 'make' to needlessly run 'autoheader'.
 echo timestamp > src/stamp-h.in || exit
 
 
 ## Create a timestamp, so that './autogen.sh; make' doesn't
 ## cause 'make' to needlessly run 'autoheader'.
 echo timestamp > src/stamp-h.in || exit
 

-echo "You can now run \`./configure'."
+echo "You can now run './configure'."

 
 exit 0
 
 
 exit 0