Index: configure.ac
===================================================================
RCS file: /cvsroot/classpath/classpath/configure.ac,v
retrieving revision 1.18
diff -u -r1.18 configure.ac
--- configure.ac	12 Apr 2004 05:51:58 -0000	1.18
+++ configure.ac	12 Apr 2004 08:56:06 -0000
@@ -21,6 +21,8 @@
 dnl at which time we'll have to be more anal about such things
 dnl -----------------------------------------------------------
 AC_SUBST(LIBVERSION, "0:0:0")
+CLASSPATH_MODULE="-module -version-info ${LIBVERSION}"
+AC_SUBST(CLASSPATH_MODULE)
 
 AC_PREREQ(2.59)
 AM_INIT_AUTOMAKE(1.7.0)
Index: native/fdlibm/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/native/fdlibm/Makefile.am,v
retrieving revision 1.4
diff -u -r1.4 Makefile.am
--- native/fdlibm/Makefile.am	10 Apr 2004 13:10:29 -0000	1.4
+++ native/fdlibm/Makefile.am	12 Apr 2004 08:56:06 -0000
@@ -45,7 +45,7 @@
 			w_remainder.c \
 			w_sqrt.c 
 
-libfdlibm_la_LDFLAGS = -module -version-info @LIBVERSION@ 
+libfdlibm_la_LDFLAGS = @CLASSPATH_MODULE@ 
 
 # We just want the standard flags for fdlibm since it is an upstream lib
 # and our normal -ansi -pedantic -Wall -Werror breaks this lib.
Index: native/jni/classpath/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/classpath/Makefile.am,v
retrieving revision 1.1
diff -u -r1.1 Makefile.am
--- native/jni/classpath/Makefile.am	5 Nov 2001 03:03:27 -0000	1.1
+++ native/jni/classpath/Makefile.am	12 Apr 2004 08:56:06 -0000
@@ -5,7 +5,7 @@
 				primlib.c primlib.h \
 				native_state.c native_state.h
 
-libclasspath_la_LDFLAGS = -module -version-info @LIBVERSION@
+libclasspath_la_LDFLAGS = @CLASSPATH_MODULE@
 
 INCLUDES =  -I. @EXTRA_INCLUDES@ \
 	    -I$(top_srcdir)/include \
Index: native/jni/gtk-peer/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/gtk-peer/Makefile.am,v
retrieving revision 1.7
diff -u -r1.7 Makefile.am
--- native/jni/gtk-peer/Makefile.am	12 Feb 2004 16:53:09 -0000	1.7
+++ native/jni/gtk-peer/Makefile.am	12 Apr 2004 08:56:06 -0000
@@ -36,7 +36,7 @@
 			gtkpeer.h 
 
 libgtkpeer_la_LIBADD = $(top_builddir)/native/jni/classpath/native_state.lo
-libgtkpeer_la_LDFLAGS = -module -version-info @LIBVERSION@ @GTK_LIBS@
+libgtkpeer_la_LDFLAGS = @CLASSPATH_MODULE@ @GTK_LIBS@
 
 INCLUDES = -I. @EXTRA_INCLUDES@ \
 	   @GTK_CFLAGS@ \
Index: native/jni/java-awt/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/java-awt/Makefile.am,v
retrieving revision 1.1
diff -u -r1.1 Makefile.am
--- native/jni/java-awt/Makefile.am	12 Feb 2004 16:53:09 -0000	1.1
+++ native/jni/java-awt/Makefile.am	12 Apr 2004 08:56:06 -0000
@@ -3,7 +3,7 @@
 libjavaawt_la_SOURCES = gnu_java_awt_EmbeddedWindow.c
 			
 
-libjavaawt_la_LDFLAGS = -module -version-info @LIBVERSION@
+libjavaawt_la_LDFLAGS = @CLASSPATH_MODULE@
 libjavaawt_la_LIBADD = $(top_builddir)/native/jni/classpath/jcl.lo
 
 INCLUDES = -I. @EXTRA_INCLUDES@ \
Index: native/jni/java-io/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/java-io/Makefile.am,v
retrieving revision 1.13
diff -u -r1.13 Makefile.am
--- native/jni/java-io/Makefile.am	15 Mar 2004 23:08:48 -0000	1.13
+++ native/jni/java-io/Makefile.am	12 Apr 2004 08:56:06 -0000
@@ -7,7 +7,7 @@
 			java_io_ObjectInputStream.c \
 			java_io_VMObjectStreamClass.c
 
-libjavaio_la_LDFLAGS = -module -version-info @LIBVERSION@ 
+libjavaio_la_LDFLAGS = @CLASSPATH_MODULE@ 
 
 libjavaio_la_LIBADD = $(top_builddir)/native/jni/classpath/jcl.lo
 INCLUDES = -I. @EXTRA_INCLUDES@ \
Index: native/jni/java-lang/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/java-lang/Makefile.am,v
retrieving revision 1.6
diff -u -r1.6 Makefile.am
--- native/jni/java-lang/Makefile.am	16 Jul 2003 12:21:07 -0000	1.6
+++ native/jni/java-lang/Makefile.am	12 Apr 2004 08:56:06 -0000
@@ -11,8 +11,8 @@
 
 libjavalang_la_LIBADD = $(wildcard $(top_builddir)/native/fdlibm/*.lo) \
 			$(top_builddir)/native/jni/classpath/jcl.lo
-libjavalang_la_LDFLAGS = -module -version-info @LIBVERSION@
-libjavalangreflect_la_LDFLAGS = -module -version-info @LIBVERSION@
+libjavalang_la_LDFLAGS = @CLASSPATH_MODULE@
+libjavalangreflect_la_LDFLAGS = @CLASSPATH_MODULE@
 
 INCLUDES = -I. @EXTRA_INCLUDES@ \
 	   -I$(top_srcdir)/native/jni/classpath \
Index: native/jni/java-net/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/java-net/Makefile.am,v
retrieving revision 1.5
diff -u -r1.5 Makefile.am
--- native/jni/java-net/Makefile.am	19 Sep 2003 06:12:39 -0000	1.5
+++ native/jni/java-net/Makefile.am	12 Apr 2004 08:56:06 -0000
@@ -7,7 +7,7 @@
 			gnu_java_net_PlainDatagramSocketImpl.c \
                         gnu_java_net_PlainSocketImpl.c
 
-libjavanet_la_LDFLAGS = -module -version-info @LIBVERSION@
+libjavanet_la_LDFLAGS = @CLASSPATH_MODULE@
 libjavanet_la_LIBADD = $(top_builddir)/native/jni/classpath/jcl.lo
 
 INCLUDES = -I. @EXTRA_INCLUDES@ \
Index: native/jni/java-nio/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/java-nio/Makefile.am,v
retrieving revision 1.4
diff -u -r1.4 Makefile.am
--- native/jni/java-nio/Makefile.am	8 Apr 2004 23:11:20 -0000	1.4
+++ native/jni/java-nio/Makefile.am	12 Apr 2004 08:56:06 -0000
@@ -7,7 +7,7 @@
 			java_nio_DirectByteBufferImpl.c \
 			java_nio_FileLockImpl.c
 
-libjavanio_la_LDFLAGS = -module -version-info @LIBVERSION@
+libjavanio_la_LDFLAGS = @CLASSPATH_MODULE@
 libjavanio_la_LIBADD = $(top_builddir)/native/jni/classpath/jcl.lo
 
 INCLUDES = -I. @EXTRA_INCLUDES@ \
Index: native/jni/java-util/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/java-util/Makefile.am,v
retrieving revision 1.3
diff -u -r1.3 Makefile.am
--- native/jni/java-util/Makefile.am	9 Feb 2002 21:32:16 -0000	1.3
+++ native/jni/java-util/Makefile.am	12 Apr 2004 08:56:06 -0000
@@ -2,7 +2,7 @@
 
 libjavautil_la_SOURCES = java_util_TimeZone.c
 
-libjavautil_la_LDFLAGS = -module -version-info @LIBVERSION@
+libjavautil_la_LDFLAGS = @CLASSPATH_MODULE@
 
 INCLUDES = -I. @EXTRA_INCLUDES@ \
            -I$(top_srcdir)/include \