diff options
| author | Mark Wielaard <mark@klomp.org> | 2007-04-05 12:05:47 +0000 |
|---|---|---|
| committer | Mark Wielaard <mark@klomp.org> | 2007-04-05 12:05:47 +0000 |
| commit | f1549145d7d7753cf229ce799656c2d9a0aa45b1 (patch) | |
| tree | 7f5d07d3d8dd8496484c285664f30d9785f66163 /autogen.sh | |
| parent | e80ab36f051362974b356490563a9f2af8261a76 (diff) | |
| download | classpath-f1549145d7d7753cf229ce799656c2d9a0aa45b1.tar.gz | |
* autogen.sh: Recognize automake 1.10.
* configure.ac (AM_INIT_AUTOMAKE): Add -Wno-portability.
* native/jawt/Makefile.am (libjawt_la_LDFLAGS): Add AM_LDFLAGS.
* native/jni/gconf-peer/Makefile.am (libgconfpeer_la_LDFLAGS): Likewise.
* native/jni/gtk-peer/Makefile.am (libgtkpeer_la_LDFLAGS): Likewise.
* native/jni/midi-alsa/Makefile.am (libgjsmalsa_la_LDFLAGS): Likewise.
* native/jni/midi-dssi/Makefile.am (libgjsmdssi_la_LDFLAGS): Likewise.
* native/jni/qt-peer/Makefile.am (libqtpeer_la_LDFLAGS): Likewise.
Diffstat (limited to 'autogen.sh')
| -rwxr-xr-x | autogen.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/autogen.sh b/autogen.sh index 21d2917e0..eb94e2258 100755 --- a/autogen.sh +++ b/autogen.sh @@ -62,14 +62,14 @@ elif automake --version < /dev/null > /dev/null 2>&1 ; then ACLOCAL=aclocal automake_version=`automake --version | sed 's/^[^0-9]*\([0-9.][0-9.]*\).*/\1/'` case $automake_version in - 1.9*) + 1.9* | 1.10*) have_automake=true ;; esac fi if $have_automake ; then : ; else echo - echo "You must have automake 1.9 installed to compile $PROJECT." + echo "You must have automake 1.9 or 1.10 installed to compile $PROJECT." echo "Install the appropriate package for your distribution," echo "or get the source tarball at http://ftp.gnu.org/gnu/automake/" DIE=1 |