diff options
| author | mkoch <mkoch@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-01-30 22:01:11 +0000 |
|---|---|---|
| committer | mkoch <mkoch@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-01-30 22:01:11 +0000 |
| commit | bb366ae60d16fa89358f85586280bcfd12946ed7 (patch) | |
| tree | c9bd395a1775b42134e39ed62af38b29ae54acd7 /libjava/configure.in | |
| parent | 341c819295ed3709f62d7ca83b7bca6594579f93 (diff) | |
| download | ppe42-gcc-bb366ae60d16fa89358f85586280bcfd12946ed7.tar.gz ppe42-gcc-bb366ae60d16fa89358f85586280bcfd12946ed7.zip | |
2004-01-30 Michael Koch <konqueror@gmx.de>
* configure.in: Use pkg-config to check for GTK 2.2 and libart 2.1.
* configure: Regenerated.
* glib-2.0.m4: Removed.
* gtk-2.0.m4: Removed.
* libart.m4: Removed.
* pkg.m4: New file.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@76993 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/configure.in')
| -rw-r--r-- | libjava/configure.in | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/libjava/configure.in b/libjava/configure.in index 26f39cc3359..f3cee23c5a7 100644 --- a/libjava/configure.in +++ b/libjava/configure.in @@ -876,11 +876,13 @@ else # Test for Gtk stuff, if asked for. if test "$use_gtk_awt" = yes; then - AM_PATH_GTK_2_0(2.2.0,,exit 1) - AM_PATH_GLIB_2_0(2.2.0,,exit 1,gthread) - dnl XXX Fix me when libart.m4 has the compile test fixed! - enable_libarttest=no - AM_PATH_LIBART(2.1.0,,exit 1) + PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.2) + AC_SUBST(GTK_CFLAGS) + AC_SUBST(GTK_LIBS) + + PKG_CHECK_MODULES(LIBART, libart-2.0 >= 2.1) + AC_SUBST(LIBART_CFLAGS) + AC_SUBST(LIBART_LIBS) fi # On Solaris, and maybe other architectures, the Boehm collector |
