I'm checking this in. This fixes an automake nit with tools/Makefile.am. See the original posting for details:
http://gcc.gnu.org/ml/gcc-patches/2008-03/msg00941.html Tom ChangeLog: 2008-04-16 Ralf Wildenhues <[EMAIL PROTECTED]> * m4/gcc_attribute.m4 (GCC_ATTRIBUTE): Fix cache variable name. * tools/Makefile.am (gappletviewer, gjarsigner, gkeytool, gjar) (gnative2ascii, gserialver, gjavah, grmiregistry, gtnameserv) (gorbd, grmid, grmic) [!CREATE_WRAPPERS]: Add stub dependencies for these scripts, to trick automake into hiding the respective rules for the programs below the CREATE_WRAPPERS conditional. Index: m4/gcc_attribute.m4 =================================================================== RCS file: /cvsroot/classpath/classpath/m4/gcc_attribute.m4,v retrieving revision 1.2 diff -u -r1.2 gcc_attribute.m4 --- m4/gcc_attribute.m4 21 Aug 2006 23:34:45 -0000 1.2 +++ m4/gcc_attribute.m4 16 Apr 2008 23:50:11 -0000 @@ -15,7 +15,7 @@ dnl GCC_ATTRIBUTE(<short-label>,<cachevar>,<func-params>,<attribute>,<HAVE>,<desc>,[<true-cmds>],[<false-cmds>]) AC_DEFUN([GCC_ATTRIBUTE],[ - CACHED_TRY_COMPILE(__attribute__(($1)),cv_c_gcc_attribute_$2,, + CACHED_TRY_COMPILE(__attribute__(($1)),gcc_cv_c_gcc_attribute_$2,, [extern int testfunction($3) __attribute__(($4))], AC_MSG_RESULT(yes) AC_DEFINE(HAVE_GNUC25_$5,,$6) Index: tools/Makefile.am =================================================================== RCS file: /cvsroot/classpath/classpath/tools/Makefile.am,v retrieving revision 1.45 diff -u -r1.45 Makefile.am --- tools/Makefile.am 4 Mar 2008 22:25:47 -0000 1.45 +++ tools/Makefile.am 16 Apr 2008 23:50:11 -0000 @@ -85,6 +85,19 @@ gjar gnative2ascii gserialver gjavah grmiregistry \ gtnameserv gorbd grmid grmic bin_PROGRAMS = +## FIXME: revisit this with a newer automake. +gappletviewer: gappletviewer.in +gjarsigner: gjarsigner.in +gkeytool: gkeytool.in +gjar: gjar.in +gnative2ascii: gnative2ascii.in +gserialver: gserialver.in +gjavah: gjavah.in +grmiregistry: grmiregistry.in +gtnameserv: gtnameserv.in +gorbd: gorbd.in +grmid: grmid.in +grmic: grmic.in endif EXTRA_DIST = toolwrapper.c gappletviewer.in gjarsigner.in gkeytool.in \ gjar.in gnative2ascii.in gserialver.in gjavah.in grmiregistry.in \
