[kaffe] CVS kaffe (robilad): Fixed default compiler setting

[Kaffe CVS]

PatchSet 6986 
Date: 2005/12/04 22:52:18
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
Fixed default compiler setting

2005-12-04  Dalibor Topic  <robilad at kaffe.org>

        * configure.ac: Set compiler to jikes,
        if the user does not explicitely specify
        a compiler.

        Reported by:  David Walluck <walluck at mandrake.org>

        * configure.ac: (--disable-xawt-xi18n) Fixed
        flag name used in test to use underscores.

Members: 
	ChangeLog:1.4507->1.4508 
	configure:1.510->1.511 
	configure.ac:1.189->1.190 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4507 kaffe/ChangeLog:1.4508
--- kaffe/ChangeLog:1.4507	Sun Dec  4 21:28:46 2005
+++ kaffe/ChangeLog	Sun Dec  4 22:52:18 2005
@@ -1,3 +1,14 @@
+2005-12-04  Dalibor Topic  <robilad at kaffe.org>
+
+	* configure.ac: Set compiler to jikes,
+	if the user does not explicitely specify
+	a compiler.
+
+	Reported by:  David Walluck <walluck at mandrake.org>
+
+	* configure.ac: (--disable-xawt-xi18n) Fixed 
+	flag name used in test to use underscores.
+
 2005-12-04  Guilhem Lavaux  <guilhem at kaffe.org>
 
 	* libraries/javalib/external/classpath: Resynched GNU Classpath.
Index: kaffe/configure
diff -u kaffe/configure:1.510 kaffe/configure:1.511
--- kaffe/configure:1.510	Sun Dec  4 01:02:58 2005
+++ kaffe/configure	Sun Dec  4 22:52:22 2005
@@ -25214,8 +25214,10 @@
   use_jikes="no"
 fi;
 
-if test x"$use_ecj" = xno -a x"$use_jikes" = xno; then
+if test x"$use_ecj" = x"no" ; then
+  if test x"$use_jikes" = x"no"; then
 	use_jikes="yes";
+  fi
 fi
 
 echo "$as_me:$LINENO: checking whether to use jikes" >&5
@@ -25234,15 +25236,15 @@
           fi
 	fi
 	JAVA_COMPILER="$JIKESPROG +Pno-switchcheck +Pno-shadow +E"
-	use_jikes="yes ($JAVA_COMPILER)"
+	msg_use_jikes="yes ($JAVA_COMPILER)"
 	;;
 no)
-	use_jikes="no"
+	msg_use_jikes="no"
 	;;
 esac
 
-echo "$as_me:$LINENO: result: $use_jikes" >&5
-echo "${ECHO_T}$use_jikes" >&6
+echo "$as_me:$LINENO: result: $msg_use_jikes" >&5
+echo "${ECHO_T}$msg_use_jikes" >&6
 
 
 if test x"use_ecj" = x"yes" -a x"use_jikes" = x"yes"; then
@@ -46712,12 +46714,12 @@
   enableval="$enable_xawt_xi18n"
 
 else
-  enable_xawt-i18n=yes
+  enable_xawt_xi18n=yes
 
 fi;
 
 XI18N_CFLAGS=
-if test x"$enable_xawt-i18n" = xyes; then
+if test x"$enable_xawt_xi18n" = xyes; then
 	XI18N_CFLAGS="-DKAFFE_I18N"
 fi
 
@@ -49245,8 +49247,13 @@
 # Unfortunately, many gcj versions are incapable of compiling GNU
 # Classpath, while many versions of jikes seem to make it through. :/
 # This should be preset to gcjx, once gcjx is merged in.
-if test x"$with_jikes" = x"yes"; then
+
+if test x"$use_jikes" = x"yes"; then
   ac_configure_args="$ac_configure_args --with-jikes"
+fi
+
+if test x"$use_ecj" = x"yes"; then
+  ac_configure_args="$ac_configure_args --with-ecj"
 fi
 
 ac_configure_args="$ac_configure_args --disable-core-jni"
Index: kaffe/configure.ac
diff -u kaffe/configure.ac:1.189 kaffe/configure.ac:1.190
--- kaffe/configure.ac:1.189	Sun Dec  4 01:03:05 2005
+++ kaffe/configure.ac	Sun Dec  4 22:52:28 2005
@@ -784,8 +784,10 @@
 	 use_jikes="yes"],
 	[use_jikes="no"])
 
-if test x"$use_ecj" = xno -a x"$use_jikes" = xno; then
+if test x"$use_ecj" = x"no" ; then 
+  if test x"$use_jikes" = x"no"; then
 	use_jikes="yes";
+  fi
 fi
 
 AC_MSG_CHECKING([whether to use jikes])
@@ -800,14 +802,14 @@
           fi
 	fi
 	JAVA_COMPILER="$JIKESPROG +Pno-switchcheck +Pno-shadow +E"
-	use_jikes="yes ($JAVA_COMPILER)"
+	msg_use_jikes="yes ($JAVA_COMPILER)"
 	;;
 no)
-	use_jikes="no"
+	msg_use_jikes="no"
 	;;
 esac
 
-AC_MSG_RESULT($use_jikes)
+AC_MSG_RESULT($msg_use_jikes)
 
 dnl =========================================================================
 dnl Set the java compiler variable.
@@ -1786,11 +1788,11 @@
 	AS_HELP_STRING([--disable-xawt-xi18n],
 		[disable build of Xi18n support of Xlib AWT backend (enabled by default)]),
 	[],
-	[enable_xawt-i18n=yes]
+	[enable_xawt_xi18n=yes]
 )
 
 XI18N_CFLAGS=
-if test x"$enable_xawt-i18n" = xyes; then
+if test x"$enable_xawt_xi18n" = xyes; then
 	XI18N_CFLAGS="-DKAFFE_I18N"  
 fi
 AC_SUBST(XI18N_CFLAGS)
@@ -2319,8 +2321,13 @@
 # Unfortunately, many gcj versions are incapable of compiling GNU 
 # Classpath, while many versions of jikes seem to make it through. :/
 # This should be preset to gcjx, once gcjx is merged in.
-if test x"$with_jikes" = x"yes"; then
+
+if test x"$use_jikes" = x"yes"; then
   ac_configure_args="$ac_configure_args --with-jikes"
+fi
+
+if test x"$use_ecj" = x"yes"; then
+  ac_configure_args="$ac_configure_args --with-ecj"
 fi
 
 ac_configure_args="$ac_configure_args --disable-core-jni"