/[classpath]/classpath/configure.ac
ViewVC logotype

Diff of /classpath/configure.ac

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.110 by tromey, Wed Oct 5 19:18:59 2005 UTC revision 1.111 by andreast, Thu Oct 6 06:24:11 2005 UTC
# Line 324  if test "x${COMPILE_JNI}" = xyes; then Line 324  if test "x${COMPILE_JNI}" = xyes; then
324    
325    dnl Check for AWT related Qt4    dnl Check for AWT related Qt4
326    if test "x${COMPILE_QT_PEER}" = xyes; then    if test "x${COMPILE_QT_PEER}" = xyes; then
327      PKG_CHECK_MODULES(QT, QtGui >= 4.0.1)      PKG_CHECK_MODULES(QT, QtGui >= 4.0.1, HAVE_QT4="yes", HAVE_QT4="no")
328      dnl Check needed because in some cases the QtGui includedir      if test "x$HAVE_QT4" = "xyes"; then
329      dnl doesn't contain the subsystem dir.        dnl Check needed because in some cases the QtGui includedir
330      QT_INCLUDE_DIR=$($PKG_CONFIG --variable=includedir QtGui)        dnl doesn't contain the subsystem dir.
331      EXTRA_QT_INCLUDE_DIR="$QT_INCLUDE_DIR/Qt"        QT_INCLUDE_DIR=$($PKG_CONFIG --variable=includedir QtGui)
332      AC_CHECK_FILE([$QT_INCLUDE_DIR/QWidget],        EXTRA_QT_INCLUDE_DIR="$QT_INCLUDE_DIR/Qt"
333                    AC_MSG_NOTICE([No extra QT_INCLUDE_DIR needed]),        AC_CHECK_FILE([$QT_INCLUDE_DIR/QWidget],
334                    AC_CHECK_FILE([$EXTRA_QT_INCLUDE_DIR/QWidget],        AC_MSG_NOTICE([No extra QT_INCLUDE_DIR needed]),
335                          QT_CFLAGS="$QT_CFLAGS -I$EXTRA_QT_INCLUDE_DIR",        AC_CHECK_FILE([$EXTRA_QT_INCLUDE_DIR/QWidget],
336                          AC_MSG_WARN([QWidget not found])))          QT_CFLAGS="$QT_CFLAGS -I$EXTRA_QT_INCLUDE_DIR",
337      AC_MSG_NOTICE([Set QT_CFLAGS... $QT_CFLAGS])          AC_MSG_WARN([QWidget not found])))
338      AC_CHECK_PROG(MOC, [moc], [moc])          AC_CHECK_PROG(MOC, [moc], [moc])
339      AC_SUBST(QT_CFLAGS)      fi
340      AC_SUBST(QT_LIBS)    if test "x$HAVE_QT4" = "xno"; then
341        AC_MSG_NOTICE([Looking for QT_CFLAGS and QT_LIBS without pkg-config])
342        case "$host_os" in
343          darwin*)
344            AC_ARG_WITH([qtdir],
345              [AS_HELP_STRING([--with-qtdir=DIR],
346              [Qt4 installation directory used for OS-X.
347              For other systems use pkg-config.])],
348              [QT4DIR=$withval]
349              )
350            if test x"$QT4DIR" = x ; then
351              AC_MSG_ERROR([*** No path for Qt4 --with-qtdir option given])
352            fi
353            AC_MSG_RESULT([QT4DIR... $QT4DIR])
354            AC_CHECK_PROG(MOC, [moc], [$QT4DIR/bin/moc], [], $QT4DIR/bin)
355            if test x"$MOC" = x; then
356              AC_MSG_ERROR([*** This is not the right Qt installation])
357            fi
358            QT_CFLAGS="-F$QT4DIR/lib -I$QT4DIR/lib/QtCore.framework/Headers"
359            QT_CFLAGS="$QT_CFLAGS -I$QT4DIR/lib/QtGui.framework/Headers"
360            QT_LIBS="-Xlinker -F$QT4DIR/lib -Xlinker -framework -Xlinker QtCore"
361            QT_LIBS="$QT_LIBS -Xlinker -framework -Xlinker QtGui"
362            ;;
363          *)
364            AC_MSG_ERROR([*** Please check PKG_CONFIG_PATH or the version
365            of your installed Qt4 installation.])
366            ;;
367        esac
368    fi    fi
369      AC_MSG_NOTICE([Set QT_CFLAGS... $QT_CFLAGS])
370      AC_SUBST(QT_CFLAGS)
371      AC_SUBST(QT_LIBS)
372    fi
373    
374    if test "x${enable_gtk_cairo}" = xyes; then    if test "x${enable_gtk_cairo}" = xyes; then
375      PKG_CHECK_MODULES(CAIRO, cairo >= 0.5.0)      PKG_CHECK_MODULES(CAIRO, cairo >= 0.5.0)

Legend:
Removed from v.1.110  
changed lines
  Added in v.1.111

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26