mirror of
git://gcc.gnu.org/git/gcc.git
synced 2024-12-21 11:09:40 +08:00
5aac1dac62
* java/awt/Window.java (Window(Window,GraphicsConfiguration)): Don't try to find graphics configuration. * java/awt/Toolkit.java (default_toolkit_name): Use new Configuration entry. * gnu/classpath/Configuration.java.in (default_awt_peer_toolkit): New global. * configure: Rebuilt. * configure.in (TOOLKIT): New subst. (--enable-java-awt) [xlib, gtk]: Set TOOLKIT if required. Do AWT tests much earlier. Run Gtk tests. Make jniinclude directory. Make output directories for .c files. * Makefile.in: Rebuilt. * Makefile.am (lib_gnu_java_awt_peer_gtk_la_SOURCES): New macro. (toolexeclib_LTLIBRARIES): Added cond_gtk_ltlibrary. (all_java_source_files): Added new sources. ($(lib_gnu_java_awt_peer_gtk_la_OBJECTS)): New target. (gtk_c_files): New macro. (gtk_c_source_files): New macro. (cond_gtk_ltlibrary): New macro. ($(gtk_c_files)): New target. (lib_gnu_java_awt_peer_gtk_la_LIBADD): New macro. (gtk_awt_peer_sources): New macro. (gtk_c_headers): New macro. ($(gtk_c_headers)): New target. (ACLOCAL_AMFLAGS): New macro. * gtk.m4, glib.m4, libart.m4: New files. * gnu/java/awt/peer/gtk/GdkFontMetrics.java, gnu/java/awt/peer/gtk/GdkGraphics.java, gnu/java/awt/peer/gtk/GtkArg.java, gnu/java/awt/peer/gtk/GtkArgList.java, gnu/java/awt/peer/gtk/GtkButtonPeer.java, gnu/java/awt/peer/gtk/GtkCanvasPeer.java, gnu/java/awt/peer/gtk/GtkCheckboxGroupPeer.java, gnu/java/awt/peer/gtk/GtkCheckboxMenuItemPeer.java, gnu/java/awt/peer/gtk/GtkCheckboxPeer.java, gnu/java/awt/peer/gtk/GtkChoicePeer.java, gnu/java/awt/peer/gtk/GtkClipboard.java, gnu/java/awt/peer/gtk/GtkComponentPeer.java, gnu/java/awt/peer/gtk/GtkContainerPeer.java, gnu/java/awt/peer/gtk/GtkDialogPeer.java, gnu/java/awt/peer/gtk/GtkFileDialogPeer.java, gnu/java/awt/peer/gtk/GtkFontPeer.java, gnu/java/awt/peer/gtk/GtkFramePeer.java, gnu/java/awt/peer/gtk/GtkGenericPeer.java, gnu/java/awt/peer/gtk/GtkImage.java, gnu/java/awt/peer/gtk/GtkImagePainter.java, gnu/java/awt/peer/gtk/GtkLabelPeer.java, gnu/java/awt/peer/gtk/GtkListPeer.java, gnu/java/awt/peer/gtk/GtkMainThread.java, gnu/java/awt/peer/gtk/GtkMenuBarPeer.java, gnu/java/awt/peer/gtk/GtkMenuComponentPeer.java, gnu/java/awt/peer/gtk/GtkMenuItemPeer.java, gnu/java/awt/peer/gtk/GtkMenuPeer.java, gnu/java/awt/peer/gtk/GtkOffScreenImage.java, gnu/java/awt/peer/gtk/GtkPanelPeer.java, gnu/java/awt/peer/gtk/GtkPopupMenuPeer.java, gnu/java/awt/peer/gtk/GtkScrollbarPeer.java, gnu/java/awt/peer/gtk/GtkScrollPanePeer.java, gnu/java/awt/peer/gtk/GtkTextAreaPeer.java, gnu/java/awt/peer/gtk/GtkTextComponentPeer.java, gnu/java/awt/peer/gtk/GtkTextFieldPeer.java, gnu/java/awt/peer/gtk/GtkToolkit.java, gnu/java/awt/peer/gtk/GtkWindowPeer.java, gnu/java/awt/peer/gtk/TestAWT.java, gnu/java/awt/peer/gtk/Test.java: New files from Classpath. * jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontMetrics.c, jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics.c, jni/gtk-peer/gnu_java_awt_peer_gtk_GtkButtonPeer.c, jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCanvasPeer.c, jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCheckboxMenuItemPeer.c, jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCheckboxPeer.c, jni/gtk-peer/gnu_java_awt_peer_gtk_GtkChoicePeer.c, jni/gtk-peer/gnu_java_awt_peer_gtk_GtkClipboard.c, jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c, jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c, jni/gtk-peer/gnu_java_awt_peer_gtk_GtkFileDialogPeer.c, jni/gtk-peer/gnu_java_awt_peer_gtk_GtkImagePainter.c, jni/gtk-peer/gnu_java_awt_peer_gtk_GtkLabelPeer.c, jni/gtk-peer/gnu_java_awt_peer_gtk_GtkListPeer.c, jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMainThread.c, jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuBarPeer.c, jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuItemPeer.c, jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuPeer.c, jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPanelPeer.c, jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPopupMenuPeer.c, jni/gtk-peer/gnu_java_awt_peer_gtk_GtkScrollBarPeer.c, jni/gtk-peer/gnu_java_awt_peer_gtk_GtkScrollPanePeer.c, jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextAreaPeer.c, jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextComponentPeer.c, jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextFieldPeer.c, jni/gtk-peer/gnu_java_awt_peer_gtk_GtkToolkit.c, jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c, jni/gtk-peer/gthread-jni.c, jni/gtk-peer/gthread-jni.h, jni/gtk-peer/gtkpeer.h, jni/classpath/jcl.c, jni/classpath/jcl.h, jni/classpath/jnilink.c, jni/classpath/jnilink.h, jni/classpath/native_state.c, jni/classpath/native_state.h, jni/classpath/primlib.c, jni/classpath/primlib.h: Likewise. From-SVN: r62187
197 lines
8.2 KiB
Plaintext
197 lines
8.2 KiB
Plaintext
# Configure paths for GLIB
|
|
# Owen Taylor 97-11-3
|
|
|
|
dnl AM_PATH_GLIB([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
|
|
dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if "gmodule" or
|
|
dnl gthread is specified in MODULES, pass to glib-config
|
|
dnl
|
|
AC_DEFUN(AM_PATH_GLIB,
|
|
[dnl
|
|
dnl Get the cflags and libraries from the glib-config script
|
|
dnl
|
|
AC_ARG_WITH(glib-prefix,[ --with-glib-prefix=PFX Prefix where GLIB is installed (optional)],
|
|
glib_config_prefix="$withval", glib_config_prefix="")
|
|
AC_ARG_WITH(glib-exec-prefix,[ --with-glib-exec-prefix=PFX Exec prefix where GLIB is installed (optional)],
|
|
glib_config_exec_prefix="$withval", glib_config_exec_prefix="")
|
|
AC_ARG_ENABLE(glibtest, [ --disable-glibtest Do not try to compile and run a test GLIB program],
|
|
, enable_glibtest=yes)
|
|
|
|
if test x$glib_config_exec_prefix != x ; then
|
|
glib_config_args="$glib_config_args --exec-prefix=$glib_config_exec_prefix"
|
|
if test x${GLIB_CONFIG+set} != xset ; then
|
|
GLIB_CONFIG=$glib_config_exec_prefix/bin/glib-config
|
|
fi
|
|
fi
|
|
if test x$glib_config_prefix != x ; then
|
|
glib_config_args="$glib_config_args --prefix=$glib_config_prefix"
|
|
if test x${GLIB_CONFIG+set} != xset ; then
|
|
GLIB_CONFIG=$glib_config_prefix/bin/glib-config
|
|
fi
|
|
fi
|
|
|
|
for module in . $4
|
|
do
|
|
case "$module" in
|
|
gmodule)
|
|
glib_config_args="$glib_config_args gmodule"
|
|
;;
|
|
gthread)
|
|
glib_config_args="$glib_config_args gthread"
|
|
;;
|
|
esac
|
|
done
|
|
|
|
AC_PATH_PROG(GLIB_CONFIG, glib-config, no)
|
|
min_glib_version=ifelse([$1], ,0.99.7,$1)
|
|
AC_MSG_CHECKING(for GLIB - version >= $min_glib_version)
|
|
no_glib=""
|
|
if test "$GLIB_CONFIG" = "no" ; then
|
|
no_glib=yes
|
|
else
|
|
GLIB_CFLAGS=`$GLIB_CONFIG $glib_config_args --cflags`
|
|
GLIB_LIBS=`$GLIB_CONFIG $glib_config_args --libs`
|
|
glib_config_major_version=`$GLIB_CONFIG $glib_config_args --version | \
|
|
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
|
|
glib_config_minor_version=`$GLIB_CONFIG $glib_config_args --version | \
|
|
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
|
|
glib_config_micro_version=`$GLIB_CONFIG $glib_config_args --version | \
|
|
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
|
|
if test "x$enable_glibtest" = "xyes" ; then
|
|
ac_save_CFLAGS="$CFLAGS"
|
|
ac_save_LIBS="$LIBS"
|
|
CFLAGS="$CFLAGS $GLIB_CFLAGS"
|
|
LIBS="$GLIB_LIBS $LIBS"
|
|
dnl
|
|
dnl Now check if the installed GLIB is sufficiently new. (Also sanity
|
|
dnl checks the results of glib-config to some extent
|
|
dnl
|
|
rm -f conf.glibtest
|
|
AC_TRY_RUN([
|
|
#include <glib.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
|
|
int
|
|
main ()
|
|
{
|
|
int major, minor, micro;
|
|
char *tmp_version;
|
|
|
|
system ("touch conf.glibtest");
|
|
|
|
/* HP/UX 9 (%@#!) writes to sscanf strings */
|
|
tmp_version = g_strdup("$min_glib_version");
|
|
if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) {
|
|
printf("%s, bad version string\n", "$min_glib_version");
|
|
exit(1);
|
|
}
|
|
|
|
if ((glib_major_version != $glib_config_major_version) ||
|
|
(glib_minor_version != $glib_config_minor_version) ||
|
|
(glib_micro_version != $glib_config_micro_version))
|
|
{
|
|
printf("\n*** 'glib-config --version' returned %d.%d.%d, but GLIB (%d.%d.%d)\n",
|
|
$glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version,
|
|
glib_major_version, glib_minor_version, glib_micro_version);
|
|
printf ("*** was found! If glib-config was correct, then it is best\n");
|
|
printf ("*** to remove the old version of GLIB. You may also be able to fix the error\n");
|
|
printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
|
|
printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
|
|
printf("*** required on your system.\n");
|
|
printf("*** If glib-config was wrong, set the environment variable GLIB_CONFIG\n");
|
|
printf("*** to point to the correct copy of glib-config, and remove the file config.cache\n");
|
|
printf("*** before re-running configure\n");
|
|
}
|
|
else if ((glib_major_version != GLIB_MAJOR_VERSION) ||
|
|
(glib_minor_version != GLIB_MINOR_VERSION) ||
|
|
(glib_micro_version != GLIB_MICRO_VERSION))
|
|
{
|
|
printf("*** GLIB header files (version %d.%d.%d) do not match\n",
|
|
GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION);
|
|
printf("*** library (version %d.%d.%d)\n",
|
|
glib_major_version, glib_minor_version, glib_micro_version);
|
|
}
|
|
else
|
|
{
|
|
if ((glib_major_version > major) ||
|
|
((glib_major_version == major) && (glib_minor_version > minor)) ||
|
|
((glib_major_version == major) && (glib_minor_version == minor) && (glib_micro_version >= micro)))
|
|
{
|
|
return 0;
|
|
}
|
|
else
|
|
{
|
|
printf("\n*** An old version of GLIB (%d.%d.%d) was found.\n",
|
|
glib_major_version, glib_minor_version, glib_micro_version);
|
|
printf("*** You need a version of GLIB newer than %d.%d.%d. The latest version of\n",
|
|
major, minor, micro);
|
|
printf("*** GLIB is always available from ftp://ftp.gtk.org.\n");
|
|
printf("***\n");
|
|
printf("*** If you have already installed a sufficiently new version, this error\n");
|
|
printf("*** probably means that the wrong copy of the glib-config shell script is\n");
|
|
printf("*** being found. The easiest way to fix this is to remove the old version\n");
|
|
printf("*** of GLIB, but you can also set the GLIB_CONFIG environment to point to the\n");
|
|
printf("*** correct copy of glib-config. (In this case, you will have to\n");
|
|
printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
|
|
printf("*** so that the correct libraries are found at run-time))\n");
|
|
}
|
|
}
|
|
return 1;
|
|
}
|
|
],, no_glib=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
|
|
CFLAGS="$ac_save_CFLAGS"
|
|
LIBS="$ac_save_LIBS"
|
|
fi
|
|
fi
|
|
if test "x$no_glib" = x ; then
|
|
AC_MSG_RESULT(yes)
|
|
ifelse([$2], , :, [$2])
|
|
else
|
|
AC_MSG_RESULT(no)
|
|
if test "$GLIB_CONFIG" = "no" ; then
|
|
echo "*** The glib-config script installed by GLIB could not be found"
|
|
echo "*** If GLIB was installed in PREFIX, make sure PREFIX/bin is in"
|
|
echo "*** your path, or set the GLIB_CONFIG environment variable to the"
|
|
echo "*** full path to glib-config."
|
|
else
|
|
if test -f conf.glibtest ; then
|
|
:
|
|
else
|
|
echo "*** Could not run GLIB test program, checking why..."
|
|
CFLAGS="$CFLAGS $GLIB_CFLAGS"
|
|
LIBS="$LIBS $GLIB_LIBS"
|
|
AC_TRY_LINK([
|
|
#include <glib.h>
|
|
#include <stdio.h>
|
|
], [ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ],
|
|
[ echo "*** The test program compiled, but did not run. This usually means"
|
|
echo "*** that the run-time linker is not finding GLIB or finding the wrong"
|
|
echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your"
|
|
echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
|
|
echo "*** to the installed location Also, make sure you have run ldconfig if that"
|
|
echo "*** is required on your system"
|
|
echo "***"
|
|
echo "*** If you have an old version installed, it is best to remove it, although"
|
|
echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
|
|
echo "***"
|
|
echo "*** If you have a RedHat 5.0 system, you should remove the GTK package that"
|
|
echo "*** came with the system with the command"
|
|
echo "***"
|
|
echo "*** rpm --erase --nodeps gtk gtk-devel" ],
|
|
[ echo "*** The test program failed to compile or link. See the file config.log for the"
|
|
echo "*** exact error that occured. This usually means GLIB was incorrectly installed"
|
|
echo "*** or that you have moved GLIB since it was installed. In the latter case, you"
|
|
echo "*** may want to edit the glib-config script: $GLIB_CONFIG" ])
|
|
CFLAGS="$ac_save_CFLAGS"
|
|
LIBS="$ac_save_LIBS"
|
|
fi
|
|
fi
|
|
GLIB_CFLAGS=""
|
|
GLIB_LIBS=""
|
|
ifelse([$3], , :, [$3])
|
|
fi
|
|
AC_SUBST(GLIB_CFLAGS)
|
|
AC_SUBST(GLIB_LIBS)
|
|
rm -f conf.glibtest
|
|
])
|