# HG changeset patch # User William Pitcock # Date 1205443836 18000 # Node ID 2357e50e5e253122ff51abea9e4b72bc40dfdd68 # Parent 955c5281cd38b3c836113221cdca331ea206bfa0# Parent 3965405e62f859c1a477dcb3f62224976d8ee881 Automated merge with ssh://hg.atheme.org//hg/audacious diff -r 955c5281cd38 -r 2357e50e5e25 configure.ac --- a/configure.ac Thu Mar 13 16:30:15 2008 -0500 +++ b/configure.ac Thu Mar 13 16:30:36 2008 -0500 @@ -87,23 +87,27 @@ dnl Check for GTK/GLib/GThread/Pango -PKG_CHECK_MODULES(GTK, [glib-2.0 >= 2.14.0 gtk+-2.0 >= 2.10.0 gthread-2.0 pango], - [ADD_PC_REQUIRES([glib-2.0 >= 2.14.0, gtk+-2.0 >= 2.10.0])], - [AC_MSG_ERROR([Cannot find GLib2/Gtk+2/Pango])] +PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.14.0 gthread-2.0], + [ADD_PC_REQUIRES([glib-2.0 >= 2.14.0])], + [AC_MSG_ERROR([Cannot find Glib2 >= 2.14.0])] ) -dnl Check for GLib. +PKG_CHECK_MODULES(GTK, [gtk+-2.0 >= 2.10.0], + [ADD_PC_REQUIRES([gtk+-2.0 >= 2.10.0])], + [AC_MSG_ERROR([Cannot find Gtk+2 >= 2.10.0])] +) -PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.14.0], - [ADD_PC_REQUIRES([glib-2.0 >= 2.14.0])], - [AC_MSG_ERROR([Cannot find GLib2])] +PKG_CHECK_MODULES(PANGO, [pango >= 1.8.0], + [ADD_PC_REQUIRES([pango >= 1.8.0])], + [AC_MSG_ERROR([Cannot find Pango >= 1.8.0])] ) + dnl Check for libmowgli. -PKG_CHECK_MODULES(MOWGLI, [libmowgli >= 0.4], - [ADD_PC_REQUIRES([libmowgli >= 0.4])], - [AC_MSG_ERROR([Cannot find libmowgli: try http://www.atheme.org/projects/mowgli.shtml])] +PKG_CHECK_MODULES(MOWGLI, [libmowgli >= 0.4.0], + [ADD_PC_REQUIRES([libmowgli >= 0.4.0])], + [AC_MSG_ERROR([Cannot find libmowgli, try http://www.atheme.org/projects/mowgli.shtml])] ) # Check if socklen_t is defined