aniani/irssi
1
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2024-12-04 14:46:39 -05:00
Code

Added --with-glib2 option which can be used to build irssi with GLIB 2.0

Browse Source 
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
This commit is contained in:
Timo Sirainen 2002-04-15 15:48:04 +00:00 committed by cras
parent 754b9c3a0b
commit 4b09990116
1 changed files with 40 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
configure.in
View File

@ -111,6 +111,19 @@ if test "x$prefix" != "xNONE"; then
perl_prefix_note=yes perl_prefix_note=yes
fi 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, AC_ARG_WITH(perl-staticlib,
[ --with-perl-staticlib Specify that we want to link perl libraries [ --with-perl-staticlib Specify that we want to link perl libraries
statically in irssi, default is no], statically in irssi, default is no],
@ -312,15 +325,35 @@ AC_DEFUN(AC_CHECK_GLIBDIR,[
AC_CHECK_GLIBDIR AC_CHECK_GLIBDIR
if test -z "$GLIB_DIR"; then if test -z "$GLIB_DIR"; then
AM_PATH_GLIB(1.2.0,,, gmodule) if test "x$with_glib2" = "xyes"; then
if test -z "$GLIB_LIBS"; then dnl * check only for glib2
echo "*** trying without -lgmodule" checks="3 4"
glib_config_args=
AM_PATH_GLIB(1.2.0)
else else
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) AC_DEFINE(HAVE_GMODULE)
have_gmodule=yes have_gmodule=yes
fi fi
break
fi
done
if test -z "$GLIB_LIBS"; then if test -z "$GLIB_LIBS"; then
echo echo