[kaffe] CVS kaffe (dalibor): Fixed a few automake warnings

[Kaffe CVS]

PatchSet 4627 
Date: 2004/04/06 19:51:29
Author: dalibor
Branch: HEAD
Tag: (none) 
Log:
Fixed a few automake warnings

2004-04-06  Dalibor Topic <robilad@kaffe.org>

        * configure:
        Regenerated.

        * m4/esd.m4,
        m4/gcc_attribute.m4:
        Fixed various automake warnings.

Members: 
	ChangeLog:1.2204->1.2205 
	configure:1.305->1.306 
	m4/esd.m4:1.2->1.3 
	m4/gcc_attribute.m4:1.2->1.3 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.2204 kaffe/ChangeLog:1.2205
--- kaffe/ChangeLog:1.2204	Tue Apr  6 17:28:52 2004
+++ kaffe/ChangeLog	Tue Apr  6 19:51:29 2004
@@ -1,5 +1,14 @@
 2004-04-06  Dalibor Topic <robilad@kaffe.org>
 
+	* configure:
+	Regenerated.
+
+	* m4/esd.m4,
+	m4/gcc_attribute.m4:
+	Fixed various automake warnings.
+
+2004-04-06  Dalibor Topic <robilad@kaffe.org>
+
 	* configure.ac:
 	Renamed --enable-pxa to --enable-xscale since pxa is an
 	XScale not the other way round.
Index: kaffe/configure
diff -u kaffe/configure:1.305 kaffe/configure:1.306
--- kaffe/configure:1.305	Tue Apr  6 17:28:53 2004
+++ kaffe/configure	Tue Apr  6 19:51:30 2004
@@ -51474,8 +51474,6 @@
   if test "$ESD_CONFIG" = "no" ; then
     no_esd=yes
   else
-
-
     ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -51613,8 +51611,6 @@
           echo "*** Could not run ESD test program, checking why..."
           CFLAGS="$CFLAGS $ESD_CFLAGS"
           LIBS="$LIBS $ESD_LIBS"
-
-
           ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
Index: kaffe/m4/esd.m4
diff -u kaffe/m4/esd.m4:1.2 kaffe/m4/esd.m4:1.3
--- kaffe/m4/esd.m4:1.2	Thu Jan 15 04:25:20 2004
+++ kaffe/m4/esd.m4	Tue Apr  6 19:51:40 2004
@@ -38,8 +38,7 @@
   if test "$ESD_CONFIG" = "no" ; then
     no_esd=yes
   else
-    AC_LANG_SAVE
-    AC_LANG_C
+    AC_LANG_PUSH([C])
     ESD_CFLAGS=`$ESD_CONFIG $esdconf_args --cflags`
     ESD_LIBS=`$ESD_CONFIG $esdconf_args --libs`
 
@@ -59,7 +58,7 @@
 dnl checks the results of esd-config to some extent
 dnl
       rm -f conf.esdtest
-      AC_TRY_RUN([
+      AC_RUN_IFELSE([AC_LANG_SOURCE([[
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -113,10 +112,10 @@
     }
 }
 
-],, no_esd=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
+]])],[],[no_esd=yes],[echo $ac_n "cross compiling; assumed OK... $ac_c"])
        CFLAGS="$ac_save_CFLAGS"
        LIBS="$ac_save_LIBS"
-       AC_LANG_RESTORE
+       AC_LANG_POP([C])
      fi
   fi
   if test "x$no_esd" = x ; then
@@ -136,13 +135,11 @@
           echo "*** Could not run ESD test program, checking why..."
           CFLAGS="$CFLAGS $ESD_CFLAGS"
           LIBS="$LIBS $ESD_LIBS"
-          AC_LANG_SAVE
-          AC_LANG_C
-          AC_TRY_LINK([
+          AC_LANG_PUSH([C])
+          AC_LINK_IFELSE([AC_LANG_PROGRAM([[
 #include <stdio.h>
 #include <esd.h>
-],      [ return 0; ],
-        [ echo "*** The test program compiled, but did not run. This usually means"
+]], [[ return 0; ]])],[ echo "*** The test program compiled, but did not run. This usually means"
           echo "*** that the run-time linker is not finding ESD or finding the wrong"
           echo "*** version of ESD. If it is not finding ESD, you'll need to set your"
           echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
@@ -150,14 +147,13 @@
           echo "*** is required on your system"
 	  echo "***"
           echo "*** If you have an old version installed, it is best to remove it, although"
-          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"],
-        [ echo "*** The test program failed to compile or link. See the file config.log for the"
+          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"],[ echo "*** The test program failed to compile or link. See the file config.log for the"
           echo "*** exact error that occured. This usually means ESD was incorrectly installed"
           echo "*** or that you have moved ESD since it was installed. In the latter case, you"
           echo "*** may want to edit the esd-config script: $ESD_CONFIG" ])
           CFLAGS="$ac_save_CFLAGS"
           LIBS="$ac_save_LIBS"
-          AC_LANG_RESTORE
+          AC_LANG_POP([C])
        fi
      fi
      ESD_CFLAGS=""
Index: kaffe/m4/gcc_attribute.m4
diff -u kaffe/m4/gcc_attribute.m4:1.2 kaffe/m4/gcc_attribute.m4:1.3
--- kaffe/m4/gcc_attribute.m4:1.2	Thu Apr  1 16:23:51 2004
+++ kaffe/m4/gcc_attribute.m4	Tue Apr  6 19:51:40 2004
@@ -2,7 +2,7 @@
 AC_DEFUN([CACHED_TRY_COMPILE],[
  AC_MSG_CHECKING($1)
  AC_CACHE_VAL($2,[
-  AC_TRY_COMPILE([$3],[$4],[$2=yes],[$2=no])
+  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[$3]], [[$4]])],[$2=yes],[$2=no])
  ])
  if test "x$$2" = xyes; then
   true