[kaffe] CVS kaffe (dalibor): Disabled building of peerless AWT by default

Kaffe CVS cvs-commits at kaffe.org
Mon Sep 6 10:49:11 PDT 2004 

PatchSet 5146 
Date: 2004/09/06 17:36:58
Author: dalibor
Branch: HEAD
Tag: (none) 
Log:
Disabled building of peerless AWT by default

2004-09-06  Dalibor Topic  <robilad at kaffe.org>

        * configure.ac:
        Do not build the X and QT AWT backends by default.

        * libraries/javalib/Makefile.am.in:
        Do not build peerless AWT class library unless
        a peerless AWT backend is chosen.

        * configure,
        libraries/javalib/Makefile.am,
        libraries/javalib/Makefile.in:
        Regenerated.

Members: 
	ChangeLog:1.2702->1.2703 
	configure:1.380->1.381 
	configure.ac:1.78->1.79 
	libraries/javalib/Makefile.am:1.227->1.228 
	libraries/javalib/Makefile.am.in:1.20->1.21 
	libraries/javalib/Makefile.in:1.304->1.305 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.2702 kaffe/ChangeLog:1.2703
--- kaffe/ChangeLog:1.2702	Sun Sep  5 15:56:39 2004
+++ kaffe/ChangeLog	Mon Sep  6 17:36:58 2004
@@ -1,3 +1,17 @@
+2004-09-06  Dalibor Topic  <robilad at kaffe.org>
+
+        * configure.ac:
+	Do not build the X and QT AWT backends by default.
+
+        * libraries/javalib/Makefile.am.in:
+	Do not build peerless AWT class library unless
+	a peerless AWT backend is chosen.
+
+        * configure,
+        libraries/javalib/Makefile.am,
+        libraries/javalib/Makefile.in:
+	Regenerated.
+
 2004-09-05  Dalibor Topic  <robilad at kaffe.org>
 
 	* kaffe/kaffeh/support.c:
Index: kaffe/configure
diff -u kaffe/configure:1.380 kaffe/configure:1.381
--- kaffe/configure:1.380	Tue Aug 31 17:27:47 2004
+++ kaffe/configure	Mon Sep  6 17:37:00 2004
@@ -1130,11 +1130,11 @@
   --with-libffi           Use libffi for sysdepCallMethod
   --without-gmp           don't use GNU multiple precision arithmetic library
   --with-stats            Gather statistics on vm execution
-  --without-kaffe-x-awt   disable build of Kaffe's Xlib-based AWT engine
-                          (built by default)
+  --with-kaffe-x-awt      enable build of Kaffe's Xlib-based AWT engine (not
+                          built by default)
   --with-x                use the X Window System
-  --without-kaffe-qt-awt  disable build of Kaffe's Qt2/3/embedded-based AWT
-                          engine (built by default)
+  --with-kaffe-qt-awt     enable build of Kaffe's Qt2/3/embedded-based AWT
+                          engine (not built by default)
   --with-qtdir=DIR        Qt installation directory default=$QTDIR
   --without-classpath-gtk-awt
                           disable build of GNU Classpath's Gtk+-based AWT
@@ -50901,7 +50901,7 @@
   withval="$with_kaffe_x_awt"
 
 else
-  with_kaffe_x_awt=yes
+  with_kaffe_x_awt=no
 
 fi;
 
@@ -53176,7 +53176,7 @@
   withval="$with_kaffe_qt_awt"
 
 else
-  with_kaffe_qt_awt=yes
+  with_kaffe_qt_awt=no
 
 fi;
 
Index: kaffe/configure.ac
diff -u kaffe/configure.ac:1.78 kaffe/configure.ac:1.79
--- kaffe/configure.ac:1.78	Tue Aug 31 17:27:50 2004
+++ kaffe/configure.ac	Mon Sep  6 17:37:05 2004
@@ -1546,10 +1546,10 @@
 AM_CONDITIONAL(COND_NATIVE_AWT, test x"$enable_native_awt" != x"no")
 
 AC_ARG_WITH([kaffe-x-awt],
-	AS_HELP_STRING([--without-kaffe-x-awt],
-		       [disable build of Kaffe's Xlib-based AWT engine (built by default)]),
+	AS_HELP_STRING([--with-kaffe-x-awt],
+		       [enable build of Kaffe's Xlib-based AWT engine (not built by default)]),
 	[],
-	[with_kaffe_x_awt=yes]
+	[with_kaffe_x_awt=no]
 )
 
 AM_CONDITIONAL(COND_KAFFE_X_AWT, test x"$with_kaffe_x_awt" != x"no")
@@ -1626,10 +1626,10 @@
 fi
 
 AC_ARG_WITH([kaffe-qt-awt],
-            AS_HELP_STRING([--without-kaffe-qt-awt],
-                           [disable build of Kaffe's Qt2/3/embedded-based AWT engine (built by default)]),
+            AS_HELP_STRING([--with-kaffe-qt-awt],
+                           [enable build of Kaffe's Qt2/3/embedded-based AWT engine (not built by default)]),
         [],
-        [with_kaffe_qt_awt=yes]
+        [with_kaffe_qt_awt=no]
 )
 
 AM_CONDITIONAL(COND_KAFFE_QT_AWT, test x"$with_kaffe_qt_awt" != x"no")
Index: kaffe/libraries/javalib/Makefile.am
diff -u kaffe/libraries/javalib/Makefile.am:1.227 kaffe/libraries/javalib/Makefile.am:1.228
--- kaffe/libraries/javalib/Makefile.am:1.227	Tue Aug 31 17:27:52 2004
+++ kaffe/libraries/javalib/Makefile.am	Mon Sep  6 17:37:07 2004
@@ -21,7 +21,17 @@
 #
 #   Makefile.am.in -> Makefile.am -> Makefile.in -> Makefile
 
-SUBDIRS = . awt-implementations gmp-math
+# Only build the peerless AWT libraries if kaffe is configured to
+# build the native libraries as well.
+if COND_KAFFE_QT_AWT
+MAYBE_PEERLESS_KAFFE_AWT=awt-implementations
+else
+if COND_KAFFE_X_AWT
+MAYBE_PEERLESS_KAFFE_AWT=awt-implementations
+endif
+endif
+
+SUBDIRS = . $(MAYBE_PEERLESS_KAFFE_AWT) gmp-math
 
 SRCDIRS = com gnu java javax kaffe org
 
Index: kaffe/libraries/javalib/Makefile.am.in
diff -u kaffe/libraries/javalib/Makefile.am.in:1.20 kaffe/libraries/javalib/Makefile.am.in:1.21
--- kaffe/libraries/javalib/Makefile.am.in:1.20	Fri Aug 27 08:41:02 2004
+++ kaffe/libraries/javalib/Makefile.am.in	Mon Sep  6 17:37:08 2004
@@ -21,7 +21,17 @@
 #
 #   Makefile.am.in -> Makefile.am -> Makefile.in -> Makefile
 
-SUBDIRS = . awt-implementations gmp-math
+# Only build the peerless AWT libraries if kaffe is configured to
+# build the native libraries as well.
+if COND_KAFFE_QT_AWT
+MAYBE_PEERLESS_KAFFE_AWT=awt-implementations
+else
+if COND_KAFFE_X_AWT
+MAYBE_PEERLESS_KAFFE_AWT=awt-implementations
+endif
+endif
+
+SUBDIRS = . $(MAYBE_PEERLESS_KAFFE_AWT) gmp-math
 
 SRCDIRS = com gnu java javax kaffe org
 
Index: kaffe/libraries/javalib/Makefile.in
diff -u kaffe/libraries/javalib/Makefile.in:1.304 kaffe/libraries/javalib/Makefile.in:1.305
--- kaffe/libraries/javalib/Makefile.in:1.304	Tue Aug 31 17:27:53 2004
+++ kaffe/libraries/javalib/Makefile.in	Mon Sep  6 17:37:08 2004
@@ -107,7 +107,7 @@
 DATA = $(jrelib_DATA) $(toolslib_DATA)
 ETAGS = etags
 CTAGS = ctags
-DIST_SUBDIRS = $(SUBDIRS)
+DIST_SUBDIRS = . awt-implementations gmp-math
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALSA_CFLAGS = @ALSA_CFLAGS@
@@ -371,7 +371,12 @@
 target_alias = @target_alias@
 toolslibdir = @toolslibdir@
 with_engine = @with_engine@
-SUBDIRS = . awt-implementations gmp-math
+ at COND_KAFFE_QT_AWT_FALSE@@COND_KAFFE_X_AWT_TRUE at MAYBE_PEERLESS_KAFFE_AWT = awt-implementations
+
+# Only build the peerless AWT libraries if kaffe is configured to
+# build the native libraries as well.
+ at COND_KAFFE_QT_AWT_TRUE@MAYBE_PEERLESS_KAFFE_AWT = awt-implementations
+SUBDIRS = . $(MAYBE_PEERLESS_KAFFE_AWT) gmp-math
 SRCDIRS = com gnu java javax kaffe org
 JAVA = $(top_builddir)/kaffe/kaffe/kaffe-bin$(EXEEXT)
 KAFFELIBRARYPATH = $(top_builddir)/libraries/clib/native/:$(top_builddir)/libraries/clib/io/:$(top_builddir)/libraries/clib/zip/:$(top_builddir)/libraries/clib/nio/

More information about the kaffe mailing list