From 4b09990116d3f92d266132cf7c7bf7fce0595247 Mon Sep 17 00:00:00 2001
From: Timo Sirainen <cras@irssi.org>
Date: Mon, 15 Apr 2002 15:48:04 +0000
Subject: [PATCH] Added --with-glib2 option which can be used to build irssi
 with GLIB 2.0 instead of 1.2. It autodetects first 1.2 and if not found,
 tries 2.0. NOTE: if you're building from CVS, you MUST have both glib 1.2 and
 2.0 devel. packages installed.

git-svn-id: http://svn.irssi.org/repos/irssi/trunk@2687 dbcabf3a-b0e7-0310-adc4-f8d773084564
---
 configure.in | 47 ++++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 40 insertions(+), 7 deletions(-)

diff --git a/configure.in b/configure.in
index db4e5818..c4680054 100644
--- a/configure.in
+++ b/configure.in
@@ -111,6 +111,19 @@ if test "x$prefix" != "xNONE"; then
 	perl_prefix_note=yes
 fi
 
+AC_ARG_WITH(tests,
+[  --with-glib2           Use GLIB 2.0 instead of 1.2],
+	if test x$withval = xyes; then
+		want_glib2=yes
+	else
+		if test "x$withval" = xno; then
+			want_glib2=no
+		else
+			want_glib2=yes
+		fi
+	fi,
+	want_glib2=yes)
+
 AC_ARG_WITH(perl-staticlib,
 [  --with-perl-staticlib   Specify that we want to link perl libraries
                         statically in irssi, default is no],
@@ -312,16 +325,36 @@ AC_DEFUN(AC_CHECK_GLIBDIR,[
 AC_CHECK_GLIBDIR
 
 if test -z "$GLIB_DIR"; then
-  AM_PATH_GLIB(1.2.0,,, gmodule)
-  if test -z "$GLIB_LIBS"; then
-    echo "*** trying without -lgmodule"
-    glib_config_args=
-    AM_PATH_GLIB(1.2.0)
+  if test "x$with_glib2" = "xyes"; then
+    dnl * check only for glib2
+    checks="3 4"
   else
-    AC_DEFINE(HAVE_GMODULE)
-    have_gmodule=yes
+    dnl * check glib1 then glib2
+    checks="1 2 3 4"
   fi
 
+  for try in $checks; do
+    glib_config_args=
+    if test $try = 1 -o $try = 3; then
+      glib_modules=gmodule
+    else
+      echo "*** trying without -lgmodule"
+      glib_modules=
+    fi
+    if test $try = 1 -o $try = 2; then
+      AM_PATH_GLIB(1.2.0,,, $glib_modules)
+    else
+      AM_PATH_GLIB_2_0(2.0.0,,, $glib_modules)
+    fi
+    if test "$GLIB_LIBS"; then
+      if test $glib_modules = gmodule; then
+        AC_DEFINE(HAVE_GMODULE)
+        have_gmodule=yes
+      fi
+      break
+    fi
+  done
+
   if test -z "$GLIB_LIBS"; then
     echo
     echo "*** If you don't have GLIB, you can get it from ftp://ftp.gtk.org"