diff options
Diffstat (limited to 'libjava/classpath/configure.ac')
| -rw-r--r-- | libjava/classpath/configure.ac | 138 |
1 files changed, 101 insertions, 37 deletions
diff --git a/libjava/classpath/configure.ac b/libjava/classpath/configure.ac index 658b375..65980fd 100644 --- a/libjava/classpath/configure.ac +++ b/libjava/classpath/configure.ac @@ -6,7 +6,7 @@ dnl ----------------------------------------------------------- dnl define([AC_CACHE_LOAD], )dnl dnl define([AC_CACHE_SAVE], )dnl -AC_INIT([GNU Classpath],[0.91],[classpath@gnu.org],[classpath]) +AC_INIT([GNU Classpath],[0.92-pre],[classpath@gnu.org],[classpath]) AC_CONFIG_SRCDIR(java/lang/System.java) AC_CANONICAL_TARGET @@ -41,9 +41,6 @@ AM_INIT_AUTOMAKE([1.9.0 gnu std-options tar-ustar]) AC_CONFIG_HEADERS([include/config.h]) AC_PREFIX_DEFAULT(/usr/local/classpath) -dnl GCC LOCAL -GCC_NO_EXECUTABLES - dnl ----------------------------------------------------------- dnl Enable collections.jar (disabled by default) dnl ----------------------------------------------------------- @@ -168,23 +165,6 @@ dnl GTK native peer error checking dnl ----------------------------------------------------------- AC_ARG_ENABLE([gtk-peers],,AC_MSG_ERROR([No --enable-gtk-peers (or --disable-gtk-peers) option; you want --enable-gtk-peer])) -dnl ------------------------------------------------------------ -dnl determine whether to enable the cairo GTK Graphics2D backend -dnl ------------------------------------------------------------ -AC_ARG_ENABLE([gtk-cairo], - [AS_HELP_STRING(--enable-gtk-cairo,build the cairo Graphics2D implementation on GTK [default=no])], - [case "${enableval}" in - yes) GTK_CAIRO_ENABLED=true ;; - no) GTK_CAIRO_ENABLED=false ;; - *) GTK_CAIRO_ENABLED=true ;; - esac], - [GTK_CAIRO_ENABLED=false]) -AC_SUBST(GTK_CAIRO_ENABLED) -if test "x${GTK_CAIRO_ENABLED}" = xtrue; then - AC_DEFINE(GTK_CAIRO, 1, [defined if cairo support was built in]) -fi -AM_CONDITIONAL(GTK_CAIRO, test "x${GTK_CAIRO_ENABLED}" = xtrue) - dnl ----------------------------------------------------------- dnl Qt native peer (disabled by default) dnl ----------------------------------------------------------- @@ -198,12 +178,24 @@ AC_ARG_ENABLE([qt-peer], [COMPILE_QT_PEER=no]) AM_CONDITIONAL(CREATE_QT_PEER_LIBRARIES, test "x${COMPILE_QT_PEER}" = xyes) +dnl ----------------------------------------------------------- +dnl Plugin (enabled by default) +dnl ----------------------------------------------------------- +AC_ARG_ENABLE([plugin], + [AS_HELP_STRING(--disable-plugin,compile gcjwebplugin (disabled by --disable-plugin) [default=yes])], + [case "${enableval}" in + yes) COMPILE_PLUGIN=yes ;; + no) COMPILE_PLUGIN=no ;; + *) COMPILE_PLUGIN=yes ;; + esac], + [COMPILE_PLUGIN=yes]) +AM_CONDITIONAL(CREATE_PLUGIN, test "x${COMPILE_PLUGIN}" = xyes) dnl ----------------------------------------------------------- dnl Sets the native libraries installation dir dnl ----------------------------------------------------------- AC_ARG_WITH([native-libdir], - [AS_HELP_STRING(--with-native-libdir,sets the installation directore for native libraries [default='${libdir}/${PACKAGE}'])], + [AS_HELP_STRING(--with-native-libdir,sets the installation directory for native libraries [default='${libdir}/${PACKAGE}'])], [ nativeexeclibdir=${withval} ], @@ -228,6 +220,21 @@ AC_ARG_WITH([glibj-dir], AC_SUBST(glibjdir) dnl ----------------------------------------------------------- +dnl Sets the VM name for use in tool wrapper scripts +dnl ----------------------------------------------------------- +AC_ARG_WITH([vm], + [AS_HELP_STRING(--with-vm,sets the VM binary name [default='${prefix}/bin/jamvm'])], + [ + VM_BINARY=${withval} + ], + [ + VM_BINARY='${prefix}/bin/jamvm' + ]) + +AC_SUBST(VM_BINARY) +AM_CONDITIONAL(FOUND_CACAO, test "x`basename $VM_BINARY`" = xcacao) + +dnl ----------------------------------------------------------- dnl Regenerate headers at build time (disabled by default) dnl ----------------------------------------------------------- AC_ARG_ENABLE([regen-headers], @@ -240,20 +247,33 @@ AC_ARG_ENABLE([regen-headers], [REGENERATE_JNI_HEADERS=no]) AM_CONDITIONAL(CREATE_JNI_HEADERS, test "x${REGENERATE_JNI_HEADERS}" = xyes) +dnl ----------------------------------------------------------- +dnl Enable tool wrapper binaries (disabled by default) +dnl ----------------------------------------------------------- +AC_ARG_ENABLE([tool-wrappers], + [AS_HELP_STRING(--enable-tool-wrappers,create tool wrapper binaries [default=no])], + [case x"${enableval}" in + xyes) COMPILE_WRAPPERS=yes ;; + xno) COMPILE_WRAPPERS=no ;; + x) COMPILE_WRAPPERS=yes ;; + *) COMPILE_WRAPPERS=yes ;; + esac], + [COMPILE_WRAPPERS=no]) +AM_CONDITIONAL(CREATE_WRAPPERS, test "x${COMPILE_WRAPPERS}" = xyes) + AC_PROG_LN_S AC_PROG_INSTALL dnl ----------------------------------------------------------- dnl Checks for programs. dnl ----------------------------------------------------------- - +AC_PROG_CXX dnl Initialize libtool AC_DISABLE_STATIC AC_PROG_LIBTOOL dnl AC_PROG_AWK AC_PROG_CC AC_PROG_CPP -AC_PROG_CXX if test "x${COMPILE_COLLECTIONS}" = xyes; then AC_PATH_PROG(PERL, [perl]) @@ -284,7 +304,8 @@ if test "x${COMPILE_JNI}" = xyes; then sys/select.h \ crt_externs.h \ fcntl.h \ - sys/mman.h]) + sys/mman.h \ + magic.h]) AC_EGREP_HEADER(uint32_t, stdint.h, AC_DEFINE(HAVE_INT32_DEFINED, 1, [Define to 1 if you have uint32_t])) AC_EGREP_HEADER(uint32_t, inttypes.h, AC_DEFINE(HAVE_INT32_DEFINED, 1, [Define to 1 if you have uint32_t])) @@ -300,8 +321,13 @@ if test "x${COMPILE_JNI}" = xyes; then strerror_r \ fcntl \ mmap munmap mincore msync madvise getpagesize sysconf \ + lstat readlink \ ]) + LIBMAGIC= + AC_CHECK_LIB(magic, magic_open, LIBMAGIC=-lmagic) + AC_SUBST(LIBMAGIC) + AC_HEADER_TIME AC_STRUCT_TM AC_STRUCT_TIMEZONE @@ -375,26 +401,35 @@ if test "x${COMPILE_JNI}" = xyes; then AC_MSG_ERROR([GTK+ peers requested but no X library available]) fi dnl We explicitly want the XTest Extension for Robot support. - AC_CHECK_LIB([Xtst], [XTestQueryExtension], [true], - [AC_MSG_ERROR([libXtst NOT found, required for GdkRobot])], - [${X_LIBS}]) - PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.4 gthread-2.0 >= 2.2 gdk-pixbuf-2.0) - - if test "x${enable_gtk_cairo}" = xyes; then - PKG_CHECK_MODULES(CAIRO, cairo >= 0.5.0) - fi + AC_CHECK_LIB([Xtst], [XTestQueryExtension], + [XTEST_LIBS="$XTEST_LIBS -lX11 -lXtst"], + [AC_MSG_ERROR([libXtst NOT found, required for GdkRobot])], + [${X_LIBS}]) + PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.8 gthread-2.0 >= 2.2 gdk-pixbuf-2.0) PKG_CHECK_MODULES(FREETYPE2, freetype2) PKG_CHECK_MODULES(PANGOFT2, pangoft2) + dnl Check if we can link against the XRender library and set + dnl HAVE_XRENDER accordingly. + AC_CHECK_LIB([Xrender], [XRenderQueryExtension], + [AC_DEFINE(HAVE_XRENDER, 1, [Define to 1 if you have libXrender.])[X_EXTRA_LIBS="$X_EXTRA_LIBS -lXrender"]], + [true], + [${X_LIBS}]) + + dnl Check if we can link against the XRandR library and set + dnl HAVE_XRANDR accordingly. + AC_CHECK_LIB([Xrandr], [XRRQueryExtension], + [AC_DEFINE(HAVE_XRANDR, 1, [Define to 1 if you have libXrandr.])[X_EXTRA_LIBS="$X_EXTRA_LIBS -lXrandr"]], + [true], + [${X_LIBS}]) AC_SUBST(GTK_CFLAGS) AC_SUBST(GTK_LIBS) - AC_SUBST(CAIRO_LIBS) - AC_SUBST(CAIRO_CFLAGS) AC_SUBST(FREETYPE2_LIBS) AC_SUBST(FREETYPE2_CFLAGS) AC_SUBST(PANGOFT2_LIBS) AC_SUBST(PANGOFT2_CFLAGS) + AC_SUBST(XTEST_LIBS) fi dnl Check for AWT related Qt4 @@ -445,6 +480,25 @@ if test "x${COMPILE_JNI}" = xyes; then AC_SUBST(QT_CFLAGS) AC_SUBST(QT_LIBS) fi + + dnl Check for plugin support headers and libraries. + if test "x${COMPILE_PLUGIN}" = xyes; then + PKG_CHECK_MODULES(MOZILLA, mozilla-plugin, [MOZILLA_FOUND=yes], [MOZILLA_FOUND=no]) + if test "x${MOZILLA_FOUND}" = xno; then + PKG_CHECK_MODULES(MOZILLA, firefox-plugin, [MOZILLA_FOUND=yes], [MOZILLA_FOUND=no]) + fi + if test "x${MOZILLA_FOUND}" = xno; then + PKG_CHECK_MODULES(MOZILLA, xulrunner-plugin, [MOZILLA_FOUND=yes], [MOZILLA_FOUND=no]) + fi + PKG_CHECK_MODULES(GLIB, glib-2.0) + + AC_SUBST(MOZILLA_CFLAGS) + AC_SUBST(MOZILLA_LIBS) + AC_SUBST(GLIB_CFLAGS) + AC_SUBST(GLIB_LIBS) + + AC_SUBST(PLUGIN_DIR, $HOME/.mozilla/plugins/) + fi fi CLASSPATH_WITH_JAVAH @@ -669,6 +723,7 @@ native/jni/qt-peer/Makefile native/jni/xmlj/Makefile native/jni/midi-alsa/Makefile native/jni/midi-dssi/Makefile +native/plugin/Makefile native/target/Makefile native/target/Linux/Makefile native/target/generic/Makefile @@ -679,10 +734,19 @@ lib/Makefile lib/gen-classlist.sh lib/copy-vmresources.sh tools/Makefile -tools/jarsigner.sh -tools/keytool.sh examples/Makefile examples/Makefile.jawt]) + +if test "x${COMPILE_WRAPPERS}" = xno +then +AC_CONFIG_FILES([tools/appletviewer +tools/jarsigner +tools/keytool]) +AC_CONFIG_COMMANDS([appletviewer],[chmod 755 tools/appletviewer]) +AC_CONFIG_COMMANDS([jarsigner],[chmod 755 tools/jarsigner]) +AC_CONFIG_COMMANDS([keytool],[chmod 755 tools/keytool]) +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 |