diff options
| author | Roman Kennke <roman@kennke.org> | 2006-06-29 15:15:54 +0000 |
|---|---|---|
| committer | Roman Kennke <roman@kennke.org> | 2006-06-29 15:15:54 +0000 |
| commit | c608e01d88022c7604a3901717a279237e418ca0 (patch) | |
| tree | d4f66b254f992d1a1b8c309707711741afe2ed5b /configure.ac | |
| parent | 993b9c042ca4cfa36b02247ba12c754d62dfb8de (diff) | |
| download | classpath-c608e01d88022c7604a3901717a279237e418ca0.tar.gz | |
2006-06-29 Roman Kennke <kennke@aicas.com>
* gnu/java/awt/peer/x/GLGraphics.java,
* gnu/java/awt/peer/x/ImageConverter.java,
* gnu/java/awt/peer/x/KeyboardMapping.java,
* gnu/java/awt/peer/x/XEventPump.java,
* gnu/java/awt/peer/x/XFontPeer.java,
* gnu/java/awt/peer/x/XFontPeer2.java,
* gnu/java/awt/peer/x/XFramePeer.java,
* gnu/java/awt/peer/x/XGraphics.java,
* gnu/java/awt/peer/x/XGraphics2D.java,
* gnu/java/awt/peer/x/XGraphicsConfiguration.java,
* gnu/java/awt/peer/x/XGraphicsDevice.java,
* gnu/java/awt/peer/x/XGraphicsEnvironment.java,
* gnu/java/awt/peer/x/XImage.java,
* gnu/java/awt/peer/x/XLightweightPeer.java,
* gnu/java/awt/peer/x/XToolkit.java,
* gnu/java/awt/peer/x/XWindowPeer.java,
* gnu/java/awt/peer/x/fonts.properties: New files.
* lib/standard.omit: Removed.
* lib/standard.omit.in: Added.
* configure.ac: Added configure option --with-escher. Added some
configury for omitting gnu.java.awt.peer.x package when
this option is not specified.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index 92375b607..e3569dcc0 100644 --- a/configure.ac +++ b/configure.ac @@ -697,6 +697,30 @@ esac; AM_CONDITIONAL(USE_PREBUILT_GLIBJ_ZIP, test x$use_glibj_zip = xtrue) AC_SUBST(PATH_TO_GLIBJ_ZIP) +dnl ----------------------------------------------------------- +dnl Build with Escher based X peers. +dnl ----------------------------------------------------------- +AC_ARG_WITH([escher], + AS_HELP_STRING([--with-escher=ABS.PATH], + [specify path to escher dir or JAR for X peers])) +case "$with_escher" in +"") + use_escher=false + ;; +"no") + use_escher=false + ;; +"yes") + AC_MSG_ERROR([Please suply an absolute path to Escher library]) + ;; +*) + use_escher=true + PATH_TO_ESCHER=$with_escher + ;; +esac; + +AM_CONDITIONAL(USE_ESCHER, test x$use_escher = xtrue) +AC_SUBST(PATH_TO_ESCHER) dnl ----------------------------------------------------------- dnl Check if local socket support should be included. @@ -784,3 +808,9 @@ fi AC_CONFIG_COMMANDS([gen-classlist],[chmod 755 lib/gen-classlist.sh]) AC_CONFIG_COMMANDS([copy-vmresources],[chmod 755 lib/copy-vmresources.sh]) AC_OUTPUT + +# Create standard.omit based on decisions we just made. +cp lib/standard.omit.in lib/standard.omit +if test x$use_escher != xtrue; then + echo gnu/java/awt/peer/x >> lib/standard.omit +fi |