From f1549145d7d7753cf229ce799656c2d9a0aa45b1 Mon Sep 17 00:00:00 2001 From: Mark Wielaard Date: Thu, 5 Apr 2007 12:05:47 +0000 Subject: * 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. --- ChangeLog | 11 +++++++++++ autogen.sh | 4 ++-- configure.ac | 2 +- native/jawt/Makefile.am | 2 +- native/jni/gconf-peer/Makefile.am | 2 +- native/jni/gtk-peer/Makefile.am | 2 +- native/jni/midi-alsa/Makefile.am | 2 +- native/jni/midi-dssi/Makefile.am | 2 +- native/jni/qt-peer/Makefile.am | 2 +- 9 files changed, 20 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9079957fc..948f51f30 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2007-04-05 Mark Wielaard + + * 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. + 2007-04-04 Mark Wielaard * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkImage.c 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 diff --git a/configure.ac b/configure.ac index 259a6b3c1..a90d6a3e8 100644 --- a/configure.ac +++ b/configure.ac @@ -37,7 +37,7 @@ CLASSPATH_CONVENIENCE="-no-undefined" 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) diff --git a/native/jawt/Makefile.am b/native/jawt/Makefile.am index c81e75429..87dcc9b0b 100644 --- a/native/jawt/Makefile.am +++ b/native/jawt/Makefile.am @@ -2,7 +2,7 @@ nativeexeclib_LTLIBRARIES = libjawt.la 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@ diff --git a/native/jni/gconf-peer/Makefile.am b/native/jni/gconf-peer/Makefile.am index 1c8c4a147..3008b3d7a 100644 --- a/native/jni/gconf-peer/Makefile.am +++ b/native/jni/gconf-peer/Makefile.am @@ -5,7 +5,7 @@ libgconfpeer_la_SOURCES = GConfNativePeer.c 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@ diff --git a/native/jni/gtk-peer/Makefile.am b/native/jni/gtk-peer/Makefile.am index 3084c97e4..15f865d4f 100644 --- a/native/jni/gtk-peer/Makefile.am +++ b/native/jni/gtk-peer/Makefile.am @@ -48,7 +48,7 @@ libgtkpeer_la_SOURCES = gnu_java_awt_peer_gtk_CairoSurface.c \ 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@ diff --git a/native/jni/midi-alsa/Makefile.am b/native/jni/midi-alsa/Makefile.am index 4a9c48442..60c7a5af5 100644 --- a/native/jni/midi-alsa/Makefile.am +++ b/native/jni/midi-alsa/Makefile.am @@ -5,7 +5,7 @@ gnu_javax_sound_midi_alsa_AlsaPortDevice.c \ 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` diff --git a/native/jni/midi-dssi/Makefile.am b/native/jni/midi-dssi/Makefile.am index 692579d46..200649431 100644 --- a/native/jni/midi-dssi/Makefile.am +++ b/native/jni/midi-dssi/Makefile.am @@ -5,7 +5,7 @@ libgjsmdssi_la_SOURCES = gnu_javax_sound_midi_dssi_DSSIMidiDeviceProvider.c \ 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@ diff --git a/native/jni/qt-peer/Makefile.am b/native/jni/qt-peer/Makefile.am index b123ed36e..d0c2f32b2 100644 --- a/native/jni/qt-peer/Makefile.am +++ b/native/jni/qt-peer/Makefile.am @@ -72,7 +72,7 @@ libqtpeer_la_SOURCES = \ qtwindowpeer.cpp \ slotcallbacks.cpp \ slotcallbacks.h -libqtpeer_la_LDFLAGS = -avoid-version +libqtpeer_la_LDFLAGS = $(AM_LDFLAGS) -avoid-version BUILT_SOURCES = $(libqtpeer_la_MOC) -- cgit v1.2.1