diff options
Diffstat (limited to 'libjava/classpath/configure.ac')
| -rw-r--r-- | libjava/classpath/configure.ac | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/libjava/classpath/configure.ac b/libjava/classpath/configure.ac index 39e88be..a751c7d 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.94-pre],[classpath@gnu.org],[classpath]) +AC_INIT([GNU Classpath],[0.95],[classpath@gnu.org],[classpath]) AC_CONFIG_SRCDIR(java/lang/System.java) dnl GCJ LOCAL @@ -72,7 +72,7 @@ CLASSPATH_CONVENIENCE="-no-undefined" AC_SUBST(CLASSPATH_CONVENIENCE) AC_PREREQ(2.59) -AM_INIT_AUTOMAKE([1.9.0 gnu std-options tar-ustar]) +AM_INIT_AUTOMAKE([1.9.0 gnu std-options tar-ustar -Wno-portability]) AC_CONFIG_HEADERS([include/config.h]) AC_PREFIX_DEFAULT(/usr/local/classpath) @@ -360,6 +360,7 @@ AC_DISABLE_STATIC AC_PROG_LIBTOOL dnl AC_PROG_AWK AC_PROG_CC +AM_PROG_CC_C_O AC_PROG_CPP AC_PROG_CXX @@ -427,7 +428,7 @@ if test "x${COMPILE_JNI}" = xyes; then lstat readlink \ inet_aton inet_addr inet_pton \ getifaddrs kqueue kevent epoll_create \ - readdir_r ]) + readdir_r getloadavg]) LIBMAGIC= AC_CHECK_LIB(magic, magic_open, LIBMAGIC=-lmagic) @@ -467,7 +468,9 @@ if test "x${COMPILE_JNI}" = xyes; then [AC_MSG_RESULT(no)])])]) AC_C_CONST + AC_C_INLINE AC_C_ATTRIBUTE + AX_FUNC_WHICH_GETHOSTBYNAME_R dnl See if we HAVE_ICONV, how ICONV_CONST is set and LTLIBICONV AM_ICONV @@ -521,6 +524,7 @@ if test "x${COMPILE_JNI}" = xyes; then 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) + PKG_CHECK_MODULES(CAIRO, cairo >= 1.1.8) dnl Check if we can link against the XRender library and set dnl HAVE_XRENDER accordingly. AC_CHECK_LIB([Xrender], [XRenderQueryExtension], @@ -546,7 +550,7 @@ if test "x${COMPILE_JNI}" = xyes; then dnl gconf-peer if test "x${COMPILE_GCONF_PEER}" = xyes; then - PKG_CHECK_MODULES(GCONF, gconf-2.0 >= 2.11.2) + PKG_CHECK_MODULES(GCONF, gconf-2.0 >= 2.6.0) AC_SUBST(GCONF_CFLAGS) AC_SUBST(GCONF_LIBS) dnl we also need gdk for locking @@ -649,12 +653,22 @@ if test "x${COMPILE_JNI}" = xyes; then if test "x${MOZILLA_FOUND}" = xno; then PKG_CHECK_MODULES(MOZILLA, seamonkey-plugin seamonkey-xpcom, [MOZILLA_FOUND=yes], [MOZILLA_FOUND=no]) fi + if test "x${MOZILLA_FOUND}" = xno; then + PKG_CHECK_MODULES(MOZILLA, iceape-plugin iceape-xpcom, [MOZILLA_FOUND=yes], [MOZILLA_FOUND=no]) + fi + if test "x${MOZILLA_FOUND}" = xno; then + AC_MSG_ERROR([Couldn't find plugin support headers and libraries, try --disable-plugin]) + fi + PKG_CHECK_MODULES(GLIB, glib-2.0) + PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.8 gthread-2.0 >= 2.2 gdk-pixbuf-2.0) AC_SUBST(MOZILLA_CFLAGS) AC_SUBST(MOZILLA_LIBS) AC_SUBST(GLIB_CFLAGS) AC_SUBST(GLIB_LIBS) + AC_SUBST(GTK_CFLAGS) + AC_SUBST(GTK_LIBS) AC_SUBST(PLUGIN_DIR, $HOME/.mozilla/plugins/) fi |