OSDN Git Service

libjava/classpath/
authorrwild <rwild@138bc75d-0d04-0410-961f-82ee72b054a4>
Thu, 17 Apr 2008 21:58:12 +0000 (21:58 +0000)
committerrwild <rwild@138bc75d-0d04-0410-961f-82ee72b054a4>
Thu, 17 Apr 2008 21:58:12 +0000 (21:58 +0000)
* 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.
* aclocal.m4: Regenerate.
* configure: Likewise.
* Makefile.in: Likewise.
* native/jni/Makefile.in: Likewise.
* native/jni/classpath/Makefile.in: Likewise.
* native/jni/gstreamer-peer/Makefile.in: Likewise.
* native/jni/midi-dssi/Makefile.in: Likewise.
* native/jni/gconf-peer/Makefile.in: Likewise.
* native/jni/java-io/Makefile.in: Likewise.
* native/jni/native-lib/Makefile.in: Likewise.
* native/jni/java-util/Makefile.in: Likewise.
* native/jni/java-lang/Makefile.in: Likewise.
* native/jni/midi-alsa/Makefile.in: Likewise.
* native/jni/java-nio/Makefile.in: Likewise.
* native/jni/java-net/Makefile.in: Likewise.
* native/jni/xmlj/Makefile.in: Likewise.
* native/jni/qt-peer/Makefile.in: Likewise.
* native/jni/gtk-peer/Makefile.in: Likewise.
* native/Makefile.in: Likewise.
* native/jawt/Makefile.in: Likewise.
* native/fdlibm/Makefile.in: Likewise.
* native/plugin/Makefile.in: Likewise.
* resource/Makefile.in: Likewise.
* scripts/Makefile.in: Likewise.
* tools/Makefile.in: Likewise.
* doc/Makefile.in: Likewise.
* doc/api/Makefile.in: Likewise.
* lib/Makefile.in: Likewise.
* external/Makefile.in: Likewise.
* external/jsr166/Makefile.in: Likewise.
* external/sax/Makefile.in: Likewise.
* external/w3c_dom/Makefile.in: Likewise.
* external/relaxngDatatype/Makefile.in: Likewise.
* include/Makefile.in: Likewise.
* examples/Makefile.in: Likewise.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@134413 138bc75d-0d04-0410-961f-82ee72b054a4

38 files changed:
libjava/classpath/ChangeLog
libjava/classpath/Makefile.in
libjava/classpath/aclocal.m4
libjava/classpath/configure
libjava/classpath/doc/Makefile.in
libjava/classpath/doc/api/Makefile.in
libjava/classpath/examples/Makefile.in
libjava/classpath/external/Makefile.in
libjava/classpath/external/jsr166/Makefile.in
libjava/classpath/external/relaxngDatatype/Makefile.in
libjava/classpath/external/sax/Makefile.in
libjava/classpath/external/w3c_dom/Makefile.in
libjava/classpath/include/Makefile.in
libjava/classpath/lib/Makefile.in
libjava/classpath/m4/gcc_attribute.m4
libjava/classpath/native/Makefile.in
libjava/classpath/native/fdlibm/Makefile.in
libjava/classpath/native/jawt/Makefile.in
libjava/classpath/native/jni/Makefile.in
libjava/classpath/native/jni/classpath/Makefile.in
libjava/classpath/native/jni/gconf-peer/Makefile.in
libjava/classpath/native/jni/gstreamer-peer/Makefile.in
libjava/classpath/native/jni/gtk-peer/Makefile.in
libjava/classpath/native/jni/java-io/Makefile.in
libjava/classpath/native/jni/java-lang/Makefile.in
libjava/classpath/native/jni/java-net/Makefile.in
libjava/classpath/native/jni/java-nio/Makefile.in
libjava/classpath/native/jni/java-util/Makefile.in
libjava/classpath/native/jni/midi-alsa/Makefile.in
libjava/classpath/native/jni/midi-dssi/Makefile.in
libjava/classpath/native/jni/native-lib/Makefile.in
libjava/classpath/native/jni/qt-peer/Makefile.in
libjava/classpath/native/jni/xmlj/Makefile.in
libjava/classpath/native/plugin/Makefile.in
libjava/classpath/resource/Makefile.in
libjava/classpath/scripts/Makefile.in
libjava/classpath/tools/Makefile.am
libjava/classpath/tools/Makefile.in

index c3d8f63..a15c502 100644 (file)
@@ -1,3 +1,47 @@
+2008-04-18  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       * 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.
+       * aclocal.m4: Regenerate.
+       * configure: Likewise.
+       * Makefile.in: Likewise.
+       * native/jni/Makefile.in: Likewise.
+       * native/jni/classpath/Makefile.in: Likewise.
+       * native/jni/gstreamer-peer/Makefile.in: Likewise.
+       * native/jni/midi-dssi/Makefile.in: Likewise.
+       * native/jni/gconf-peer/Makefile.in: Likewise.
+       * native/jni/java-io/Makefile.in: Likewise.
+       * native/jni/native-lib/Makefile.in: Likewise.
+       * native/jni/java-util/Makefile.in: Likewise.
+       * native/jni/java-lang/Makefile.in: Likewise.
+       * native/jni/midi-alsa/Makefile.in: Likewise.
+       * native/jni/java-nio/Makefile.in: Likewise.
+       * native/jni/java-net/Makefile.in: Likewise.
+       * native/jni/xmlj/Makefile.in: Likewise.
+       * native/jni/qt-peer/Makefile.in: Likewise.
+       * native/jni/gtk-peer/Makefile.in: Likewise.
+       * native/Makefile.in: Likewise.
+       * native/jawt/Makefile.in: Likewise.
+       * native/fdlibm/Makefile.in: Likewise.
+       * native/plugin/Makefile.in: Likewise.
+       * resource/Makefile.in: Likewise.
+       * scripts/Makefile.in: Likewise.
+       * tools/Makefile.in: Likewise.
+       * doc/Makefile.in: Likewise.
+       * doc/api/Makefile.in: Likewise.
+       * lib/Makefile.in: Likewise.
+       * external/Makefile.in: Likewise.
+       * external/jsr166/Makefile.in: Likewise.
+       * external/sax/Makefile.in: Likewise.
+       * external/w3c_dom/Makefile.in: Likewise.
+       * external/relaxngDatatype/Makefile.in: Likewise.
+       * include/Makefile.in: Likewise.
+       * examples/Makefile.in: Likewise.
+
 2008-03-10  Jim Meyering  <meyering@redhat.com>
 
        Don't leak upon failed realloc.
index 3f1ba48..585b4e6 100644 (file)
@@ -61,6 +61,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \
        $(top_srcdir)/../../config/lead-dot.m4 \
        $(top_srcdir)/../../config/multi.m4 \
        $(top_srcdir)/../../config/no-executables.m4 \
+       $(top_srcdir)/../../config/proginstall.m4 \
        $(top_srcdir)/../../libtool.m4 \
        $(top_srcdir)/../../ltoptions.m4 \
        $(top_srcdir)/../../ltsugar.m4 \
index aca1c3c..ddf6028 100644 (file)
@@ -905,6 +905,7 @@ m4_include([../../config/depstand.m4])
 m4_include([../../config/lead-dot.m4])
 m4_include([../../config/multi.m4])
 m4_include([../../config/no-executables.m4])
+m4_include([../../config/proginstall.m4])
 m4_include([../../libtool.m4])
 m4_include([../../ltoptions.m4])
 m4_include([../../ltsugar.m4])
index 7d283ed..7258e0b 100755 (executable)
@@ -1810,6 +1810,7 @@ am__api_version="1.9"
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # OS/2's system install, which has a completely different semantic
 # ./install, which can be erroneously created by make from ./install.sh.
+# Reject install programs that cannot install multiple files.
 echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
 echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6
 if test -z "$INSTALL"; then
@@ -1843,8 +1844,18 @@ case $as_dir/ in
            # program-specific install script used by HP pwplus--don't use.
            :
          else
-           ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
-           break 3
+           rm -rf conftest.one conftest.two conftest.dir
+           echo one > conftest.one
+           echo two > conftest.two
+           mkdir conftest.dir
+           if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
+             test -s conftest.one && test -s conftest.two &&
+             test -s conftest.dir/conftest.one &&
+             test -s conftest.dir/conftest.two
+           then
+             ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
+             break 3
+           fi
          fi
        fi
       done
@@ -1853,15 +1864,16 @@ case $as_dir/ in
 esac
 done
 
+rm -rf conftest.one conftest.two conftest.dir
 
 fi
   if test "${ac_cv_path_install+set}" = set; then
     INSTALL=$ac_cv_path_install
   else
-    # As a last resort, use the slow shell script.  We don't cache a
-    # path for INSTALL within a source directory, because that will
+    # As a last resort, use the slow shell script.  Don't cache a
+    # value for INSTALL within a source directory, because that will
     # break other packages using the cache if that directory is
-    # removed, or if the path is relative.
+    # removed, or if the value is a relative name.
     INSTALL=$ac_install_sh
   fi
 fi
@@ -5115,6 +5127,7 @@ fi
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # OS/2's system install, which has a completely different semantic
 # ./install, which can be erroneously created by make from ./install.sh.
+# Reject install programs that cannot install multiple files.
 echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
 echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6
 if test -z "$INSTALL"; then
@@ -5148,8 +5161,18 @@ case $as_dir/ in
            # program-specific install script used by HP pwplus--don't use.
            :
          else
-           ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
-           break 3
+           rm -rf conftest.one conftest.two conftest.dir
+           echo one > conftest.one
+           echo two > conftest.two
+           mkdir conftest.dir
+           if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
+             test -s conftest.one && test -s conftest.two &&
+             test -s conftest.dir/conftest.one &&
+             test -s conftest.dir/conftest.two
+           then
+             ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
+             break 3
+           fi
          fi
        fi
       done
@@ -5158,15 +5181,16 @@ case $as_dir/ in
 esac
 done
 
+rm -rf conftest.one conftest.two conftest.dir
 
 fi
   if test "${ac_cv_path_install+set}" = set; then
     INSTALL=$ac_cv_path_install
   else
-    # As a last resort, use the slow shell script.  We don't cache a
-    # path for INSTALL within a source directory, because that will
+    # As a last resort, use the slow shell script.  Don't cache a
+    # value for INSTALL within a source directory, because that will
     # break other packages using the cache if that directory is
-    # removed, or if the path is relative.
+    # removed, or if the value is a relative name.
     INSTALL=$ac_install_sh
   fi
 fi
@@ -5702,13 +5726,13 @@ if test "${lt_cv_nm_interface+set}" = set; then
 else
   lt_cv_nm_interface="BSD nm"
   echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:5705: $ac_compile\"" >&5)
+  (eval echo "\"\$as_me:5729: $ac_compile\"" >&5)
   (eval "$ac_compile" 2>conftest.err)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:5708: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval echo "\"\$as_me:5732: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:5711: output\"" >&5)
+  (eval echo "\"\$as_me:5735: output\"" >&5)
   cat conftest.out >&5
   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
     lt_cv_nm_interface="MS dumpbin"
@@ -5964,7 +5988,7 @@ lt_cv_deplibs_check_method='unknown'
 # whether `pass_all' will *always* work, you probably want this one.
 
 case $host_os in
-aix4* | aix5*)
+aix[4-9]*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
@@ -6752,7 +6776,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 6755 "configure"' > conftest.$ac_ext
+  echo '#line 6779 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -7384,11 +7408,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7387: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7411: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7391: \$? = $ac_status" >&5
+   echo "$as_me:7415: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -7706,11 +7730,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7709: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7733: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7713: \$? = $ac_status" >&5
+   echo "$as_me:7737: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -7811,11 +7835,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7814: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7838: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:7818: \$? = $ac_status" >&5
+   echo "$as_me:7842: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -7866,11 +7890,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7869: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7893: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:7873: \$? = $ac_status" >&5
+   echo "$as_me:7897: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -8014,7 +8038,7 @@ echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared librar
 
     # See if GNU ld supports shared libraries.
     case $host_os in
-    aix3* | aix4* | aix5*)
+    aix[3-9]*)
       # On AIX/PPC, the GNU linker is very broken
       if test "$host_cpu" != ia64; then
        ld_shlibs=no
@@ -8248,7 +8272,7 @@ _LT_EOF
       fi
       ;;
 
-    aix4* | aix5*)
+    aix[4-9]*)
       if test "$host_cpu" = ia64; then
        # On IA64, the linker does run time linking by default, so we don't
        # have to do anything special.
@@ -8268,7 +8292,7 @@ _LT_EOF
        # Test if we are trying to use run time linking or normal
        # AIX style linking. If -brtl is somewhere in LDFLAGS, we
        # need to do runtime linking.
-       case $host_os in aix4.[23]|aix4.[23].*|aix5*)
+       case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
          for ld_flag in $LDFLAGS; do
          if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
            aix_use_runtimelinking=yes
@@ -9343,7 +9367,7 @@ aix3*)
   soname_spec='${libname}${release}${shared_ext}$major'
   ;;
 
-aix4* | aix5*)
+aix[4-9]*)
   version_type=linux
   need_lib_prefix=no
   need_version=no
@@ -10718,7 +10742,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10721 "configure"
+#line 10745 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10818,7 +10842,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10821 "configure"
+#line 10845 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11001,7 +11025,7 @@ echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6
     fi
     ;;
 
-  aix4* | aix5*)
+  aix[4-9]*)
     if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
       test "$enable_shared" = yes && enable_static=no
     fi
@@ -13677,7 +13701,7 @@ echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared librar
         # FIXME: insert proper C++ library support
         ld_shlibs_CXX=no
         ;;
-      aix4* | aix5*)
+      aix[4-9]*)
         if test "$host_cpu" = ia64; then
           # On IA64, the linker does run time linking by default, so we don't
           # have to do anything special.
@@ -13690,7 +13714,7 @@ echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared librar
           # Test if we are trying to use run time linking or normal
           # AIX style linking. If -brtl is somewhere in LDFLAGS, we
           # need to do runtime linking.
-          case $host_os in aix4.[23]|aix4.[23].*|aix5*)
+          case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
            for ld_flag in $LDFLAGS; do
              case $ld_flag in
              *-brtl*)
@@ -14957,7 +14981,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
     esac
   else
     case $host_os in
-      aix4* | aix5*)
+      aix[4-9]*)
        # All AIX code is PIC.
        if test "$host_cpu" = ia64; then
          # AIX 5 now supports IA64 processor
@@ -15215,11 +15239,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:15218: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15242: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:15222: \$? = $ac_status" >&5
+   echo "$as_me:15246: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -15314,11 +15338,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:15317: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15341: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:15321: \$? = $ac_status" >&5
+   echo "$as_me:15345: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -15366,11 +15390,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:15369: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15393: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:15373: \$? = $ac_status" >&5
+   echo "$as_me:15397: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -15427,7 +15451,7 @@ echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared librar
 
   export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
   case $host_os in
-  aix4* | aix5*)
+  aix[4-9]*)
     # If we're using GNU nm, then we don't want the "-C" option.
     # -C means demangle to AIX nm, but means don't demangle with GNU nm
     if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
@@ -15617,7 +15641,7 @@ aix3*)
   soname_spec='${libname}${release}${shared_ext}$major'
   ;;
 
-aix4* | aix5*)
+aix[4-9]*)
   version_type=linux
   need_lib_prefix=no
   need_version=no
@@ -16387,7 +16411,7 @@ if test "x${COMPILE_JNI}" = xyes; then
 
  echo "$as_me:$LINENO: checking __attribute__((,,))" >&5
 echo $ECHO_N "checking __attribute__((,,))... $ECHO_C" >&6
- if test "${cv_c_gcc_attribute_supported+set}" = set; then
+ if test "${gcc_cv_c_gcc_attribute_supported+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
@@ -16428,18 +16452,18 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  cv_c_gcc_attribute_supported=yes
+  gcc_cv_c_gcc_attribute_supported=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-cv_c_gcc_attribute_supported=no
+gcc_cv_c_gcc_attribute_supported=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
 fi
 
- if test "x$cv_c_gcc_attribute_supported" = xyes; then
+ if test "x$gcc_cv_c_gcc_attribute_supported" = xyes; then
   true
   echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6
@@ -16467,7 +16491,7 @@ echo "${ECHO_T}no" >&6
 
  echo "$as_me:$LINENO: checking __attribute__((unused))" >&5
 echo $ECHO_N "checking __attribute__((unused))... $ECHO_C" >&6
- if test "${cv_c_gcc_attribute_unused+set}" = set; then
+ if test "${gcc_cv_c_gcc_attribute_unused+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
@@ -16508,18 +16532,18 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  cv_c_gcc_attribute_unused=yes
+  gcc_cv_c_gcc_attribute_unused=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-cv_c_gcc_attribute_unused=no
+gcc_cv_c_gcc_attribute_unused=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
 fi
 
- if test "x$cv_c_gcc_attribute_unused" = xyes; then
+ if test "x$gcc_cv_c_gcc_attribute_unused" = xyes; then
   true
   echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6
index f5af223..efea97e 100644 (file)
@@ -43,6 +43,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \
        $(top_srcdir)/../../config/lead-dot.m4 \
        $(top_srcdir)/../../config/multi.m4 \
        $(top_srcdir)/../../config/no-executables.m4 \
+       $(top_srcdir)/../../config/proginstall.m4 \
        $(top_srcdir)/../../libtool.m4 \
        $(top_srcdir)/../../ltoptions.m4 \
        $(top_srcdir)/../../ltsugar.m4 \
index 128cd53..989da66 100644 (file)
@@ -44,6 +44,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \
        $(top_srcdir)/../../config/lead-dot.m4 \
        $(top_srcdir)/../../config/multi.m4 \
        $(top_srcdir)/../../config/no-executables.m4 \
+       $(top_srcdir)/../../config/proginstall.m4 \
        $(top_srcdir)/../../libtool.m4 \
        $(top_srcdir)/../../ltoptions.m4 \
        $(top_srcdir)/../../ltsugar.m4 \
index 996274c..6f35cab 100644 (file)
@@ -45,6 +45,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \
        $(top_srcdir)/../../config/lead-dot.m4 \
        $(top_srcdir)/../../config/multi.m4 \
        $(top_srcdir)/../../config/no-executables.m4 \
+       $(top_srcdir)/../../config/proginstall.m4 \
        $(top_srcdir)/../../libtool.m4 \
        $(top_srcdir)/../../ltoptions.m4 \
        $(top_srcdir)/../../ltsugar.m4 \
index 4d7ccfd..370b0bc 100644 (file)
@@ -43,6 +43,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \
        $(top_srcdir)/../../config/lead-dot.m4 \
        $(top_srcdir)/../../config/multi.m4 \
        $(top_srcdir)/../../config/no-executables.m4 \
+       $(top_srcdir)/../../config/proginstall.m4 \
        $(top_srcdir)/../../libtool.m4 \
        $(top_srcdir)/../../ltoptions.m4 \
        $(top_srcdir)/../../ltsugar.m4 \
index a942ff7..4a463c2 100644 (file)
@@ -43,6 +43,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \
        $(top_srcdir)/../../config/lead-dot.m4 \
        $(top_srcdir)/../../config/multi.m4 \
        $(top_srcdir)/../../config/no-executables.m4 \
+       $(top_srcdir)/../../config/proginstall.m4 \
        $(top_srcdir)/../../libtool.m4 \
        $(top_srcdir)/../../ltoptions.m4 \
        $(top_srcdir)/../../ltsugar.m4 \
index 9a56815..79426fc 100644 (file)
@@ -43,6 +43,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \
        $(top_srcdir)/../../config/lead-dot.m4 \
        $(top_srcdir)/../../config/multi.m4 \
        $(top_srcdir)/../../config/no-executables.m4 \
+       $(top_srcdir)/../../config/proginstall.m4 \
        $(top_srcdir)/../../libtool.m4 \
        $(top_srcdir)/../../ltoptions.m4 \
        $(top_srcdir)/../../ltsugar.m4 \
index 1b22402..03d8f60 100644 (file)
@@ -43,6 +43,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \
        $(top_srcdir)/../../config/lead-dot.m4 \
        $(top_srcdir)/../../config/multi.m4 \
        $(top_srcdir)/../../config/no-executables.m4 \
+       $(top_srcdir)/../../config/proginstall.m4 \
        $(top_srcdir)/../../libtool.m4 \
        $(top_srcdir)/../../ltoptions.m4 \
        $(top_srcdir)/../../ltsugar.m4 \
index d553a7b..55e0395 100644 (file)
@@ -43,6 +43,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \
        $(top_srcdir)/../../config/lead-dot.m4 \
        $(top_srcdir)/../../config/multi.m4 \
        $(top_srcdir)/../../config/no-executables.m4 \
+       $(top_srcdir)/../../config/proginstall.m4 \
        $(top_srcdir)/../../libtool.m4 \
        $(top_srcdir)/../../ltoptions.m4 \
        $(top_srcdir)/../../ltsugar.m4 \
index a93e9ce..7e16c0a 100644 (file)
@@ -44,6 +44,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \
        $(top_srcdir)/../../config/lead-dot.m4 \
        $(top_srcdir)/../../config/multi.m4 \
        $(top_srcdir)/../../config/no-executables.m4 \
+       $(top_srcdir)/../../config/proginstall.m4 \
        $(top_srcdir)/../../libtool.m4 \
        $(top_srcdir)/../../ltoptions.m4 \
        $(top_srcdir)/../../ltsugar.m4 \
index bb2dac4..1ccdcef 100644 (file)
@@ -46,6 +46,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \
        $(top_srcdir)/../../config/lead-dot.m4 \
        $(top_srcdir)/../../config/multi.m4 \
        $(top_srcdir)/../../config/no-executables.m4 \
+       $(top_srcdir)/../../config/proginstall.m4 \
        $(top_srcdir)/../../libtool.m4 \
        $(top_srcdir)/../../ltoptions.m4 \
        $(top_srcdir)/../../ltsugar.m4 \
index f0c2572..f332d21 100644 (file)
@@ -15,7 +15,7 @@ AC_DEFUN([CACHED_TRY_COMPILE],[
 
 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 de59a59..9a8cfe1 100644 (file)
@@ -43,6 +43,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \
        $(top_srcdir)/../../config/lead-dot.m4 \
        $(top_srcdir)/../../config/multi.m4 \
        $(top_srcdir)/../../config/no-executables.m4 \
+       $(top_srcdir)/../../config/proginstall.m4 \
        $(top_srcdir)/../../libtool.m4 \
        $(top_srcdir)/../../ltoptions.m4 \
        $(top_srcdir)/../../ltsugar.m4 \
index 2b1bd1f..02b82c6 100644 (file)
@@ -44,6 +44,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \
        $(top_srcdir)/../../config/lead-dot.m4 \
        $(top_srcdir)/../../config/multi.m4 \
        $(top_srcdir)/../../config/no-executables.m4 \
+       $(top_srcdir)/../../config/proginstall.m4 \
        $(top_srcdir)/../../libtool.m4 \
        $(top_srcdir)/../../ltoptions.m4 \
        $(top_srcdir)/../../ltsugar.m4 \
index 2361b92..5453591 100644 (file)
@@ -44,6 +44,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \
        $(top_srcdir)/../../config/lead-dot.m4 \
        $(top_srcdir)/../../config/multi.m4 \
        $(top_srcdir)/../../config/no-executables.m4 \
+       $(top_srcdir)/../../config/proginstall.m4 \
        $(top_srcdir)/../../libtool.m4 \
        $(top_srcdir)/../../ltoptions.m4 \
        $(top_srcdir)/../../ltsugar.m4 \
index 00e6c51..e96dc4b 100644 (file)
@@ -43,6 +43,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \
        $(top_srcdir)/../../config/lead-dot.m4 \
        $(top_srcdir)/../../config/multi.m4 \
        $(top_srcdir)/../../config/no-executables.m4 \
+       $(top_srcdir)/../../config/proginstall.m4 \
        $(top_srcdir)/../../libtool.m4 \
        $(top_srcdir)/../../ltoptions.m4 \
        $(top_srcdir)/../../ltsugar.m4 \
index aff43aa..7533f06 100644 (file)
@@ -44,6 +44,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \
        $(top_srcdir)/../../config/lead-dot.m4 \
        $(top_srcdir)/../../config/multi.m4 \
        $(top_srcdir)/../../config/no-executables.m4 \
+       $(top_srcdir)/../../config/proginstall.m4 \
        $(top_srcdir)/../../libtool.m4 \
        $(top_srcdir)/../../ltoptions.m4 \
        $(top_srcdir)/../../ltsugar.m4 \
index 9c45946..ede1024 100644 (file)
@@ -44,6 +44,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \
        $(top_srcdir)/../../config/lead-dot.m4 \
        $(top_srcdir)/../../config/multi.m4 \
        $(top_srcdir)/../../config/no-executables.m4 \
+       $(top_srcdir)/../../config/proginstall.m4 \
        $(top_srcdir)/../../libtool.m4 \
        $(top_srcdir)/../../ltoptions.m4 \
        $(top_srcdir)/../../ltsugar.m4 \
index 7d752f9..86f7f23 100644 (file)
@@ -44,6 +44,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \
        $(top_srcdir)/../../config/lead-dot.m4 \
        $(top_srcdir)/../../config/multi.m4 \
        $(top_srcdir)/../../config/no-executables.m4 \
+       $(top_srcdir)/../../config/proginstall.m4 \
        $(top_srcdir)/../../libtool.m4 \
        $(top_srcdir)/../../ltoptions.m4 \
        $(top_srcdir)/../../ltsugar.m4 \
index 1b76b7f..a02f371 100644 (file)
@@ -44,6 +44,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \
        $(top_srcdir)/../../config/lead-dot.m4 \
        $(top_srcdir)/../../config/multi.m4 \
        $(top_srcdir)/../../config/no-executables.m4 \
+       $(top_srcdir)/../../config/proginstall.m4 \
        $(top_srcdir)/../../libtool.m4 \
        $(top_srcdir)/../../ltoptions.m4 \
        $(top_srcdir)/../../ltsugar.m4 \
index 42bb7cd..6851b05 100644 (file)
@@ -44,6 +44,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \
        $(top_srcdir)/../../config/lead-dot.m4 \
        $(top_srcdir)/../../config/multi.m4 \
        $(top_srcdir)/../../config/no-executables.m4 \
+       $(top_srcdir)/../../config/proginstall.m4 \
        $(top_srcdir)/../../libtool.m4 \
        $(top_srcdir)/../../ltoptions.m4 \
        $(top_srcdir)/../../ltsugar.m4 \
index a7b436b..c541552 100644 (file)
@@ -44,6 +44,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \
        $(top_srcdir)/../../config/lead-dot.m4 \
        $(top_srcdir)/../../config/multi.m4 \
        $(top_srcdir)/../../config/no-executables.m4 \
+       $(top_srcdir)/../../config/proginstall.m4 \
        $(top_srcdir)/../../libtool.m4 \
        $(top_srcdir)/../../ltoptions.m4 \
        $(top_srcdir)/../../ltsugar.m4 \
index 3fdf64d..788176d 100644 (file)
@@ -44,6 +44,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \
        $(top_srcdir)/../../config/lead-dot.m4 \
        $(top_srcdir)/../../config/multi.m4 \
        $(top_srcdir)/../../config/no-executables.m4 \
+       $(top_srcdir)/../../config/proginstall.m4 \
        $(top_srcdir)/../../libtool.m4 \
        $(top_srcdir)/../../ltoptions.m4 \
        $(top_srcdir)/../../ltsugar.m4 \
index 390a278..6896937 100644 (file)
@@ -44,6 +44,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \
        $(top_srcdir)/../../config/lead-dot.m4 \
        $(top_srcdir)/../../config/multi.m4 \
        $(top_srcdir)/../../config/no-executables.m4 \
+       $(top_srcdir)/../../config/proginstall.m4 \
        $(top_srcdir)/../../libtool.m4 \
        $(top_srcdir)/../../ltoptions.m4 \
        $(top_srcdir)/../../ltsugar.m4 \
index af44e11..3487f21 100644 (file)
@@ -44,6 +44,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \
        $(top_srcdir)/../../config/lead-dot.m4 \
        $(top_srcdir)/../../config/multi.m4 \
        $(top_srcdir)/../../config/no-executables.m4 \
+       $(top_srcdir)/../../config/proginstall.m4 \
        $(top_srcdir)/../../libtool.m4 \
        $(top_srcdir)/../../ltoptions.m4 \
        $(top_srcdir)/../../ltsugar.m4 \
index 8018706..b51f16c 100644 (file)
@@ -44,6 +44,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \
        $(top_srcdir)/../../config/lead-dot.m4 \
        $(top_srcdir)/../../config/multi.m4 \
        $(top_srcdir)/../../config/no-executables.m4 \
+       $(top_srcdir)/../../config/proginstall.m4 \
        $(top_srcdir)/../../libtool.m4 \
        $(top_srcdir)/../../ltoptions.m4 \
        $(top_srcdir)/../../ltsugar.m4 \
index 9eacf1c..58be712 100644 (file)
@@ -44,6 +44,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \
        $(top_srcdir)/../../config/lead-dot.m4 \
        $(top_srcdir)/../../config/multi.m4 \
        $(top_srcdir)/../../config/no-executables.m4 \
+       $(top_srcdir)/../../config/proginstall.m4 \
        $(top_srcdir)/../../libtool.m4 \
        $(top_srcdir)/../../ltoptions.m4 \
        $(top_srcdir)/../../ltsugar.m4 \
index 558750e..145ccbd 100644 (file)
@@ -44,6 +44,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \
        $(top_srcdir)/../../config/lead-dot.m4 \
        $(top_srcdir)/../../config/multi.m4 \
        $(top_srcdir)/../../config/no-executables.m4 \
+       $(top_srcdir)/../../config/proginstall.m4 \
        $(top_srcdir)/../../libtool.m4 \
        $(top_srcdir)/../../ltoptions.m4 \
        $(top_srcdir)/../../ltsugar.m4 \
index ad19aa7..d46f0b3 100644 (file)
@@ -47,6 +47,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \
        $(top_srcdir)/../../config/lead-dot.m4 \
        $(top_srcdir)/../../config/multi.m4 \
        $(top_srcdir)/../../config/no-executables.m4 \
+       $(top_srcdir)/../../config/proginstall.m4 \
        $(top_srcdir)/../../libtool.m4 \
        $(top_srcdir)/../../ltoptions.m4 \
        $(top_srcdir)/../../ltsugar.m4 \
index 016f97f..e958212 100644 (file)
@@ -44,6 +44,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \
        $(top_srcdir)/../../config/lead-dot.m4 \
        $(top_srcdir)/../../config/multi.m4 \
        $(top_srcdir)/../../config/no-executables.m4 \
+       $(top_srcdir)/../../config/proginstall.m4 \
        $(top_srcdir)/../../libtool.m4 \
        $(top_srcdir)/../../ltoptions.m4 \
        $(top_srcdir)/../../ltsugar.m4 \
index 62bcde5..9c14283 100644 (file)
@@ -44,6 +44,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \
        $(top_srcdir)/../../config/lead-dot.m4 \
        $(top_srcdir)/../../config/multi.m4 \
        $(top_srcdir)/../../config/no-executables.m4 \
+       $(top_srcdir)/../../config/proginstall.m4 \
        $(top_srcdir)/../../libtool.m4 \
        $(top_srcdir)/../../ltoptions.m4 \
        $(top_srcdir)/../../ltsugar.m4 \
index bfceca8..89881c5 100644 (file)
@@ -44,6 +44,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \
        $(top_srcdir)/../../config/lead-dot.m4 \
        $(top_srcdir)/../../config/multi.m4 \
        $(top_srcdir)/../../config/no-executables.m4 \
+       $(top_srcdir)/../../config/proginstall.m4 \
        $(top_srcdir)/../../libtool.m4 \
        $(top_srcdir)/../../ltoptions.m4 \
        $(top_srcdir)/../../ltsugar.m4 \
index a6f6e01..d87bb74 100644 (file)
@@ -44,6 +44,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \
        $(top_srcdir)/../../config/lead-dot.m4 \
        $(top_srcdir)/../../config/multi.m4 \
        $(top_srcdir)/../../config/no-executables.m4 \
+       $(top_srcdir)/../../config/proginstall.m4 \
        $(top_srcdir)/../../libtool.m4 \
        $(top_srcdir)/../../ltoptions.m4 \
        $(top_srcdir)/../../ltsugar.m4 \
index de54eed..773157d 100755 (executable)
@@ -100,6 +100,19 @@ noinst_SCRIPTS = gappletviewer gjarsigner gkeytool \
        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 \
index ef1b2d0..68991e9 100644 (file)
@@ -59,6 +59,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \
        $(top_srcdir)/../../config/lead-dot.m4 \
        $(top_srcdir)/../../config/multi.m4 \
        $(top_srcdir)/../../config/no-executables.m4 \
+       $(top_srcdir)/../../config/proginstall.m4 \
        $(top_srcdir)/../../libtool.m4 \
        $(top_srcdir)/../../ltoptions.m4 \
        $(top_srcdir)/../../ltsugar.m4 \
@@ -639,42 +640,42 @@ installcheck-binPROGRAMS: $(bin_PROGRAMS)
            else echo "$$f does not support $$opt" 1>&2; bad=1; fi; \
          done; \
        done; rm -f c$${pid}_.???; exit $$bad
-gappletviewer$(EXEEXT): $(gappletviewer_OBJECTS) $(gappletviewer_DEPENDENCIES) 
-       @rm -f gappletviewer$(EXEEXT)
-       $(LINK) $(gappletviewer_LDFLAGS) $(gappletviewer_OBJECTS) $(gappletviewer_LDADD) $(LIBS)
-gjar$(EXEEXT): $(gjar_OBJECTS) $(gjar_DEPENDENCIES) 
-       @rm -f gjar$(EXEEXT)
-       $(LINK) $(gjar_LDFLAGS) $(gjar_OBJECTS) $(gjar_LDADD) $(LIBS)
-gjarsigner$(EXEEXT): $(gjarsigner_OBJECTS) $(gjarsigner_DEPENDENCIES) 
-       @rm -f gjarsigner$(EXEEXT)
-       $(LINK) $(gjarsigner_LDFLAGS) $(gjarsigner_OBJECTS) $(gjarsigner_LDADD) $(LIBS)
-gjavah$(EXEEXT): $(gjavah_OBJECTS) $(gjavah_DEPENDENCIES) 
-       @rm -f gjavah$(EXEEXT)
-       $(LINK) $(gjavah_LDFLAGS) $(gjavah_OBJECTS) $(gjavah_LDADD) $(LIBS)
-gkeytool$(EXEEXT): $(gkeytool_OBJECTS) $(gkeytool_DEPENDENCIES) 
-       @rm -f gkeytool$(EXEEXT)
-       $(LINK) $(gkeytool_LDFLAGS) $(gkeytool_OBJECTS) $(gkeytool_LDADD) $(LIBS)
-gnative2ascii$(EXEEXT): $(gnative2ascii_OBJECTS) $(gnative2ascii_DEPENDENCIES) 
-       @rm -f gnative2ascii$(EXEEXT)
-       $(LINK) $(gnative2ascii_LDFLAGS) $(gnative2ascii_OBJECTS) $(gnative2ascii_LDADD) $(LIBS)
-gorbd$(EXEEXT): $(gorbd_OBJECTS) $(gorbd_DEPENDENCIES) 
-       @rm -f gorbd$(EXEEXT)
-       $(LINK) $(gorbd_LDFLAGS) $(gorbd_OBJECTS) $(gorbd_LDADD) $(LIBS)
-grmic$(EXEEXT): $(grmic_OBJECTS) $(grmic_DEPENDENCIES) 
-       @rm -f grmic$(EXEEXT)
-       $(LINK) $(grmic_LDFLAGS) $(grmic_OBJECTS) $(grmic_LDADD) $(LIBS)
-grmid$(EXEEXT): $(grmid_OBJECTS) $(grmid_DEPENDENCIES) 
-       @rm -f grmid$(EXEEXT)
-       $(LINK) $(grmid_LDFLAGS) $(grmid_OBJECTS) $(grmid_LDADD) $(LIBS)
-grmiregistry$(EXEEXT): $(grmiregistry_OBJECTS) $(grmiregistry_DEPENDENCIES) 
-       @rm -f grmiregistry$(EXEEXT)
-       $(LINK) $(grmiregistry_LDFLAGS) $(grmiregistry_OBJECTS) $(grmiregistry_LDADD) $(LIBS)
-gserialver$(EXEEXT): $(gserialver_OBJECTS) $(gserialver_DEPENDENCIES) 
-       @rm -f gserialver$(EXEEXT)
-       $(LINK) $(gserialver_LDFLAGS) $(gserialver_OBJECTS) $(gserialver_LDADD) $(LIBS)
-gtnameserv$(EXEEXT): $(gtnameserv_OBJECTS) $(gtnameserv_DEPENDENCIES) 
-       @rm -f gtnameserv$(EXEEXT)
-       $(LINK) $(gtnameserv_LDFLAGS) $(gtnameserv_OBJECTS) $(gtnameserv_LDADD) $(LIBS)
+@CREATE_WRAPPERS_TRUE@gappletviewer$(EXEEXT): $(gappletviewer_OBJECTS) $(gappletviewer_DEPENDENCIES) 
+@CREATE_WRAPPERS_TRUE@ @rm -f gappletviewer$(EXEEXT)
+@CREATE_WRAPPERS_TRUE@ $(LINK) $(gappletviewer_LDFLAGS) $(gappletviewer_OBJECTS) $(gappletviewer_LDADD) $(LIBS)
+@CREATE_WRAPPERS_TRUE@gjar$(EXEEXT): $(gjar_OBJECTS) $(gjar_DEPENDENCIES) 
+@CREATE_WRAPPERS_TRUE@ @rm -f gjar$(EXEEXT)
+@CREATE_WRAPPERS_TRUE@ $(LINK) $(gjar_LDFLAGS) $(gjar_OBJECTS) $(gjar_LDADD) $(LIBS)
+@CREATE_WRAPPERS_TRUE@gjarsigner$(EXEEXT): $(gjarsigner_OBJECTS) $(gjarsigner_DEPENDENCIES) 
+@CREATE_WRAPPERS_TRUE@ @rm -f gjarsigner$(EXEEXT)
+@CREATE_WRAPPERS_TRUE@ $(LINK) $(gjarsigner_LDFLAGS) $(gjarsigner_OBJECTS) $(gjarsigner_LDADD) $(LIBS)
+@CREATE_WRAPPERS_TRUE@gjavah$(EXEEXT): $(gjavah_OBJECTS) $(gjavah_DEPENDENCIES) 
+@CREATE_WRAPPERS_TRUE@ @rm -f gjavah$(EXEEXT)
+@CREATE_WRAPPERS_TRUE@ $(LINK) $(gjavah_LDFLAGS) $(gjavah_OBJECTS) $(gjavah_LDADD) $(LIBS)
+@CREATE_WRAPPERS_TRUE@gkeytool$(EXEEXT): $(gkeytool_OBJECTS) $(gkeytool_DEPENDENCIES) 
+@CREATE_WRAPPERS_TRUE@ @rm -f gkeytool$(EXEEXT)
+@CREATE_WRAPPERS_TRUE@ $(LINK) $(gkeytool_LDFLAGS) $(gkeytool_OBJECTS) $(gkeytool_LDADD) $(LIBS)
+@CREATE_WRAPPERS_TRUE@gnative2ascii$(EXEEXT): $(gnative2ascii_OBJECTS) $(gnative2ascii_DEPENDENCIES) 
+@CREATE_WRAPPERS_TRUE@ @rm -f gnative2ascii$(EXEEXT)
+@CREATE_WRAPPERS_TRUE@ $(LINK) $(gnative2ascii_LDFLAGS) $(gnative2ascii_OBJECTS) $(gnative2ascii_LDADD) $(LIBS)
+@CREATE_WRAPPERS_TRUE@gorbd$(EXEEXT): $(gorbd_OBJECTS) $(gorbd_DEPENDENCIES) 
+@CREATE_WRAPPERS_TRUE@ @rm -f gorbd$(EXEEXT)
+@CREATE_WRAPPERS_TRUE@ $(LINK) $(gorbd_LDFLAGS) $(gorbd_OBJECTS) $(gorbd_LDADD) $(LIBS)
+@CREATE_WRAPPERS_TRUE@grmic$(EXEEXT): $(grmic_OBJECTS) $(grmic_DEPENDENCIES) 
+@CREATE_WRAPPERS_TRUE@ @rm -f grmic$(EXEEXT)
+@CREATE_WRAPPERS_TRUE@ $(LINK) $(grmic_LDFLAGS) $(grmic_OBJECTS) $(grmic_LDADD) $(LIBS)
+@CREATE_WRAPPERS_TRUE@grmid$(EXEEXT): $(grmid_OBJECTS) $(grmid_DEPENDENCIES) 
+@CREATE_WRAPPERS_TRUE@ @rm -f grmid$(EXEEXT)
+@CREATE_WRAPPERS_TRUE@ $(LINK) $(grmid_LDFLAGS) $(grmid_OBJECTS) $(grmid_LDADD) $(LIBS)
+@CREATE_WRAPPERS_TRUE@grmiregistry$(EXEEXT): $(grmiregistry_OBJECTS) $(grmiregistry_DEPENDENCIES) 
+@CREATE_WRAPPERS_TRUE@ @rm -f grmiregistry$(EXEEXT)
+@CREATE_WRAPPERS_TRUE@ $(LINK) $(grmiregistry_LDFLAGS) $(grmiregistry_OBJECTS) $(grmiregistry_LDADD) $(LIBS)
+@CREATE_WRAPPERS_TRUE@gserialver$(EXEEXT): $(gserialver_OBJECTS) $(gserialver_DEPENDENCIES) 
+@CREATE_WRAPPERS_TRUE@ @rm -f gserialver$(EXEEXT)
+@CREATE_WRAPPERS_TRUE@ $(LINK) $(gserialver_LDFLAGS) $(gserialver_OBJECTS) $(gserialver_LDADD) $(LIBS)
+@CREATE_WRAPPERS_TRUE@gtnameserv$(EXEEXT): $(gtnameserv_OBJECTS) $(gtnameserv_DEPENDENCIES) 
+@CREATE_WRAPPERS_TRUE@ @rm -f gtnameserv$(EXEEXT)
+@CREATE_WRAPPERS_TRUE@ $(LINK) $(gtnameserv_LDFLAGS) $(gtnameserv_OBJECTS) $(gtnameserv_LDADD) $(LIBS)
 install-binSCRIPTS: $(bin_SCRIPTS)
        @$(NORMAL_INSTALL)
        test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
@@ -1092,6 +1093,18 @@ uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS \
        uninstall-binPROGRAMS uninstall-binSCRIPTS uninstall-info-am
 
 @FOUND_ECJ_FALSE@@FOUND_GCJ_FALSE@@FOUND_JAVAC_FALSE@error dunno how to setup the JCOMPILER and compile
+@CREATE_WRAPPERS_FALSE@gappletviewer: gappletviewer.in
+@CREATE_WRAPPERS_FALSE@gjarsigner: gjarsigner.in
+@CREATE_WRAPPERS_FALSE@gkeytool: gkeytool.in
+@CREATE_WRAPPERS_FALSE@gjar: gjar.in
+@CREATE_WRAPPERS_FALSE@gnative2ascii: gnative2ascii.in
+@CREATE_WRAPPERS_FALSE@gserialver: gserialver.in
+@CREATE_WRAPPERS_FALSE@gjavah: gjavah.in
+@CREATE_WRAPPERS_FALSE@grmiregistry: grmiregistry.in
+@CREATE_WRAPPERS_FALSE@gtnameserv: gtnameserv.in
+@CREATE_WRAPPERS_FALSE@gorbd: gorbd.in
+@CREATE_WRAPPERS_FALSE@grmid: grmid.in
+@CREATE_WRAPPERS_FALSE@grmic: grmic.in
 
 # Make sure everything is included in the distribution.
 dist-hook: