diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | configure.ac | 9 | ||||
| -rw-r--r-- | m4/acinclude.m4 | 16 | ||||
| -rwxr-xr-x | tools/Makefile.am | 3 |
4 files changed, 29 insertions, 5 deletions
@@ -1,3 +1,9 @@ +2008-07-15 Ralf Wildenhues <Ralf.Wildenhues@gmx.de> + + * m4/acinclude.m4 (CLASSPATH_COND_IF): New macro. + * configure.ac: Use it. + * tools/Makefile.am (!CREATE_WRAPPERS): Update comment. + 2008-07-12 Andrew John Hughes <gnu_andrew@member.fsf.org> * resource/gnu/java/locale/LocaleInformation.properties, diff --git a/configure.ac b/configure.ac index c5176481f..d17beba02 100644 --- a/configure.ac +++ b/configure.ac @@ -1077,9 +1077,8 @@ examples/Makefile examples/Makefile.jawt examples/Makefile.java2d]) -if test "x${COMPILE_WRAPPERS}" = xno -then -AC_CONFIG_FILES([tools/gappletviewer +CLASSPATH_COND_IF([CREATE_WRAPPERS], [test "x${COMPILE_WRAPPERS}" = xyes], [], +[AC_CONFIG_FILES([tools/gappletviewer tools/gjarsigner tools/gkeytool tools/gjar @@ -1091,6 +1090,7 @@ tools/gorbd tools/grmid tools/grmic tools/gjavah]) + AC_CONFIG_COMMANDS([gappletviewer],[chmod 755 tools/gappletviewer]) AC_CONFIG_COMMANDS([gjarsigner],[chmod 755 tools/gjarsigner]) AC_CONFIG_COMMANDS([gkeytool],[chmod 755 tools/gkeytool]) @@ -1103,12 +1103,13 @@ AC_CONFIG_COMMANDS([gorbd],[chmod 755 tools/gorbd]) AC_CONFIG_COMMANDS([grmid],[chmod 755 tools/grmid]) AC_CONFIG_COMMANDS([grmic],[chmod 755 tools/grmic]) AC_CONFIG_COMMANDS([gjavah], [chmod 755 tools/gjavah]) +]) + if test "x${COMPILE_GJDOC}" = xyes then AC_CONFIG_FILES([tools/gjdoc]) AC_CONFIG_COMMANDS([gjdoc], [chmod 755 tools/gjdoc]) fi -fi AC_CONFIG_COMMANDS([gen-classlist],[chmod 755 lib/gen-classlist.sh]) AC_CONFIG_COMMANDS([copy-vmresources],[chmod 755 lib/copy-vmresources.sh]) diff --git a/m4/acinclude.m4 b/m4/acinclude.m4 index 7990e6360..18af91c51 100644 --- a/m4/acinclude.m4 +++ b/m4/acinclude.m4 @@ -260,3 +260,19 @@ EOF rm -f $JAVA_TEST $CLASS_TEST AC_SUBST(JAVAC_MEM_OPT) ]) + +dnl --------------------------------------------------------------- +dnl CLASSPATH_COND_IF(COND, SHELL-CONDITION, [IF-TRUE], [IF-FALSE]) +dnl --------------------------------------------------------------- +dnl Automake 1.11 can emit conditional rules for AC_CONFIG_FILES, +dnl using AM_COND_IF. This wrapper uses it if it is available, +dnl otherwise falls back to code compatible with Automake 1.9.6. +AC_DEFUN([CLASSPATH_COND_IF], +[m4_ifdef([AM_COND_IF], + [AM_COND_IF([$1], [$3], [$4])], + [if $2; then + m4_default([$3], [:]) + else + m4_default([$4], [:]) + fi +])]) diff --git a/tools/Makefile.am b/tools/Makefile.am index 0d57f50c3..2786954eb 100755 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -101,7 +101,8 @@ if CREATE_GJDOC bin_SCRIPTS += gjdoc endif bin_PROGRAMS = -## FIXME: revisit this with a newer automake. +## FIXME: remove these unneeded dependency lines once we can +## require Automake 1.11. gappletviewer: gappletviewer.in gjarsigner: gjarsigner.in gkeytool: gkeytool.in |