Mercurial > audlegacy

changeset 4340:2357e50e5e25

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Automated merge with ssh://hg.atheme.org//hg/audacious
author William Pitcock <nenolod@atheme.org>
date Thu, 13 Mar 2008 16:30:36 -0500
parents 955c5281cd38 (current diff) 3965405e62f8 (diff)
children ffc124a4725b
files
diffstat 1 files changed, 14 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- 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