HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge from trunk.
[bpt/emacs.git]
/
autogen.sh
diff --git
a/autogen.sh
b/autogen.sh
index
d15817d
..
e7c28c1
100755
(executable)
--- a/
autogen.sh
+++ b/
autogen.sh
@@
-1,7
+1,7
@@
#!/bin/sh
### autogen.sh - tool to help build Emacs from a bzr checkout
#!/bin/sh
### autogen.sh - tool to help build Emacs from a bzr checkout
-## Copyright (C) 2011
Free Software Foundation, Inc.
+## Copyright (C) 2011
-2013
Free Software Foundation, Inc.
## Author: Glenn Morris <rgm@gnu.org>
## Author: Glenn Morris <rgm@gnu.org>
@@
-34,10
+34,11
@@
progs="autoconf automake"
## Minimum versions we need:
progs="autoconf automake"
## Minimum versions we need:
-autoconf_min=`sed -n 's/^ *AC_PREREQ(\([0-9\.]*\)).*/\1/p' configure.
in
`
+autoconf_min=`sed -n 's/^ *AC_PREREQ(\([0-9\.]*\)).*/\1/p' configure.
ac
`
-## FIXME how to determine this from the sources?
-automake_min=1.11
+## This will need improving if more options are ever added to the
+## AM_INIT_AUTOMAKE call.
+automake_min=`sed -n 's/^ *AM_INIT_AUTOMAKE(\([0-9\.]*\)).*/\1/p' configure.ac`
## $1 = program, eg "autoconf".
## $1 = program, eg "autoconf".
@@
-67,7
+68,7
@@
minor_version ()
## $1 = program
## $2 = minimum version.
## $1 = program
## $2 = minimum version.
-## Return 0 if program is present with version >= min
u
mum version.
+## Return 0 if program is present with version >= min
i
mum version.
## Return 1 if program is missing.
## Return 2 if program is present but too old.
## Return 3 for unexpected error (eg failed to parse version).
## Return 1 if program is missing.
## Return 2 if program is present but too old.
## Return 3 for unexpected error (eg failed to parse version).
@@
-209,6
+210,10
@@
echo "Your system has the required tools, running autoreconf..."
## Let autoreconf figure out what, if anything, needs doing.
autoreconf -i -I m4 || exit $?
## Let autoreconf figure out what, if anything, needs doing.
autoreconf -i -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
+
echo "You can now run \`./configure'."
exit 0
echo "You can now run \`./configure'."
exit 0