mirror of
https://github.com/irssi/irssi.git
synced 2026-08-21 01:22:26 +02:00
Prefer glib2 to 1.2 always now
git-svn-id: http://svn.irssi.org/repos/irssi/trunk@3068 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
parent
c1a1f4c804
commit
9e6ee33cdf
1 changed files with 2 additions and 20 deletions
20
configure.in
20
configure.in
|
|
@ -111,19 +111,6 @@ if test "x$prefix" != "xNONE"; then
|
||||||
perl_prefix_note=yes
|
perl_prefix_note=yes
|
||||||
fi
|
fi
|
||||||
|
|
||||||
AC_ARG_WITH(glib2,
|
|
||||||
[ --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(gc,
|
AC_ARG_WITH(gc,
|
||||||
[ --with-gc Use garbage collector, requires GLIB2],
|
[ --with-gc Use garbage collector, requires GLIB2],
|
||||||
if test x$withval = xyes; then
|
if test x$withval = xyes; then
|
||||||
|
|
@ -401,13 +388,8 @@ AC_DEFUN(AC_CHECK_GLIBDIR,[
|
||||||
AC_CHECK_GLIBDIR
|
AC_CHECK_GLIBDIR
|
||||||
|
|
||||||
if test -z "$GLIB_DIR"; then
|
if test -z "$GLIB_DIR"; then
|
||||||
if test "x$with_glib2" = "xyes"; then
|
|
||||||
dnl * check only for glib2
|
|
||||||
checks="3 4"
|
|
||||||
else
|
|
||||||
dnl * check glib1 then glib2
|
dnl * check glib1 then glib2
|
||||||
checks="1 2 3 4"
|
checks="3 4 1 2"
|
||||||
fi
|
|
||||||
|
|
||||||
for try in $checks; do
|
for try in $checks; do
|
||||||
glib_config_args=
|
glib_config_args=
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue