Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Xiph.Org
Vorbis
Commits
62cdea16
Commit
62cdea16
authored
Jun 07, 2007
by
Ralph Giles
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update autogen.sh to handle automake 1.10.
svn path=/trunk/vorbis/; revision=13069
parent
3eeb6c97
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
16 additions
and
11 deletions
+16
-11
autogen.sh
autogen.sh
+16
-11
No files found.
autogen.sh
View file @
62cdea16
...
...
@@ -20,9 +20,10 @@ echo "checking for autoconf... "
DIE
=
1
}
VERSIONGREP
=
"sed -e s/.*[^0-9
\.
]
\(
[0-9]
\.
[0-9]
\)
.*/
\1
/"
VERSIONMKINT
=
"sed -e s/[^0-9]//"
VERSIONGREP
=
"sed -e s/.*[^0-9
\.
]
\(
[0-9][0-9]*
\.
[0-9][0-9]*
\)
.*/
\1
/"
VERSIONMKMAJ
=
"sed -e s/
\(
[0-9][0-9]*
\)
[^0-9].*/
\\
1/"
VERSIONMKMIN
=
"sed -e s/.*[0-9][0-9]*
\.
//"
# do we need automake?
if
test
-r
Makefile.am
;
then
AM_OPTIONS
=
`
fgrep AUTOMAKE_OPTIONS Makefile.am
`
...
...
@@ -42,12 +43,15 @@ if test -r Makefile.am; then
fi
else
echo
-n
"checking for automake
$AM_NEEDED
or later... "
majneeded
=
`
echo
$AM_NEEDED
|
$VERSIONMKMAJ
`
minneeded
=
`
echo
$AM_NEEDED
|
$VERSIONMKMIN
`
for
am
in
automake-
$AM_NEEDED
automake
$AM_NEEDED
\
automake automake-1.7 automake-1.8 automake-1.9
;
do
automake automake-1.7 automake-1.8 automake-1.9
automake-1.10
;
do
(
$am
--version
< /dev/null
>
/dev/null 2>&1
)
||
continue
ver
=
`
$am
--version
< /dev/null |
head
-n
1 |
$VERSIONGREP
|
$VERSIONMKINT
`
verneeded
=
`
echo
$AM_NEEDED
|
$VERSIONMKINT
`
if
test
$ver
-ge
$verneeded
;
then
ver
=
`
$am
--version
< /dev/null |
head
-n
1 |
$VERSIONGREP
`
maj
=
`
echo
$ver
|
$VERSIONMKMAJ
`
min
=
`
echo
$ver
|
$VERSIONMKMIN
`
if
test
$maj
-eq
$majneeded
-a
$min
-ge
$minneeded
;
then
AUTOMAKE
=
$am
echo
$AUTOMAKE
break
...
...
@@ -56,11 +60,12 @@ if test -r Makefile.am; then
test
-z
$AUTOMAKE
&&
echo
"no"
echo
-n
"checking for aclocal
$AM_NEEDED
or later... "
for
ac
in
aclocal-
$AM_NEEDED
aclocal
$AM_NEEDED
\
aclocal aclocal-1.7 aclocal-1.8 aclocal-1.9
;
do
aclocal aclocal-1.7 aclocal-1.8 aclocal-1.9
aclocal-1.10
;
do
(
$ac
--version
< /dev/null
>
/dev/null 2>&1
)
||
continue
ver
=
`
$ac
--version
< /dev/null |
head
-n
1 |
$VERSIONGREP
|
$VERSIONMKINT
`
verneeded
=
`
echo
$AM_NEEDED
|
$VERSIONMKINT
`
if
test
$ver
-ge
$verneeded
;
then
ver
=
`
$ac
--version
< /dev/null |
head
-n
1 |
$VERSIONGREP
`
maj
=
`
echo
$ver
|
$VERSIONMKMAJ
`
min
=
`
echo
$ver
|
$VERSIONMKMIN
`
if
test
$maj
-eq
$majneeded
-a
$min
-ge
$minneeded
;
then
ACLOCAL
=
$ac
echo
$ACLOCAL
break
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment