2005-11-02 Christian Thalinger <twisti@complang.tuwien.ac.at>

	* configure.ac: Check for cairo, pangoft2 and freetype2 only
	when gtk peers are enabled.

2 files changed, 62 insertions, 57 deletions

diff --git a/ChangeLog b/ChangeLog
index c410d94a3..31a565565 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-11-02  Christian Thalinger  <twisti@complang.tuwien.ac.at>
+
+	* configure.ac: Check for cairo, pangoft2 and freetype2 only 
+	when gtk peers are enabled.
+
 2005-11-02    Audrius Meskauskas  <AudriusA@Bioinformatics.org>
 
 	* AUTHORS (Stuart Ballard): Address update.
diff --git a/configure.ac b/configure.ac
index d54e6d18a..88f7af6f6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -338,17 +338,31 @@ if test "x${COMPILE_JNI}" = xyes; then
 
   dnl Check for AWT related gthread/gtk
   if test "x${COMPILE_GTK_PEER}" = xyes; then
-     AC_PATH_XTRA
-     if test "$no_x" = yes; 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}])
-     PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.4 gthread-2.0 >= 2.2 gdk-pixbuf-2.0)
-     AC_SUBST(GTK_CFLAGS)
-     AC_SUBST(GTK_LIBS)
+    AC_PATH_XTRA
+    if test "$no_x" = yes; 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}])
+    PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.4 gthread-2.0 >= 2.2 gdk-pixbuf-2.0)
+
+    if test "x${enable_gtk_cairo}" = xyes; then
+      PKG_CHECK_MODULES(CAIRO, cairo >= 0.5.0)
+    fi
+
+    PKG_CHECK_MODULES(PANGOFT2, pangoft2)
+    PKG_CHECK_MODULES(FREETYPE2, freetype2)
+  
+    AC_SUBST(GTK_CFLAGS)
+    AC_SUBST(GTK_LIBS)
+    AC_SUBST(CAIRO_LIBS)
+    AC_SUBST(CAIRO_CFLAGS)
+    AC_SUBST(PANGOFT2_LIBS)
+    AC_SUBST(PANGOFT2_CFLAGS)
+    AC_SUBST(FREETYPE2_LIBS)
+    AC_SUBST(FREETYPE2_CFLAGS)
   fi
 
   dnl Check for AWT related Qt4
@@ -366,53 +380,39 @@ if test "x${COMPILE_JNI}" = xyes; then
 	AC_MSG_WARN([QWidget not found])))
 	AC_CHECK_PROG(MOC, [moc], [moc])
     fi
-  if test "x$HAVE_QT4" = "xno"; then
-    AC_MSG_NOTICE([Looking for QT_CFLAGS and QT_LIBS without pkg-config])
-    case "$host_os" in
-      darwin*)
-	AC_ARG_WITH([qt4dir],
-	  [AS_HELP_STRING([--with-qt4dir=DIR],
-	  [Qt4 installation directory used for OS-X.
-	  For other systems use pkg-config.])],
-	  [QT4DIR=$withval]
-	  )
-	if test x"$QT4DIR" = x ; then
-	  AC_MSG_ERROR([*** No path for Qt4 --with-qt4dir option given])
-	fi
-	AC_MSG_RESULT([QT4DIR... $QT4DIR])
-	AC_CHECK_PROG(MOC, [moc], [$QT4DIR/bin/moc], [], $QT4DIR/bin)
-	if test x"$MOC" = x; then
-	  AC_MSG_ERROR([*** This is not the right Qt installation])
-	fi
-	QT_CFLAGS="-F$QT4DIR/lib -I$QT4DIR/lib/QtCore.framework/Headers"
-	QT_CFLAGS="$QT_CFLAGS -I$QT4DIR/lib/QtGui.framework/Headers"
-	QT_LIBS="-Xlinker -F$QT4DIR/lib -Xlinker -framework -Xlinker QtCore"
-	QT_LIBS="$QT_LIBS -Xlinker -framework -Xlinker QtGui"
-	;;
-      *)
-	AC_MSG_ERROR([*** Please check PKG_CONFIG_PATH or the version
-	of your installed Qt4 installation.])
-	;;
-    esac
-  fi
-  AC_MSG_NOTICE([Set QT_CFLAGS... $QT_CFLAGS])
-  AC_SUBST(QT_CFLAGS)
-  AC_SUBST(QT_LIBS)
-fi
-
-  if test "x${enable_gtk_cairo}" = xyes; then
-    PKG_CHECK_MODULES(CAIRO, cairo >= 0.5.0)
+    if test "x$HAVE_QT4" = "xno"; then
+      AC_MSG_NOTICE([Looking for QT_CFLAGS and QT_LIBS without pkg-config])
+      case "$host_os" in
+  	darwin*)
+  	  AC_ARG_WITH([qt4dir],
+  	    [AS_HELP_STRING([--with-qt4dir=DIR],
+  	    [Qt4 installation directory used for OS-X.
+  	    For other systems use pkg-config.])],
+  	    [QT4DIR=$withval]
+  	    )
+  	  if test x"$QT4DIR" = x ; then
+  	    AC_MSG_ERROR([*** No path for Qt4 --with-qt4dir option given])
+  	  fi
+  	  AC_MSG_RESULT([QT4DIR... $QT4DIR])
+  	  AC_CHECK_PROG(MOC, [moc], [$QT4DIR/bin/moc], [], $QT4DIR/bin)
+  	  if test x"$MOC" = x; then
+  	    AC_MSG_ERROR([*** This is not the right Qt installation])
+  	  fi
+  	  QT_CFLAGS="-F$QT4DIR/lib -I$QT4DIR/lib/QtCore.framework/Headers"
+  	  QT_CFLAGS="$QT_CFLAGS -I$QT4DIR/lib/QtGui.framework/Headers"
+  	  QT_LIBS="-Xlinker -F$QT4DIR/lib -Xlinker -framework -Xlinker QtCore"
+  	  QT_LIBS="$QT_LIBS -Xlinker -framework -Xlinker QtGui"
+  	  ;;
+  	*)
+  	  AC_MSG_ERROR([*** Please check PKG_CONFIG_PATH or the version
+  	  of your installed Qt4 installation.])
+  	  ;;
+      esac
+    fi
+    AC_MSG_NOTICE([Set QT_CFLAGS... $QT_CFLAGS])
+    AC_SUBST(QT_CFLAGS)
+    AC_SUBST(QT_LIBS)
   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)
 fi
 
 CLASSPATH_WITH_JAVAH