This turns off the native java.math libraries if GMP is not found
or asked for.

ChangeLog:

2008-03-03  Andrew John Hughes  <[EMAIL PROTECTED]>

        PR classpath/28664
        * native/jni/Makefile.am: Check CREATE_GMPBI_LIBRARY
        and only compile GMP libraries if set.

-- 
Andrew :)

Support Free Java!
Contribute to GNU Classpath and the OpenJDK
http://www.gnu.org/software/classpath
http://openjdk.java.net
PGP Key: 94EFD9D8 (http://subkeys.pgp.net)
Fingerprint = F8EF F1EA 401E 2E60 15FA  7927 142C 2591 94EF D9D8
Index: native/jni/Makefile.am
===================================================================
RCS file: /sources/classpath/classpath/native/jni/Makefile.am,v
retrieving revision 1.22
diff -u -3 -p -u -r1.22 Makefile.am
--- native/jni/Makefile.am	2 Mar 2008 22:50:34 -0000	1.22
+++ native/jni/Makefile.am	3 Mar 2008 02:10:12 -0000
@@ -1,7 +1,7 @@
 ## Input file for automake to generate the Makefile.in used by configure
 
 if CREATE_CORE_JNI_LIBRARIES
-  JNIDIRS = native-lib java-io java-lang java-math java-net java-nio java-util
+  JNIDIRS = native-lib java-io java-lang java-net java-nio java-util
 endif
 
 if CREATE_ALSA_LIBRARIES
@@ -32,11 +32,14 @@ if CREATE_XMLJ_LIBRARY
   XMLJDIR = xmlj
 endif
 
+if CREATE_GMPBI_LIBRARY
+  GMPDIR = java-math
+endif
+
 SUBDIRS = classpath $(JNIDIRS) \
   $(ALSADIR) $(DSSIDIR) $(GTKDIR) $(CLASSPATH_QT_PEER_DIR) $(XMLJDIR) \
-  $(CLASSPATH_GCONF_PEER_DIR) $(CLASSPATH_GSTREAMER_PEER_DIR)
-DIST_SUBDIRS = classpath java-io java-lang java-net java-nio java-util \
-               java-math \
+  $(CLASSPATH_GCONF_PEER_DIR) $(CLASSPATH_GSTREAMER_PEER_DIR) $(GMPDIR)
+DIST_SUBDIRS = classpath java-io java-lang java-math java-net java-nio java-util \
                gtk-peer gconf-peer gstreamer-peer qt-peer xmlj midi-alsa \
                midi-dssi native-lib
 

Attachment: signature.asc
Description: Digital signature

Reply via email to