diff options
| author | Andreas Tobler <a.tobler@schweiz.org> | 2006-06-02 20:47:04 +0000 |
|---|---|---|
| committer | Andreas Tobler <a.tobler@schweiz.org> | 2006-06-02 20:47:04 +0000 |
| commit | b28806f357f380fe0e4343d9b7413efc32b760c7 (patch) | |
| tree | 730b9bf1ff8581d50f4580d698cbdb84377834f6 /configure.ac | |
| parent | d181aaeaa04fe08cb501e07112a09fc1c0da8344 (diff) | |
| download | classpath-b28806f357f380fe0e4343d9b7413efc32b760c7.tar.gz | |
2006-06-02 Andreas Tobler <a.tobler@schweiz.ch>
* configure.ac: Add -lX11 and -lXtst to XTEST_LIBS.
(XTEST_LIBS): New, substitute.
* native/jni/gtk-peer/Makefile.am (AM_LDFLAGS): Add XTEST_LIBS.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 7d1288a16..d3d10bc9e 100644 --- a/configure.ac +++ b/configure.ac @@ -400,9 +400,11 @@ 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}]) + 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) @@ -419,6 +421,7 @@ if test "x${COMPILE_JNI}" = xyes; then AC_SUBST(FREETYPE2_CFLAGS) AC_SUBST(PANGOFT2_LIBS) AC_SUBST(PANGOFT2_CFLAGS) + AC_SUBST(XTEST_LIBS) fi dnl Check for AWT related Qt4 |