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

Diff of /classpath/configure.ac

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

revision 1.43.2.18 by mark, Wed Nov 2 20:30:10 2005 UTC revision 1.43.2.19 by gnu_andrew, Wed Nov 2 21:44:46 2005 UTC
# Line 338  if test "x${COMPILE_JNI}" = xyes; then Line 338  if test "x${COMPILE_JNI}" = xyes; then
338    
339    dnl Check for AWT related gthread/gtk    dnl Check for AWT related gthread/gtk
340    if test "x${COMPILE_GTK_PEER}" = xyes; then    if test "x${COMPILE_GTK_PEER}" = xyes; then
341       AC_PATH_XTRA      AC_PATH_XTRA
342       if test "$no_x" = yes; then      if test "$no_x" = yes; then
343           AC_MSG_ERROR([GTK+ peers requested but no X library available])          AC_MSG_ERROR([GTK+ peers requested but no X library available])
344       fi      fi
345       dnl We explicitly want the XTest Extension for Robot support.      dnl We explicitly want the XTest Extension for Robot support.
346       AC_CHECK_LIB([Xtst], [XTestQueryExtension], [true],      AC_CHECK_LIB([Xtst], [XTestQueryExtension], [true],
347                    [AC_MSG_ERROR([libXtst NOT found, required for GdkRobot])],            [AC_MSG_ERROR([libXtst NOT found, required for GdkRobot])],
348                    [${X_LIBS}])            [${X_LIBS}])
349       PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.4 gthread-2.0 >= 2.2 gdk-pixbuf-2.0)      PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.4 gthread-2.0 >= 2.2 gdk-pixbuf-2.0)
350       AC_SUBST(GTK_CFLAGS)  
351       AC_SUBST(GTK_LIBS)      if test "x${enable_gtk_cairo}" = xyes; then
352          PKG_CHECK_MODULES(CAIRO, cairo >= 0.5.0)
353        fi
354    
355        PKG_CHECK_MODULES(PANGOFT2, pangoft2)
356        PKG_CHECK_MODULES(FREETYPE2, freetype2)
357      
358        AC_SUBST(GTK_CFLAGS)
359        AC_SUBST(GTK_LIBS)
360        AC_SUBST(CAIRO_LIBS)
361        AC_SUBST(CAIRO_CFLAGS)
362        AC_SUBST(PANGOFT2_LIBS)
363        AC_SUBST(PANGOFT2_CFLAGS)
364        AC_SUBST(FREETYPE2_LIBS)
365        AC_SUBST(FREETYPE2_CFLAGS)
366    fi    fi
367    
368    dnl Check for AWT related Qt4    dnl Check for AWT related Qt4
# Line 366  if test "x${COMPILE_JNI}" = xyes; then Line 380  if test "x${COMPILE_JNI}" = xyes; then
380          AC_MSG_WARN([QWidget not found])))          AC_MSG_WARN([QWidget not found])))
381          AC_CHECK_PROG(MOC, [moc], [moc])          AC_CHECK_PROG(MOC, [moc], [moc])
382      fi      fi
383    if test "x$HAVE_QT4" = "xno"; then      if test "x$HAVE_QT4" = "xno"; then
384      AC_MSG_NOTICE([Looking for QT_CFLAGS and QT_LIBS without pkg-config])        AC_MSG_NOTICE([Looking for QT_CFLAGS and QT_LIBS without pkg-config])
385      case "$host_os" in        case "$host_os" in
386        darwin*)          darwin*)
387          AC_ARG_WITH([qt4dir],            AC_ARG_WITH([qt4dir],
388            [AS_HELP_STRING([--with-qt4dir=DIR],              [AS_HELP_STRING([--with-qt4dir=DIR],
389            [Qt4 installation directory used for OS-X.              [Qt4 installation directory used for OS-X.
390            For other systems use pkg-config.])],              For other systems use pkg-config.])],
391            [QT4DIR=$withval]              [QT4DIR=$withval]
392            )              )
393          if test x"$QT4DIR" = x ; then            if test x"$QT4DIR" = x ; then
394            AC_MSG_ERROR([*** No path for Qt4 --with-qt4dir option given])              AC_MSG_ERROR([*** No path for Qt4 --with-qt4dir option given])
395          fi            fi
396          AC_MSG_RESULT([QT4DIR... $QT4DIR])            AC_MSG_RESULT([QT4DIR... $QT4DIR])
397          AC_CHECK_PROG(MOC, [moc], [$QT4DIR/bin/moc], [], $QT4DIR/bin)            AC_CHECK_PROG(MOC, [moc], [$QT4DIR/bin/moc], [], $QT4DIR/bin)
398          if test x"$MOC" = x; then            if test x"$MOC" = x; then
399            AC_MSG_ERROR([*** This is not the right Qt installation])              AC_MSG_ERROR([*** This is not the right Qt installation])
400          fi            fi
401          QT_CFLAGS="-F$QT4DIR/lib -I$QT4DIR/lib/QtCore.framework/Headers"            QT_CFLAGS="-F$QT4DIR/lib -I$QT4DIR/lib/QtCore.framework/Headers"
402          QT_CFLAGS="$QT_CFLAGS -I$QT4DIR/lib/QtGui.framework/Headers"            QT_CFLAGS="$QT_CFLAGS -I$QT4DIR/lib/QtGui.framework/Headers"
403          QT_LIBS="-Xlinker -F$QT4DIR/lib -Xlinker -framework -Xlinker QtCore"            QT_LIBS="-Xlinker -F$QT4DIR/lib -Xlinker -framework -Xlinker QtCore"
404          QT_LIBS="$QT_LIBS -Xlinker -framework -Xlinker QtGui"            QT_LIBS="$QT_LIBS -Xlinker -framework -Xlinker QtGui"
405          ;;            ;;
406        *)          *)
407          AC_MSG_ERROR([*** Please check PKG_CONFIG_PATH or the version            AC_MSG_ERROR([*** Please check PKG_CONFIG_PATH or the version
408          of your installed Qt4 installation.])            of your installed Qt4 installation.])
409          ;;            ;;
410      esac        esac
411    fi      fi
412    AC_MSG_NOTICE([Set QT_CFLAGS... $QT_CFLAGS])      AC_MSG_NOTICE([Set QT_CFLAGS... $QT_CFLAGS])
413    AC_SUBST(QT_CFLAGS)      AC_SUBST(QT_CFLAGS)
414    AC_SUBST(QT_LIBS)      AC_SUBST(QT_LIBS)
 fi  
   
   if test "x${enable_gtk_cairo}" = xyes; then  
     PKG_CHECK_MODULES(CAIRO, cairo >= 0.5.0)  
415    fi    fi
   
   PKG_CHECK_MODULES(PANGOFT2, pangoft2)  
   PKG_CHECK_MODULES(FREETYPE2, freetype2)  
   
   AC_SUBST(CAIRO_LIBS)  
   AC_SUBST(CAIRO_CFLAGS)  
   AC_SUBST(PANGOFT2_LIBS)  
   AC_SUBST(PANGOFT2_CFLAGS)  
   AC_SUBST(FREETYPE2_LIBS)  
   AC_SUBST(FREETYPE2_CFLAGS)  
416  fi  fi
417    
418  CLASSPATH_WITH_JAVAH  CLASSPATH_WITH_JAVAH

Legend:
Removed from v.1.43.2.18  
changed lines
  Added in v.1.43.2.19

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