Hi, this adds automake 1.10 support. It disables some new warnings (we always required GNU Make anyway) and adopts the new LDFLAGS rules of 1.10.
2007-04-05 Mark Wielaard <[EMAIL PROTECTED]> * 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. Committed, Mark
Index: autogen.sh =================================================================== RCS file: /cvsroot/classpath/classpath/autogen.sh,v retrieving revision 1.16 diff -u -r1.16 autogen.sh --- autogen.sh 15 Dec 2006 21:31:31 -0000 1.16 +++ autogen.sh 5 Apr 2007 11:26:59 -0000 @@ -62,14 +62,14 @@ 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 Index: configure.ac =================================================================== RCS file: /cvsroot/classpath/classpath/configure.ac,v retrieving revision 1.200 diff -u -r1.200 configure.ac --- configure.ac 20 Mar 2007 17:17:01 -0000 1.200 +++ configure.ac 5 Apr 2007 11:26:59 -0000 @@ -37,7 +37,7 @@ AC_SUBST(CLASSPATH_CONVENIENCE) AC_PREREQ(2.59) -AM_INIT_AUTOMAKE([1.9.0 gnu std-options tar-ustar]) +AM_INIT_AUTOMAKE([1.9.0 gnu std-options tar-ustar -Wno-portability]) AC_CONFIG_HEADERS([include/config.h]) AC_PREFIX_DEFAULT(/usr/local/classpath) Index: native/jawt/Makefile.am =================================================================== RCS file: /cvsroot/classpath/classpath/native/jawt/Makefile.am,v retrieving revision 1.8 diff -u -r1.8 Makefile.am --- native/jawt/Makefile.am 28 Jul 2006 23:37:11 -0000 1.8 +++ native/jawt/Makefile.am 5 Apr 2007 11:27:00 -0000 @@ -2,7 +2,7 @@ libjawt_la_SOURCES = jawt.c libjawt_la_LIBADD = $(top_builddir)/native/jni/gtk-peer/libgtkpeer.la -libjawt_la_LDFLAGS = -avoid-version +libjawt_la_LDFLAGS = $(AM_LDFLAGS) -avoid-version AM_LDFLAGS = @CLASSPATH_MODULE@ @GTK_LIBS@ @PANGOFT2_LIBS@ @X_LIBS@ @XTEST_LIBS@ AM_CPPFLAGS = @CLASSPATH_INCLUDES@ Index: native/jni/gconf-peer/Makefile.am =================================================================== RCS file: /cvsroot/classpath/classpath/native/jni/gconf-peer/Makefile.am,v retrieving revision 1.5 diff -u -r1.5 Makefile.am --- native/jni/gconf-peer/Makefile.am 25 Sep 2006 21:02:26 -0000 1.5 +++ native/jni/gconf-peer/Makefile.am 5 Apr 2007 11:27:00 -0000 @@ -5,7 +5,7 @@ libgconfpeer_la_LIBADD = $(top_builddir)/native/jni/classpath/native_state.lo \ $(top_builddir)/native/jni/classpath/jcl.lo -libgconfpeer_la_LDFLAGS = -avoid-version +libgconfpeer_la_LDFLAGS = $(AM_LDFLAGS) -avoid-version AM_LDFLAGS = @CLASSPATH_MODULE@ @GCONF_LIBS@ @GDK_LIBS@ Index: native/jni/gtk-peer/Makefile.am =================================================================== RCS file: /cvsroot/classpath/classpath/native/jni/gtk-peer/Makefile.am,v retrieving revision 1.50 diff -u -r1.50 Makefile.am --- native/jni/gtk-peer/Makefile.am 3 Apr 2007 19:33:45 -0000 1.50 +++ native/jni/gtk-peer/Makefile.am 5 Apr 2007 11:27:00 -0000 @@ -48,7 +48,7 @@ libgtkpeer_la_LIBADD = $(top_builddir)/native/jni/classpath/native_state.lo \ $(top_builddir)/native/jni/classpath/jcl.lo -libgtkpeer_la_LDFLAGS = -avoid-version +libgtkpeer_la_LDFLAGS = $(AM_LDFLAGS) -avoid-version AM_LDFLAGS = @CLASSPATH_MODULE@ @GTK_LIBS@ @FREETYPE2_LIBS@ \ @PANGOFT2_LIBS@ @X_PRE_LIBS@ @X_LIBS@ @X_EXTRA_LIBS@ @XTEST_LIBS@ Index: native/jni/midi-alsa/Makefile.am =================================================================== RCS file: /cvsroot/classpath/classpath/native/jni/midi-alsa/Makefile.am,v retrieving revision 1.4 diff -u -r1.4 Makefile.am --- native/jni/midi-alsa/Makefile.am 28 Jul 2006 23:37:11 -0000 1.4 +++ native/jni/midi-alsa/Makefile.am 5 Apr 2007 11:27:00 -0000 @@ -5,7 +5,7 @@ gnu_javax_sound_midi_alsa_AlsaMidiDeviceProvider.c libgjsmalsa_la_LIBADD = -lasound -libgjsmalsa_la_LDFLAGS = -avoid-version +libgjsmalsa_la_LDFLAGS = $(AM_LDFLAGS) -avoid-version AM_LDFLAGS = @CLASSPATH_MODULE@ AM_CPPFLAGS = @CLASSPATH_INCLUDES@ `pkg-config --cflags-only-I alsa` Index: native/jni/midi-dssi/Makefile.am =================================================================== RCS file: /cvsroot/classpath/classpath/native/jni/midi-dssi/Makefile.am,v retrieving revision 1.8 diff -u -r1.8 Makefile.am --- native/jni/midi-dssi/Makefile.am 26 Nov 2006 20:31:03 -0000 1.8 +++ native/jni/midi-dssi/Makefile.am 5 Apr 2007 11:27:00 -0000 @@ -5,7 +5,7 @@ dssi_data.h libgjsmdssi_la_LIBADD = $(top_builddir)/native/jni/classpath/jcl.lo -ljack -libgjsmdssi_la_LDFLAGS = -avoid-version +libgjsmdssi_la_LDFLAGS = $(AM_LDFLAGS) -avoid-version AM_LDFLAGS = @CLASSPATH_MODULE@ AM_CPPFLAGS = @CLASSPATH_INCLUDES@ Index: native/jni/qt-peer/Makefile.am =================================================================== RCS file: /cvsroot/classpath/classpath/native/jni/qt-peer/Makefile.am,v retrieving revision 1.7 diff -u -r1.7 Makefile.am --- native/jni/qt-peer/Makefile.am 31 Jul 2006 13:50:38 -0000 1.7 +++ native/jni/qt-peer/Makefile.am 5 Apr 2007 11:27:00 -0000 @@ -72,7 +72,7 @@ qtwindowpeer.cpp \ slotcallbacks.cpp \ slotcallbacks.h -libqtpeer_la_LDFLAGS = -avoid-version +libqtpeer_la_LDFLAGS = $(AM_LDFLAGS) -avoid-version BUILT_SOURCES = $(libqtpeer_la_MOC)
